bond 0.4.2-java → 0.4.3-java

data/.gemspec

@@ -15,8 +15,8 @@ Gem::Specification.new do |s|
   s.has_rdoc = 'yard'
   s.rdoc_options = ['--title', "Bond #{Bond::VERSION} Documentation"]
   s.add_development_dependency 'bacon', '>= 1.1.0'
-  s.add_development_dependency 'mocha', '>= 0.9.8'
-  s.add_development_dependency 'mocha-on-bacon'
+  s.add_development_dependency 'mocha', '~> 0.12.1'
+  s.add_development_dependency 'mocha-on-bacon', '~> 0.2.1'
   s.add_development_dependency 'bacon-bits'
   s.files = Dir.glob(%w[{lib,test}/**/*.rb bin/* [A-Z]*.{txt,rdoc} **/deps.rip]) + %w{Rakefile .gemspec .travis.yml}
   if ENV['GEM_PLATFORM'] != 'java'

data/.travis.yml

@@ -4,5 +4,6 @@ rvm:
 - 1.8.7
 - 1.9.2
 - 1.9.3
+- 2.0.0
 - rbx
 - jruby

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+== 0.4.3
+* Fix to support ruby 2.0
+* Fix to support objects with invalid .class
+* Fix mocha dev ependency issue
+
 == 0.4.2
 * Start also releasing java version of gem
 * Put tests on travis

data/README.rdoc

@@ -221,7 +221,8 @@ 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
+* headius and rking for jruby help
+* ConradIrwin for 2.0 and other fixes
 * tobias for a java version of the gem
 
 == Bugs/Issues

data/lib/bond/mission.rb

@@ -53,8 +53,8 @@ module Bond
     attr_reader :on
     # Takes same options as {Bond#complete}.
     def initialize(options)
-      raise InvalidMissionError, ":action" unless (options[:action] || respond_to?(:default_action))
-      raise InvalidMissionError, ":on" unless (options[:on] && options[:on].is_a?(Regexp)) || respond_to?(:default_on)
+      raise InvalidMissionError, ":action" unless (options[:action] || respond_to?(:default_action, true))
+      raise InvalidMissionError, ":on" unless (options[:on] && options[:on].is_a?(Regexp)) || respond_to?(:default_on, true)
       @action, @on = options[:action], options[:on]
       @place = options[:place] if options[:place]
       @name = options[:name] if options[:name]

data/lib/bond/missions/object_mission.rb

@@ -28,8 +28,7 @@ class Bond::ObjectMission < Bond::Mission
   end
 
   def do_match(input)
-    super && eval_object(@matched[1]) && @evaled_object.class.respond_to?(:ancestors) &&
-      @evaled_object.class.ancestors.any? {|e| e.to_s =~ @object_condition }
+    super && eval_object(@matched[1]) && klass(@evaled_object).ancestors.any? {|e| e.to_s =~ @object_condition }
   end
 
   def after_match(input)
@@ -39,6 +38,12 @@ class Bond::ObjectMission < Bond::Mission
   end
 
   def default_action(obj)
-    obj.methods.map {|e| e.to_s} - OPERATORS
+    klass(obj).instance_methods.map {|e| e.to_s} - OPERATORS
+  end
+
+  def klass(obj)
+    (class << obj; self; end)
+  rescue TypeError # can't define singleton
+    obj.class
   end
 end

data/lib/bond/version.rb

@@ -1,3 +1,3 @@
 module Bond
-  VERSION = '0.4.2'
+  VERSION = '0.4.3'
 end

data/test/completion_test.rb

@@ -125,6 +125,11 @@ describe "Completion" do
         tab("%s[man oh].t").should be_methods_from(Symbol, 'oh].', :man)
         tab("%[man oh].t").should be_methods_from(String, 'oh].')
       end
+
+      it "with overridden class method" do
+        complete :on=>/(.*)./, :object=>'Object'
+        tab("obj = Object.new; def obj.class; end; obj.").should be_methods_from(Object, 'obj.')
+      end
     end
 
     describe "for" do

data/test/object_mission_test.rb

@@ -43,13 +43,6 @@ describe "ObjectMission" do
       tab("blah.upt").should == []
     end
 
-    it "ignores object that doesn't have a valid class" do
-      complete :on=>/(.*)./, :object=>'Object'
-      capture_stdout {
-        tab("obj = Object.new; def obj.class; end; obj.").should == []
-      }.should == ''
-    end
-
     # needed to ensure Bond works in irbrc
     it "doesn't evaluate irb binding on definition" do
       Object.expects(:const_defined?).never

data/test/test_helper.rb

@@ -1,6 +1,5 @@
 require 'bacon'
 require 'bacon/bits'
-require 'mocha'
 require 'mocha-on-bacon'
 require 'bond'
 require 'rbconfig'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bond
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
   prerelease: 
 platform: java
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-04 00:00:00.000000000 Z
+date: 2012-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bacon
@@ -32,33 +32,33 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.8
+        version: 0.12.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.8
+        version: 0.12.1
 - !ruby/object:Gem::Dependency
   name: mocha-on-bacon
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: bacon-bits
   requirement: !ruby/object:Gem::Requirement
@@ -142,7 +142,7 @@ licenses:
 post_install_message: 
 rdoc_options:
 - --title
-- Bond 0.4.2 Documentation
+- Bond 0.4.3 Documentation
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement