rails-sh 1.4.0 → 1.5.0

data/Gemfile

@@ -6,6 +6,7 @@ source "http://rubygems.org"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
+  gem "rake", "0.8.7"
   gem "rspec", "~> 2.3.0"
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.5.2"

data/Gemfile.lock

@@ -24,5 +24,6 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.0.0)
   jeweler (~> 1.5.2)
+  rake (= 0.8.7)
   rcov
   rspec (~> 2.3.0)

data/README.rdoc

@@ -23,7 +23,7 @@ Execute rake task:
 
 Generate a controller:
 
-  rails> g controller foo bar
+  rails> rails generate controller foo bar
   $ rails g controller foo bar
         create  app/controllers/foo_controller.rb
          route  get "foo/bar"
@@ -45,6 +45,17 @@ Run console:
 
 please type help
 
+== Configuration
+
+rails-sh will try to load '~/railsshrc' as configuration.
+
+Example:
+
+  # ~/railsshrc
+  Rails::Sh::Command.define 'my_command' do |arg|
+    puts "Execute my_command with arg(`#{arg}`)!"
+  end
+
 == TODO
 
 == Contributing to rails-sh

data/VERSION

@@ -1 +1 @@
-1.4.0
+1.5.0

data/lib/rails/sh.rb

@@ -1,4 +1,5 @@
 require 'readline'
+require 'rails/sh/helpers'
 require 'rails/sh/forkable'
 require 'rails/sh/rails'
 require 'rails/sh/rake'
@@ -14,11 +15,13 @@ module Rails
 
         require 'rails/sh/commands'
 
-        puts "Rails.env: #{::Rails.env}"
-        puts "type `help` to print help"
+        begin; load "~/.railsshrc"; rescue LoadError; end
+
+        puts "\e[36mRails.env: #{::Rails.env}\e[0m"
+        puts "\e[36mtype `help` to print help\e[0m"
 
         setup_readline
-        while buf = Readline.readline("rails> ", true)
+        while buf = Readline.readline(prompt, true)
           line = buf.strip
           next if line.empty?
           begin
@@ -32,6 +35,10 @@ module Rails
         end
       end
 
+      def prompt
+        "%s> " % "rails-sh(#{::Rails.root.basename})"
+      end
+
       def setup_readline
         Readline.basic_word_break_characters = ""
         Readline.completion_proc = Command.completion_proc

data/lib/rails/sh/command.rb

@@ -30,13 +30,27 @@ module Rails
         end
 
         def completion_proc
-          lambda { |line| completions.grep(/#{Regexp.quote(line)}/) }
+          lambda { |line|
+            regex = /#{Regexp.quote(line)}/
+            completions.map { |completion|
+              case completion
+              when String
+                completion if completion.match(regex)
+              when Proc
+                completion.call(line)
+              end
+            }.compact
+          }
         end
 
         def completions
           @completions ||= []
         end
 
+        def completions=(completions)
+          @completions = completions
+        end
+
         def clear
           commands.clear
           completions.clear

data/lib/rails/sh/commands.rb

@@ -42,7 +42,7 @@ Command.define 'bundle' do |arg|
   Rails::Sh::Bundler.invoke(arg)
 end
 
-Rails::Sh::Bundler.sub_commands.map do |c|
+(Rails::Sh::Bundler.sub_commands - ['init']).map do |c|
   Command.completions << "bundle #{c}"
 end
 
@@ -63,6 +63,12 @@ Command.define 'reload' do
   Rails::Sh::Rails.reload!
 end
 
+Command.define 'log' do |arg|
+  puts "\e[7mCtrl-C to quit\e[0m"
+  system 'tail', '-f', Rails.root.join('log', (arg || 'development') + '.log').to_s
+end
+Command.completions += %w(development test production).map { |i| "log #{i}" }
+
 Command.define 'exit' do
   exit
 end

data/lib/rails/sh/forkable.rb

@@ -1,11 +1,23 @@
+require 'stringio'
+
 module Rails
   module Sh
     module Forkable
+      include Rails::Sh::Helpers
+
       def invoke(line)
         run_before_fork
         pid = fork do
           run_after_fork
-          _invoke(line)
+
+          begin
+            $stdout = StringIO.new
+            _invoke(line)
+          ensure
+            output = $stdout.string
+            lesspipe output
+            $stdout = STDOUT
+          end
         end
         Process.waitpid(pid)
       end

data/lib/rails/sh/helpers.rb

@@ -0,0 +1,60 @@
+module Rails
+  module Sh
+    module Helpers
+      # copy from pry: https://github.com/pry/pry
+      #
+      # Create scrollable output via less!
+      #
+      # This command runs `less` in a subprocess, and gives you the IO to its STDIN pipe
+      # so that you can communicate with it.
+      #
+      # Example:
+      #
+      #   lesspipe do |less|
+      #     50.times { less.puts "Hi mom!" }
+      #   end
+      #
+      # The default less parameters are:
+      # * Allow colour
+      # * Don't wrap lines longer than the screen
+      # * Quit immediately (without paging) if there's less than one screen of text.
+      #
+      # You can change these options by passing a hash to `lesspipe`, like so:
+      #
+      #   lesspipe(:wrap=>false) { |less| less.puts essay.to_s }
+      #
+      # It accepts the following boolean options:
+      #    :color  => Allow ANSI colour codes?
+      #    :wrap   => Wrap long lines?
+      #    :always => Always page, even if there's less than one page of text?
+      #
+      def lesspipe(*args)
+        if args.any? and args.last.is_a?(Hash)
+          options = args.pop
+        else
+          options = {}
+        end
+
+        output = args.first if args.any?
+
+        params = []
+        params << "-R" unless options[:color] == false
+        params << "-S" unless options[:wrap] == true
+        params << "-F" unless options[:always] == true
+        if options[:tail] == true
+          params << "+\\>"
+          $stderr.puts "Seeking to end of stream..."
+        end
+        params << "-X"
+
+        IO.popen("less #{params * ' '}", "w") do |less|
+          if output
+            less.puts output
+          else
+            yield less
+          end
+        end
+      end
+    end
+  end
+end

data/rails-sh.gemspec

@@ -4,15 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{rails-sh}
-  s.version = "1.4.0"
+  s.name = "rails-sh"
+  s.version = "1.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["jugyo"]
-  s.date = %q{2011-02-03}
-  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.date = "2011-11-23"
+  s.description = "The Rails Shell to execute sub commands of rails quickly."
+  s.email = "jugyo.org@gmail.com"
   s.executables = ["rails-sh"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -33,6 +32,7 @@ Gem::Specification.new do |s|
     "lib/rails/sh/command.rb",
     "lib/rails/sh/commands.rb",
     "lib/rails/sh/forkable.rb",
+    "lib/rails/sh/helpers.rb",
     "lib/rails/sh/rails.rb",
     "lib/rails/sh/rake.rb",
     "rails-sh.gemspec",
@@ -40,11 +40,11 @@ Gem::Specification.new do |s|
     "spec/rails/sh_spec.rb",
     "spec/spec_helper.rb"
   ]
-  s.homepage = %q{http://github.com/jugyo/rails-sh}
+  s.homepage = "http://github.com/jugyo/rails-sh"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.0}
-  s.summary = %q{The Rails Shell}
+  s.rubygems_version = "1.8.11"
+  s.summary = "The Rails Shell"
   s.test_files = [
     "spec/rails/sh/command_spec.rb",
     "spec/rails/sh_spec.rb",
@@ -55,17 +55,20 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rake>, ["= 0.8.7"])
       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<rake>, ["= 0.8.7"])
       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<rake>, ["= 0.8.7"])
     s.add_dependency(%q<rspec>, ["~> 2.3.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])

data/spec/rails/sh/command_spec.rb

@@ -58,5 +58,16 @@ describe Rails::Sh::Command do
       Rails::Sh::Command.completion_proc.call('foo').should =~ ['foo']
       Rails::Sh::Command.completion_proc.call('rake').should =~ ['rake routes', 'rake spec']
     end
+
+    context 'with blocks for completion' do
+      before do
+        Rails::Sh::Command.completions.clear
+        Rails::Sh::Command.completions << lambda { |line| 'block' }
+      end
+
+      it 'return completions' do
+        Rails::Sh::Command.completion_proc.call('foo').should =~ ['block']
+      end
+    end
   end
 end

metadata

@@ -1,72 +1,80 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rails-sh
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.5.0
   prerelease: 
-  version: 1.4.0
 platform: ruby
-authors: 
+authors:
 - jugyo
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-02-03 00:00:00 +09:00
-default_executable: rails-sh
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-23 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &2177367420 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 0.8.7
+  type: :development
+  prerelease: false
+  version_requirements: *2177367420
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2177366860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2177366860
+- !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &2177366240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2177366240
+- !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &2177365660 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2177365660
+- !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &2177365100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id004
+  version_requirements: *2177365100
 description: The Rails Shell to execute sub commands of rails quickly.
 email: jugyo.org@gmail.com
-executables: 
+executables:
 - rails-sh
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
-files: 
+files:
 - .document
 - .rspec
 - Gemfile
@@ -81,44 +89,42 @@ files:
 - lib/rails/sh/command.rb
 - lib/rails/sh/commands.rb
 - lib/rails/sh/forkable.rb
+- lib/rails/sh/helpers.rb
 - lib/rails/sh/rails.rb
 - lib/rails/sh/rake.rb
 - rails-sh.gemspec
 - spec/rails/sh/command_spec.rb
 - spec/rails/sh_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/jugyo/rails-sh
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -857922454327872908
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 3117646239956155231
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: The Rails Shell
-test_files: 
+test_files:
 - spec/rails/sh/command_spec.rb
 - spec/rails/sh_spec.rb
 - spec/spec_helper.rb