ripl-rc 0.1.0 → 0.1.1

data/CHANGES

@@ -1,5 +1,11 @@
 = ripl-rc changes history
 
-== ripl-rc 0.1.0 -- ?
+== ripl-rc 0.1.1 -- 2011-02-24
+
+* [ plugin] added strip_backtrace
+* [general] now use Ripl::Rc::U.include(YourExtension) to customize details
+* [  color] use Ripl.config[:rc_color] to configure color schema
+
+== ripl-rc 0.1.0 -- 2011-02-23
 
 * release early, release often

data/README

@@ -1,6 +1,6 @@
-= ripl-rc 0.1.0
+= ripl-rc 0.1.1
 by Lin Jen-Shin (godfat[http://godfat.org])
-  godfat (XD) godfat.org
+ godfat (XD) godfat.org
 
 == LINKS:
 
@@ -17,6 +17,7 @@ ripl plugins collection
 * require 'ripl/rc/ctrld_newline'
 * require 'ripl/rc/eat_whites'
 * require 'ripl/rc/color'
+* require 'ripl/rc/strip_backtrace'
 * require 'ripl/rc' # for all of above
 
 == REQUIREMENTS:
@@ -31,7 +32,7 @@ ripl plugins collection
 
   Apache License 2.0
 
-  Copyright (c) 2010, Cardinal Blue
+  Copyright (c) 2010, Lin Jen-Shin (godfat)
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

data/README.rdoc

@@ -1,6 +1,6 @@
-= ripl-rc 0.1.0
+= ripl-rc 0.1.1
 by Lin Jen-Shin (godfat[http://godfat.org])
-  godfat (XD) godfat.org
+ godfat (XD) godfat.org
 
 == LINKS:
 
@@ -17,6 +17,7 @@ ripl plugins collection
 * require 'ripl/rc/ctrld_newline'
 * require 'ripl/rc/eat_whites'
 * require 'ripl/rc/color'
+* require 'ripl/rc/strip_backtrace'
 * require 'ripl/rc' # for all of above
 
 == REQUIREMENTS:
@@ -31,7 +32,7 @@ ripl plugins collection
 
   Apache License 2.0
 
-  Copyright (c) 2010, Cardinal Blue
+  Copyright (c) 2010, Lin Jen-Shin (godfat)
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

data/Rakefile

@@ -1,6 +1,42 @@
 
-require 'bundler'
-Bundler::GemHelper.install_tasks
+gemspec = "#{File.dirname(__FILE__)}/ripl-rc.gemspec"
+
+if File.exist?(gemspec) && File.read(gemspec).strip != ''
+  require 'bundler'
+  # please do me a favor, don't use thor!!
+  b = Bundler::GemHelper.new(File.dirname(__FILE__))
+  Bundler::GemHelper.send(:public, :name, :version, :version_tag)
+
+  desc "Build #{b.name}-#{b.version}.gem into the pkg directory"
+  task :build => [:gemspec] do
+    b.build_gem
+  end
+
+  desc "Build and install #{b.name}-#{b.version}.gem into system gems"
+  task :install => [:gemspec] do
+    b.install_gem
+  end
+
+  desc "Create tag #{b.version_tag} and build and push " \
+       "#{b.name}-#{b.version}.gem to Rubygems"
+  task :release => [:check_version, :gemspec] do
+    b.release_gem
+  end
+
+  task :check_version do
+    if ENV['VERSION'].nil?
+      puts("\x1b[33mPlease provide "                     \
+           "\x1b[36mVERSION\x1b[33m=\x1b[36mx.y.z\x1b[m")
+      exit(1)
+
+    elsif ENV['VERSION'] != b.version.to_s
+      puts("\x1b[33mYou gave \x1b[36mVERSION\x1b[33m=\x1b[36m#{b.version} " \
+           "\x1b[33mbut got\n         \x1b[36m"                             \
+           "VERSION\x1b[33m=\x1b[36m#{ENV['VERSION']}\x1b[m")
+      exit(2)
+    end
+  end
+end
 
 desc 'Run tests'
 task :test do
@@ -9,7 +45,39 @@ end
 
 desc 'Generate gemspec'
 task :gemspec do
+  require 'pathname'
   require 'ripl/rc/version'
+
+  def dir
+    @dir ||= File.dirname(__FILE__)
+  end
+
+  def to_regexpes pathes
+    pathes.map{ |ignore|
+      if ignore =~ /\*/
+        to_regexpes(Dir["**/#{ignore}"])
+      else
+        Regexp.new("^#{Regexp.escape(ignore)}")
+      end
+    }.flatten
+  end
+
+  def ignore_files
+    @ignore_files ||= to_regexpes(
+      File.read("#{dir}/.gitignore").split("\n") + ['.git/'])
+  end
+
+  def gem_files
+    @gem_files ||= gem_files_find(Pathname.new(File.dirname(__FILE__)))
+  end
+
+  def gem_files_find path
+    path.children.select(&:file?).map{ |file| file.to_s[(dir.size+1)..-1] }.
+      reject{ |file| ignore_files.find{ |ignore| file.to_s =~ ignore }}    +
+
+    path.children.select(&:directory?).map{ |dir| gem_files_find(dir)}.flatten
+  end
+
   File.open('ripl-rc.gemspec', 'w'){ |f|
     f <<
       Gem::Specification.new do |s|
@@ -17,6 +85,9 @@ task :gemspec do
         s.version = Ripl::Rc::VERSION
 
         s.add_dependency('ripl')
+        %w[bacon rr].each{ |g|
+          s.add_development_dependency(g)
+        }
 
         s.authors     = ['Lin Jen-Shin (godfat)']
         s.email       = ['godfat (XD) godfat.org']
@@ -27,8 +98,8 @@ task :gemspec do
 
         s.date             = Time.now.strftime('%Y-%m-%d')
         s.rubygems_version = Gem::VERSION
-        s.files            = `git ls-files`.split("\n")
-        s.test_files       = `git ls-files -- test/test_*.rb`.split("\n")
+        s.files            = gem_files
+        s.test_files       = gem_files.grep(/test_.+?\.rb$/)
         s.extra_rdoc_files = ['CHANGES', 'README', "#{s.name}.gemspec"]
         s.rdoc_options     = ['--main', 'README']
         s.require_paths    = ['lib']

data/lib/ripl/rc/color.rb

@@ -3,54 +3,63 @@ require 'ripl'
 
 module Ripl::Rc; end
 module Ripl::Rc::Color
-  def format_result result
-    colors = {
-      String     => :green  ,
-      Numeric    => :red    ,
-      Symbol     => :cyan   ,
-      Array      => :blue   ,
-      Hash       => :blue   ,
-      NilClass   => :magenta,
-      TrueClass  => :magenta,
-      FalseClass => :magenta,
-      Object     => :yellow
-    }
+  include Ripl::Rc # makes U avaliable
 
+  def format_result result
     case result
-      when String ; send(colors[String      ]){ "'#{result}'"  }
-      when Numeric; send(colors[Numeric     ]){ result         }
-      when Symbol ; send(colors[Symbol      ]){ ":#{result}"   }
-      when Array  ; send(colors[Array       ]){ '['            }  +
-                    result.map{ |e| format_result(e) }.join(
-                    send(colors[Array       ]){ ', '           }) +
-                    send(colors[Array       ]){ ']'            }
-      when Hash   ; send(colors[Hash        ]){ '{'            }  +
-                    result.map{ |k, v| format_result(k)           +
-                    send(colors[Hash        ]){ '=>'           }  +
+      when String ; U.send(U.colors[String      ]){ "'#{result}'"  }
+      when Numeric; U.send(U.colors[Numeric     ]){ result         }
+      when Symbol ; U.send(U.colors[Symbol      ]){ ":#{result}"   }
+      when Array  ; U.send(U.colors[Array       ]){ '['            }  +
+                      result.map{ |e| format_result(e) }.join(
+                    U.send(U.colors[Array       ]){ ', '           }) +
+                    U.send(U.colors[Array       ]){ ']'            }
+      when Hash   ; U.send(U.colors[Hash        ]){ '{'            }  +
+                      result.map{ |k, v| format_result(k)             +
+                    U.send(U.colors[Hash        ]){ '=>'           }  +
                                        format_result(v) }.join(
-                    send(colors[Hash        ]){ ', '           }) +
-                    send(colors[Hash        ]){ '}'            }
-      else        ; if colors[result.class]
-                    send(colors[result.class]){ result.inspect }
+                    U.send(U.colors[Hash        ]){ ', '           }) +
+                    U.send(U.colors[Hash        ]){ '}'            }
+      else        ; if U.colors[result.class]
+                    U.send(U.colors[result.class]){ result.inspect }
                     else
-                    send(colors[Object      ]){ result.inspect }
+                    U.send(U.colors[Object      ]){ result.inspect }
                     end
     end
   end
 
-  def color rgb
-    "\x1b[#{rgb}m" + (block_given? ? "#{yield}#{reset}" : '')
-  end
+  module Imp
+    def colors
+      Ripl.config[:rc_color]
+    end
 
-  def   black █ color(30, &block); end
-  def     red █ color(31, &block); end
-  def   green █ color(32, &block); end
-  def  yellow █ color(33, &block); end
-  def    blue █ color(34, &block); end
-  def magenta █ color(35, &block); end
-  def    cyan █ color(36, &block); end
-  def   white █ color(37, &block); end
-  def   reset █ color('', &block); end
+    def color rgb
+      "\x1b[#{rgb}m" + (block_given? ? "#{yield}#{reset}" : '')
+    end
+
+    def   black █ color(30, &block); end
+    def     red █ color(31, &block); end
+    def   green █ color(32, &block); end
+    def  yellow █ color(33, &block); end
+    def    blue █ color(34, &block); end
+    def magenta █ color(35, &block); end
+    def    cyan █ color(36, &block); end
+    def   white █ color(37, &block); end
+    def   reset █ color('', &block); end
+  end
 end
 
+module Ripl::Rc::U; extend Ripl::Rc::Color::Imp; end
+
 Ripl::Shell.include(Ripl::Rc::Color)
+Ripl.config[:rc_color] ||= {
+  String     => :green  ,
+  Numeric    => :red    ,
+  Symbol     => :cyan   ,
+  Array      => :blue   ,
+  Hash       => :blue   ,
+  NilClass   => :magenta,
+  TrueClass  => :magenta,
+  FalseClass => :magenta,
+  Object     => :yellow
+}

data/lib/ripl/rc/ctrld_newline.rb

@@ -1,4 +1,7 @@
 
+require 'ripl'
+
+module Ripl::Rc; end
 module Ripl::Rc::CtrldNewline
   # make ctrl-d end with a newline
   def after_loop

data/lib/ripl/rc/squeeze_history.rb

@@ -3,9 +3,13 @@ require 'ripl'
 
 module Ripl::Rc; end
 module Ripl::Rc::SqueezeHistory
+  include Ripl::Rc # makes U avaliable
+
   # write squeezed history
   def write_history
-    File.open(history_file, 'w'){ |f| f.puts squeeze_history.join("\n") }
+    File.open(history_file, 'w'){ |f|
+      f.puts U.squeeze_history(history).join("\n")
+    }
   end
 
   # squeeze history on memory too
@@ -15,15 +19,19 @@ module Ripl::Rc::SqueezeHistory
     super
   end
 
-  def squeeze_history
-    history.to_a.inject([]){ |result, item|
-      if result.last == item
-        result
-      else
-        result << item
-      end
-    }
+  module Imp
+    def squeeze_history history
+      history.to_a.inject([]){ |result, item|
+        if result.last == item
+          result
+        else
+          result << item
+        end
+      }
+    end
   end
 end
 
+module Ripl::Rc::U; extend Ripl::Rc::SqueezeHistory::Imp; end
+
 Ripl::Shell.include(Ripl::Rc::SqueezeHistory)

data/lib/ripl/rc/strip_backtrace.rb

@@ -0,0 +1,35 @@
+
+require 'ripl'
+
+module Ripl::Rc; end
+module Ripl::Rc::StripBacktrace
+  include Ripl::Rc # makes U avaliable
+
+  # strip backtrace until ripl
+  def format_error e
+    "#{e.class}: #{e.message}\n  #{U.strip_backtrace(e).join("\n  ")}"
+  end
+
+  module Imp
+    def strip_backtrace e
+      home(cwd(snip(e)))
+    end
+
+    def home b
+      b.map{ |p| p.sub(ENV['HOME'], '~') }
+    end
+
+    def cwd b
+      b.map{ |p| p.sub(Dir.pwd, './') }
+    end
+
+    def snip e
+      e.backtrace[0..e.backtrace.rindex{ |l| l =~ /\(ripl\):\d+:in `.+?'/ } ||
+                     -1]
+    end
+  end
+end
+
+module Ripl::Rc::U; extend Ripl::Rc::StripBacktrace::Imp; end
+
+Ripl::Shell.include(Ripl::Rc::StripBacktrace)

data/lib/ripl/rc/version.rb

@@ -1,6 +1,6 @@
 
 module Ripl
   module Rc
-    VERSION = '0.1.0'
+    VERSION = '0.1.1'
   end
 end

data/lib/ripl/rc.rb

@@ -3,3 +3,4 @@ require 'ripl/rc/squeeze_history'
 require 'ripl/rc/ctrld_newline'
 require 'ripl/rc/eat_whites'
 require 'ripl/rc/color'
+require 'ripl/rc/strip_backtrace'

data/ripl-rc.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ripl-rc}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Lin Jen-Shin (godfat)"]
-  s.date = %q{2011-02-23}
+  s.date = %q{2011-02-24}
   s.description = %q{ripl plugins collection}
   s.email = ["godfat (XD) godfat.org"]
   s.extra_rdoc_files = ["CHANGES", "README", "ripl-rc.gemspec"]
-  s.files = [".gitignore", "CHANGES", "Gemfile", "LICENSE", "README", "README.rdoc", "Rakefile", "TODO", "lib/ripl/rc.rb", "lib/ripl/rc/color.rb", "lib/ripl/rc/ctrld_newline.rb", "lib/ripl/rc/eat_whites.rb", "lib/ripl/rc/squeeze_history.rb", "lib/ripl/rc/version.rb", "ripl-rc.gemspec", "test/test_squeeze_history.rb"]
+  s.files = [".gitignore", "CHANGES", "Gemfile", "LICENSE", "README", "README.rdoc", "Rakefile", "TODO", "ripl-rc.gemspec", "lib/ripl/rc.rb", "lib/ripl/rc/color.rb", "lib/ripl/rc/ctrld_newline.rb", "lib/ripl/rc/eat_whites.rb", "lib/ripl/rc/squeeze_history.rb", "lib/ripl/rc/strip_backtrace.rb", "lib/ripl/rc/version.rb", "test/test_squeeze_history.rb"]
   s.homepage = %q{http://github.com/godfat/ripl-rc}
   s.rdoc_options = ["--main", "README"]
   s.require_paths = ["lib"]
@@ -23,10 +23,16 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<ripl>, [">= 0"])
+      s.add_development_dependency(%q<bacon>, [">= 0"])
+      s.add_development_dependency(%q<rr>, [">= 0"])
     else
       s.add_dependency(%q<ripl>, [">= 0"])
+      s.add_dependency(%q<bacon>, [">= 0"])
+      s.add_dependency(%q<rr>, [">= 0"])
     end
   else
     s.add_dependency(%q<ripl>, [">= 0"])
+    s.add_dependency(%q<bacon>, [">= 0"])
+    s.add_dependency(%q<rr>, [">= 0"])
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ripl-rc
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-02-23 00:00:00.000000000 +08:00
+date: 2011-02-24 00:00:00.000000000 +08:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ripl
-  requirement: &2152443260 !ruby/object:Gem::Requirement
+  requirement: &2152294800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,7 +22,29 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152443260
+  version_requirements: *2152294800
+- !ruby/object:Gem::Dependency
+  name: bacon
+  requirement: &2152262760 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2152262760
+- !ruby/object:Gem::Dependency
+  name: rr
+  requirement: &2152171240 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2152171240
 description: ripl plugins collection
 email:
 - godfat (XD) godfat.org
@@ -41,13 +63,14 @@ files:
 - README.rdoc
 - Rakefile
 - TODO
+- ripl-rc.gemspec
 - lib/ripl/rc.rb
 - lib/ripl/rc/color.rb
 - lib/ripl/rc/ctrld_newline.rb
 - lib/ripl/rc/eat_whites.rb
 - lib/ripl/rc/squeeze_history.rb
+- lib/ripl/rc/strip_backtrace.rb
 - lib/ripl/rc/version.rb
-- ripl-rc.gemspec
 - test/test_squeeze_history.rb
 has_rdoc: true
 homepage: http://github.com/godfat/ripl-rc