resync-client 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa4c934bab5f910e12150c2cafd5c6ce45e74e52
-  data.tar.gz: 1506085c4edec3af5e91d880c092ae4c3462d7d7
+  metadata.gz: e80e1bb83812f0b30e430a3acda5190b8dfefda9
+  data.tar.gz: 8711fbe32e6148e47e907a42872b697cb0f2270c
 SHA512:
-  metadata.gz: 1164e90bd20134fb7abfa42363586636b0ea43bdb8afcbc76af6b2a12987381c449c5151b5b07e571ab7485f02fc401b9147ef40d3be0dfb9603e7ec43561d2e
-  data.tar.gz: f6e9891cecb8ee287265391c41e27d34badbc15e612656a36b9ce8226fc5e4d625b9a436757a57111022e3eabb935554cbfe26dd9019d136cd3dfd7a99ac56ff
+  metadata.gz: c22c1d4221cff5e30392ce2cc4cca0f1f9dcdd40d128065ba72a1fbabd0439fa9d64be8f0b4c5b34a3e4c7c5561702a5ac537769271f7c05f4bb0f86218af0d6
+  data.tar.gz: cc49a1e20af322c80b260698464234e6578ec201e9c0728b4ecbd649c5a5d8d43b5653aa2c59405dcd21454a7b04e26e2e16fa69c1971b9954e8011d4399c02e

data/.rubocop.yml

@@ -17,7 +17,3 @@ Style/EmptyLinesAroundModuleBody:
 # Allow one line around block body (Style/EmptyLines will still disallow two or more)
 Style/EmptyLinesAroundBlockBody:
   Enabled: false
-
-# Allow %r notation for regexes with a single / character
-Style/RegexpLiteral:
-  MaxSlashes: 0

data/.ruby-version

@@ -1 +1 @@
-2.2.2
+2.2.5

data/CHANGES.md

@@ -1,3 +1,10 @@
+## 0.4.6
+
+- Update to [resync](https://github.com/CDLUC3/resync) 0.4.5
+- Update to Ruby 2.2.5
+- Update to RuboCop 0.47
+- Allow Rake versions > 10.x
+
 ## 0.4.5
 
 - Update to [resync](https://github.com/CDLUC3/resync) 0.4.4

data/Rakefile

@@ -8,18 +8,18 @@ namespace :spec do
 
   desc 'Run all unit tests'
   RSpec::Core::RakeTask.new(:unit) do |task|
-    task.rspec_opts = %w(--color --format documentation --order default)
+    task.rspec_opts = %w[--color --format documentation --order default]
     task.pattern = 'unit/**/*_spec.rb'
   end
 
   desc 'Run all acceptance tests'
   RSpec::Core::RakeTask.new(:acceptance) do |task|
     ENV['COVERAGE'] = nil
-    task.rspec_opts = %w(--color --format documentation --order default)
+    task.rspec_opts = %w[--color --format documentation --order default]
     task.pattern = 'acceptance/**/*_spec.rb'
   end
 
-  task all: [:unit, :acceptance]
+  task all: %i[unit acceptance]
 end
 
 desc 'Run all tests'
@@ -45,7 +45,7 @@ RuboCop::RakeTask.new
 
 desc 'List TODOs (from spec/todo.rb)'
 RSpec::Core::RakeTask.new(:todo) do |task|
-  task.rspec_opts = %w(--color --format documentation --order default)
+  task.rspec_opts = %w[--color --format documentation --order default]
   task.pattern = 'todo.rb'
 end
 

data/lib/resync/client/http_helper.rb

@@ -74,17 +74,17 @@ module Resync
       private
 
       def make_request(uri, limit, &block) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
-        fail "Redirect limit (#{redirect_limit}) exceeded retrieving URI #{uri}" if limit <= 0
+        raise "Redirect limit (#{redirect_limit}) exceeded retrieving URI #{uri}" if limit <= 0
         req = Net::HTTP::Get.new(uri, 'User-Agent' => user_agent)
         Net::HTTP.start(uri.hostname, uri.port, use_ssl: (uri.scheme == 'https')) do |http|
           http.request(req) do |response|
             case response
             when Net::HTTPSuccess
-              block.call(response)
+              yield(response)
             when Net::HTTPInformation, Net::HTTPRedirection
               make_request(redirect_uri_for(response, uri), limit - 1, &block)
             else
-              fail "Error #{response.code}: #{response.message} retrieving URI #{uri}"
+              raise "Error #{response.code}: #{response.message} retrieving URI #{uri}"
             end
           end
         end

data/lib/resync/client/mixins/downloadable.rb

@@ -19,14 +19,14 @@ module Resync
         # Delegates to {Client#get} to get the contents of this +:uri+.
         # The downloaded content will only be downloaded once; subsequent
         # calls to this method will return the cached content.
-        def get # rubocop:disable Style/AccessorMethodName
+        def get
           @content ||= client.get(uri)
         end
 
         # Delegates to {Client#download_to_temp_file} to download the
         # contents of +:uri+ to a file. Subsequent calls will download
         # the contents again, each time to a fresh temporary file.
-        def download_to_temp_file # rubocop:disable Style/AccessorMethodName
+        def download_to_temp_file
           client.download_to_temp_file(uri)
         end
 

data/lib/resync/client/version.rb

@@ -1,6 +1,6 @@
 module Resync
   class Client
     # The version of this gem.
-    VERSION = '0.4.5'
+    VERSION = '0.4.6'.freeze
   end
 end

data/lib/resync/client/zip/bitstream.rb

@@ -63,19 +63,19 @@ module Resync
         private
 
         def resource=(value)
-          fail ArgumentError, 'nil is not a resource' unless value
+          raise ArgumentError, 'nil is not a resource' unless value
           self.metadata = value.metadata
           @resource = value
         end
 
         def metadata=(value)
-          fail 'no metadata found' unless value
+          raise 'no metadata found' unless value
           self.path = value.path
           @metadata = value
         end
 
         def path=(value)
-          fail 'no path found in metadata' unless value
+          raise 'no path found in metadata' unless value
           @path = value.start_with?('/') ? value.slice(1..-1) : value
         end
 

data/lib/resync/client/zip/zip_package.rb

@@ -67,7 +67,7 @@ module Resync
         def zipfile=(value)
           @zipfile = value.is_a?(::Zip::File) ? value : ::Zip::File.open(value)
           manifest_entry = zipfile.find_entry('manifest.xml')
-          fail "No manifest.xml found in zipfile #{zipfile.name}" unless manifest_entry
+          raise "No manifest.xml found in zipfile #{zipfile.name}" unless manifest_entry
           manifest_stream = manifest_entry.get_input_stream
           self.manifest = XMLParser.parse(manifest_stream)
         end

data/resync-client.gemspec

@@ -1,4 +1,5 @@
 # coding: utf-8
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
@@ -15,7 +16,7 @@ Gem::Specification.new do |spec|
   spec.license = 'MIT'
 
   origin = `git config --get remote.origin.url`.chomp
-  origin_uri = origin.start_with?('http') ? URI(origin) : URI(origin.sub('git@github.com:', 'https://github.com/'))
+  origin_uri = origin.start_with?('http') ? URI(origin) : URI(origin.gsub(%r{git@([^:]+)(.com|.org)[^\/]+}, 'http://\1\2'))
   spec.homepage = URI::HTTP.build(host: origin_uri.host, path: origin_uri.path.chomp('.git')).to_s
 
   spec.files = `git ls-files -z`.split("\x0")
@@ -24,13 +25,13 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'promise', '~> 0.3', '>= 0.3.1'
-  spec.add_dependency 'resync', '~> 0.4', '>= 0.4.4'
+  spec.add_dependency 'resync', '~> 0.4', '>= 0.4.5'
   spec.add_dependency 'rubyzip', '~> 1.1'
 
   spec.add_development_dependency 'equivalent-xml', '~> 0.6.0'
-  spec.add_development_dependency 'rake', '~> 10.4'
+  spec.add_development_dependency 'rake', '>= 10.4'
   spec.add_development_dependency 'rspec', '~> 3.2'
-  spec.add_development_dependency 'rubocop', '~> 0.29.1'
+  spec.add_development_dependency 'rubocop', '~> 0.47'
   spec.add_development_dependency 'simplecov', '~> 0.9.2'
   spec.add_development_dependency 'simplecov-console', '~> 0.2.0'
   spec.add_development_dependency 'yard', '~> 0.8'

data/spec/.rubocop.yml

@@ -0,0 +1,13 @@
+inherit_from: ../.rubocop.yml
+
+Metrics/MethodLength:
+  Enabled: false
+
+Metrics/ModuleLength:
+  Enabled: false
+
+Metrics/BlockLength:
+  Enabled: false
+
+Style/MultilineTernaryOperator:
+  Enabled: false

data/spec/rspec_custom_matchers.rb

@@ -17,12 +17,9 @@ RSpec::Matchers.define :be_time do |expected|
   end
 
   match do |actual|
-    if expected
-      fail "Expected value #{expected} is not a Time" unless expected.is_a?(Time)
-      actual.is_a?(Time) && (to_string(expected) == to_string(actual))
-    else
-      return actual.nil?
-    end
+    return actual.nil? unless expected
+    raise "Expected value #{expected} is not a Time" unless expected.is_a?(Time)
+    actual.is_a?(Time) && (to_string(expected) == to_string(actual))
   end
 
   failure_message do |actual|

data/spec/unit/resync/client/change_dump_index_spec.rb

@@ -18,7 +18,8 @@ module Resync
                                                                <loc>http://example.com/20130103-changedump.xml</loc>
                                                                <rs:md from='2013-01-03T00:00:00Z' until='2013-01-04T00:00:00Z'/>
                                                              </sitemap>
-                                                           </sitemapindex>"))
+                                                           </sitemapindex>"
+      ))
 
       @change_dumps = [
         "<urlset xmlns='http://www.sitemaps.org/schemas/sitemap/0.9' xmlns:rs='http://www.openarchives.org/rs/terms/'>

data/spec/unit/resync/client/change_dump_spec.rb

@@ -9,19 +9,25 @@ module Resync
           modified_time: Time.utc(2013, 1, 1, 23, 59, 59),
           metadata: Metadata.new(
             from_time: Time.utc(2013, 1, 1),
-            until_time: Time.utc(2013, 1, 2))),
+            until_time: Time.utc(2013, 1, 2)
+          )
+        ),
         Resource.new(
           uri: URI('http://example.com/20130102-changedump.zip'),
           modified_time: Time.utc(2013, 1, 2, 23, 59, 59),
           metadata: Metadata.new(
             from_time: Time.utc(2013, 1, 2),
-            until_time: Time.utc(2013, 1, 3))),
+            until_time: Time.utc(2013, 1, 3)
+          )
+        ),
         Resource.new(
           uri: URI('http://example.com/20130103-changedump.zip'),
           modified_time: Time.utc(2013, 1, 3, 23, 59, 59),
           metadata: Metadata.new(
             from_time: Time.utc(2013, 1, 3),
-            until_time: Time.utc(2013, 1, 4)))
+            until_time: Time.utc(2013, 1, 4)
+          )
+        )
       ]
       @dump = ChangeDump.new(resources: @resources)
 

data/spec/unit/resync/client/dump_spec.rb

@@ -55,7 +55,7 @@ module Resync
         expect(lazy_flat_mapped).to eq(all_packages)
       end
 
-      it 'supports lazy iteration 'do
+      it 'supports lazy iteration ' do
         manifests = Array.new(3) { instance_double(ChangeDumpManifest) }
         all_packages = Array.new(3) do |index|
           zip_package = instance_double(Client::Zip::ZipPackage)
@@ -159,7 +159,7 @@ module Resync
         expect(flat_mapped).to eq(all_packages)
       end
 
-      it 'supports lazy iteration 'do
+      it 'supports lazy iteration ' do
         manifests = Array.new(3) { instance_double(ChangeDumpManifest) }
         all_packages = Array.new(3) do |index|
           zip_package = instance_double(Client::Zip::ZipPackage)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resync-client
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - David Moles
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-28 00:00:00.000000000 Z
+date: 2017-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: promise
@@ -39,7 +39,7 @@ dependencies:
         version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.4.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.4.5
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -82,14 +82,14 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.4'
 - !ruby/object:Gem::Dependency
@@ -112,14 +112,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.29.1
+        version: '0.47'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.29.1
+        version: '0.47'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -200,6 +200,7 @@ files:
 - lib/resync/client/zip/bitstream.rb
 - lib/resync/client/zip/zip_package.rb
 - resync-client.gemspec
+- spec/.rubocop.yml
 - spec/acceptance/example_spec.rb
 - spec/data/examples/capability-list.xml
 - spec/data/examples/change-dump-manifest.xml
@@ -241,7 +242,7 @@ files:
 - spec/unit/resync/client/list_index_spec.rb
 - spec/unit/resync/client/mixins_spec.rb
 - spec/unit/resync/client/zip_package_spec.rb
-homepage: http://github.com/CDLUC3/resync-client
+homepage: http://github.com/resync-client
 licenses:
 - MIT
 metadata: {}
@@ -261,11 +262,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Client library for ResourceSync
 test_files:
+- spec/.rubocop.yml
 - spec/acceptance/example_spec.rb
 - spec/data/examples/capability-list.xml
 - spec/data/examples/change-dump-manifest.xml
@@ -307,4 +309,3 @@ test_files:
 - spec/unit/resync/client/list_index_spec.rb
 - spec/unit/resync/client/mixins_spec.rb
 - spec/unit/resync/client/zip_package_spec.rb
-has_rdoc: