neo4j-rake_tasks 0.5.6 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b088bea8515cd73ee7a7fc8425377d1ca5c3aae
-  data.tar.gz: 304ad19a929b2f67982c0d74e8c8fe7fb7a5d838
+  metadata.gz: 1f635df119c539d9833db598349cfa146b943ec8
+  data.tar.gz: 3fc426ff2628e691f4ecba42a3f79710fb4159bd
 SHA512:
-  metadata.gz: 0574df67c4ed6aa0e852de92a8575a6fec8699b61fbbaf831f842107a1d4464bc637cfd60ba6352c9d023f27c95532bb51a72a119130f66c1482c7eff94d9e8a
-  data.tar.gz: 0985c525edeb4e41523dda4b79d83f2110ab4087e00ebeed923c9674cfbabef190aa927442a1f9669f79a884bc75c533b7562a5706e2a359bbdc87866dfbfc55
+  metadata.gz: c4e39866c185f26aaa10665d1c04bee52aab9ad2f1e2c4800a524643a4b3f482270c8233ba1feb7cad4caa760b4fa1387d04f1d06f0080743eaa14f2ae83a956
+  data.tar.gz: 930aca00dbd18f693f94c12eb2c583afeba7a7aebcd4509f09fb6c6fa9daa168fd256bc1bf4860d221972c4e21cb49c6c0c23f65892d77d8f817283116b226a4

data/lib/neo4j/rake_tasks/download.rb

@@ -0,0 +1,46 @@
+require 'ruby-progressbar'
+require 'net/http'
+
+module Neo4j
+  module RakeTasks
+    class Download
+      def initialize(url)
+        @url = url
+      end
+
+      def exists?
+        status = head(@url).code.to_i
+        (200...300).cover?(status)
+      end
+
+      def fetch(message)
+        require 'open-uri'
+        open(@url,
+             content_length_proc: lambda do |total|
+               create_progress_bar(message, total) if total && total > 0
+             end,
+             progress_proc: method(:update_progress_bar)).read
+      end
+
+      private
+
+      def create_progress_bar(message, total)
+        @progress_bar ||= ProgressBar.create title: message,
+                                             total: total
+      end
+
+      def update_progress_bar(value)
+        return unless @progress_bar
+        value = @progress_bar.total >= value ? value : @progress_bar.total
+        @progress_bar.progress = value
+      end
+
+      def head(url)
+        parsed_url = URI(url)
+        Net::HTTP.start(parsed_url.host, parsed_url.port) do |http|
+          return http.head(parsed_url.path)
+        end
+      end
+    end
+  end
+end

data/lib/neo4j/rake_tasks/server_manager.rb

@@ -14,10 +14,10 @@ module Neo4j
 
       def install(edition_string)
         version = version_from_edition(edition_string)
-        puts "Installing neo4j-#{version}"
 
         if !neo4j_binary_path.exist?
           archive_path = download_neo4j(version)
+          puts "Installing neo4j-#{version}"
           extract!(archive_path)
 
           FileUtils.rm archive_path
@@ -232,18 +232,16 @@ module Neo4j
 
       def download_neo4j(version)
         tempfile = Tempfile.open('neo4j-download', encoding: 'ASCII-8BIT')
-
         url = download_url(version)
 
-        status = HTTParty.head(url).code
-        unless (200...300).include?(status)
-          fail "#{version} is not available to download"
-        end
+        download = Download.new(url)
+        raise "#{version} is not available to download" unless download.exists?
 
-        tempfile << HTTParty.get(url)
+        tempfile << download.fetch("Fetching neo4j-#{version}")
         tempfile.flush
-
         tempfile.path
+      ensure
+        puts
       end
 
       # POSTs to an endpoint with the form required to change a Neo4j password

data/lib/neo4j/rake_tasks/version.rb

@@ -1,5 +1,5 @@
 module Neo4j
   module RakeTasks
-    VERSION = '0.5.6'
+    VERSION = '0.6.0'
   end
 end

data/lib/neo4j/rake_tasks.rb

@@ -1,3 +1,4 @@
+require 'neo4j/rake_tasks/download'
 require 'neo4j/rake_tasks/starnix_server_manager'
 require 'neo4j/rake_tasks/windows_server_manager'
 require 'rake'

data/neo4j-rake_tasks.gemspec

@@ -37,9 +37,9 @@ DESCRIPTION
     '--inline-source']
 
   s.add_dependency('colored')
-  s.add_dependency('httparty')
   s.add_dependency('rake')
   s.add_dependency('os')
+  s.add_dependency('ruby-progressbar')
   s.add_dependency('rubyzip', '>= 1.1.7')
 
   # s.add_development_dependency('vcr')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j-rake_tasks
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.6.0
 platform: ruby
 authors:
 - Brian Underwood
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-30 00:00:00.000000000 Z
+date: 2016-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: httparty
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: os
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: os
+  name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -163,6 +163,7 @@ files:
 - Gemfile
 - README.md
 - lib/neo4j/rake_tasks.rb
+- lib/neo4j/rake_tasks/download.rb
 - lib/neo4j/rake_tasks/neo4j_server.rake
 - lib/neo4j/rake_tasks/server_manager.rb
 - lib/neo4j/rake_tasks/starnix_server_manager.rb