bond 0.1.3 → 0.1.4

data/CHANGELOG.rdoc

@@ -1,3 +1,9 @@
+== 0.1.4
+* Added Bond.recomplete to make redefinition of completion missions easy.
+* Added flag to readline extension building so that installing bond doesn't fail for
+  users without readline.
+* bond/completion allows require to autocomplete gems and within gems.
+
 == 0.1.3
 * Fixing deployment mistake
 
@@ -9,6 +15,7 @@
 * Fixed irb's completion inconsistencies
 * Added ability to specify :default_search for Bond.debrief
 * Added placement of completions with :place for Bond.complete
+
 == 0.1.1
 * Added Bond.spy to debug completions
 * Fixed object completion failing in irbrc

data/README.rdoc

@@ -190,6 +190,8 @@ this Readline enhancement to ruby.
 
 == Links
 * http://tagaholic.me/2009/07/16/bond-from-irb-with-completion-love.html
+* http://tagaholic.me/2009/07/22/better-irb-completion-with-bond.html
+* http://tagaholic.me/2009/07/23/mini-irb-and-mini-script-console.html
 
 == Todo
 * Allow usage of prefined Bond::Actions in action procs.

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:major: 0
 :minor: 1
-:patch: 3
+:patch: 4
+:major: 0

data/ext/readline_line_buffer/extconf.rb

@@ -1,3 +1,4 @@
 require "mkmf"
+have_header 'readline/readline.h'
 dir_config 'readline_line_buffer'
-create_makefile 'readline_line_buffer'
+create_makefile 'readline_line_buffer'

data/ext/readline_line_buffer/readline_line_buffer.c

@@ -2,6 +2,7 @@
    Copyright (C) 1997-2001  Shugo Maeda */
 /* body of line_buffer() from irb enhancements at http://www.creo.hu/~csaba/ruby/ */
  
+#ifdef HAVE_READLINE_READLINE_H
 #include "ruby.h"
 #include <errno.h>
 #include <stdio.h>
@@ -20,3 +21,4 @@ void Init_readline_line_buffer() {
   c = rb_const_get(c, rb_intern("Readline"));
   rb_define_singleton_method(c, "line_buffer", (VALUE(*)(ANYARGS))line_buffer, -1);
 }
+#endif

data/lib/bond.rb

@@ -54,17 +54,23 @@ module Bond
   #  Bond.complete(:object=>ActiveRecord::Base) {|input| input.object.class.instance_methods(false) }
   #  Bond.complete(:method=>'you', :search=>proc {|input, list| list.grep(/#{input}/i)} ) {|input| %w{Only Live Twice} }
   def complete(options={}, &block)
-    agent.complete(options, &block)
-    true
-  rescue InvalidMissionError
-    $stderr.puts "Invalid mission given. Mission needs an action and a condition."
-    false
-  rescue InvalidMissionActionError
-    $stderr.puts "Invalid mission action given. Make sure action responds to :call or refers to a predefined action that does."
-    false
-  rescue
-    $stderr.puts "Mission setup failed with:", $!
-    false
+    if (result = agent.complete(options, &block)).is_a?(String)
+      $stderr.puts result
+      false
+    else
+      true
+    end
+  end
+
+  # Redefines an existing completion mission. Takes same options as Bond.complete. This is useful when wanting to override existing
+  # completions or when wanting to toggle between multiple definitions or modes of a completion.
+  def recomplete(options={}, &block)
+    if (result = agent.recomplete(options, &block)).is_a?(String)
+      $stderr.puts result
+      false
+    else
+      true
+    end
   end
 
   # Resets Bond so that next time Bond.complete is called, a new set of completion missions are created. This does not

data/lib/bond/actions.rb

@@ -11,7 +11,7 @@ module Bond
     def current_eval(string)
       Missions::ObjectMission.current_eval(string)
     rescue Exception
-      nil
+      []
     end
 
     # Completes backtick and Kernel#system with shell commands available in ENV['PATH']
@@ -50,7 +50,7 @@ module Bond
          File.directory?(File.join(dir,f)) ? f+fs : f } }
       input_regex = /^#{Regexp.escape(input)}/
 
-      $:.select {|e| File.directory?(e)}.inject([]) do |t,dir|
+      require_paths.select {|e| File.directory?(e)}.inject([]) do |t,dir|
         if input[/.$/] == fs && File.directory?(File.join(dir,input))
           matches = dir_entries.call(File.join(dir,input)).select {|e| e =~ extensions_regex }.map {|e| input + e }
         else
@@ -61,5 +61,9 @@ module Bond
         t += matches
       end
     end
+
+    def require_paths
+      $: + Gem.path.map {|e| Dir["#{e}/gems/*/lib"] }.flatten.uniq rescue $:
+    end
   end
 end

data/lib/bond/agent.rb

@@ -14,10 +14,38 @@ module Bond
       @missions = []
     end
 
-    def complete(options={}, &block) #:nodoc:
+    def complete(options={}, &block)
+      if (mission = create_mission(options, &block)).is_a?(Mission)
+        mission.place.is_a?(Integer) ? @missions.insert(mission.place - 1, mission).compact! : @missions << mission
+        sort_last_missions
+      end
+      mission
+    end
+
+    def create_mission(options, &block) #:nodoc:
       options[:action] ||= block
-      mission = Mission.create(options.merge(:eval_binding=>@eval_binding))
-      mission.place.is_a?(Integer) ? @missions.insert(mission.place - 1, mission).compact! : @missions << mission
+      Mission.create(options.merge(:eval_binding=>@eval_binding))
+    rescue InvalidMissionError
+      "Invalid mission given. Mission needs an action and a condition."
+    rescue InvalidMissionActionError
+      "Invalid mission action given. Make sure action responds to :call or refers to a predefined action that does."
+    rescue
+      "Mission setup failed with:\n#{$!}"
+    end
+
+    def recomplete(options={}, &block)
+      if (mission = create_mission(options, &block)).is_a?(Mission)
+        if (existing_mission = @missions.find {|e| e.unique_id == mission.unique_id })
+          @missions[@missions.index(existing_mission)] = mission
+          sort_last_missions
+        else
+          return "No existing mission found to recomplete."
+        end
+      end
+      mission
+    end
+
+    def sort_last_missions #:nodoc:
       @missions.replace @missions.partition {|e| e.place != :last }.flatten
     end
 

data/lib/bond/completion.rb

@@ -21,7 +21,7 @@ Bond.complete(:on=>/(\$[^\s.]*)$/, :search=>false) {|e|
   global_variables.grep(/^#{Regexp.escape(e.matched[1])}/)
 }
 # Completes files
-Bond.complete(:on=>/\s+["']([^'"]*)$/, :search=>false, :action=>:quoted_files, :place=>:last)
+Bond.complete(:on=>/[\s(]["']([^'"]*)$/, :search=>false, :action=>:quoted_files, :place=>:last)
 # Completes any object's methods
 Bond.complete(:object=>"Object", :place=>:last)
 # Completes method completion anywhere in the line

data/lib/bond/mission.rb

@@ -90,6 +90,10 @@ module Bond
     end
 
     #:stopdoc:
+    def unique_id
+      @condition
+    end
+
     def set_input(input, match)
       @input = input[/\S+$/]
     end

data/lib/bond/missions/method_mission.rb

@@ -8,6 +8,10 @@ class Bond::Missions::MethodMission < Bond::Mission
     super
   end
 
+  def unique_id #:nodoc:
+    @method_condition.is_a?(Regexp) ? @method_condition : @method_condition.to_s
+  end
+
   def set_input(input, match) #:nodoc:
     @input = match[-1]
   end

data/lib/bond/missions/object_mission.rb

@@ -13,6 +13,10 @@ class Bond::Missions::ObjectMission < Bond::Mission
     super
   end
 
+  def unique_id
+    "#{@object_condition.inspect}+#{@condition.inspect}"
+  end
+
   def handle_valid_match(input)
     if (match = super)
       begin

data/test/agent_test.rb

@@ -42,6 +42,61 @@ class Bond::AgentTest < Test::Unit::TestCase
     end
   end
 
+  context "complete" do
+    test "prints error if no action given" do
+      capture_stderr { complete :on=>/blah/ }.should =~ /Invalid mission/
+    end
+
+    test "prints error if no condition given" do
+      capture_stderr { complete {|e| []} }.should =~ /Invalid mission/
+    end
+
+    test "prints error if invalid condition given" do
+      capture_stderr { complete(:on=>'blah') {|e| []} }.should =~ /Invalid mission/
+    end
+
+    test "prints error if invalid symbol action given" do
+      capture_stderr { complete(:on=>/blah/, :action=>:bling) }.should =~ /Invalid mission action/
+    end
+
+    test "prints error if setting mission fails unpredictably" do
+      Bond::Mission.expects(:create).raises(RuntimeError)
+      capture_stderr { complete(:on=>/blah/) {|e| [] } }.should =~ /Mission setup failed/
+    end
+  end
+
+  context "recomplete" do
+    before(:each) {|e| Bond.agent.reset }
+
+    test "recompletes a mission" do
+      Bond.complete(:on=>/man/) { %w{1 2 3}}
+      Bond.recomplete(:on=>/man/) { %w{4 5 6}}
+      tabtab('man ').should == %w{4 5 6}
+    end
+
+    test "recompletes a method mission" do
+      Bond.complete(:method=>'blah') { %w{1 2 3}}
+      Bond.recomplete(:method=>'blah') { %w{4 5 6}}
+      tabtab('blah ').should == %w{4 5 6}
+    end
+
+    test "recompletes an object mission" do
+      Bond.complete(:object=>'String') { %w{1 2 3}}
+      Bond.recomplete(:object=>'String') { %w{4 5 6}}
+      tabtab('"blah".').should == %w{.4 .5 .6}
+    end
+
+    test "prints error if no existing mission" do
+      Bond.complete(:object=>'String') { %w{1 2 3}}
+      capture_stderr { Bond.recomplete(:object=>'Array') { %w{4 5 6}}}.should =~ /No existing mission/
+      tabtab('[].').should == []
+    end
+
+    test "prints error if invalid condition given" do
+      capture_stderr { Bond.recomplete}.should =~ /Invalid mission/
+    end
+  end
+
   context "spy" do
     before(:all) {
       Bond.reset; complete(:on=>/end$/) { [] }; complete(:method=>'the') { %w{spy who loved me} }

data/test/bond_test.rb

@@ -31,29 +31,6 @@ class BondTest < Test::Unit::TestCase
     end
   end
 
-  context "complete" do
-    test "prints error if no action given" do
-      capture_stderr { complete :on=>/blah/ }.should =~ /Invalid mission/
-    end
-
-    test "prints error if no condition given" do
-      capture_stderr { complete {|e| []} }.should =~ /Invalid mission/
-    end
-
-    test "prints error if invalid condition given" do
-      capture_stderr { complete(:on=>'blah') {|e| []} }.should =~ /Invalid mission/
-    end
-
-    test "prints error if invalid symbol action given" do
-      capture_stderr { complete(:on=>/blah/, :action=>:bling) }.should =~ /Invalid mission action/
-    end
-
-    test "prints error if setting mission fails unpredictably" do
-      Bond.agent.expects(:complete).raises(ArgumentError)
-      capture_stderr { complete(:on=>/blah/) {|e| [] } }.should =~ /Mission setup failed/
-    end
-  end
-
   test "reset clears existing missions" do
     complete(:on=>/blah/) {[]}
     Bond.agent.missions.size.should_not == 0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bond
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Gabriel Horner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-22 00:00:00 -04:00
+date: 2009-07-30 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -72,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: tagaholic
-rubygems_version: 1.3.2
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: "Mission: Easy custom autocompletion for arguments, methods and beyond. Accomplished for irb and any other readline-like console environments."