irbtools 0.8.1 → 0.8.2

data/README.rdoc

@@ -31,7 +31,8 @@ You have the following ways:
 * <tt>Irbtools.remove_library(lib)</tt>
 * <tt>Irbtools.add_package(pkg)</tt>
 * <tt>Irbtools.remove_package(pkg)</tt>
-* Edit the <tt>Irbtools.libraries</tt>, <tt>Irbtools.libraries_in_proc</tt> or <tt>Irbtools.packages</tt> arrays directly (no way to set callbacks).
+
+Edit the <tt>Irbtools.libraries</tt>, <tt>Irbtools.libraries_in_proc</tt> or <tt>Irbtools.packages</tt> arrays directly. If you use the <tt>add_library</tt> method, you can apply a block which gets executed when the library is loaded.
 
 == Features
 
@@ -40,22 +41,22 @@ See http://rbjl.net/40-irbtools-release-the-power-of-irb or read the commented s
 === Included gems and libraries
 
 * wirble[http://pablotron.org/software/wirble/]      colorize output
-* fancy_irbt[tODO]   put result as comment and more colorization
+* fancy_irbt[https://github.com/janlelis/fancy_irb]   put result as comment and more colorization
 * hirb[http://tagaholic.me/2009/03/13/hirb-irb-on-the-good-stuff.html]     (active record) tables and custom views for specific objects
 * *fileutils*    cd, pwd, ln_s, mv, rm, mkdir, touch ... ;)
 * zucker/env[http://rubyzucker.info]   Info, OS, RubyVersion, RubyEngine
 * zucker/debug[http:/rubyzucker.info]   nice debug printing (q, o, c, .m, .d)
-* ap[http://github.com/michaeldv/awesome_print]      nice debug printing (ap)
+* ap[https://github.com/michaeldv/awesome_print]      nice debug printing (ap)
 * *yaml*      nice debug printing (y)
 * clipboard[http://github.com/janlelis/clipboard]     easy clipboard access (copy & paste)
 * guessmethod[http://guessmethod.rubyforge.org/]    automatically corrects typos (method_missing hook)
-* interactive_editor[http://github.com/jberkel/interactive_editor]    lets you open vim, hack something, and it gets loaded into the current session
+* interactive_editor[https://github.com/jberkel/interactive_editor]    lets you open vim, hack something, and it gets loaded into the current session
 * sketches[http://sketches.rubyforge.org/] another, more flexible "start editor and it gets loaded into your irb session" plugin
 * coderay[http://coderay.rubychan.de/]    some nice colorful display ;)
 * boson[http://tagaholic.me/boson/]  IRB commands repository (which also works for the shell!)
 
 === Helper methods
-See the source/rdoc for a description. These methods are defined directly by irbtools. Each gem may add its own 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>
 

data/Rakefile

@@ -5,22 +5,22 @@ 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.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 'fancy_irb'
-    gem.add_dependency 'hirb'
-    gem.add_dependency 'zucker', '>=8'
-    gem.add_dependency 'awesome_print'
     gem.add_dependency 'g'
-    gem.add_dependency 'clipboard', '>=0.9'
     gem.add_dependency 'guessmethod'
     gem.add_dependency 'interactive_editor'
-    gem.add_dependency 'coderay'
-    gem.add_dependency 'boson'
     gem.add_dependency 'sketches'
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.8.1
+0.8.2

data/irbtools.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{irbtools}
-  s.version = "0.8.1"
+  s.version = "0.8.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jan Lelis"]
-  s.date = %q{2010-11-10}
+  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 = [
@@ -17,7 +17,6 @@ Gem::Specification.new do |s|
      "README.rdoc"
   ]
   s.files = [
-    ".document",
      ".gitignore",
      "CHANGELOG",
      "LICENSE",
@@ -41,44 +40,44 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<wirble>, [">= 0"])
-      s.add_runtime_dependency(%q<fancy_irb>, [">= 0"])
-      s.add_runtime_dependency(%q<hirb>, [">= 0"])
+      s.add_runtime_dependency(%q<fancy_irb>, [">= 0.6.2"])
       s.add_runtime_dependency(%q<zucker>, [">= 8"])
-      s.add_runtime_dependency(%q<awesome_print>, [">= 0"])
+      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<clipboard>, [">= 0.9"])
       s.add_runtime_dependency(%q<guessmethod>, [">= 0"])
       s.add_runtime_dependency(%q<interactive_editor>, [">= 0"])
-      s.add_runtime_dependency(%q<coderay>, [">= 0"])
-      s.add_runtime_dependency(%q<boson>, [">= 0"])
       s.add_runtime_dependency(%q<sketches>, [">= 0"])
     else
-      s.add_dependency(%q<wirble>, [">= 0"])
-      s.add_dependency(%q<fancy_irb>, [">= 0"])
-      s.add_dependency(%q<hirb>, [">= 0"])
+      s.add_dependency(%q<fancy_irb>, [">= 0.6.2"])
       s.add_dependency(%q<zucker>, [">= 8"])
-      s.add_dependency(%q<awesome_print>, [">= 0"])
+      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<clipboard>, [">= 0.9"])
       s.add_dependency(%q<guessmethod>, [">= 0"])
       s.add_dependency(%q<interactive_editor>, [">= 0"])
-      s.add_dependency(%q<coderay>, [">= 0"])
-      s.add_dependency(%q<boson>, [">= 0"])
       s.add_dependency(%q<sketches>, [">= 0"])
     end
   else
-    s.add_dependency(%q<wirble>, [">= 0"])
-    s.add_dependency(%q<fancy_irb>, [">= 0"])
-    s.add_dependency(%q<hirb>, [">= 0"])
+    s.add_dependency(%q<fancy_irb>, [">= 0.6.2"])
     s.add_dependency(%q<zucker>, [">= 8"])
-    s.add_dependency(%q<awesome_print>, [">= 0"])
+    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<clipboard>, [">= 0.9"])
     s.add_dependency(%q<guessmethod>, [">= 0"])
     s.add_dependency(%q<interactive_editor>, [">= 0"])
-    s.add_dependency(%q<coderay>, [">= 0"])
-    s.add_dependency(%q<boson>, [">= 0"])
     s.add_dependency(%q<sketches>, [">= 0"])
   end
 end

data/lib/irbtools.rb

@@ -31,12 +31,7 @@ load_libraries_proc = proc{ |libs|
       Irbtools.send :library_loaded, lib
 
     rescue LoadError => err
-      if err.to_s =~ /irb_rocket/ && RubyEngine.mri?
-        warn "Couldn't load the irb_rocket gem.
-You can install it with: gem install irb_rocket --source http://merbi.st"
-      else
-        warn "Couldn't load an irb library: #{err}"
-      end
+      warn "Couldn't load an irb library: #{err}"
     end
   }
   $VERBOSE, $DEBUG = remember_verbose_and_debug
@@ -45,12 +40,16 @@ You can install it with: gem install irb_rocket --source http://merbi.st"
 # load them :)
 load_libraries_proc[ Irbtools.libraries ]
 
-# load these each time a new sub irb starts
-original_irbrc_proc = IRB.conf[:IRB_RC]
-IRB.conf[:IRB_RC] = proc{
+# load these each time a new sub irb starts (only if supported)
+if defined? ::IRB
+  original_irbrc_proc = IRB.conf[:IRB_RC]
+  IRB.conf[:IRB_RC] = proc{
+    load_libraries_proc[ Irbtools.libraries_in_proc ]
+    original_irbrc_proc[ ]  if original_irbrc_proc
+  }
+else
   load_libraries_proc[ Irbtools.libraries_in_proc ]
-  original_irbrc_proc[ ]  if original_irbrc_proc
-}
+end
 
 
 # # # # #
@@ -59,31 +58,33 @@ require File.expand_path('irbtools/general', File.dirname(__FILE__) )
 
 # # # # #
 # irb options
-IRB.conf[:AUTO_INDENT]  = true                 # simple auto indent
-IRB.conf[:EVAL_HISTORY] = 42424242424242424242 # creates the special __ variable
-IRB.conf[:SAVE_HISTORY] = 2000                 # how many lines will go to ~/.irb_history
-
-# prompt
-(IRB.conf[:PROMPT] ||= {} ).merge!( {:IRBTOOLS => {
-  :PROMPT_I => ">> ",    # normal
-  :PROMPT_N => "|  ",    # indenting
-  :PROMPT_C => ".> ",  # continuing a statement
-  :PROMPT_S => "%l> ",   # continuing a string
-  :RETURN   => "=> %s \n",
-  :AUTO_INDENT => true,
-}})
-
-IRB.conf[:PROMPT_MODE] = :IRBTOOLS
+if defined? ::IRB && !defined? ::Ripl
+  IRB.conf[:AUTO_INDENT]  = true                 # simple auto indent
+  IRB.conf[:EVAL_HISTORY] = 42424242424242424242 # creates the special __ variable
+  IRB.conf[:SAVE_HISTORY] = 2000                 # how many lines will go to ~/.irb_history
+
+  # prompt
+  (IRB.conf[:PROMPT] ||= {} ).merge!( {:IRBTOOLS => {
+    :PROMPT_I => ">> ",    # normal
+    :PROMPT_N => "|  ",    # indenting
+    :PROMPT_C => ".> ",    # continuing a statement
+    :PROMPT_S => "%l> ",   # continuing a string
+    :RETURN   => "=> %s \n",
+    :AUTO_INDENT => true,
+  }})
+
+  IRB.conf[:PROMPT_MODE] = :IRBTOOLS
+end
 
 # # # # #
 # misc
 
-# add current directory to the loadpath
+# add current directory to the load path
 $: << '.'  if RubyVersion.is.at_least? '1.9.2'
 
 # shorter ruby info constants
-Object.const_set 'RV', RubyVersion  rescue nil
-Object.const_set 'RE', RubyEngine   rescue nil
+Object.const_set :RV, RubyVersion  rescue nil
+Object.const_set :RE, RubyEngine   rescue nil
 
 # load rails.rc
 begin 

data/lib/irbtools/configure.rb

@@ -9,23 +9,27 @@ begin
   require 'zucker/alias_for'
   require 'zucker/env'       # Info, OS, RubyVersion, RubyEngine
 rescue LoadError
-  raise "Sorry, the irbtools couldn't load, because the zucker gem is not available"
+  raise LoadError, "Sorry, the irbtools couldn't load, because the zucker gem is not available"
 end
 
 # # # # #
 # define module methods
 module Irbtools
-  @lib_hooks = Hash.new{|h,k| h[k] = [] }
-  @libs = [] # %w[rubygems]
-  @libs_in_proc = []
-  @packages = []
-  @railsrc = '~/.railsrc'
-  @welcome_message = "Welcome to IRB. You are using #{ RUBY_DESCRIPTION }. Have fun ;)"
+  @lib_hooks       = Hash.new{|h,k| h[k] = [] }
+  @libs            = [] # %w[rubygems]
+  @libs_in_proc    = []
+  @packages        = []
+  @railsrc         = '~/.railsrc'
+  @shell_name      = File.split($0)[-1].upcase
+  @welcome_message = "Welcome to #{ @shell_name }. You are using #{ RUBY_DESCRIPTION }. Have fun ;)"
 
   class << self
     # message to display when starting. Set to nil to disable
     attr_accessor :welcome_message
 
+    # shell name (usually irb), retrieved from $0
+    attr_reader :shell_name
+
     # lets you define the path to the irbrc or deactivate this feature with nil
     attr_accessor :railsrc
 

data/lib/irbtools/general.rb

@@ -78,8 +78,8 @@ def dbg
   begin
     require 'ruby-debug'
     debugger
-  rescue LoadError => e
-    throw "Sorry, unable to load ruby-debug gem for debugger: #{e}"
+  rescue LoadError => err
+    throw "Sorry, unable to load ruby-debug gem for debugger: #{err}"
   end
 end
 

data/lib/irbtools/libraries.rb

@@ -97,4 +97,8 @@ if RubyVersion.is? 1.9
   Irbtools.libraries_in_proc -= %w[guessmethod]
 end
 
+if defined? Ripl
+  Irbtools.libraries -= %w[wirble fancy_irb]
+end
+
 # J-_-L

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: irbtools
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 59
   prerelease: false
   segments: 
   - 0
   - 8
-  - 1
-  version: 0.8.1
+  - 2
+  version: 0.8.2
 platform: ruby
 authors: 
 - Jan Lelis
@@ -15,11 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-10 00:00:00 +01:00
+date: 2010-11-17 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: wirble
+  name: fancy_irb
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -29,21 +29,23 @@ dependencies:
         hash: 3
         segments: 
         - 0
-        version: "0"
+        - 6
+        - 2
+        version: 0.6.2
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: fancy_irb
+  name: zucker
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 19
         segments: 
-        - 0
-        version: "0"
+        - 8
+        version: "8"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -52,73 +54,77 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 13
         segments: 
         - 0
-        version: "0"
+        - 3
+        version: "0.3"
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: zucker
+  name: awesome_print
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 13
         segments: 
-        - 8
-        version: "8"
+        - 0
+        - 3
+        version: "0.3"
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: awesome_print
+  name: clipboard
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 25
         segments: 
         - 0
-        version: "0"
+        - 9
+        version: "0.9"
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: g
+  name: coderay
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 25
         segments: 
         - 0
-        version: "0"
+        - 9
+        version: "0.9"
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: clipboard
+  name: boson
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 13
         segments: 
         - 0
-        - 9
-        version: "0.9"
+        - 3
+        version: "0.3"
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: guessmethod
+  name: wirble
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
@@ -132,7 +138,7 @@ dependencies:
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: interactive_editor
+  name: g
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
@@ -146,7 +152,7 @@ dependencies:
   type: :runtime
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: coderay
+  name: guessmethod
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
@@ -160,7 +166,7 @@ dependencies:
   type: :runtime
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  name: boson
+  name: interactive_editor
   prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
@@ -197,7 +203,6 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files: 
-- .document
 - .gitignore
 - CHANGELOG
 - LICENSE

data/.document

@@ -1,5 +0,0 @@
-README.rdoc
-lib/**/*.rb
-bin/*
-features/**/*.feature
-LICENSE