New Upstream Release - ruby-fog-xml
Ready changes
Summary
Merged new upstream version: 0.1.4 (was: 0.1.1).
Resulting package
Built on 2022-03-18T23:43 (took 3m7s)
The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:
apt install -t fresh-releases ruby-fog-xml
Lintian Result
Diff
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000..9f77688
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,10 @@
+version: 2
+updates:
+ - package-ecosystem: "bundler"
+ directory: "/"
+ schedule:
+ interval: "daily"
+ - package-ecosystem: "github-actions"
+ directory: "/"
+ schedule:
+ interval: "daily"
diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
new file mode 100644
index 0000000..72d51c8
--- /dev/null
+++ b/.github/workflows/ruby.yml
@@ -0,0 +1,34 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Ruby
+
+on:
+ push:
+ branches: [ master ]
+ pull_request:
+ branches: [ master ]
+
+jobs:
+ test:
+
+ runs-on: ubuntu-latest
+ strategy:
+ matrix:
+ ruby-version: ['2.5', '2.6', '2.7', '3.0', 'head']
+
+ steps:
+ - uses: actions/checkout@v2.3.4
+ - name: Set up Ruby
+ uses: ruby/setup-ruby@v1
+ with:
+ ruby-version: ${{ matrix.ruby-version }}
+ bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+ - name: Install dependencies
+ run: bundle install
+ - name: Run tests
+ run: bundle exec rake
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
new file mode 100644
index 0000000..00b048f
--- /dev/null
+++ b/.github/workflows/stale.yml
@@ -0,0 +1,23 @@
+name: Mark stale issues and pull requests
+
+on:
+ schedule:
+ - cron: "30 1 * * *"
+
+jobs:
+ stale:
+
+ runs-on: ubuntu-latest
+
+ steps:
+ - uses: actions/stale@v4
+ with:
+ repo-token: ${{ secrets.GITHUB_TOKEN }}
+ days-before-stale: 60
+ days-before-close: 7
+ exempt-issue-labels: 'pinned,security'
+ exempt-pr-labels: 'pinned,security'
+ stale-issue-message: 'This issue has been marked inactive and will be closed if no further activity occurs.'
+ stale-pr-message: 'This pr has been marked inactive and will be closed if no further activity occurs.'
+ stale-issue-label: 'no-issue-activity'
+ stale-pr-label: 'no-pr-activity'
diff --git a/.ruby-version b/.ruby-version
deleted file mode 100644
index 8f9174b..0000000
--- a/.ruby-version
+++ /dev/null
@@ -1 +0,0 @@
-2.1.2
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index eb374b1..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-matrix:
- include:
- - rvm: 1.8.7
- gemfile: gemfiles/Gemfile.1.8.7
- - rvm: 1.9.2
- gemfile: gemfiles/Gemfile.1.9.2+
- env: COVERAGE=true
- - rvm: 1.9.3
- gemfile: gemfiles/Gemfile.1.9.2+
- env: COVERAGE=true
- - rvm: 2.0.0
- gemfile: gemfiles/Gemfile.1.9.2+
- env: COVERAGE=true
- - rvm: 2.1.1
- gemfile: gemfiles/Gemfile.1.9.2+
- env: COVERAGE=true
- - rvm: ree
- gemfile: gemfiles/Gemfile.1.8.7
- - rvm: jruby
- gemfile: gemfiles/Gemfile.1.9.2+
- env: COVERAGE=true
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 6d229ea..c3cc301 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1,4 +1,5 @@
* Michael Hale <mike@hales.ws>
* Paul Thornthwaite <tokengeek@gmail.com>
* Paulo Henrique Lopes Ribeiro <plribeiro3000@gmail.com>
-* Wesley Beary <geemus@gmail.com>
\ No newline at end of file
+* Wesley Beary <geemus@gmail.com>
+* Tomer Brisker <tbrisker@gmail.com>
diff --git a/README.md b/README.md
index b722f3c..ed4fe61 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
Shared XML related functionality for fog
-[](http://travis-ci.org/fog/fog-xml)
+ [](https://travis-ci.org/fog/fog-xml) [](https://gemnasium.com/fog/fog-xml) [](https://coveralls.io/r/fog/fog-xml?branch=master) [](https://codeclimate.com/github/fog/fog-xml)
## Installation
diff --git a/debian/changelog b/debian/changelog
index e8fbc8d..dffab1e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ruby-fog-xml (0.1.1-6) UNRELEASED; urgency=medium
+ruby-fog-xml (0.1.4-1) UNRELEASED; urgency=medium
[ Cédric Boutillier ]
* Bump debhelper compatibility level to 9
@@ -19,8 +19,9 @@ ruby-fog-xml (0.1.1-6) UNRELEASED; urgency=medium
* Use canonical URL in Vcs-Git.
* Update watch file format version to 4.
* Bump debhelper from old 12 to 13.
+ * New upstream release.
- -- Utkarsh Gupta <guptautkarsh2102@gmail.com> Tue, 13 Aug 2019 05:06:15 +0530
+ -- Utkarsh Gupta <guptautkarsh2102@gmail.com> Fri, 18 Mar 2022 23:40:18 -0000
ruby-fog-xml (0.1.1-5) unstable; urgency=medium
diff --git a/debian/patches/library-path b/debian/patches/library-path
index d1af155..23a7a61 100644
--- a/debian/patches/library-path
+++ b/debian/patches/library-path
@@ -4,9 +4,11 @@ Author: Balasankar C <balasankarc@autistici.org>
Last-Update: 2015-01-17
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/spec/minitest_helper.rb
-+++ b/spec/minitest_helper.rb
-@@ -28,6 +28,6 @@
+Index: ruby-fog-xml/spec/minitest_helper.rb
+===================================================================
+--- ruby-fog-xml.orig/spec/minitest_helper.rb
++++ ruby-fog-xml/spec/minitest_helper.rb
+@@ -28,6 +28,6 @@ if ENV["COVERAGE"]
end
end
diff --git a/debian/patches/remove-turn-dependency b/debian/patches/remove-turn-dependency
index 131d256..d28ea0d 100644
--- a/debian/patches/remove-turn-dependency
+++ b/debian/patches/remove-turn-dependency
@@ -7,8 +7,10 @@ Description: Comment out portions using the gem "turn"
Author: Balasankar C <balasankarc@autistici.org>
---- ruby-fog-xml-0.1.1.orig/spec/minitest_helper.rb
-+++ ruby-fog-xml-0.1.1/spec/minitest_helper.rb
+Index: ruby-fog-xml/spec/minitest_helper.rb
+===================================================================
+--- ruby-fog-xml.orig/spec/minitest_helper.rb
++++ ruby-fog-xml/spec/minitest_helper.rb
@@ -1,23 +1,23 @@
require "minitest/spec"
require "minitest/autorun"
diff --git a/fog-xml.gemspec b/fog-xml.gemspec
index 1ad436e..49b749b 100644
--- a/fog-xml.gemspec
+++ b/fog-xml.gemspec
@@ -14,16 +14,21 @@ Gem::Specification.new do |spec|
spec.homepage = "https://github.com/fog/fog-xml"
spec.license = "MIT"
- spec.files = `git ls-files -z`.split("\x0")
+ files = `git ls-files -z`.split("\x0")
+ files.delete(".hound.yml")
+ spec.files = files
+
spec.executables = spec.files.grep(/^bin\//) { |f| File.basename(f) }
spec.test_files = spec.files.grep(/^(test|spec|features)\//)
spec.require_paths = %w(lib)
+ spec.required_ruby_version = '>= 2.0.0'
+
spec.add_dependency "fog-core"
- spec.add_dependency "nokogiri", "~> 1.5", ">= 1.5.11"
+ spec.add_dependency "nokogiri", ">= 1.5.11", "< 2.0.0" #pinned for 2.0 support
spec.add_development_dependency "rake"
spec.add_development_dependency "minitest"
spec.add_development_dependency "turn"
spec.add_development_dependency "pry"
- spec.add_development_dependency "coveralls" if RUBY_VERSION.to_f >= 1.9
+ spec.add_development_dependency "coveralls"
end
diff --git a/gemfiles/Gemfile.1.8.7 b/gemfiles/Gemfile.1.8.7
deleted file mode 100644
index cc2e35a..0000000
--- a/gemfiles/Gemfile.1.8.7
+++ /dev/null
@@ -1,8 +0,0 @@
-source :rubygems
-
-gem 'mime-types', '< 2.0'
-gem 'nokogiri', '< 1.6'
-gem 'rest-client', '~> 1.6.8'
-gem 'fog-core', :github => 'fog/fog-core'
-
-gemspec :path => '../'
\ No newline at end of file
diff --git a/gemfiles/Gemfile.1.9.2+ b/gemfiles/Gemfile.1.9.2+
deleted file mode 100644
index 7448793..0000000
--- a/gemfiles/Gemfile.1.9.2+
+++ /dev/null
@@ -1,7 +0,0 @@
-source :rubygems
-
-gem 'activesupport', '>= 3.0', '< 4'
-gem 'mime-types', '< 2.0'
-gem 'fog-core', :github => 'fog/fog-core'
-
-gemspec :path => '../'
\ No newline at end of file
diff --git a/gemfiles/Gemfile.1.9.3+ b/gemfiles/Gemfile.1.9.3+
new file mode 100644
index 0000000..660761e
--- /dev/null
+++ b/gemfiles/Gemfile.1.9.3+
@@ -0,0 +1,7 @@
+source "https://rubygems.org"
+
+gem 'activesupport', '>= 3.0', '< 4'
+gem 'mime-types', '< 2.0'
+gem 'fog-core'
+
+gemspec :path => '../'
diff --git a/lib/fog/xml.rb b/lib/fog/xml.rb
index 1816163..f937344 100644
--- a/lib/fog/xml.rb
+++ b/lib/fog/xml.rb
@@ -1,15 +1,17 @@
-require "fog/xml/version"
+require "fog/core"
require "nokogiri"
+require File.expand_path("../xml/version", __FILE__)
module Fog
- autoload :ToHashDocument, "fog/to_hash_document"
+ autoload :ToHashDocument, File.expand_path("../to_hash_document", __FILE__)
module XML
- autoload :SAXParserConnection, "fog/xml/sax_parser_connection"
- autoload :Connection, "fog/xml/connection"
+ autoload :SAXParserConnection, File.expand_path("../xml/sax_parser_connection", __FILE__)
+ autoload :Connection, File.expand_path("../xml/connection", __FILE__)
+ autoload :Response, File.expand_path("../xml/response", __FILE__)
end
module Parsers
- autoload :Base, "fog/parsers/base"
+ autoload :Base, File.expand_path("../parsers/base", __FILE__)
end
end
diff --git a/lib/fog/xml/response.rb b/lib/fog/xml/response.rb
new file mode 100644
index 0000000..1222abc
--- /dev/null
+++ b/lib/fog/xml/response.rb
@@ -0,0 +1,26 @@
+module Fog
+ module XML
+ class Response
+ def initialize(parser)
+ @parser = parser
+ @data_stream = Nokogiri::XML::SAX::PushParser.new(parser)
+ @response_string = ""
+ end
+
+ def call(chunk, _remaining, _total)
+ @response_string << chunk if ENV["DEBUG_RESPONSE"]
+ @data_stream << chunk
+ end
+
+ def rewind
+ @parser.reset
+ @response_string = ""
+ end
+
+ def finish
+ Fog::Logger.debug "\n#{@response_string}" if ENV["DEBUG_RESPONSE"]
+ @data_stream.finish
+ end
+ end
+ end
+end
diff --git a/lib/fog/xml/sax_parser_connection.rb b/lib/fog/xml/sax_parser_connection.rb
index 96faa3f..824f5c9 100644
--- a/lib/fog/xml/sax_parser_connection.rb
+++ b/lib/fog/xml/sax_parser_connection.rb
@@ -1,5 +1,3 @@
-require "fog/core/connection"
-
module Fog
module XML
class SAXParserConnection < ::Fog::Core::Connection
@@ -25,20 +23,13 @@ module Fog
def request(parser, params)
reset unless @persistent
- # Prepare the SAX parser
- data_stream = Nokogiri::XML::SAX::PushParser.new(parser)
- response_string = ""
- params[:response_block] = lambda do |chunk, _remaining, _total|
- response_string << chunk if ENV["DEBUG_RESPONSE"]
- data_stream << chunk
- end
+ params[:response_block] = ::Fog::XML::Response.new(parser)
# Make request which read chunks into parser
response = @excon.request(params)
- Fog::Logger.debug "\n#{response_string}" if ENV["DEBUG_RESPONSE"]
# Cease parsing and override response.body with parsed data
- data_stream.finish
+ params[:response_block].finish
response.body = parser.response
response
end
diff --git a/lib/fog/xml/version.rb b/lib/fog/xml/version.rb
index 3b321bf..2d98c94 100644
--- a/lib/fog/xml/version.rb
+++ b/lib/fog/xml/version.rb
@@ -1,5 +1,5 @@
module Fog
module Xml
- VERSION = "0.1.1"
+ VERSION = "0.1.4"
end
end
diff --git a/metadata.yml b/metadata.yml
deleted file mode 100644
index f361019..0000000
--- a/metadata.yml
+++ /dev/null
@@ -1,179 +0,0 @@
---- !ruby/object:Gem::Specification
-name: fog-xml
-version: !ruby/object:Gem::Version
- version: 0.1.1
-platform: ruby
-authors:
-- Wesley Beary (geemus)
-- Paul Thornthwaite (tokengeek)
-- The fog team
-autorequire:
-bindir: bin
-cert_chain: []
-date: 2014-11-06 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
- name: fog-core
- requirement: !ruby/object:Gem::Requirement
- requirements:
- - - ">="
- - !ruby/object:Gem::Version
- version: '0'
- type: :runtime
- prerelease: false
- version_requirements: !ruby/object:Gem::Requirement
- requirements:
- - - ">="
- - !ruby/object:Gem::Version
- version: '0'
-- !ruby/object:Gem::Dependency
- name: nokogiri
- requirement: !ruby/object:Gem::Requirement
- requirements:
- - - "~>"
- - !ruby/object:Gem::Version
- version: '1.5'
- - - ">="
- - !ruby/object:Gem::Version
- version: 1.5.11
- type: :runtime
- prerelease: false
- version_requirements: !ruby/object:Gem::Requirement
- requirements:
- - - "~>"
- - !ruby/object:Gem::Version
- version: '1.5'
- - - ">="
- - !ruby/object:Gem::Version
- version: 1.5.11
-- !ruby/object:Gem::Dependency
- name: rake
- requirement: !ruby/object:Gem::Requirement
- requirements:
- - - ">="
- - !ruby/object:Gem::Version
- version: '0'
- type: :development
- prerelease: false
- version_requirements: !ruby/object:Gem::Requirement
- requirements:
- - - ">="
- - !ruby/object:Gem::Version
- version: '0'
-- !ruby/object:Gem::Dependency
- name: minitest
- requirement: !ruby/object:Gem::Requirement
- requirements:
- - - ">="
- - !ruby/object:Gem::Version
- version: '0'
- type: :development
- prerelease: false
- version_requirements: !ruby/object:Gem::Requirement
- requirements:
- - - ">="
- - !ruby/object:Gem::Version
- version: '0'
-- !ruby/object:Gem::Dependency
- name: turn
- requirement: !ruby/object:Gem::Requirement
- requirements:
- - - ">="
- - !ruby/object:Gem::Version
- version: '0'
- type: :development
- prerelease: false
- version_requirements: !ruby/object:Gem::Requirement
- requirements:
- - - ">="
- - !ruby/object:Gem::Version
- version: '0'
-- !ruby/object:Gem::Dependency
- name: pry
- requirement: !ruby/object:Gem::Requirement
- requirements:
- - - ">="
- - !ruby/object:Gem::Version
- version: '0'
- type: :development
- prerelease: false
- version_requirements: !ruby/object:Gem::Requirement
- requirements:
- - - ">="
- - !ruby/object:Gem::Version
- version: '0'
-- !ruby/object:Gem::Dependency
- name: coveralls
- requirement: !ruby/object:Gem::Requirement
- requirements:
- - - ">="
- - !ruby/object:Gem::Version
- version: '0'
- type: :development
- prerelease: false
- version_requirements: !ruby/object:Gem::Requirement
- requirements:
- - - ">="
- - !ruby/object:Gem::Version
- version: '0'
-description: |-
- Extraction of the XML parsing tools shared between a
- number of providers in the 'fog' gem
-email:
-- geemus@gmail.com
-- tokengeek@gmail.com
-executables: []
-extensions: []
-extra_rdoc_files: []
-files:
-- ".gitignore"
-- ".rubocop.yml"
-- ".ruby-gemset"
-- ".ruby-version"
-- ".travis.yml"
-- CONTRIBUTING.md
-- CONTRIBUTORS.md
-- Gemfile
-- LICENSE.md
-- README.md
-- Rakefile
-- fog-xml.gemspec
-- gemfiles/Gemfile.1.8.7
-- gemfiles/Gemfile.1.9.2+
-- lib/fog/parsers/base.rb
-- lib/fog/to_hash_document.rb
-- lib/fog/xml.rb
-- lib/fog/xml/connection.rb
-- lib/fog/xml/sax_parser_connection.rb
-- lib/fog/xml/version.rb
-- spec/fog/parsers/base_spec.rb
-- spec/fog/xml/connection_spec.rb
-- spec/minitest_helper.rb
-homepage: https://github.com/fog/fog-xml
-licenses:
-- MIT
-metadata: {}
-post_install_message:
-rdoc_options: []
-require_paths:
-- lib
-required_ruby_version: !ruby/object:Gem::Requirement
- requirements:
- - - ">="
- - !ruby/object:Gem::Version
- version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
- requirements:
- - - ">="
- - !ruby/object:Gem::Version
- version: '0'
-requirements: []
-rubyforge_project:
-rubygems_version: 2.2.2
-signing_key:
-specification_version: 4
-summary: XML parsing for fog providers
-test_files:
-- spec/fog/parsers/base_spec.rb
-- spec/fog/xml/connection_spec.rb
-- spec/minitest_helper.rb
Debdiff
[The following lists of changes regard files as different if they have different names, permissions or owners.]
Files in second set of .debs but not in first
-rw-r--r-- root/root /usr/lib/ruby/vendor_ruby/fog/xml/response.rb -rw-r--r-- root/root /usr/share/rubygems-integration/all/specifications/fog-xml-0.1.4.gemspec
Files in first set of .debs but not in second
-rw-r--r-- root/root /usr/share/rubygems-integration/all/specifications/fog-xml-0.1.1.gemspec
No differences were encountered in the control files