brynary-testjour 0.2.0 → 0.2.1

data/lib/testjour.rb

@@ -31,7 +31,7 @@ module Kernel
 end
 
 module Testjour
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
   
   class << self
     attr_accessor :step_mother

data/lib/testjour/commands.rb

@@ -6,5 +6,7 @@ require "testjour/commands/slave_start"
 require "testjour/commands/slave_stop"
 require "testjour/commands/slave_run"
 require "testjour/commands/slave_warm"
+require "testjour/commands/mysql_create"
+require "testjour/commands/mysql_drop"
 require "testjour/commands/warm"
 require "testjour/commands/local_run"

data/lib/testjour/commands/base_command.rb

@@ -51,6 +51,10 @@ module Testjour
         OptionParser.new
       end
       
+      def testjour_bin_path
+        File.expand_path(File.dirname(__FILE__) + "/../../../bin/testjour")
+      end
+      
     end
     
   end

data/lib/testjour/commands/local_run.rb

@@ -1,15 +1,16 @@
 require "drb"
 require "uri"
+require "systemu"
 
 require "testjour/commands/base_command"
 require "testjour/queue_server"
 require "testjour/cucumber_extensions/drb_formatter"
-require "testjour/mysql"
 
 module Testjour
   module CLI
   
     class LocalRun < BaseCommand
+      
       def self.command
         "local:run"
       end
@@ -24,11 +25,16 @@ module Testjour
         ARGV.clear # Don't pass along args to RSpec
         Testjour.load_cucumber
         
-        Testjour::MysqlDatabaseSetup.with_new_database do
-          Cucumber::CLI.executor.formatters = Testjour::DRbFormatter.new(queue_server)
-          require_files
-          work
-        end
+        status, stdout, stderr = systemu("#{testjour_bin_path} mysql:create")
+        database_name = stdout.split.last.strip
+        Testjour.logger.info "MySQL db name: #{database_name.inspect}"
+        
+        Cucumber::CLI.executor.formatters = Testjour::DRbFormatter.new(queue_server)
+        require_files
+        work
+        
+        status, stdout, stderr = systemu("#{testjour_bin_path} mysql:drop #{database_name}")
+        Testjour.logger.info "Dropped MySQL db: #{status.inspect}, #{stdout.inspect}, #{stderr.inspect}"
       end
       
       def work

data/lib/testjour/commands/mysql_create.rb

@@ -0,0 +1,34 @@
+require "testjour/commands/base_command"
+require "testjour/mysql"
+
+module Testjour
+  module CLI
+    
+    class MysqlCreate < BaseCommand
+      
+      def self.command
+        "mysql:create"
+      end
+      
+      def initialize(*args)
+        super
+        Testjour.logger.debug "Runner command #{self.class}..."
+        
+        ENV["RAILS_ENV"] ||= "test"
+        require File.expand_path("./config/environment")
+      end
+      
+      def run
+        mysql = MysqlDatabaseSetup.new
+        mysql.create_database
+        mysql.connect
+        mysql.load_schema
+
+        ENV["TESTJOUR_DB"] = mysql.runner_database_name
+        puts mysql.runner_database_name
+      end
+      
+    end
+   
+  end
+end

data/lib/testjour/commands/mysql_drop.rb

@@ -0,0 +1,31 @@
+require "testjour/commands/base_command"
+require "testjour/mysql"
+
+module Testjour
+  module CLI
+    
+    class MysqlDrop < BaseCommand
+      
+      def self.command
+        "mysql:drop"
+      end
+      
+      def initialize(*args)
+        super
+        Testjour.logger.debug "Runner command #{self.class}..."
+        
+        ENV["RAILS_ENV"] ||= "test"
+        require File.expand_path("./config/environment")
+      end
+      
+      def run
+        database_name = @non_options.shift
+        mysql = MysqlDatabaseSetup.new(database_name)
+        mysql.connect
+        mysql.drop_database
+      end
+      
+    end
+   
+  end
+end

data/lib/testjour/mysql.rb

@@ -22,27 +22,8 @@ module Testjour
       :database => "information_schema"
     }
 
-    def self.with_new_database
-      ENV["RAILS_ENV"] ||= "test"
-      require File.expand_path("./vendor/rails/railties/lib/initializer")
-      Rails::Initializer.run(:set_load_path)
-      
-      require "active_record"
-      require "active_record/connection_adapters/mysql_adapter"
-      
-      mysql = self.new
-      mysql.create_database
-      
-      ENV["TESTJOUR_DB"] = mysql.runner_database_name
-      
-      at_exit do
-        mysql.drop_database
-      end
-      
-      mysql.connect
-      mysql.load_schema
-      
-      yield
+    def initialize(runner_database_name = nil)
+      @runner_database_name = runner_database_name
     end
     
     def grant_privileges(connection)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: brynary-testjour
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Bryan Helmkamp
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-11 00:00:00 -08:00
+date: 2009-01-28 00:00:00 -08:00
 default_executable: testjour
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -53,6 +53,8 @@ files:
 - lib/testjour/commands/help.rb
 - lib/testjour/commands/list.rb
 - lib/testjour/commands/local_run.rb
+- lib/testjour/commands/mysql_create.rb
+- lib/testjour/commands/mysql_drop.rb
 - lib/testjour/commands/run.rb
 - lib/testjour/commands/slave_run.rb
 - lib/testjour/commands/slave_start.rb