solr_wrapper 0.7.3 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e4d41ab3bd1b628c5f948717dcf7f48d76d1106
-  data.tar.gz: 204dcf436957092b4f9e787f60ebcd3af028b390
+  metadata.gz: 26e84bf462a67bf41bcc28be718464861ce482d8
+  data.tar.gz: c38874bc575bfe27d3481ea5e6b61d8f9da28ca1
 SHA512:
-  metadata.gz: d234f9ac3315f4a09edd69c759c174305e81ac55ff50165cffcb4a62d2a275fde28acb1c36dd500da796f24120e6ecc668ef70f130a0b9b2a003974e96673893
-  data.tar.gz: 2df041374409128b007c738f2824806bd249a3fce6a10c6400bd2da2273fbe2bb75dd63dc7848c977b57cc2b0e7c54e3b4117c485f7b519b71b99926817d389d
+  metadata.gz: 28ade5c8d559625c6d584202ecdd9ce5ca0bc55d2e49fe3bfe3480629df45e766311986cf8d0a1ba80d2f1b3826094c18014c8e2dd3e754702067391d726846f
+  data.tar.gz: fc164fb6434984bd6c6f05964a2755b08c71c303480542dea0da5149dc0c3e60d79eb61c74afaafb8aa44a591baba8a728bb4420f34ca91055918b7ee38c064a

data/.travis.yml

@@ -7,3 +7,6 @@ rvm:
 cache:
   directories:
   - /tmp/solr-5.4.1
+
+jdk:
+  - oraclejdk8

data/lib/solr_wrapper.rb

@@ -7,7 +7,7 @@ require 'solr_wrapper/instance'
 
 module SolrWrapper
   def self.default_solr_version
-    '5.4.1'
+    '6.0.0'
   end
 
   def self.default_instance_options

data/lib/solr_wrapper/downloader.rb

@@ -1,17 +1,23 @@
+require 'ruby-progressbar'
+
 module SolrWrapper
   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 <= new_progress
+        super
+      end
+
+      def total=(new_total)
+        super if new_total && new_total > 0
+      end
+    end
   end
 end

data/lib/solr_wrapper/instance.rb

@@ -2,7 +2,6 @@ require 'digest'
 require 'fileutils'
 require 'json'
 require 'open-uri'
-require 'ruby-progressbar'
 require 'securerandom'
 require 'socket'
 require 'stringio'

data/lib/solr_wrapper/version.rb

@@ -1,3 +1,3 @@
 module SolrWrapper
-  VERSION = '0.7.3'
+  VERSION = '0.8.0'
 end

data/spec/lib/solr_wrapper/instance_spec.rb

@@ -73,7 +73,7 @@ describe SolrWrapper::Instance do
 
   describe "#version" do
     subject { solr_instance.version }
-    it { is_expected.to eq '5.4.1' }
+    it { is_expected.to eq '6.0.0' }
   end
 
   describe "#md5" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solr_wrapper
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.8.0
 platform: ruby
 authors:
 - Chris Beer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-24 00:00:00.000000000 Z
+date: 2016-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -171,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Solr 5 service wrapper
@@ -189,4 +189,3 @@ test_files:
 - spec/lib/solr_wrapper/instance_spec.rb
 - spec/lib/solr_wrapper_spec.rb
 - spec/spec_helper.rb
-has_rdoc: