nkpart-accidentally 0.0.1 → 0.0.2

data/Manifest.txt

@@ -6,6 +6,7 @@ Rakefile
 TODO
 accidentally.gemspec
 coverage/index.html
+coverage/lib-accidentally-invocation_result_rb.html
 coverage/lib-accidentally-mad_hax_rb.html
 coverage/lib-accidentally-method_invoker_rb.html
 coverage/lib-accidentally-patches-kernel_rb.html
@@ -14,6 +15,7 @@ coverage/lib-accidentally_rb.html
 etc/examples.rb
 etc/textmate_command.rb
 lib/accidentally.rb
+lib/accidentally/invocation_result.rb
 lib/accidentally/mad_hax.rb
 lib/accidentally/method_invoker.rb
 lib/accidentally/patches/kernel.rb
@@ -22,6 +24,8 @@ script/console
 script/destroy
 script/generate
 spec/accidentally_spec.rb
+spec/invocation_result_spec.rb
+spec/method_invoker_spec.rb
 spec/spec.opts
 spec/spec_helper.rb
 tasks/rspec.rake

data/Rakefile

@@ -6,7 +6,7 @@ require File.dirname(__FILE__) + '/lib/accidentally'
 $hoe = Hoe.new('accidentally', Accidentally::VERSION) do |p|
   p.developer('nkpart', 'nkpart@gmail.com')
   p.changes              = p.paragraphs_of("History.txt", 0..1).join("\n\n")
-  p.post_install_message = 'PostInstall.txt' # TODO remove if post-install message not required
+  p.post_install_message = 'the whole thing?!'
   p.rubyforge_name       = p.name # TODO this is default value
   p.extra_deps         = [
     ['nkpart-prohax','>= 1.0.1']
@@ -14,7 +14,7 @@ $hoe = Hoe.new('accidentally', Accidentally::VERSION) do |p|
   p.extra_dev_deps = [
     ['newgem', ">= #{::Newgem::VERSION}"]
   ]
-  
+
   p.clean_globs |= %w[**/.DS_Store tmp *.log]
   path = (p.rubyforge_name == p.name) ? p.rubyforge_name : "\#{p.rubyforge_name}/\#{p.name}"
   p.remote_rdoc_dir = File.join(path.gsub(/^#{p.rubyforge_name}\/?/,''), 'rdoc')

data/accidentally.gemspec

@@ -2,18 +2,18 @@
 
 Gem::Specification.new do |s|
   s.name = %q{accidentally}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["nkpart"]
-  s.date = %q{2008-11-19}
+  s.date = %q{2008-11-20}
   s.description = %q{}
   s.email = ["nkpart@gmail.com"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "PostInstall.txt", "README.rdoc"]
-  s.files = ["History.txt", "Manifest.txt", "PostInstall.txt", "README.rdoc", "Rakefile", "TODO", "accidentally.gemspec", "coverage/index.html", "coverage/lib-accidentally-mad_hax_rb.html", "coverage/lib-accidentally-method_invoker_rb.html", "coverage/lib-accidentally-patches-kernel_rb.html", "coverage/lib-accidentally-patches-thread_rb.html", "coverage/lib-accidentally_rb.html", "etc/examples.rb", "etc/textmate_command.rb", "lib/accidentally.rb", "lib/accidentally/mad_hax.rb", "lib/accidentally/method_invoker.rb", "lib/accidentally/patches/kernel.rb", "lib/accidentally/patches/thread.rb", "script/console", "script/destroy", "script/generate", "spec/accidentally_spec.rb", "spec/spec.opts", "spec/spec_helper.rb", "tasks/rspec.rake"]
+  s.files = ["History.txt", "Manifest.txt", "PostInstall.txt", "README.rdoc", "Rakefile", "TODO", "accidentally.gemspec", "coverage/index.html", "coverage/lib-accidentally-invocation_result_rb.html", "coverage/lib-accidentally-mad_hax_rb.html", "coverage/lib-accidentally-method_invoker_rb.html", "coverage/lib-accidentally-patches-kernel_rb.html", "coverage/lib-accidentally-patches-thread_rb.html", "coverage/lib-accidentally_rb.html", "etc/examples.rb", "etc/textmate_command.rb", "lib/accidentally.rb", "lib/accidentally/invocation_result.rb", "lib/accidentally/mad_hax.rb", "lib/accidentally/method_invoker.rb", "lib/accidentally/patches/kernel.rb", "lib/accidentally/patches/thread.rb", "script/console", "script/destroy", "script/generate", "spec/accidentally_spec.rb", "spec/invocation_result_spec.rb", "spec/method_invoker_spec.rb", "spec/spec.opts", "spec/spec_helper.rb", "tasks/rspec.rake"]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/nkpart/accidentally}
-  s.post_install_message = %q{PostInstall.txt}
+  s.post_install_message = %q{the whole thing?!}
   s.rdoc_options = ["--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{accidentally}

data/lib/accidentally/invocation_result.rb

@@ -0,0 +1,14 @@
+module Accidentally
+  class InvocationResult
+    def initialize result, block_used = nil
+      @result= result
+      @block_used = block_used
+    end
+  
+    attr_reader :result, :block_used
+    
+    def == other
+      self.result == other.result && self.block_used == other.block_used
+    end
+  end
+end

data/lib/accidentally/mad_hax.rb

@@ -16,7 +16,11 @@ module Accidentally
         :f => proc { |m| MethodInvoker.invoke(original, m, args, &blk) },
         :candidates => proc { select_candidates(original.methods) }
       ).in {
-        candidates.select { |m| f(m) == target }
+        candidates.inject([]) { |acc, m| 
+          v = f(m)
+          acc << "#{m}#{" " + v.block_used if v.block_used}" if v.result == target 
+          acc
+        }        
       } 
     end
   

data/lib/accidentally/method_invoker.rb

@@ -1,7 +1,6 @@
 require 'accidentally/patches/kernel'
 require 'accidentally/patches/thread'
-
-class InvocationResult < Strucked.build(:result, :block_used); end
+require 'accidentally/invocation_result'
   
 module Accidentally  
   class MethodInvoker
@@ -14,16 +13,19 @@ module Accidentally
     end
     
     def invoke meth, args, &blk
+      # TODO This look bad. Too many places where invocation results are getting built
+      # and failure happening.
       v, warns = yield_and_collect_stderr {
-        invocation_result, fail = either { do_send(meth, args, &blk) }
-        if should_do_block_execute(invocation_result, fail) then
-          either { invoke_and_infer_block(meth, args) }.compact.first
+        value, fail = either { do_send(meth, args, &blk) }
+        if should_do_block_execute(value, fail) then
+          r, fail = either { invoke_and_infer_block(meth, args) }
+          r || InvocationResult.new(fail)
         else
-          invocation_result
+          InvocationResult.new(value)
         end
       }
-      # TODO handle the warns            
-      v
+      # TODO handle the warns     
+      v       
     end
     
     private
@@ -47,8 +49,10 @@ module Accidentally
     end
     
     def invoke_and_infer_block m, args
-      blk = proc { |x| x }
-      do_send(m, args, &blk)
+      proc_body = "{ |x| x }"
+      blk = eval "proc #{proc_body}"
+      v = do_send(m, args, &blk)
+      InvocationResult.new(v, proc_body)
     end
   end
 end

data/lib/accidentally.rb

@@ -12,7 +12,7 @@ class Object
 end
 
 module Accidentally
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 
   class Proxy
     def initialize object

data/spec/accidentally_spec.rb

@@ -5,54 +5,42 @@ include Accidentally
 describe Accidentally do
   it "should figure out length of an array" do
     methods = "dog".accidentally == 3
-    assert methods.include?("length")
+    methods.should include("length")
   end
 
   it "should figure out array reversal" do
     methods = [1, 2].accidentally == [2, 1]
-    assert methods.include?("reverse")
+    methods.should include("reverse")
   end
   
   it "should figure out select" do
     methods = [1, false, 2].accidentally == [1, 2]
-    assert methods.include?("select { |x| x }")
+    methods.should include("select { |x| x }")
   end
   
   it "should figure out index" do
     methods = [:a, :b, :c].accidentally == :a
-    assert methods.include?("first")
+    methods.should include("first")
   end
   
   it "should be able to be guided by a parameter" do
     methods = [:a, :b, :c].accidentally(:b) == 1
-    assert methods.include?("index")
+    methods.should include("index")
   end
   
   it "should be able to be guided by more than one parameter" do
     methods = [:a, :b, :c, :d, :e].accidentally(1, 2) == [:b, :c]
-    assert methods.include?("slice")
+    methods.should include("slice")
   end
 
   it "should be able to take a block suggestion" do
     m = [1, 2, 3].accidentally{ |a, b| a + b } == 6
-    assert m.include?("inject")
+    m.should include("inject")
   end
   
   it "should not fail for fixnums" do
     m = 1.accidentally == "1"
-    assert m.include?("to_s")
-  end
-end
-
-describe Accidentally::MethodInvoker do
-  it "should invoke a simple no args method" do
-    r = MethodInvoker.invoke [], :size, []
-    assert_equal 0, r
-  end
-  
-  it "should invoke a no args method that takes a block" do
-    r = MethodInvoker.invoke [1], :select, []
-    assert_equal [1], r    
+    m.should include("to_s")
   end
 end
 

data/spec/invocation_result_spec.rb

@@ -0,0 +1,11 @@
+require File.dirname(__FILE__) + '/spec_helper.rb'
+
+include Accidentally
+
+describe InvocationResult do
+  it "should be equal to others" do
+    InvocationResult.new(5, "b").should_not ==(InvocationResult.new(5))
+    InvocationResult.new(3, "b").should_not ==(InvocationResult.new(5, "b"))
+  end
+  
+end

data/spec/method_invoker_spec.rb

@@ -0,0 +1,14 @@
+
+include Accidentally
+
+describe Accidentally::MethodInvoker do
+  it "should invoke a simple no args method" do
+    r = MethodInvoker.invoke [], :size, []
+    r.should == InvocationResult.new(0, nil)
+  end
+  
+  it "should invoke a no args method that takes a block" do
+    r = MethodInvoker.invoke [1], :select, []
+    r.should == InvocationResult.new([1], "{ |x| x }")    
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nkpart-accidentally
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - nkpart
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-19 00:00:00 -08:00
+date: 2008-11-20 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,6 +60,7 @@ files:
 - TODO
 - accidentally.gemspec
 - coverage/index.html
+- coverage/lib-accidentally-invocation_result_rb.html
 - coverage/lib-accidentally-mad_hax_rb.html
 - coverage/lib-accidentally-method_invoker_rb.html
 - coverage/lib-accidentally-patches-kernel_rb.html
@@ -68,6 +69,7 @@ files:
 - etc/examples.rb
 - etc/textmate_command.rb
 - lib/accidentally.rb
+- lib/accidentally/invocation_result.rb
 - lib/accidentally/mad_hax.rb
 - lib/accidentally/method_invoker.rb
 - lib/accidentally/patches/kernel.rb
@@ -76,12 +78,14 @@ files:
 - script/destroy
 - script/generate
 - spec/accidentally_spec.rb
+- spec/invocation_result_spec.rb
+- spec/method_invoker_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - tasks/rspec.rake
 has_rdoc: true
 homepage: http://github.com/nkpart/accidentally
-post_install_message: PostInstall.txt
+post_install_message: the whole thing?!
 rdoc_options: 
 - --main
 - README.rdoc