irbtools 0.8.2 → 0.8.3

data/CHANGELOG

@@ -1,3 +1,14 @@
+0.8.3
+* improved/added rvm methods (use, gemset, rubies, gemsets)
+  * RVM (Ruby API) constant gets autoloaded
+* improved cd command
+* don't load guessmethod by default (it's cool, but not always suited for production)
+* more small changes
+
+0.8.2
+* only do irb specific features if in irb (ripl compatibility)
+* more generic shell_name (in welcome message)
+
 0.8.1
 * rewrote irb_rocket: fancy_irb. No more workarounds needed, anymore.
 * added sketches gem

data/README.rdoc

@@ -36,7 +36,7 @@ Edit the <tt>Irbtools.libraries</tt>, <tt>Irbtools.libraries_in_proc</tt> or <tt
 
 == Features
 
-See http://rbjl.net/40-irbtools-release-the-power-of-irb or read the commented source file.
+See http://rbjl.net/40-irbtools-release-the-power-of-irb or read the commented source files.
 
 === Included gems and libraries
 
@@ -58,12 +58,16 @@ See http://rbjl.net/40-irbtools-release-the-power-of-irb or read the commented s
 === Helper methods
 See the source for a description. These methods are defined directly by irbtools. Each gem may add its own helper methods.
 
-*General*: <tt>ls, cat, rq, rrq/rerequire, ld, session_history, reset!, clear, use_ruby/use, dbg, Object#ri</tt>
+*General*: <tt>ls, cat, rq, rrq/rerequire, ld, session_history, reset!, clear, use_ruby/use, rubies, use_gemset/gemset, gemsets, dbg, Object#ri</tt>
 
 *Clipboard*: <tt>copy, paste, copy_input, copy_output</tt>
 
 *CodeRay*: <tt>colorize, ray</tt>
 
+==== RVM
+
+If you have RVM installed, you can switch your gemset or ruby with <tt>gemset</tt> and <tt>use</tt> (use <tt>gemsets</tt> and <tt>rubies</tt> to get a list). The gemset can be changed within the session, while changing ruby starts a new one. Please also note that you need to have installed irbtools for that ruby version. I recommend installing it in the <tt>global</tt> gemset.
+
 == Welcome message
 
 You can customize the welcome message with <tt>Irbtools.welcome_message=</tt>
@@ -73,6 +77,10 @@ You can customize the welcome message with <tt>Irbtools.welcome_message=</tt>
 * Make guessmethod 1.9 compatible
 * Nicer ri command
 
+=== Planned features for 0.9.0 (next version)
+* define flexibly, whether library should be loaded on start/on subsession or via autoload
+* faster loading
+
 == More Features
 
 * See the irbtools-more[https://github.com/janlelis/irbtools-more] package.

data/Rakefile

@@ -1,34 +1,33 @@
-require 'rubygems'
 require 'rake'
+require 'rake/rdoctask'
+require 'fileutils'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "irbtools"
-    gem.summary     = %Q{irbtools is a meta gem which installs some useful irb gems and configures your irb.}
-    gem.description = %Q{irbtools is a meta gem which installs some useful irb gems and configures your irb. Simply put a require 'irbtools' in the .irbrc file in your home directory.}
-    gem.email = "mail@janlelis.de"
-    gem.homepage = "http://github.com/janlelis/irbtools"
-    gem.authors = ["Jan Lelis"]
-    gem.add_dependency 'fancy_irb',     '>=0.6.2'
-    gem.add_dependency 'zucker',        '>=8'
-    gem.add_dependency 'hirb',          '~>0.3'
-    gem.add_dependency 'awesome_print', '~>0.3'
-    gem.add_dependency 'clipboard',     '~>0.9'
-    gem.add_dependency 'coderay',       '~>0.9'
-    gem.add_dependency 'boson',         '~>0.3'
-    gem.add_dependency 'wirble'
-    gem.add_dependency 'g'
-    gem.add_dependency 'guessmethod'
-    gem.add_dependency 'interactive_editor'
-    gem.add_dependency 'sketches'
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+def gemspec
+  @gemspec ||= eval(File.read('irbtools.gemspec'), binding, 'irbtools.gemspec')
+end
+
+desc "Build the gem"
+task :gem=>:gemspec do
+  sh "gem build irbtools.gemspec"
+  FileUtils.mkdir_p 'pkg'
+  FileUtils.mv "#{gemspec.name}-#{gemspec.version}.gem", 'pkg'
+end
+
+desc "Install the gem locally (without docs)"
+task :install => :gem do
+  sh %{gem install pkg/#{gemspec.name}-#{gemspec.version} --no-rdoc --no-ri}
+end
+
+desc "Generate the gemspec"
+task :generate do
+  puts gemspec.to_ruby
+end
+
+desc "Validate the gemspec"
+task :gemspec do
+  gemspec.validate
 end
 
-require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION').chomp : ""
 

data/VERSION

@@ -1 +1 @@
-0.8.2
+0.8.3

data/irbtools.gemspec

@@ -1,84 +1,30 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+require 'rubygems' unless defined? Gem
 
 Gem::Specification.new do |s|
   s.name = %q{irbtools}
-  s.version = "0.8.2"
+  s.version = File.read('VERSION').chomp
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Jan Lelis"]
-  s.date = %q{2010-11-17}
-  s.description = %q{irbtools is a meta gem which installs some useful irb gems and configures your irb. Simply put a require 'irbtools' in the .irbrc file in your home directory.}
-  s.email = %q{mail@janlelis.de}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-     ".gitignore",
-     "CHANGELOG",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "irbtools.gemspec",
-     "lib/irbtools.rb",
-     "lib/irbtools/configure.rb",
-     "lib/irbtools/general.rb",
-     "lib/irbtools/libraries.rb",
-  ]
-  s.homepage = %q{http://github.com/janlelis/irbtools}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{irbtools is a meta gem which installs some useful irb gems and configures your irb.}
+  s.authors               = ["Jan Lelis"]
+  s.date                  = %q{2010-12-14}
+  s.summary               = %q{irbtools is a meta gem which installs some useful irb gems and configures your irb.}
+  s.description           = %q{irbtools is a meta gem which installs some useful irb gems and configures your irb. Simply put a require 'irbtools' in the .irbrc file in your home directory.}
+  s.email                 = %q{mail@janlelis.de}
+  s.extra_rdoc_files      = %w[ LICENSE README.rdoc]
+  s.files                 = Dir.glob(%w[lib/**/*.rb ]) + %w{VERSION CHANGELOG Rakefile irbtools.gemspec}
+  s.homepage              = %q{http://github.com/janlelis/irbtools}
+  s.required_ruby_version = '>= 1.8.7'
 
-  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_runtime_dependency(%q<fancy_irb>, [">= 0.6.2"])
-      s.add_runtime_dependency(%q<zucker>, [">= 8"])
-      s.add_runtime_dependency(%q<hirb>, ["~> 0.3"])
-      s.add_runtime_dependency(%q<awesome_print>, ["~> 0.3"])
-      s.add_runtime_dependency(%q<clipboard>, ["~> 0.9"])
-      s.add_runtime_dependency(%q<coderay>, ["~> 0.9"])
-      s.add_runtime_dependency(%q<boson>, ["~> 0.3"])
-      s.add_runtime_dependency(%q<wirble>, [">= 0"])
-      s.add_runtime_dependency(%q<g>, [">= 0"])
-      s.add_runtime_dependency(%q<guessmethod>, [">= 0"])
-      s.add_runtime_dependency(%q<interactive_editor>, [">= 0"])
-      s.add_runtime_dependency(%q<sketches>, [">= 0"])
-    else
-      s.add_dependency(%q<fancy_irb>, [">= 0.6.2"])
-      s.add_dependency(%q<zucker>, [">= 8"])
-      s.add_dependency(%q<hirb>, ["~> 0.3"])
-      s.add_dependency(%q<awesome_print>, ["~> 0.3"])
-      s.add_dependency(%q<clipboard>, ["~> 0.9"])
-      s.add_dependency(%q<coderay>, ["~> 0.9"])
-      s.add_dependency(%q<boson>, ["~> 0.3"])
-      s.add_dependency(%q<wirble>, [">= 0"])
-      s.add_dependency(%q<g>, [">= 0"])
-      s.add_dependency(%q<guessmethod>, [">= 0"])
-      s.add_dependency(%q<interactive_editor>, [">= 0"])
-      s.add_dependency(%q<sketches>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<fancy_irb>, [">= 0.6.2"])
-    s.add_dependency(%q<zucker>, [">= 8"])
-    s.add_dependency(%q<hirb>, ["~> 0.3"])
-    s.add_dependency(%q<awesome_print>, ["~> 0.3"])
-    s.add_dependency(%q<clipboard>, ["~> 0.9"])
-    s.add_dependency(%q<coderay>, ["~> 0.9"])
-    s.add_dependency(%q<boson>, ["~> 0.3"])
-    s.add_dependency(%q<wirble>, [">= 0"])
-    s.add_dependency(%q<g>, [">= 0"])
-    s.add_dependency(%q<guessmethod>, [">= 0"])
-    s.add_dependency(%q<interactive_editor>, [">= 0"])
-    s.add_dependency(%q<sketches>, [">= 0"])
-  end
+  s.add_dependency %q<fancy_irb>,     ">= 0.6.2"
+  s.add_dependency %q<zucker>,        ">= 8"
+  s.add_dependency %q<hirb>,          "~> 0.3"
+  s.add_dependency %q<awesome_print>, "~> 0.3"
+  s.add_dependency %q<clipboard>,     ">= 0.9.3"
+  s.add_dependency %q<coderay>,       "~> 0.9"
+  s.add_dependency %q<boson>,         "~> 0.3"
+  s.add_dependency %q<wirble>,        ">= 0"
+  s.add_dependency %q<g>,             ">= 0"
+  s.add_dependency %q<guessmethod>,   ">= 0"
+  s.add_dependency %q<interactive_editor>, ">= 0"
+  s.add_dependency %q<sketches>,      ">= 0"
 end
-

data/lib/irbtools.rb

@@ -67,7 +67,7 @@ if defined? ::IRB && !defined? ::Ripl
   (IRB.conf[:PROMPT] ||= {} ).merge!( {:IRBTOOLS => {
     :PROMPT_I => ">> ",    # normal
     :PROMPT_N => "|  ",    # indenting
-    :PROMPT_C => ".> ",    # continuing a statement
+    :PROMPT_C => " > ",    # continuing a statement
     :PROMPT_S => "%l> ",   # continuing a string
     :RETURN   => "=> %s \n",
     :AUTO_INDENT => true,

data/lib/irbtools/general.rb

@@ -14,10 +14,14 @@ def rq(lib)
   require lib.to_s
 end
 
-# reloading, hints from http://www.themomorohoax.com/2009/03/27/irb-tip-load-files-faster
+# rerequire, please note: can have non-intended side effects
 def rerequire(lib)
-  $".delete( "#{lib}.rb" )
-  require( lib.to_s )
+  $".dup.grep(/#{lib}\.rb$/).each{ |path|
+    $".delete path.to_s
+    require path.to_s
+  }
+  require lib.to_s
+  true
 end
 alias rrq rerequire
 
@@ -27,14 +31,28 @@ def ld(lib)
 end
 
 # returns the last lines, needed for some copy_ methods
-def session_history(number_of_lines = context.instance_variable_get(:@line_no) )
+def session_history(number_of_lines = nil)
+  if !number_of_lines
+    if defined?(Ripl) && Ripl.instance_variable_get(:@shell) # ripl is running
+      number_of_lines = Ripl.shell.line
+    else
+      number_of_lines = context.instance_variable_get(:@line_no)
+    end
+  end
   Readline::HISTORY.entries[-number_of_lines...-1]*"\n"
 end
 
 # restart irb
 def reset!
-  at_exit { exec$0 } # remember history
-  exit
+  # remember history...
+  reset_irb = proc{ exec$0 } 
+  if defined?(Ripl) && Ripl.instance_variable_get(:@shell) # ripl is running
+    Ripl.shell.write_history if Ripl.shell.respond_to? :write_history
+    reset_irb.call
+  else
+    at_exit(&reset_irb)
+    exit
+  end
 end
 
 # just clear the screen
@@ -43,35 +61,56 @@ def clear
 end
 
 # change ruby version (requires rvm)
-def use_ruby(which = nil)
-  # test if installed
-  unless `rvm -v` =~ /Seguin/
-    raise 'Ruby Version Manager must be installed to use this command'
-  end
+autoload :RVM, 'irbtools/rvm'
 
-  # show rubies if called without options
+def rubies
+  RVM.current.list_strings
+end
+
+def use(which = nil) # TODO with gemsets?
+  # show current ruby if called without options
   if !which
-    puts 'Availabe Rubies: ' +
-          `rvm list`.scan( /^(?:  |=>) (.*) \[/ )*", "
-    return
+    return RVM.current.environment_name[/^.*@|.*$/].chomp('@')
   end
 
-  # get irb suffix
-  rv = `rvm use #{which}` # e.g. => "\ninfo: Using ruby 1.9.2 p0\n"
-                          # it does not change the ruby for the current user
-  rv =~ /^.*Using(.*)\n/
+  # start ruby :)
+  begin
+    RVM.use! which.to_s
+  rescue RVM::IncompatibleRubyError => err
+    err.message =~ /requires (.*?) \(/
+    rubies = RVM.current.list_strings
+    if rubies.include? $1
+      # remember history...
+      run_irb = proc{ exec "#{ $1 } -S #{ $0 }" } 
+      if defined?(Ripl) && Ripl.instance_variable_get(:@shell) # ripl is running
+        Ripl.shell.write_history if Ripl.shell.respond_to? :write_history
+        run_irb.call
+      else
+        at_exit(&run_irb)
+        exit
+      end
+    else
+      warn "Sorry, that Ruby version could not be found (see rubies)!"
+    end
+  end
+end
+alias use_ruby use
 
-  # if ruby is found, start it
-  if $1
-    ruby_name = File.split( $1 )[-1].tr(' ', '-')
-    irbname = $0 + '-' + ruby_name# + '@global'
-    at_exit { exec irbname } # remember history
-    exit
-  else
-    puts "Sorry, that Ruby version could not be found."
+def gemsets
+  RVM.current.gemset.list
+end
+
+def gemset(which = nil)
+  if which
+    if RVM.current.gemset.list.include? which.to_s
+      RVM.use! RVM.current.environment_name.gsub /(@.*?$)|$/, "@#{ which }"
+    else
+      warn "Sorry, that gemset could not be found (see gemsets)!"
+    end
   end
+  RVM.current.gemset_name
 end
-alias use use_ruby
+alias use_gemset gemset
 
 # load debugger, inspired by rdp
 def dbg

data/lib/irbtools/libraries.rb

@@ -19,8 +19,18 @@ Irbtools.add_library :fileutils do # cd, pwd, ln_s, mv, rm, mkdir, touch ... ;)
   include FileUtils::Verbose
 
   # patch cd so that it also shows the current directory
-  def cd(path = '/', *args)
-    FileUtils::Verbose.cd path, *args
+  def cd( path = File.expand_path('~') )
+    new_last_path = FileUtils.pwd
+    if path == '-'
+      if @last_path
+        path = @last_path
+      else
+        warn 'Sorry, there is no previous directory.'
+        return
+      end
+    end
+    FileUtils.cd path
+    @last_path = new_last_path
     ls
   end
 
@@ -68,22 +78,20 @@ Irbtools.add_library 'zucker/debug' # nice debug printing (q, o, c, .m, .d)
 Irbtools.add_library 'ap'           # nice debug printing (ap)
 Irbtools.add_library 'yaml'         # nice debug printing (y)
 Irbtools.add_library 'g'            # nice debug printing (g) - MacOS only :/
-Irbtools.add_library 'guessmethod', true   # automatically correct typos (method_missing hook)
+#Irbtools.add_library 'guessmethod', true   # automatically correct typos (method_missing hook)
 Irbtools.add_library 'interactive_editor'  # lets you open vim (or your favourite editor), hack something, save it, and it's loaded in the current irb session
 Irbtools.add_library 'sketches'            # another, more flexible "start editor and it gets loaded into your irb session" plugin
-#Irbtools.add_library 'zucker/all'         # see rubyzucker.info
 
 Irbtools.add_library :boson do
   undef :install if respond_to?( :install, true )
   Boson.start :verbose => false
 end
 
-Irbtools.add_library :hirb do # active record tables
+Irbtools.add_library :hirb do
   Hirb::View.enable
   extend Hirb::Console
 end
 
-
 # remove failing/not needed libs
 if OS.windows?
   Irbtools.libraries -= %w[coderay]
@@ -93,9 +101,9 @@ unless OS.mac?
   Irbtools.libraries -= %w[g]
 end
 
-if RubyVersion.is? 1.9
-  Irbtools.libraries_in_proc -= %w[guessmethod]
-end
+#if RubyVersion.is? 1.9
+#  Irbtools.libraries_in_proc -= %w[guessmethod]
+#end
 
 if defined? Ripl
   Irbtools.libraries -= %w[wirble fancy_irb]

data/lib/irbtools/rvm.rb

@@ -0,0 +1,8 @@
+# test if installed
+unless rvm_path = ENV['rvm_path']
+  raise 'Ruby Version Manager must be installed to use this command'
+end
+
+# load rvm ruby api
+$LOAD_PATH.unshift File.join(rvm_path, 'lib')
+require 'rvm'

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: irbtools
 version: !ruby/object:Gem::Version 
-  hash: 59
   prerelease: false
   segments: 
   - 0
   - 8
-  - 2
-  version: 0.8.2
+  - 3
+  version: 0.8.3
 platform: ruby
 authors: 
 - Jan Lelis
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-17 00:00:00 +01:00
+date: 2010-12-14 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         - 6
@@ -42,7 +40,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
         segments: 
         - 8
         version: "8"
@@ -56,7 +53,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
         segments: 
         - 0
         - 3
@@ -71,7 +67,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
         segments: 
         - 0
         - 3
@@ -84,13 +79,13 @@ dependencies:
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 25
         segments: 
         - 0
         - 9
-        version: "0.9"
+        - 3
+        version: 0.9.3
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -101,7 +96,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
         segments: 
         - 0
         - 9
@@ -116,7 +110,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
         segments: 
         - 0
         - 3
@@ -131,7 +124,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -145,7 +137,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -159,7 +150,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -173,7 +163,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -187,7 +176,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -203,24 +191,24 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files: 
-- .gitignore
+- lib/irbtools.rb
+- lib/irbtools/libraries.rb
+- lib/irbtools/general.rb
+- lib/irbtools/configure.rb
+- lib/irbtools/rvm.rb
+- VERSION
 - CHANGELOG
-- LICENSE
-- README.rdoc
 - Rakefile
-- VERSION
 - irbtools.gemspec
-- lib/irbtools.rb
-- lib/irbtools/configure.rb
-- lib/irbtools/general.rb
-- lib/irbtools/libraries.rb
+- LICENSE
+- README.rdoc
 has_rdoc: true
 homepage: http://github.com/janlelis/irbtools
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -228,16 +216,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 8
+      - 7
+      version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC