rails-sh 1.3.0 → 1.4.0

data/VERSION

@@ -1 +1 @@
-1.3.0
+1.4.0

data/lib/rails/sh.rb

@@ -1,28 +1,20 @@
 require 'readline'
-require 'rails/sh/hook_for_fork'
+require 'rails/sh/forkable'
+require 'rails/sh/rails'
 require 'rails/sh/rake'
 require 'rails/sh/command'
-require 'rails/sh/commands'
+require 'rails/sh/bundler'
 
 module Rails
   module Sh
-    extend HookForFork
-
-    RAILS_SUB_COMMANDS = ['generate', 'destroy', 'plugin', 'benchmarker', 'profiler', 
-                          'console', 'server', 'dbconsole', 'application', 'runner']
-
     class << self
       def start
-        before_fork do
-          ActiveRecord::Base.remove_connection if defined?(ActiveRecord::Base)
-        end
-        after_fork do
-          ActiveRecord::Base.establish_connection if defined?(ActiveRecord::Base)
-        end
+        ::Rails::Sh::Rails.init
+        ::Rails::Sh::Rake.init
 
-        init_rake
+        require 'rails/sh/commands'
 
-        puts "Rails.env: #{Rails.env}"
+        puts "Rails.env: #{::Rails.env}"
         puts "type `help` to print help"
 
         setup_readline
@@ -40,25 +32,9 @@ 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 setup_readline
         Readline.basic_word_break_characters = ""
-        Readline.completion_proc = lambda do |word|
-          (
-            Command.command_names.map { |name| name.to_s } +
-            RAILS_SUB_COMMANDS.map { |name| "rails #{name}" } +
-            Rails::Sh::Rake.task_names.map { |name| "rake #{name}" }
-          ).grep(/#{Regexp.quote(word)}/)
-        end
+        Readline.completion_proc = Command.completion_proc
       end
 
       def execute(line)
@@ -71,23 +47,6 @@ module Rails
           puts "\e[41mCommand not found\e[0m"
         end
       end
-
-      def execute_rails_command(line)
-        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"
-          require 'rails/commands'
-        end
-        Process.waitpid(pid)
-      end
-
-      def reload!
-        ActionDispatch::Callbacks.new(Proc.new {}, false).call({})
-      end
     end
   end
 end

data/lib/rails/sh/bundler.rb

@@ -0,0 +1,22 @@
+module Rails
+  module Sh
+    module Bundler
+      extend Forkable
+      
+      class << self
+        def _invoke(line)
+          line ||= 'install'
+          command, *args = line.split(/\s+/)
+          ARGV.clear
+          ARGV.concat args
+          require 'bundler/cli'
+          ::Bundler::CLI.new.send(command.to_sym)
+        end
+
+        def sub_commands
+          %w(exec install update open package config check list show console open viz init gem)
+        end
+      end
+    end
+  end
+end

data/lib/rails/sh/command.rb

@@ -9,6 +9,7 @@ module Rails
         def define(*names, &block)
           names.each do |name|
             commands[name.to_sym] = block
+            completions << name.to_s
           end
         end
 
@@ -25,7 +26,20 @@ module Rails
         end
 
         def [](name)
-          commands[name]
+          commands[name.to_sym]
+        end
+
+        def completion_proc
+          lambda { |line| completions.grep(/#{Regexp.quote(line)}/) }
+        end
+
+        def completions
+          @completions ||= []
+        end
+
+        def clear
+          commands.clear
+          completions.clear
         end
       end
     end

data/lib/rails/sh/commands.rb

@@ -1,25 +1,36 @@
 include Rails::Sh
 
 Command.define 'help' do
+  print "\e[36m"
   puts <<HELP
-\e[36mhelp               print help
-rails ARG          execute rails command
-rake TASK          execute rake task
-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              print help
+rails ARG         execute rails command
+rake TASK         execute rake task
+t, tasks PATTERN  print rake tasks
+bundle            execute bundler command
+exit              exit from rails-sh
+restart           restart rails-sh
+reload            reload the environment
+!                 execute a system command
+eval              eval as ruby script
 HELP
+  print "\e[0m"
 end
 
 Command.define 'rails' do |arg|
-  Rails::Sh.execute_rails_command(arg)
+  Rails::Sh::Rails.invoke(arg)
+end
+
+Rails::Sh::Rails.sub_commands.map do |c|
+  Command.completions << "rails #{c}"
 end
 
 Command.define 'rake' do |arg|
-  Rails::Sh::Rake.invoke(arg || :default)
+  Rails::Sh::Rake.invoke(arg)
+end
+
+Rails::Sh::Rake.task_names.map do |name|
+  Command.completions << "rake #{name}"
 end
 
 Command.define 'tasks', 't' do |arg|
@@ -27,7 +38,15 @@ Command.define 'tasks', 't' do |arg|
   Rake.application.display_tasks_and_comments
 end
 
-Command.define 'system', '!' do |arg|
+Command.define 'bundle' do |arg|
+  Rails::Sh::Bundler.invoke(arg)
+end
+
+Rails::Sh::Bundler.sub_commands.map do |c|
+  Command.completions << "bundle #{c}"
+end
+
+Command.define '!' do |arg|
   system arg
 end
 
@@ -41,7 +60,7 @@ Command.define 'restart' do
 end
 
 Command.define 'reload' do
-  Rails::Sh.reload!
+  Rails::Sh::Rails.reload!
 end
 
 Command.define 'exit' do

data/lib/rails/sh/{hook_for_fork.rb → forkable.rb}

@@ -1,6 +1,19 @@
 module Rails
   module Sh
-    module HookForFork
+    module Forkable
+      def invoke(line)
+        run_before_fork
+        pid = fork do
+          run_after_fork
+          _invoke(line)
+        end
+        Process.waitpid(pid)
+      end
+
+      def _invoke
+        raise NotImplementedError
+      end
+
       def before_fork(&block)
         @before_fork = block
       end

data/lib/rails/sh/rails.rb

@@ -0,0 +1,35 @@
+module Rails
+  module Sh
+    module Rails
+      extend Forkable
+
+      class << self
+        def 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
+        end
+
+        def _invoke(line)
+          reload!
+          ARGV.clear
+          ARGV.concat line.split(/\s+/)
+          puts "\e[42m$ rails #{ARGV.join(" ")}\e[0m"
+          require 'rails/commands'
+        end
+
+        def reload!
+          ActionDispatch::Callbacks.new(Proc.new {}, false).call({})
+        end
+
+        def sub_commands
+          %w(generate destroy plugin benchmarker profiler
+            console server dbconsole application runner)
+        end
+      end
+    end
+  end
+end

data/lib/rails/sh/rake.rb

@@ -4,11 +4,19 @@ require 'stringio'
 module Rails
   module Sh
     module Rake
-      extend HookForFork
+      extend Forkable
 
       class << self
         def init
           $stdout = StringIO.new
+
+          before_fork do
+            ActiveRecord::Base.remove_connection if defined?(ActiveRecord::Base)
+          end
+          after_fork do
+            ActiveRecord::Base.establish_connection if defined?(ActiveRecord::Base)
+          end
+
           ::Rake.application = ::Rake::Application.new
           ::Rake.application.init
           ::Rake.application.load_rakefile
@@ -17,19 +25,15 @@ module Rails
           $stdout = STDOUT
         end
 
-        def invoke(line)
+        def _invoke(line)
+          line ||= 'default'
           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?
-              ENV[env] = value
-            end
-            ::Rake.application[name].invoke
+          args.each do |arg|
+            env, value = arg.split('=')
+            next unless env && !env.empty? && value && !value.empty?
+            ENV[env] = value
           end
-          Process.waitpid(pid)
+          ::Rake.application[name].invoke
         end
 
         def task_names

data/rails-sh.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rails-sh}
-  s.version = "1.3.0"
+  s.version = "1.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["jugyo"]
@@ -29,9 +29,11 @@ Gem::Specification.new do |s|
     "VERSION",
     "bin/rails-sh",
     "lib/rails/sh.rb",
+    "lib/rails/sh/bundler.rb",
     "lib/rails/sh/command.rb",
     "lib/rails/sh/commands.rb",
-    "lib/rails/sh/hook_for_fork.rb",
+    "lib/rails/sh/forkable.rb",
+    "lib/rails/sh/rails.rb",
     "lib/rails/sh/rake.rb",
     "rails-sh.gemspec",
     "spec/rails/sh/command_spec.rb",

data/spec/rails/sh/command_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Rails::Sh::Command do
   before do
-    Rails::Sh::Command.commands.clear
+    Rails::Sh::Command.clear
   end
 
   context 'when define a command' do
@@ -23,10 +23,40 @@ describe Rails::Sh::Command do
       Rails::Sh::Command.command_names.should =~ [:foo]
     end
 
-    define 'Command.[]' do
+    describe 'Command.[]' do
       it 'can get a command' do
         Rails::Sh::Command['foo'].should eq(@block)
       end
     end
   end
+
+  describe '.completions' do
+    context 'when command does not exist' do
+      it 'completions is empty' do
+        Rails::Sh::Command.completions.should be_empty
+      end
+    end
+
+    context 'when commands exist' do
+      before do
+        Rails::Sh::Command.define('foo') {}
+        Rails::Sh::Command.define('bar') {}
+      end
+
+      it 'completions is empty' do
+        Rails::Sh::Command.completions.should =~ ['foo', 'bar']
+      end
+    end
+  end
+
+  describe '.completion_proc' do
+    before do
+      ['foo', 'rails generate', 'rake routes', 'rake spec'].each { |c| Rails::Sh::Command.completions << c }
+    end
+
+    it 'return completions' do
+      Rails::Sh::Command.completion_proc.call('foo').should =~ ['foo']
+      Rails::Sh::Command.completion_proc.call('rake').should =~ ['rake routes', 'rake spec']
+    end
+  end
 end

data/spec/rails/sh_spec.rb

@@ -1,26 +1,5 @@
 require 'spec_helper'
 
 describe Rails::Sh do
-  context 'when define a command' do
-    before do
-      @block = lambda {}
-      Rails::Sh::Command.define('foo', &@block)
-    end
-
-    ['foo'].each do |line|
-      it "the command should be executed if the line is '#{line}'" do
-        @block.should_receive(:call).with(nil).once
-        Rails::Sh.should_receive(:execute_rails_command).with(line).exactly(0).times
-        Rails::Sh.execute(line)
-      end
-    end
-
-    ['fo', 'bar'].each do |line|
-      it "the command should not be executed if the line is '#{line}'" do
-        @block.should_receive(:call).with(nil).exactly(0).times
-        Rails::Sh.should_receive(:execute_rails_command).with(line).once
-        Rails::Sh.execute(line)
-      end
-    end
-  end
+  pending
 end

metadata

@@ -2,7 +2,7 @@
 name: rails-sh
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors: 
 - jugyo
@@ -77,9 +77,11 @@ files:
 - VERSION
 - bin/rails-sh
 - lib/rails/sh.rb
+- lib/rails/sh/bundler.rb
 - lib/rails/sh/command.rb
 - lib/rails/sh/commands.rb
-- lib/rails/sh/hook_for_fork.rb
+- lib/rails/sh/forkable.rb
+- lib/rails/sh/rails.rb
 - lib/rails/sh/rake.rb
 - rails-sh.gemspec
 - spec/rails/sh/command_spec.rb
@@ -99,7 +101,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3249246770813538482
+      hash: -857922454327872908
       segments: 
       - 0
       version: "0"