bond 0.2.2 → 0.3.0

data/.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.email       = "gabriel.horner@gmail.com"
   s.homepage    = "http://tagaholic.me/bond/"
   s.summary = "Mission: Easy custom autocompletion for arguments, methods and beyond. Accomplished for irb and any other readline-like console environments."
-  s.description = "Bond is on a mission to improve irb’s autocompletion. Aside from doing everything irb’s can do and fixing its quirks, Bond can autocomplete argument(s) to methods, uniquely completing per module, per method and per argument. Bond brings irb’s completion closer to bash/zsh as it provides a configuration system and a DSL for creating custom completions and completion rules. With this configuration system, users can customize their irb autocompletions and share it with others. Bond can also generate completions from yard documentation and load completions that ship with gems. Bond is able to offer more than irb’s completion since it uses a Readline C extension to get the full line of input when completing as opposed to irb’s last-word approach."
+  s.description = "Bond is on a mission to improve irb's autocompletion. Aside from doing everything irb's can do and fixing its quirks, Bond can autocomplete argument(s) to methods, uniquely completing per module, per method and per argument. Bond brings irb's completion closer to bash/zsh as it provides a configuration system and a DSL for creating custom completions and completion rules. With this configuration system, users can customize their irb autocompletions and share it with others. Bond can also generate completions from yard documentation and load completions that ship with gems. Bond is able to offer more than irb's completion since it uses a Readline C extension to get the full line of input when completing as opposed to irb's last-word approach."
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project = 'tagaholic'
   s.has_rdoc = 'yard'
@@ -18,8 +18,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'mocha', '>= 0.9.8'
   s.add_development_dependency 'mocha-on-bacon'
   s.add_development_dependency 'bacon-bits'
-  s.files = Dir.glob(%w[{lib,test}/**/*.rb bin/* [A-Z]*.{txt,rdoc} ext/**/*.{rb,c}]) + %w{Rakefile .gemspec}
-  s.files += Dir.glob('**/*.rip')
+  s.files = Dir.glob(%w[{lib,test}/**/*.rb bin/* [A-Z]*.{txt,rdoc} ext/**/*.{rb,c} **/deps.rip]) + %w{Rakefile .gemspec}
   s.extra_rdoc_files = ["README.rdoc", "LICENSE.txt"]
   s.extensions = ["ext/readline_line_buffer/extconf.rb"]
   s.license = 'MIT'

data/CHANGELOG.rdoc

@@ -1,3 +1,10 @@
+== 0.3.0
+* Fixes for tests to pass in rubinius and 1.9.2.
+* Add support for a proc :eval_binding.
+* Add instance variables to default completion.
+* Add DefaultMission.completions to make default completions reusable
+* Remove unused Mission#eval_binding.
+
 == 0.2.2
 * Moved documentation to yard.
 * Better extconf.rb thanks to @timcharper

data/lib/bond.rb

@@ -96,8 +96,9 @@ module Bond
   #  See {Agent#default_mission}.
   # @option options [Symbol] :default_search (:underscore) Name of a *_search method in Rc to use as the default
   #   search in completions. See {#complete}'s :search option for valid values.
-  # @option options [Binding] :eval_binding (TOPLEVEL_BINDING) Binding to use when evaluating objects in
-  #   ObjectMission and MethodMission. When in irb, defaults to irb's current binding.
+  # @option options [Binding, Proc] :eval_binding (TOPLEVEL_BINDING) Binding to use when evaluating objects in
+  #   ObjectMission and MethodMission. When in irb, defaults to irb's current binding. When proc,
+  #   binding is evaluated each time by calling proc.
   # @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.
@@ -118,4 +119,4 @@ module Bond
 
   # Lists all methods that have argument completion.
   def list_methods; MethodMission.all_methods; end
-end
+end

data/lib/bond/completion.rb

@@ -7,10 +7,10 @@ complete :all_operator_methods=>true
 complete(:name=>:constants, :anywhere=>'([A-Z][^. \(]*)::([^: .]*)') {|e|
   receiver = e.matched[2]
   candidates = eval("#{receiver}.constants | #{receiver}.methods") || []
-  normal_search(e.matched[3], candidates).map {|e| receiver + "::" + e}
+  normal_search(e.matched[3], candidates).map {|e| "#{receiver}::#{e}" }
 }
 # absolute constants
 complete(:prefix=>'::', :anywhere=>'[A-Z][^:\.\(]*') {|e| Object.constants }
 complete(:anywhere=>':[^:\s.]*') {|e|  Symbol.all_symbols.map {|f| ":#{f}" } rescue [] }
 complete(:anywhere=>'\$[^\s.]*') {|e| global_variables }
-complete(:name=>:quoted_files, :on=>/[\s(]["']([^'"]*)$/, :search=>false, :place=>:last) {|e| files(e.matched[1]) }
+complete(:name=>:quoted_files, :on=>/[\s(]["']([^'"]*)$/, :search=>false, :place=>:last) {|e| files(e.matched[1]) }

data/lib/bond/mission.rb

@@ -26,7 +26,8 @@ module Bond
       end
 
       # Calls eval with either the irb's current workspace binding or TOPLEVEL_BINDING.
-      def current_eval(string, ebinding=eval_binding)
+      def current_eval(string, ebinding=Mission.eval_binding)
+        ebinding = ebinding.call if ebinding.is_a?(Proc)
         eval(string, ebinding)
       end
 
@@ -62,7 +63,7 @@ module Bond
 
     # Returns a boolean indicating if a mission matches the given Input and should be executed for completion.
     def matches?(input)
-      @matched = @input = @completion_prefix = @eval_binding = nil
+      @matched = @input = @completion_prefix = nil
       (match = do_match(input)) && after_match(@line = input)
       !!match
     end
@@ -132,17 +133,13 @@ module Bond
     end
 
     def eval_object(obj)
-      @evaled_object = self.class.current_eval(obj, eval_binding)
+      @evaled_object = self.class.current_eval(obj)
       true
     rescue Exception
       raise FailedMissionError.new(self), "Match failed during eval of '#{obj}'." if Bond.config[:eval_debug]
       false
     end
 
-    def eval_binding
-      @eval_binding ||= self.class.eval_binding
-    end
-
     def unique_id
       @on.inspect
     end

data/lib/bond/missions/default_mission.rb

@@ -6,14 +6,16 @@ class Bond::DefaultMission < Bond::Mission
     "then", "true", "undef", "unless", "until", "when", "while", "yield"
   ]
 
+
+  # Default action which generates methods, private methods, reserved words, local variables and constants.
+  def self.completions(input=nil)
+    Bond::Mission.current_eval("methods | private_methods | local_variables | " +
+                               "self.class.constants | instance_variables") | ReservedWords
+  end
+
   def initialize(options={}) #@private
-    options[:action] ||= method(:default)
+    options[:action] ||= self.class.method(:completions)
     super
   end
   def default_on; end #@private
-
-  # Default action which generates methods, private methods, reserved words, local variables and constants.
-  def default(input)
-    Bond::Mission.current_eval("methods | private_methods | local_variables | self.class.constants") | ReservedWords
-  end
-end
+end

data/lib/bond/version.rb

@@ -1,3 +1,3 @@
 module Bond
-  VERSION = '0.2.2'
+  VERSION = '0.3.0'
 end

data/test/agent_test.rb

@@ -61,7 +61,7 @@ describe "Agent" do
 
     it 'for completion action failing with Rc.eval and debug completes error' do
       complete(:on=>/blah/) { Rc.eval('{[}') || [] }
-      tab('blah').should complete_error(/Bond Error: Failed.*action.*(eval)/)
+      tab('blah').should complete_error(/Bond Error: Failed.*action.*(syntax|expect)/m)
     end
 
     it "for completion action raising SyntaxError in eval completes error" do
@@ -231,4 +231,4 @@ describe "Agent" do
       capture_stdout { Bond.spy('blah')}.should =~ /Doesn't match/
     end
   end
-end
+end

data/test/bond_test.rb

@@ -35,6 +35,13 @@ describe "Bond" do
       tab('blah all').should == ["all_quiet"]
     end
 
+    it "sets proc eval_binding" do
+      bdg = binding
+      start :eval_binding => lambda { bdg }
+      Mission.expects(:eval).with(anything, bdg).returns([])
+      tab("'blah'.").should == []
+    end
+
     after_all { M.debrief :readline_plugin=>valid_readline_plugin; M.reset }
   end
 
@@ -95,4 +102,4 @@ describe "Bond" do
     M.reset
     Bond.agent.missions.size.should == 0
   end
-end
+end

data/test/completions_test.rb

@@ -43,7 +43,9 @@ describe "completions for" do
 
   describe "Object" do
     it "#instance_of?" do
-      tab("[].instance_of? Arr").should == ['Array']
+      expectations = ['Array']
+      expectations = ["Array", "Array::"] if Config::CONFIG["RUBY_SO_NAME"].to_s[/rubinius/i]
+      tab("[].instance_of? Arr").should == expectations
     end
 
     it "#is_a?" do
@@ -51,7 +53,7 @@ describe "completions for" do
     end
 
     it "#send" do
-      tab("Object.send :super").should == [':superclass']
+      tab("Object.send :ne").should == [':new']
     end
 
     it "#send and additional arguments" do
@@ -93,4 +95,4 @@ describe "completions for" do
       tab("Object > Bon").should == %w{Bond Bond::}
     end
   end
-end
+end

data/test/test_helper.rb

@@ -3,6 +3,7 @@ require 'bacon/bits'
 require 'mocha'
 require 'mocha-on-bacon'
 require 'bond'
+require 'rbconfig'
 
 module TestHelpers
   extend self

data/test/yard_test.rb

@@ -75,6 +75,8 @@ describe 'Bond.load_yard_gems' do
       M.expects(:load_file)
     }
 
+    # rubinius implements Kernel#require with File.exists? which is different than MRI
+    unless Config::CONFIG["RUBY_SO_NAME"].to_s[/rubinius/i]
     it "with :reload option" do
       File.expects(:exists?).returns(true)
       Yard.expects(:create_completion_file)
@@ -86,6 +88,7 @@ describe 'Bond.load_yard_gems' do
       Yard.expects(:create_completion_file)
       load_yard_gems
     end
+    end
 
     describe 'which has' do
       before { YARD::Registry.expects(:load!) }
@@ -111,4 +114,4 @@ describe 'Bond.load_yard_gems' do
       end
     end
   end
-end
+end

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 2
-  version: 0.2.2
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Gabriel Horner
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-17 00:00:00 -04:00
+date: 2010-09-27 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -78,7 +78,7 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id004
-description: "Bond is on a mission to improve irb\xE2\x80\x99s autocompletion. Aside from doing everything irb\xE2\x80\x99s can do and fixing its quirks, Bond can autocomplete argument(s) to methods, uniquely completing per module, per method and per argument. Bond brings irb\xE2\x80\x99s completion closer to bash/zsh as it provides a configuration system and a DSL for creating custom completions and completion rules. With this configuration system, users can customize their irb autocompletions and share it with others. Bond can also generate completions from yard documentation and load completions that ship with gems. Bond is able to offer more than irb\xE2\x80\x99s completion since it uses a Readline C extension to get the full line of input when completing as opposed to irb\xE2\x80\x99s last-word approach."
+description: Bond is on a mission to improve irb's autocompletion. Aside from doing everything irb's can do and fixing its quirks, Bond can autocomplete argument(s) to methods, uniquely completing per module, per method and per argument. Bond brings irb's completion closer to bash/zsh as it provides a configuration system and a DSL for creating custom completions and completion rules. With this configuration system, users can customize their irb autocompletions and share it with others. Bond can also generate completions from yard documentation and load completions that ship with gems. Bond is able to offer more than irb's completion since it uses a Readline C extension to get the full line of input when completing as opposed to irb's last-word approach.
 email: gabriel.horner@gmail.com
 executables: []
 
@@ -130,17 +130,17 @@ files:
 - README.rdoc
 - ext/readline_line_buffer/extconf.rb
 - ext/readline_line_buffer/readline_line_buffer.c
+- test/deps.rip
 - Rakefile
 - .gemspec
-- test/deps.rip
-has_rdoc: yard
+has_rdoc: true
 homepage: http://tagaholic.me/bond/
 licenses: 
 - MIT
 post_install_message: 
 rdoc_options: 
 - --title
-- Bond 0.2.2 Documentation
+- Bond 0.3.0 Documentation
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement