neo4j_test_server 1.0.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 257b7ce2ee458c295bbbea6d82777f0538f21a94
-  data.tar.gz: 5f03f0e29debae62a26f866f458090391bba3490
+  metadata.gz: 30bce83b04d5fd1b462bf8e95dbad3d6055d0609
+  data.tar.gz: fef78201629330e69da32f9f7cd7b3b3e546bbc8
 SHA512:
-  metadata.gz: 7e6731ff4c21f4407843a76c07d842b4dcb6ec37f5ce18145cbabce38043ca9a8402287084a5fe98518a8a4058082cfdefd415ef1daa86850a20ea5e84f409ca
-  data.tar.gz: cf61ba93cbbf36b90e49fc04ca10cde9c0f2459286b0ff84bdd2abc76516e15bd92612ec37cf6b29113799673287f7cb240caab61146d8068418a73196d60a4b
+  metadata.gz: dd6da5657dfeca44978240f290a83b3b50434bd100ae2737bbbc8ed2cfa06e4ab682b804347d48d4630bc51e951d68f42053ee2ac9e0bb8492f6f695c2507c67
+  data.tar.gz: f9f9e04205838bd0c317063436802c4b987477482db7ab58bd23555b45faa2c91770f97d22d9b19103803c8a45b02f16ce7cacb3054390df0e99bc2621121cc5

data/README.md

@@ -27,10 +27,13 @@ require 'sunspot_test/rspec'
 This gem will automatically startup a Neo4j server running locally for testing purposes.  The default server starts at
 [http://localhost:7474](http://localhost:7474).
 
-The gem also provides rspec hooks for tests that require Neo4j without requiring the server to be started for all of
+This gem also provides rspec hooks for tests that require Neo4j without requiring the server to be started for all of
 your tests.
 
-## Writing test that use Neo4jTestServer
+By default, the gem will download and run the "Community-2.2.0" version of Neo4j, see below for changing the edition
+used.
+
+## Writing tests that use Neo4jTestServer
 
 In `spec_helper.rb`
 ```ruby
@@ -51,3 +54,12 @@ describe 'My Tests' do
     end
 end
 ```
+
+## Using a different version of Neo4j
+
+Before your tests run, call
+```ruby
+require 'neo4j_test_server'
+
+Neo4jTestServer.edition = 'community-2.0.4' # Or whatever version you'd like to use
+```

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.1

data/lib/neo4j_test_server.rb

@@ -9,6 +9,7 @@ module Neo4jTestServer
   class << self
     attr_writer :neo4j_startup_timeout
     attr_writer :server
+    attr_accessor :edition
 
     def neo4j_startup_timeout
       @neo4j_startup_timeout ||= 30
@@ -54,7 +55,11 @@ module Neo4jTestServer
     end
 
     def server
-      @server ||= Neo4jTest::Server.new
+      @server ||= Neo4jTest::Server.new edition
+    end
+
+    def edition
+      @edition ||= 'community-2.2.0'
     end
 
     def session

data/lib/neo4j_test_server/installer.rb

@@ -24,7 +24,7 @@ module Neo4jTest
 
       def download_to(edition = '')
         # We want to ensure that we download the Neo4j archive to the gem location.  Not the project's location
-        File.join(File.dirname(here), file_name(edition))
+        File.join(File.expand_path('../../..', here), file_name(edition))
       end
 
       def download_url(edition)
@@ -52,36 +52,45 @@ module Neo4jTest
       def unzip_neo4j(edition)
         downloaded_file = download_to(edition)
 
+        clear_install_location
+
         if OS::Underlying.windows?
-          # Extract and move to neo4j directory
-          unless File.exist?(install_location)
-            Zip::ZipFile.open(downloaded_file) do |zip_file|
-              zip_file.each do |f|
-                f_path = File.join('.', f.name)
-                FileUtils.mkdir_p(File.dirname(f_path))
-                begin
-                  zip_file.extract(f, f_path) unless File.exist?(f_path)
-                rescue
-                  puts "#{f.name} failed to extract."
-                end
+          unzip_for_windows downloaded_file, edition
+        else
+          unzip_for_unix downloaded_file, edition
+        end
+      end
+
+      def unzip_for_windows(downloaded_file, edition)
+        # Extract and move to neo4j directory
+        unless File.exist?(install_location)
+          Zip::ZipFile.open(downloaded_file) do |zip_file|
+            zip_file.each do |f|
+              f_path = File.join('.', f.name)
+              FileUtils.mkdir_p(File.dirname(f_path))
+              begin
+                zip_file.extract(f, f_path) unless File.exist?(f_path)
+              rescue
+                puts "#{f.name} failed to extract."
               end
             end
-            FileUtils.mv "neo4j-#{edition}", install_location
-          end
-
-          # Install if running with Admin Privileges
-          if `reg query "HKU\\S-1-5-19"`.size > 0
-            `"#{install_location}/bin/neo4j install"`
-            puts 'Neo4j Installed as a service.'
           end
+          FileUtils.mv "neo4j-#{edition}", install_location
+        end
 
-        else
-          `tar -xvf #{downloaded_file}`
-          `mv neo4j-#{edition} #{install_location}`
-          puts 'Neo4j Installed in to neo4j directory.'
+        # Install if running with Admin Privileges
+        if `reg query "HKU\\S-1-5-19"`.size > 0
+          `"#{install_location}/bin/neo4j install"`
+          puts 'Neo4j Installed as a service.'
         end
       end
 
+      def unzip_for_unix(downloaded_file, edition)
+        `tar -xvf #{downloaded_file}`
+        `mv neo4j-#{edition} #{install_location}`
+        puts 'Neo4j Installed in to neo4j directory.'
+      end
+
       def request_url(url)
         status = HTTParty.head(url).code
         fail "#{edition} is not available to download, try a different version" if status < 200 || status >= 300
@@ -99,6 +108,10 @@ module Neo4jTest
         "#{path}/#{get_environment}"
       end
 
+      def clear_install_location
+        FileUtils.rmtree(install_location)
+      end
+
       def config_location
         "#{install_location}/conf/neo4j-server.properties"
       end

data/lib/neo4j_test_server/neo4j_server.rb

@@ -15,10 +15,9 @@ module Neo4jTest
 
     attr_writer :neo4j_data_dir, :neo4j_home, :neo4j_jar, :bind_address, :port
 
-    def initialize(*args)
+    def initialize(ed = 'community-2.2.0')
       ensure_java_installed
-      self.edition = 'community-2.2.0'
-      super(*args)
+      self.edition = ed
     end
 
     def to_s

data/neo4j_test_server.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: neo4j_test_server 1.0.0 ruby lib
+# stub: neo4j_test_server 1.1.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "neo4j_test_server"
-  s.version = "1.0.0"
+  s.version = "1.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Swimminschrage"]
-  s.date = "2015-04-20"
+  s.date = "2015-04-21"
   s.description = "Installs/Autostarts a Neo4j instance for your tests"
   s.email = "Swimminschrage@gmail.com"
   s.extra_rdoc_files = [

data/spec/neo4j_test_server_spec.rb

@@ -33,6 +33,17 @@ describe 'Neo4jTest' do
         expect { Neo4jTestServer.start_neo4j_server }.to raise_error(Neo4jTestServer::TimeoutError)
       end
     end
+
+    describe '#edition' do
+      it 'allows the user to specify the edition to install' do
+        edition = 'community-2.0.4'
+        allow(Neo4jTest::Installer).to receive(:bootstrap)
+        Neo4jTestServer.edition = edition
+
+        expect(Neo4jTest::Installer).to receive(:bootstrap).with('community-2.0.4')
+        Neo4jTestServer.server.bootstrap
+      end
+    end
   end
 
   describe '::Installer' do
@@ -105,7 +116,7 @@ describe 'Neo4jTest' do
 
           it 'returns the correct save to location' do
             allow(OS::Underlying).to receive(:windows?).and_return is_windows?
-            allow(Neo4jTest::Installer).to receive(:here).and_return("#{pwd}/test.rb")
+            allow(Neo4jTest::Installer).to receive(:here).and_return("#{pwd}/lib/anotherfolder/test.rb")
             expect(Neo4jTest::Installer.download_to(edition)).to eq expected_download_to
           end
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j_test_server
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Swimminschrage
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-20 00:00:00.000000000 Z
+date: 2015-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: neo4j