neo4j-rake_tasks 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f49243dad640d3474b999e8c645c9bd9c60c2cba
-  data.tar.gz: 78738a943de6f3a0974f16deb5cc08570a9d1d1b
+  metadata.gz: 1ed87f21ff7a5a5242dbfc8ace41b95adc1d40dd
+  data.tar.gz: 406737a27d011b728f870ad4202dc81c9f2ee9a0
 SHA512:
-  metadata.gz: b45237730eab1a69e1a7b3663ac21d12176caf07032c9975325be5c8d3f4eec53d2eec7c906e9fa79addcaadb0039b9298559c1826f6ef098d90907b4abbd0a3
-  data.tar.gz: 90c39ca72851a2a687af9b9b5d1f93969f15281432e85106f3c54c14baf7914aafdc3d559ecf3a8843614330c4f5a0bde3187af433b9a6dfa2194dc78c54aacf
+  metadata.gz: 971cdcb5bf88dac5ede1a21119b2155e0045551a02387743a1bb17501d5f2e6e3d888de82356c628347ea6c1a68818c715074e192b7ccc708366b08361645b31
+  data.tar.gz: 817864aef547aa9c372f39da3e2fde8c59b3b8854ed194c0d1f6ed12e9bea39afe43f4ee3a06dc7b7797d3dca6500bef62753f84afaee0532e9247ad172a10c7

data/lib/neo4j/rake_tasks/server_manager.rb

@@ -27,13 +27,20 @@ module Neo4j
       end
 
       def start(wait = true)
-        system_or_fail(neo4j_command_path(start_argument(wait)))
+        system_or_fail(neo4j_command_path(start_argument(wait))).tap do
+          @pid = pid_path.read.to_i
+        end
       end
 
-      def stop
+      def stop(timeout = nil)
         validate_is_system_admin!
 
-        system_or_fail(neo4j_command_path(:stop))
+        Timeout.timeout(timeout) do
+          system_or_fail(neo4j_command_path(:stop))
+        end
+      rescue Timeout::Error
+        puts 'Shutdown timeout reached, killing process...'
+        Process.kill('KILL', @pid) if @pid
       end
 
       def console
@@ -41,7 +48,7 @@ module Neo4j
       end
 
       def shell
-        not_started = !@path.join('data/neo4j-service.pid').exist?
+        not_started = !pid_path.exist?
 
         start if not_started
 
@@ -164,19 +171,36 @@ module Neo4j
           fail("Unable to run: #{command}")
       end
 
-      NEO4J_LATEST_URL = 'https://api.github.com/repos/neo4j/neo4j/releases/latest'
       def version_from_edition(edition_string)
-        edition_string.gsub(/-latest$/) do
-          require 'open-uri'
-          puts 'Retrieving latest version...'
-          latest_version = JSON.parse(open(NEO4J_LATEST_URL).read)['tag_name']
-          puts "Latest version is: #{latest_version}"
-          "-#{latest_version}"
+        edition_string.downcase.gsub(/-([a-z\-]+)$/) do
+          puts "Retrieving #{$1} version..."
+
+          version = neo4j_versions[$1]
+
+          fail "Invalid version identifier: #{$1}" if !neo4j_versions.key?($1)
+          fail "There is not currently a version for #{$1}" if version.nil?
+
+          puts "#{$1.capitalize} version is: #{version}"
+
+          "-#{version}"
         end
       end
 
+      def pid_path
+        @path.join('data/neo4j-service.pid')
+      end
+
       private
 
+      NEO4J_VERSIONS_URL = 'https://raw.githubusercontent.com/neo4jrb/neo4j-rake_tasks/master/neo4j_versions.yml'
+
+      def neo4j_versions
+        require 'open-uri'
+        require 'yaml'
+
+        YAML.load(open(NEO4J_VERSIONS_URL).read)
+      end
+
       def download_neo4j(version)
         tempfile = Tempfile.open('neo4j-download', encoding: 'ASCII-8BIT')
 

data/lib/neo4j/rake_tasks/version.rb

@@ -1,5 +1,5 @@
 module Neo4j
   module RakeTasks
-    VERSION = '0.3.0'
+    VERSION = '0.4.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j-rake_tasks
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Brian Underwood
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-14 00:00:00.000000000 Z
+date: 2016-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -200,4 +200,3 @@ signing_key:
 specification_version: 4
 summary: Rake tasks for managing Neo4j
 test_files: []
-has_rdoc: true