offshore 0.0.6 → 0.0.7

data/README.md

@@ -51,8 +51,8 @@ The :preload and :setup steps will be invoked in that order before your :seed ca
 * For other Rack apps, you should be able to use Offshore::Middleware directly.
 * This middleware is included automatically in Rails via Railties.
 * The server is meant to be a singular resource accessed by many test threads (parallelization of tests). It accomplishes this through a mutex and polling its availability.
-
-
+* You'll want to run `rake offshore:startup` on the server beforehand to call your rake code and set up the databases
+* Running the server will look something like `RAILS_ENV=test OFFSHORE=true rails s -p 6001` depending on the server configuration (app decided to only enable with the env for example)
 
 ## Client
 
@@ -94,16 +94,17 @@ You can send :snapshot => false to Offshore.suite.start to prevent rolling back
 Note, this will leave your suite in a somewhat unpredictable state especially when you consider there are other suites that might be rolling that database back. 
 However, this may be preferable if your database is very large. On small (50 tables / 1000 rows) databases, the difference in time seems to be noise. Some efforts are taken (checksum) to not rollback if the test did not change the database.
 
-
 #### Notes
 
 * You can also make API requests.
 * You get a fresh database each time by default.
+* You'll want to run `rake offshore:startup` on the server beforehand to set up the databases
 
 ## TODO
 
 * Use binlogs if enabled for even faster MySQL rollback
 * Configure custom lookups for the hash returned with the created data
+* Register with keys that maps to databases to support parallel tests
 * Configure custom paths (defaults to /offshore_tests now)
 * Anything else need to be cleared out each test? i.e. redis, memcache, etc
 * Other DB support

data/lib/offshore/server/database.rb

@@ -2,7 +2,6 @@ module Offshore
   module Database
     extend self
     
-    GENERATE_KEY = "database:generate"
     LOCK_KEY = "database:lock"
     SHUTDOWN_KEY = "database:shutdown"
     SUITES_LIST_KEY = "suites:list"
@@ -29,15 +28,13 @@ module Offshore
     def reset
       Logger.info(" Database.reset")
       redis.del(LOCK_KEY)
-      redis.del(GENERATE_KEY)
       redis.del(SHUTDOWN_KEY)
       redis.del(SUITES_LIST_KEY)
     end
     
-    def startup(background=true)
+    def startup
       Logger.info(" Database.startup")
       reset
-      create_schema(background)
     end
     
     def shutdown
@@ -54,10 +51,8 @@ module Offshore
       Offshore::Database.unlock unless ENV['MULTI_OFFSHORE']  # no reason to keep everyone waiting if I'm the only one
       
       if redis.get(SHUTDOWN_KEY)
-        Logger.info("   .... databse shutting down. Exiting.")
+        Logger.info("   .... database shutting down. Exiting.")
         raise "Database shutting down. No new connections, please."
-      else
-        create_schema(true)
       end
     end
     
@@ -73,40 +68,6 @@ module Offshore
         
     private
     
-    def create_schema(background)
-      times = redis.incr(GENERATE_KEY) # get the incremented counter value      
-      unless times == 1
-        Logger.info("   Database.create_schema: already created")
-        return
-      end
-      
-      Logger.info("   Database.create_schema: creating....")
-      lock
-      if background
-        build_in_fork
-      else
-        build_in_process
-      end
-    end
-    
-    
-    def build_in_fork
-      Logger.info("    ..... building in fork")
-      otherProcess = fork { `bundle exec rake offshore:seed_schema --trace`; `bundle exec rake offshore:unlock --trace`; }
-      Process.detach(otherProcess)
-    end
-    
-    def build_in_process
-      Logger.info("    ..... building in process")
-      #TODO: configurable, what rake job if not exist
-      %x(bundle exec rake offshore:seed_schema --trace)
-      unless $? == 0
-        reset
-        raise "rake offshore:seed_schema failed!"
-      end
-      unlock
-    end
-    
     def snapshot
       Offshore::Snapshot::Template
     end

data/lib/offshore/tasks.rb

@@ -23,8 +23,8 @@ namespace :offshore do
     Offshore::Database.shutdown
   end
   
-  task :startup => [:preload, :setup] do
-    Offshore::Database.startup(false)
+  task :startup => [:preload, :setup, :seed_schema] do
+    Offshore::Database.startup
   end
   
   desc "Reset the db"

data/lib/offshore/version.rb

@@ -1,3 +1,3 @@
 module Offshore
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: offshore
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-06 00:00:00.000000000 Z
+date: 2013-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json