neo4j-rake_tasks 0.7.9 → 0.7.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a38496d8807a96488918702d6c388b88b82eb26
-  data.tar.gz: ddca35f4d74a36b07acfab500357ab9edacd2661
+  metadata.gz: 3d06fb93166d03680acceac222aa93b23fc1d3ef
+  data.tar.gz: 187f9870bff61c3100f43ce2419d023d61b6a67c
 SHA512:
-  metadata.gz: 92164641ff7b2e100061b54c1c30d7c6a19ddea0cad78e5f2c381a69b59f34d0a9f7994f3b141eeb960df9b387a69fedc419ec6582353c61b114aff1c8f98745
-  data.tar.gz: 886473b595cbc3bf4f050de080a500de15949b4c7fff6863219619e681b7d1396396afe1fe2b948b421b422924c09d46bb385ce305ebc175b8efe3797d64b532
+  metadata.gz: 50510cc60a67d5e8c66a95f8086f65dee9bf4da7250e4e3efa86a9f9cd271e7fef1902aaca40e406dba3381ece0174803be29bb15ee4289ec1089b765ac21cfb
+  data.tar.gz: 76632bbe594a446d8347bcca1568505be7fbe2f5a6f22be700c8a9c2eac2c2cd5a8aeb65da95ee2998ba269b83c07ebfa7ea699209353178754d6775cc7689df

data/lib/neo4j/rake_tasks/server_manager.rb

@@ -23,7 +23,7 @@ module Neo4j
           FileUtils.rm archive_path
         end
 
-        config_port!(7474) if server_version_greater_than?('3.0.0')
+        config_port!(7474) if server_version_greater_than_or_equal_to?('3.0.0')
 
         puts "Neo4j installed to: #{@path}"
       end
@@ -76,7 +76,7 @@ module Neo4j
 
         stop
 
-        paths = if server_version_greater_than?('3.0.0')
+        paths = if server_version_greater_than_or_equal_to?('3.0.0')
                   ['data/databases/graph.db/*', 'logs/*']
                 else
                   ['data/graph.db/*', 'data/log/*']
@@ -116,8 +116,14 @@ module Neo4j
       def config_port!(port)
         puts "Config ports #{port} (HTTP) / #{port - 1} (HTTPS) / #{port - 2} (Bolt)"
 
-        if server_version_greater_than?('3.0.0')
+        if server_version_greater_than_or_equal_to?('3.1.0')
           # These are not ideal, perhaps...
+          modify_config_file('dbms.connector.https.enabled' => false,
+                             'dbms.connector.http.enabled' => true,
+                             'dbms.connector.http.listen_address' => "localhost:#{port}",
+                             'dbms.connector.https.listen_address' => "localhost:#{port - 1}",
+                             'dbms.connector.bolt.listen_address' => "localhost:#{port - 2}")
+        elsif server_version_greater_than_or_equal_to?('3.0.0')
           modify_config_file('dbms.connector.https.enabled' => false,
                              'dbms.connector.http.enabled' => true,
                              'dbms.connector.http.address' => "localhost:#{port}",
@@ -208,7 +214,11 @@ module Neo4j
       end
 
       def server_url
-        if server_version_greater_than?('3.0.0')
+        if server_version_greater_than_or_equal_to?('3.1.0')
+          get_config_property('dbms.connector.http.listen_address').strip.tap do |address|
+            address.prepend('http://') unless address.match(/^http:\/\//)
+          end
+        elsif server_version_greater_than_or_equal_to?('3.0.0')
           get_config_property('dbms.connector.http.address').strip.tap do |address|
             address.prepend('http://') unless address.match(/^http:\/\//)
           end
@@ -219,7 +229,7 @@ module Neo4j
       end
 
       def property_configuration_path
-        if server_version_greater_than?('3.0.0')
+        if server_version_greater_than_or_equal_to?('3.0.0')
           @path.join('conf', 'neo4j.conf')
         else
           @path.join('conf', 'neo4j-server.properties')
@@ -252,7 +262,7 @@ module Neo4j
       end
 
       def pid_path
-        if server_version_greater_than?('3.0.0')
+        if server_version_greater_than_or_equal_to?('3.0.0')
           @path.join('run/neo4j.pid')
         else
           @path.join('data/neo4j-service.pid')
@@ -263,8 +273,8 @@ module Neo4j
 
       NEO4J_VERSIONS_URL = 'https://raw.githubusercontent.com/neo4jrb/neo4j-rake_tasks/master/neo4j_versions.yml'
 
-      def server_version_greater_than?(version)
-        Gem::Version.new(server_version) > Gem::Version.new(version)
+      def server_version_greater_than_or_equal_to?(version)
+        Gem::Version.new(server_version) >= Gem::Version.new(version)
       end
 
       def server_version

data/lib/neo4j/rake_tasks/version.rb

@@ -1,5 +1,5 @@
 module Neo4j
   module RakeTasks
-    VERSION = '0.7.9'
+    VERSION = '0.7.10'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j-rake_tasks
 version: !ruby/object:Gem::Version
-  version: 0.7.9
+  version: 0.7.10
 platform: ruby
 authors:
 - Brian Underwood
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-30 00:00:00.000000000 Z
+date: 2016-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -196,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Rake tasks for managing Neo4j