rails-sh 1.1.3 → 1.1.4

data/README.rdoc

@@ -48,6 +48,8 @@ Print routes:
 
 please type help
 
+== TODO
+
 == Contributing to rails-sh
  
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet

data/VERSION

@@ -1 +1 @@
-1.1.3
+1.1.4

data/lib/rails/sh.rb

@@ -1,6 +1,7 @@
-require 'rails/sh/command'
-require 'rails/sh/patch_for_kernel'
 require 'readline'
+require 'rails/sh/patch_for_kernel'
+require 'rails/sh/command'
+require 'rails/sh/commands'
 
 module Rails
   module Sh
@@ -12,13 +13,15 @@ module Rails
         puts "Rails.env: #{Rails.env}"
         puts "type `help` to print help"
         setup_readline
-        while buf = Readline.readline("\e[42mrails>\e[0m ", true)
+        while buf = Readline.readline("rails> ", true)
           line = buf.strip
           next if line.empty?
           begin
             execute(line)
-          rescue => e
-            puts "\e[41m#{e.message}\e[0m"
+          rescue SystemExit
+            raise
+          rescue Exception => e
+            puts "\e[41m#{e.message}\n#{e.backtrace.join("\n")}\e[0m"
           end
           setup_readline
         end
@@ -33,7 +36,7 @@ module Rails
 
       def execute(line)
         if command = Command.find(line)
-          arg = line[/\s+[^\s]+/].strip rescue nil
+          arg = line.split(/\s+/, 2)[1] rescue nil
           command.call(arg)
         else
           execute_rails_command(line)

data/lib/rails/sh/command.rb

@@ -11,7 +11,7 @@ module Rails
         end
 
         def find(line)
-          if name = line[/\w+/]
+          if name = line.split(/\s+/, 2)[0]
             commands[name.to_sym]
           else
             nil
@@ -21,55 +21,11 @@ module Rails
         def command_names
           commands.keys
         end
+
+        def [](name)
+          commands[name]
+        end
       end
     end
   end
-end
-
-module Kernel
-  alias_method :_exit, :exit
-  def exit(*args); end
-end
-
-Rails::Sh::Command.define 'help' do
-  Rails::Sh.execute_rails_command('--help')
-  puts <<HELP
-
-The rails-sh commands are:
- help               print help
- routes CONTROLLER  print routes
- exit               exit from rails-sh
-HELP
-end
-
-Rails::Sh::Command.define 'routes' do |controller|
-  Rails.application.reload_routes!
-  all_routes = Rails.application.routes.routes
-
-  if controller.present?
-    all_routes = all_routes.select{ |route| route.defaults[:controller] == controller }
-  end
-
-  routes = all_routes.collect do |route|
-
-    reqs = route.requirements.dup
-    reqs[:to] = route.app unless route.app.class.name.to_s =~ /^ActionDispatch::Routing/
-    reqs = reqs.empty? ? "" : reqs.inspect
-
-    {:name => route.name.to_s, :verb => route.verb.to_s, :path => route.path, :reqs => reqs}
-  end
-
-  routes.reject! { |r| r[:path] =~ %r{/rails/info/properties} } # Skip the route if it's internal info route
-
-  name_width = routes.map{ |r| r[:name].length }.max
-  verb_width = routes.map{ |r| r[:verb].length }.max
-  path_width = routes.map{ |r| r[:path].length }.max
-
-  routes.each do |r|
-    puts "#{r[:name].rjust(name_width)} #{r[:verb].ljust(verb_width)} #{r[:path].ljust(path_width)} #{r[:reqs]}"
-  end
-end
-
-Rails::Sh::Command.define 'exit' do
-  _exit
 end

data/lib/rails/sh/commands.rb

@@ -0,0 +1,69 @@
+module Kernel
+  alias_method :_exit, :exit
+  def exit(*args); end
+end
+
+include Rails::Sh
+
+Command.define 'help' do
+  execute_rails_command('--help')
+  puts <<HELP
+
+\e[36mThe rails-sh commands are:
+help               print help
+routes CONTROLLER  print routes
+exit               exit from rails-sh
+restart            restart rails-sh
+system             execute a system command
+eval               eval as ruby script\e[0m
+HELP
+end
+
+Command.define 'routes' do |controller|
+  Rails.application.reload_routes!
+  all_routes = Rails.application.routes.routes
+
+  if controller.present?
+    all_routes = all_routes.select{ |route| route.defaults[:controller] == controller }
+  end
+
+  routes = all_routes.collect do |route|
+
+    reqs = route.requirements.dup
+    reqs[:to] = route.app unless route.app.class.name.to_s =~ /^ActionDispatch::Routing/
+    reqs = reqs.empty? ? "" : reqs.inspect
+
+    {:name => route.name.to_s, :verb => route.verb.to_s, :path => route.path, :reqs => reqs}
+  end
+
+  routes.reject! { |r| r[:path] =~ %r{/rails/info/properties} } # Skip the route if it's internal info route
+
+  name_width = routes.map{ |r| r[:name].length }.max
+  verb_width = routes.map{ |r| r[:verb].length }.max
+  path_width = routes.map{ |r| r[:path].length }.max
+
+  routes.each do |r|
+    puts "#{r[:name].rjust(name_width)} #{r[:verb].ljust(verb_width)} #{r[:path].ljust(path_width)} #{r[:reqs]}"
+  end
+end
+
+Command.define 'system' do |arg|
+  system arg
+end
+
+Command.define '!' do |arg|
+  Command[:system].call(arg)
+end
+
+Command.define 'eval' do |arg|
+  puts "\e[34m=> #{eval(arg, binding, __FILE__, __LINE__).inspect}\e[0m"
+end
+
+Command.define 'restart' do
+  puts 'restarting...'
+  exec File.expand_path($0)
+end
+
+Command.define 'exit' do
+  _exit
+end

data/rails-sh.gemspec

@@ -0,0 +1,73 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{rails-sh}
+  s.version = "1.1.4"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["jugyo"]
+  s.date = %q{2011-01-31}
+  s.default_executable = %q{rails-sh}
+  s.description = %q{The Rails Shell to execute sub commands of rails quickly.}
+  s.email = %q{jugyo.org@gmail.com}
+  s.executables = ["rails-sh"]
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+    ".rspec",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE.txt",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "bin/rails-sh",
+    "lib/rails/sh.rb",
+    "lib/rails/sh/command.rb",
+    "lib/rails/sh/commands.rb",
+    "lib/rails/sh/patch_for_kernel.rb",
+    "rails-sh.gemspec",
+    "spec/rails/sh/command_spec.rb",
+    "spec/rails/sh_spec.rb",
+    "spec/spec_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/jugyo/rails-sh}
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{The Rails Shell}
+  s.test_files = [
+    "spec/rails/sh/command_spec.rb",
+    "spec/rails/sh_spec.rb",
+    "spec/spec_helper.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
+    else
+      s.add_dependency(%q<rspec>, ["~> 2.3.0"])
+      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_dependency(%q<rcov>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<rspec>, ["~> 2.3.0"])
+    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+    s.add_dependency(%q<rcov>, [">= 0"])
+  end
+end
+

data/spec/rails/sh/command_spec.rb

@@ -1,6 +1,10 @@
 require 'spec_helper'
 
 describe Rails::Sh::Command do
+  before do
+    Rails::Sh::Command.commands.clear
+  end
+
   context 'when define a command' do
     before do
       @block = lambda {}
@@ -16,7 +20,13 @@ describe Rails::Sh::Command do
     end
 
     it 'We can get command names' do
-      Rails::Sh::Command.command_names.should =~ [:exit, :foo, :help, :routes]
+      Rails::Sh::Command.command_names.should =~ [:foo]
+    end
+
+    define 'Command.[]' do
+      it 'can get a command' do
+        Rails::Sh::Command['foo'].should eq(@block)
+      end
     end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 3
-  version: 1.1.3
+  - 4
+  version: 1.1.4
 platform: ruby
 authors: 
 - jugyo
@@ -96,7 +96,9 @@ files:
 - bin/rails-sh
 - lib/rails/sh.rb
 - lib/rails/sh/command.rb
+- lib/rails/sh/commands.rb
 - lib/rails/sh/patch_for_kernel.rb
+- rails-sh.gemspec
 - spec/rails/sh/command_spec.rb
 - spec/rails/sh_spec.rb
 - spec/spec_helper.rb
@@ -114,7 +116,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4011070128636660767
+      hash: 2507523378903183638
       segments: 
       - 0
       version: "0"