rails_parallel 0.1.1 → 0.1.2

data/README.markdown

@@ -24,9 +24,15 @@ You'll want to add a lib/tasks/rails_parallel.rake with at least the following:
         RailsParallel::Rake.launch
       end
 
-      # RailsParallel runs this if it needs to reload the DB.
       namespace :db do
+	# RailsParallel runs this if it needs to reload the DB.
         task :setup => ['db:drop', 'db:create', 'db:schema:load']
+
+        # RailsParallel normally doesn't mess with your current DB,
+	# only the 'test' env DB.  Run this to load it if required.
+        task :load => :environment do
+          RailsParallel::Rake.load_current_db
+        end
       end
     end
 

data/lib/rails_parallel/rake.rb

@@ -2,6 +2,7 @@ require 'rake/testtask'
 require 'fcntl'
 
 require 'rails_parallel/object_socket'
+require 'rails_parallel/schema'
 
 module RailsParallel
   class Rake
@@ -18,6 +19,10 @@ module RailsParallel
       instance.run(name, ruby_opts, files)
     end
 
+    def self.load_current_db
+      instance.load_schema
+    end
+
     def launch
       return if @pid
       at_exit { shutdown }
@@ -63,6 +68,11 @@ module RailsParallel
       end
     end
 
+    def load_schema
+      Schema.new(schema_file).load_main_db
+      puts "RP: Loaded #{Rails.env} schema."
+    end
+
     private
 
     def expect(want)

data/lib/rails_parallel/runner/parent.rb

@@ -1,8 +1,8 @@
 require 'rails_parallel/forks'
 require 'rails_parallel/collector'
 require 'rails_parallel/timings'
+require 'rails_parallel/schema'
 require 'rails_parallel/runner/child'
-require 'rails_parallel/runner/schema'
 require 'rails_parallel/runner/test_runner'
 
 class Test::Unit::TestResult

data/lib/rails_parallel/schema.rb

@@ -0,0 +1,90 @@
+require 'rails_parallel/forks'
+
+module RailsParallel
+  class Schema
+    include Forks
+
+    def initialize(file)
+      @file = file
+    end
+
+    def load_main_db
+      if load_db(1)
+        failed = 0
+        ObjectSpace.each_object(Class) do |klass|
+          next unless klass < ActiveRecord::Base
+
+          klass.reset_column_information
+          begin
+            klass.columns
+          rescue StandardError => e
+            failed += 1
+            raise e if failed > 3
+          end
+        end
+      end
+    end
+
+    def load_db(number)
+      update_db_config(number)
+      if schema_loaded?
+        reconnect
+        false
+      else
+        schema_load
+        true
+      end
+    end
+
+    private
+
+    def reconnect(override = {})
+      ActiveRecord::Base.establish_connection(@dbconfig.merge(override))
+      ActiveRecord::Base.connection
+    end
+
+    def update_db_config(number)
+      config = ActiveRecord::Base.configurations[Rails.env]
+      config['database'] += "_#{number}" unless number == 1
+      @dbconfig = config.with_indifferent_access
+    end
+
+    def schema_load
+      dbname = @dbconfig[:database]
+      mysql_args = ['-u', 'root']
+
+      connection = reconnect(:database => nil)
+      connection.execute("DROP DATABASE IF EXISTS #{dbname}")
+      connection.execute("CREATE DATABASE #{dbname}")
+
+      File.open(@file) do |fh|
+        pid = fork do
+          STDIN.reopen(fh)
+          exec(*['mysql', mysql_args, dbname].flatten)
+        end
+        wait_for(pid)
+      end
+
+      reconnect
+      sm_table = ActiveRecord::Migrator.schema_migrations_table_name
+      ActiveRecord::Base.connection.execute("INSERT INTO #{sm_table} (version) VALUES ('#{@file}')")
+    end
+
+    def schema_loaded?
+      begin
+        ActiveRecord::Base.establish_connection(@dbconfig)
+        ActiveRecord::Base.connection
+      rescue StandardError
+        return false
+      end
+
+      begin
+        sm_table = ActiveRecord::Migrator.schema_migrations_table_name
+        migrated = ActiveRecord::Base.connection.select_values("SELECT version FROM #{sm_table}")
+        migrated.include?(@file)
+      rescue ActiveRecord::StatementInvalid
+        false
+      end
+    end
+  end
+end

data/lib/rails_parallel/version.rb

@@ -1,3 +1,3 @@
 module RailsParallel
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rails_parallel
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Adrian Irving-Beer
@@ -88,8 +88,8 @@ files:
 - lib/rails_parallel/runner.rb
 - lib/rails_parallel/runner/child.rb
 - lib/rails_parallel/runner/parent.rb
-- lib/rails_parallel/runner/schema.rb
 - lib/rails_parallel/runner/test_runner.rb
+- lib/rails_parallel/schema.rb
 - lib/rails_parallel/timings.rb
 - lib/rails_parallel/version.rb
 - rails_parallel.gemspec

data/lib/rails_parallel/runner/schema.rb

@@ -1,93 +0,0 @@
-require 'rails_parallel/object_socket'
-require 'rails_parallel/runner/test_runner'
-
-module RailsParallel
-  class Runner
-    class Schema
-      include Forks
-
-      def initialize(file)
-        @file = file
-      end
-
-      def load_main_db
-        if load_db(1)
-          failed = 0
-          ObjectSpace.each_object(Class) do |klass|
-            next unless klass < ActiveRecord::Base
-
-            klass.reset_column_information
-            begin
-              klass.columns
-            rescue StandardError => e
-              failed += 1
-              raise e if failed > 3
-            end
-          end
-        end
-      end
-
-      def load_db(number)
-        update_db_config(number)
-        if schema_loaded?
-          reconnect
-          false
-        else
-          schema_load
-          true
-        end
-      end
-
-      private
-
-      def reconnect(override = {})
-        ActiveRecord::Base.establish_connection(@dbconfig.merge(override))
-        ActiveRecord::Base.connection
-      end
-
-      def update_db_config(number)
-        config = ActiveRecord::Base.configurations[Rails.env]
-        config['database'] += "_#{number}" unless number == 1
-        @dbconfig = config.with_indifferent_access
-      end
-
-      def schema_load
-        dbname = @dbconfig[:database]
-        mysql_args = ['-u', 'root']
-
-        connection = reconnect(:database => nil)
-        connection.execute("DROP DATABASE IF EXISTS #{dbname}")
-        connection.execute("CREATE DATABASE #{dbname}")
-
-        File.open(@file) do |fh|
-          pid = fork do
-            STDIN.reopen(fh)
-            exec(*['mysql', mysql_args, dbname].flatten)
-          end
-          wait_for(pid)
-        end
-
-        reconnect
-        sm_table = ActiveRecord::Migrator.schema_migrations_table_name
-        ActiveRecord::Base.connection.execute("INSERT INTO #{sm_table} (version) VALUES ('#{@file}')")
-      end
-
-      def schema_loaded?
-        begin
-          ActiveRecord::Base.establish_connection(@dbconfig)
-          ActiveRecord::Base.connection
-        rescue StandardError
-          return false
-        end
-
-        begin
-          sm_table = ActiveRecord::Migrator.schema_migrations_table_name
-          migrated = ActiveRecord::Base.connection.select_values("SELECT version FROM #{sm_table}")
-          migrated.include?(@file)
-        rescue ActiveRecord::StatementInvalid
-          false
-        end
-      end
-    end
-  end
-end