rails-sh 1.2.6 → 1.2.7

data/VERSION

@@ -1 +1 @@
-1.2.6
+1.2.7

data/lib/rails/sh/commands.rb

@@ -10,6 +10,7 @@ Command.define 'help' do
  t, tasks PATTERN   print rake tasks
  exit               exit from rails-sh
  restart            restart rails-sh
+ reload             reload the environment
  !, system          execute a system command
  eval               eval as ruby script\e[0m
 HELP
@@ -37,6 +38,10 @@ Command.define 'restart' do
   exec File.expand_path('../../../../bin/rails-sh', __FILE__)
 end
 
+Command.define 'reload' do
+  Rails::Sh.reload!
+end
+
 Command.define 'exit' do
   exit
 end

data/lib/rails/sh/hook_for_fork.rb

@@ -0,0 +1,21 @@
+module Rails
+  module Sh
+    module HookForFork
+      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/rake.rb

@@ -4,6 +4,8 @@ require 'stringio'
 module Rails
   module Sh
     module Rake
+      extend HookForFork
+
       class << self
         def init
           $stdout = StringIO.new
@@ -33,22 +35,6 @@ 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

@@ -1,10 +1,13 @@
 require 'readline'
+require 'rails/sh/hook_for_fork'
 require 'rails/sh/rake'
 require 'rails/sh/command'
 require 'rails/sh/commands'
 
 module Rails
   module Sh
+    extend HookForFork
+
     RAILS_SUB_COMMANDS = ['generate', 'destroy', 'plugin', 'benchmarker', 'profiler', 
                           'console', 'server', 'dbconsole', 'application', 'runner']
 
@@ -47,22 +50,6 @@ module Rails
         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|
@@ -89,6 +76,7 @@ module Rails
         run_before_fork
         pid = fork do
           run_after_fork
+          reload!
           ARGV.clear
           ARGV.concat line.split(/\s+/)
           puts "\e[42m$ rails #{ARGV.join(" ")}\e[0m"
@@ -96,6 +84,10 @@ module Rails
         end
         Process.waitpid(pid)
       end
+
+      def reload!
+        ActionDispatch::Callbacks.new(Proc.new {}, false).call({})
+      end
     end
   end
 end

data/rails-sh.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rails-sh}
-  s.version = "1.2.6"
+  s.version = "1.2.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["jugyo"]
@@ -31,6 +31,7 @@ Gem::Specification.new do |s|
     "lib/rails/sh.rb",
     "lib/rails/sh/command.rb",
     "lib/rails/sh/commands.rb",
+    "lib/rails/sh/hook_for_fork.rb",
     "lib/rails/sh/rake.rb",
     "rails-sh.gemspec",
     "spec/rails/sh/command_spec.rb",

metadata

@@ -2,7 +2,7 @@
 name: rails-sh
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.2.6
+  version: 1.2.7
 platform: ruby
 authors: 
 - jugyo
@@ -79,6 +79,7 @@ files:
 - lib/rails/sh.rb
 - lib/rails/sh/command.rb
 - lib/rails/sh/commands.rb
+- lib/rails/sh/hook_for_fork.rb
 - lib/rails/sh/rake.rb
 - rails-sh.gemspec
 - spec/rails/sh/command_spec.rb