neo4j-rake_tasks 0.4.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9561b90cd8ce47363551014583ac80f218bcd49
-  data.tar.gz: f3450f532e3fb82219979100e9da5d51b656b784
+  metadata.gz: 9fce042842aabac57204740ae7abbbd7563ebb0f
+  data.tar.gz: 47861a40fffd416dcc861544a07a5279e9a51be8
 SHA512:
-  metadata.gz: b151176bde6725936ae52c3f9c4f01781074932bd0368b3c196269e01e4dd705b544a1890ddfdaaafed04af9823eeca528e86a7cecaa52fc7f5161ad311b6bb3
-  data.tar.gz: d4e158423e870304e54a9a175b460ae65b4f1accd2a8686ca13e8dba7e97d25292315db8f977c7cdd72a2d19681a01ea81e8f3209f3e721f4bb5843541173f60
+  metadata.gz: 56e0d63c72fd7dc70e3b404f9f5cc4ac04d39f0d997e594bf3b61c6bade6295372aeaa4d9ebc14ba2d03a41ea7bfd4b9b7e4dca2d6a5a65c72eed84937bcf963
+  data.tar.gz: fffcdaa7daefad8cc2a20b2991fe38f2c6fe1557a64a6fb296c3daeabaa795e35de3be2b5a27aaa5543ba74a78b011dd2405c4dba72e02221329c7a2e719e630

data/lib/neo4j/rake_tasks/server_manager.rb

@@ -110,9 +110,17 @@ module Neo4j
       def config_port!(port)
         puts "Config ports #{port} / #{port - 1}"
 
-        modify_config_file('org.neo4j.server.webserver.https.enabled' => false,
-                           'org.neo4j.server.webserver.port' => port,
-                           'org.neo4j.server.webserver.https.port' => port - 1)
+        if server_version >= '3.0.0'
+          # These are not ideal, perhaps...
+          modify_config_file('dbms.connector.https.enabled' => false,
+                             'dbms.connector.http.enabled' => true,
+                             'dbms.connector.http.address' => "0.0.0.0:#{port}",
+                             'dbms.connector.https.address' => "localhost:#{port - 1}")
+        else
+          modify_config_file('org.neo4j.server.webserver.https.enabled' => false,
+                             'org.neo4j.server.webserver.port' => port,
+                             'org.neo4j.server.webserver.https.port' => port - 1)
+        end
       end
 
       # END MAIN COMMANDS
@@ -120,11 +128,12 @@ module Neo4j
       def modify_config_file(properties)
         contents = File.read(property_configuration_path)
 
-        File.open(property_configuration_path, 'w') do |file|
-          result = properties.inject(contents) do |r, (property, value)|
-            r.gsub(/#{property}\s*=\s*(.+)/, "#{property}=#{value}")
-          end
-          file << result
+        File.open(property_configuration_path, 'w') { |file| file << modify_config_contents(contents, properties) }
+      end
+
+      def modify_config_contents(contents, properties)
+        properties.inject(contents) do |r, (property, value)|
+          r.gsub(/^\s*(#\s*)?#{property}\s*=\s*(.+)/, "#{property}=#{value}")
         end
       end
 
@@ -159,7 +168,11 @@ module Neo4j
       end
 
       def property_configuration_path
-        @path.join('conf', 'neo4j-server.properties')
+        if server_version >= '3.0.0'
+          @path.join('conf', 'neo4j.conf')
+        else
+          @path.join('conf', 'neo4j-server.properties')
+        end
       end
 
       def validate_is_system_admin!
@@ -194,6 +207,11 @@ module Neo4j
 
       NEO4J_VERSIONS_URL = 'https://raw.githubusercontent.com/neo4jrb/neo4j-rake_tasks/master/neo4j_versions.yml'
 
+      def server_version
+        kernel_jar_path = Dir.glob(@path.join('lib/neo4j-kernel-*.jar'))[0]
+        kernel_jar_path.match(/neo4j-kernel-([\d\.]+)\.jar$/)[1]
+      end
+
       def neo4j_versions
         require 'open-uri'
         require 'yaml'

data/lib/neo4j/rake_tasks/version.rb

@@ -1,5 +1,5 @@
 module Neo4j
   module RakeTasks
-    VERSION = '0.4.4'
+    VERSION = '0.5.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j-rake_tasks
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors:
 - Brian Underwood
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-29 00:00:00.000000000 Z
+date: 2016-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored