bond 0.3.3 → 0.3.4

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+== 0.3.4
+* Add gem plugin completion
+* Add jruby support thanks to @headius
+* Add bare option to Bond.start
+
 == 0.3.3
 * Add Bond.restart
 

data/README.rdoc

@@ -207,6 +207,7 @@ has good instructions for reinstalling ruby with the official Readline.
 * Takao Kouji for {commiting}[http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ext/readline/readline.c?view=diff&r1=24018&r2=24019] this Readline enhancement to ruby 1.9.2.
 * pd for compatibility with emacs' inf-ruby mode.
 * timcharper for improving extconf.rb.
+* headius for jruby support
 
 == Links
 * http://tagaholic.me/2010/05/07/screencast-of-argument-autocompletion-for-methods-in-irb.html

data/ext/readline_line_buffer/extconf.rb

@@ -7,7 +7,7 @@ def dummy_makefile
   }
 end
 
-if RUBY_VERSION < '1.9.2'
+if RUBY_VERSION < '1.9.2' && RUBY_PLATFORM !~ /java/
   dir_config("readline")
   have_library('readline')
   if !have_header('readline/readline.h')

data/lib/bond.rb

@@ -88,7 +88,8 @@ module Bond
   #
   # @param [Hash] options Sets global keys in {#config}, some which specify what completions to load.
   # @option options [Array<String>] :gems Gems which have their completions loaded from
-  #   @gem_source/lib/bond/completions/*.rb.
+  #   @gem_source/lib/bond/completions/*.rb. If gem is a plugin gem i.e. ripl-plugin, completion will be loaded
+  #   from @gem_source/lib/ripl/completions/plugin.rb.
   # @option options [Array<String>] :yard_gems Gems using yard documentation to generate completions. See {Yard}.
   # @option options [Module] :readline_plugin (Bond::Readline) Specifies a Bond plugin to interface with a Readline-like
   #   library. Available plugins are Bond::Readline and Bond::Rawline.
@@ -102,7 +103,9 @@ module Bond
   # @option options [Boolean] :debug (false) Shows the stacktrace when autocompletion fails and raises exceptions
   #   in Rc.eval.
   # @option options [Boolean] :eval_debug (false) Raises eval errors occuring when finding a matching completion.
-  #   Useful to debug an incorrect completion.
+  #   Useful to debug an incorrect completion
+  # @option options [Boolean] :bare (false) Doesn't load default ruby completions and completions in
+  #   ~/.bond*. Useful for non-ruby completions
   def start(options={}, &block); M.start(options, &block); end
 
   # Restarts completions with given options, ensuring to delete current completions.

data/lib/bond/completions/bond.rb

@@ -2,7 +2,7 @@ complete(:methods=>%w{Bond.complete Bond.recomplete}) {
   ["on", "method", "methods", "class", "object", "anywhere", "prefix", "search", "action", "place", "name"]
 }
 complete(:methods=>['Bond.start', 'Bond.restart']) {
-  ["gems", "yard_gems", "readline_plugin", "default_mission", "default_search", "eval_binding", "debug", "eval_debug"]
+  %w{gems yard_gems readline_plugin default_mission default_search eval_binding debug eval_debug bare}
 }
 complete(:method=>'Bond.load_yard_gems') {
   ["verbose", "reload"]

data/lib/bond/m.rb

@@ -91,9 +91,15 @@ module Bond
     def load_dir(base_dir)
       if File.exists?(dir = File.join(base_dir, 'completions'))
         Dir[dir + '/*.rb'].each {|file| load_file(file) }
+        true
       end
     end
 
+    # Loads completions from gems
+    def load_gems(*gems)
+      gems.select {|e| load_gem_completion(e) }
+    end
+
     # Find a user's home in a cross-platform way
     def home
       ['HOME', 'USERPROFILE'].each {|e| return ENV[e] if ENV[e] }
@@ -105,21 +111,27 @@ module Bond
 
     protected
     def load_gem_completion(rubygem)
-      (dir = find_gem_file(rubygem, File.join(rubygem, '..', 'bond'))) ?
-        load_dir(dir) : $stderr.puts("Bond Error: No completions found for gem '#{rubygem}'.")
+      (dir = find_gem_file(rubygem, File.join(rubygem, '..', 'bond'))) ? load_dir(dir) :
+        rubygem[/\/|-/] ? load_plugin_file(rubygem) :
+        $stderr.puts("Bond Error: No completions found for gem '#{rubygem}'.")
     end
 
-    def load_gems(*gems)
-      gems.select {|e| load_gem_completion(e) }
+    def load_plugin_file(rubygem)
+      namespace, file = rubygem.split(/\/|-/, 2)
+      file += '.rb' unless file[/\.rb$/]
+      if (dir = $:.find {|e| File.exists?(File.join(e, namespace, 'completions', file)) })
+        load_file File.join(dir, namespace, 'completions', file)
+        true
+      end
     end
 
     def load_completions
-      load_file File.join(File.dirname(__FILE__), 'completion.rb')
-      load_dir File.dirname(__FILE__)
+      load_file File.join(File.dirname(__FILE__), 'completion.rb') unless config[:bare]
+      load_dir File.dirname(__FILE__) unless config[:bare]
       load_gems *config[:gems] if config[:gems]
       Yard.load_yard_gems *config[:yard_gems] if config[:yard_gems]
-      load_file(File.join(home,'.bondrc')) if File.exists?(File.join(home, '.bondrc'))
-      load_dir File.join(home, '.bond')
+      load_file(File.join(home,'.bondrc')) if File.exists?(File.join(home, '.bondrc')) && !config[:bare]
+      load_dir File.join(home, '.bond') unless config[:bare]
     end
   end
 end

data/lib/bond/readline.rb

@@ -7,7 +7,9 @@ module Bond
     # Loads the readline-like library and sets the completion_proc to the given agent.
     def setup(agent)
       require 'readline'
-      load_extension unless ::Readline.respond_to?(:line_buffer)
+      unless ::Readline.respond_to?(:line_buffer)
+        RUBY_PLATFORM =~ /java/ ? load_jruby_extension : load_extension
+      end
 
       # Reinforcing irb defaults
       ::Readline.completion_append_character = nil
@@ -21,10 +23,21 @@ module Bond
       end
     end
 
+    def load_jruby_extension
+      require 'jruby'
+
+      class << Readline
+        ReadlineExt = org.jruby.ext.Readline
+        def line_buffer
+          ReadlineExt.s_get_line_buffer(JRuby.runtime.current_context, JRuby.reference(self))
+        end
+      end
+    end
+
     def load_extension
       require 'readline_line_buffer'
     rescue LoadError
-      $stderr.puts "Bond Error: Failed to load readline_line_buffer.bundle. Ensure that it exists and was built correctly."
+      $stderr.puts "Bond Error: Failed to load readline_line_buffer. Ensure that it exists and was built correctly."
     end
 
     # Returns full line of what the user has typed.
@@ -32,4 +45,4 @@ module Bond
       ::Readline.line_buffer
     end
   end
-end
+end

data/lib/bond/version.rb

@@ -1,3 +1,3 @@
 module Bond
-  VERSION = '0.3.3'
+  VERSION = '0.3.4'
 end

data/test/completion_test.rb

@@ -14,8 +14,8 @@ describe "Completion" do
   end
 
   it "completes absolute constants anywhere" do
-    tab("blah ::Arr").should == ["::Array"]
-    tab("h[::Arr").should == ["h[::Array"]
+    tab("blah ::Has").should == ["::Hash"]
+    tab("h[::Has").should == ["h[::Hash"]
   end
 
   it "completes invalid constants safely" do
@@ -145,4 +145,4 @@ describe "Completion" do
       behaves_like "objects"
     end
   end
-end
+end

data/test/completions_test.rb

@@ -43,9 +43,9 @@ describe "completions for" do
 
   describe "Object" do
     it "#instance_of?" do
-      expectations = ['Array']
-      expectations = ["Array", "Array::"] if Config::CONFIG["RUBY_SO_NAME"].to_s[/rubinius/i]
-      tab("[].instance_of? Arr").should == expectations
+      expectations = ['Hash']
+      expectations = ["Hash", "Hash::"] if Config::CONFIG["RUBY_SO_NAME"].to_s[/rubinius/i]
+      tab("[].instance_of? Has").should == expectations
     end
 
     it "#is_a?" do

data/test/m_test.rb

@@ -0,0 +1,34 @@
+require File.join(File.dirname(__FILE__), 'test_helper')
+
+describe "M" do
+  describe "#load_gems" do
+    before { $: << '/dir' }
+    after { $:.pop }
+
+    def mock_file_exists(file)
+      File.expects(:exists?).at_least(1).returns(false).with {|e| e != file }
+      File.expects(:exists?).times(1).returns(true).with {|e| e == file }
+    end
+
+    it "loads gem" do
+      M.expects(:gem)
+      mock_file_exists '/dir/boom/../bond'
+      M.expects(:load_dir).with('/dir/boom/../bond').returns(true)
+      Bond.load_gems('boom').should == ['boom']
+    end
+
+    it "loads plugin gem in gem format" do
+      M.expects(:find_gem_file).returns(false)
+      mock_file_exists '/dir/boom/completions/what.rb'
+      M.expects(:load_file).with('/dir/boom/completions/what.rb')
+      Bond.load_gems('boom-what').should == ['boom-what']
+    end
+
+    it "loads plugin gem in file format" do
+      M.expects(:find_gem_file).returns(false)
+      mock_file_exists '/dir/boom/completions/what.rb'
+      M.expects(:load_file).with('/dir/boom/completions/what.rb')
+      Bond.load_gems('boom/what.rb').should == ['boom/what.rb']
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bond
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 3
-  - 3
-  version: 0.3.3
+  - 4
+  version: 0.3.4
 platform: ruby
 authors: 
 - Gabriel Horner
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-09 00:00:00 -05:00
+date: 2010-12-23 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -118,6 +118,7 @@ files:
 - test/bond_test.rb
 - test/completion_test.rb
 - test/completions_test.rb
+- test/m_test.rb
 - test/method_mission_test.rb
 - test/mission_test.rb
 - test/object_mission_test.rb
@@ -140,7 +141,7 @@ licenses:
 post_install_message: 
 rdoc_options: 
 - --title
-- Bond 0.3.3 Documentation
+- Bond 0.3.4 Documentation
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement