fcrepo_wrapper 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 586c5e4826f1221029e3439407b883e2e55060df
-  data.tar.gz: b38c2fffacec23ad368571395be5ec133d9bb361
+  metadata.gz: edb09244809680dd2aac813d7381cae666d9e47c
+  data.tar.gz: 392bc6cc390d1057d056c44bbf7d3baf9afee878
 SHA512:
-  metadata.gz: 6705b3df401d00cd08d1c476554ccfbf7fe27aae7be54a6df7c7a756dbe7c22919276dde077928b3d6dc4f497a819005dd8fe82055093bde6ede840974a10809
-  data.tar.gz: 0d3bd0dd6be8568fdf643a92e0dcae15730e51ff24396e1ce413de520dc62413e56af2a378ccd2bd932aa090e9c416c56a0d329359090bf1c76012a8e839fa9c
+  metadata.gz: 126eefe977370e43d2936566f1838da100408c38738b33d6c9390d1c40fb97624920c026266486329f722911b29936e1a8b3e5c19c9d647473c94b9f91bdc161
+  data.tar.gz: 9268715cdd5219d4c031be4ca14a2684acc8be3766193d70af2d52b87ae547095d59e73075823c0eeaab9bc30e293ac9a31221c3ebfc5829c883797b3f4e1575

data/README.md

@@ -3,7 +3,7 @@
 Wrap any task with a Fcrepo instance:
 
 ```ruby
-FcrepoWrapper.wrap do |solr|
+FcrepoWrapper.wrap do |fedora_repo|
   # Something that requires Fcrepo
 end
 ```
@@ -35,7 +35,7 @@ $ fcrepo_wrapper -config <path_to_config_file>
 |-----------------|-----------------------------------------|
 | download_dir    | Local path for storing the downloaded jar & md5 file |
 | env             | *(Hash)* |
-| fcrepo_home_dir | Directory to store fedora repoistory data files |
+| fcrepo_home_dir | Directory to store fedora repository data files |
 | fedora_options  | *(Hash)* |
 | ignore_md5sum   | *(Boolean)* suppress checksum error messages |
 | instance_dir    | Directory to store the fedora jar file |
@@ -54,4 +54,3 @@ To clean out data that is being stored in you FcrepoWrapper explicitly run:
 $ fcrepo_wrapper <configuration options> clean
 ```
 ***Note*** You must use the same configuration options on the clean command as you do on the run command to clean the correct instance.
-

data/fcrepo_wrapper.gemspec

@@ -25,6 +25,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "rubocop"
-  spec.add_development_dependency "simple_solr_client"
   spec.add_development_dependency "coveralls"
 end

data/lib/fcrepo_wrapper.rb

@@ -7,7 +7,7 @@ require 'fcrepo_wrapper/instance'
 
 module FcrepoWrapper
   def self.default_fcrepo_version
-    '4.7.1'
+    '4.7.3'
   end
 
   def self.default_fcrepo_port

data/lib/fcrepo_wrapper/downloader.rb

@@ -1,18 +1,25 @@
+require 'ruby-progressbar'
+
 module FcrepoWrapper
   class Downloader
     def self.fetch_with_progressbar(url, output)
-      pbar = ProgressBar.create(title: File.basename(url), total: nil, format: "%t: |%B| %p%% (%e )")
-      open(url, content_length_proc: lambda do|t|
-        if t && 0 < t
-          pbar.total = t
-        end
-      end,
-                progress_proc: lambda do|s|
-                  pbar.progress = s
-                end) do |io|
+      pbar = SafeProgressBar.new(title: File.basename(url), total: nil, format: '%t: |%B| %p%% (%e )')
+      open(url,
+           content_length_proc: ->(bytes) { pbar.total = bytes },
+           progress_proc: ->(bytes) { pbar.progress = bytes }) do |io|
         IO.copy_stream(io, output)
       end
     end
+
+    class SafeProgressBar < ProgressBar::Base
+      def progress=(new_progress)
+        self.total = new_progress if total.to_i <= new_progress
+        super
+      end
+
+      def total=(new_total)
+        super if new_total && new_total > 0
+      end
+    end
   end
 end
-

data/lib/fcrepo_wrapper/version.rb

@@ -1,3 +1,3 @@
 module FcrepoWrapper
-  VERSION = '0.8.0'.freeze
+  VERSION = '0.9.0'.freeze
 end

data/spec/spec_helper.rb

@@ -2,7 +2,6 @@ require 'coveralls'
 Coveralls.wear!
 
 require 'fcrepo_wrapper'
-require 'simple_solr_client'
 
 require 'rspec'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fcrepo_wrapper
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Chris Beer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-25 00:00:00.000000000 Z
+date: 2017-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
@@ -80,20 +80,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: simple_solr_client
-  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
@@ -164,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Solr 5 service wrapper