rails-sh 1.2.5 → 1.2.6

data/VERSION

@@ -1 +1 @@
-1.2.5
+1.2.6

data/lib/rails/sh/rake.rb

@@ -17,7 +17,9 @@ module Rails
 
         def invoke(line)
           name, *args = line.split(/\s+/)
+          run_before_fork
           pid = fork do
+            run_after_fork
             args.each do |arg|
               env, value = arg.split('=')
               next unless env && !env.empty? && value && !value.empty?
@@ -31,6 +33,22 @@ module Rails
         def task_names
           ::Rake.application.tasks.map{|t| t.name}
         end
+
+        def before_fork(&block)
+          @before_fork = block
+        end
+
+        def after_fork(&block)
+          @after_fork = block
+        end
+
+        def run_before_fork(&block)
+          @before_fork.call if @before_fork
+        end
+
+        def run_after_fork(&block)
+          @after_fork.call if @after_fork
+        end
       end
     end
   end

data/lib/rails/sh.rb

@@ -10,9 +10,18 @@ module Rails
 
     class << self
       def start
-        Rails::Sh::Rake.init
+        before_fork do
+          ActiveRecord::Base.remove_connection if defined?(ActiveRecord::Base)
+        end
+        after_fork do
+          ActiveRecord::Base.establish_connection if defined?(ActiveRecord::Base)
+        end
+
+        init_rake
+
         puts "Rails.env: #{Rails.env}"
         puts "type `help` to print help"
+
         setup_readline
         while buf = Readline.readline("rails> ", true)
           line = buf.strip
@@ -28,6 +37,32 @@ module Rails
         end
       end
 
+      def init_rake
+        Rails::Sh::Rake.init
+        Rails::Sh::Rake.before_fork do
+          run_before_fork
+        end
+        Rails::Sh::Rake.after_fork do
+          run_after_fork
+        end
+      end
+
+      def before_fork(&block)
+        @before_fork = block
+      end
+
+      def after_fork(&block)
+        @after_fork = block
+      end
+
+      def run_before_fork(&block)
+        @before_fork.call if @before_fork
+      end
+
+      def run_after_fork(&block)
+        @after_fork.call if @after_fork
+      end
+
       def setup_readline
         Readline.basic_word_break_characters = ""
         Readline.completion_proc = lambda do |word|
@@ -51,7 +86,9 @@ module Rails
       end
 
       def execute_rails_command(line)
+        run_before_fork
         pid = fork do
+          run_after_fork
           ARGV.clear
           ARGV.concat line.split(/\s+/)
           puts "\e[42m$ rails #{ARGV.join(" ")}\e[0m"

data/rails-sh.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rails-sh}
-  s.version = "1.2.5"
+  s.version = "1.2.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["jugyo"]

metadata

@@ -2,7 +2,7 @@
 name: rails-sh
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors: 
 - jugyo