[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. puppet-0.24.5-rc3-1601-gf8c1b08

[James Turnbull]

The following commit has been merged in the upstream branch:
commit 106c9a91929f00a852f7027088cee6684f83ab63
Author: Jesse Wolfe <jes5199 at gmail.com>
Date:   Tue Nov 17 10:17:21 2009 -0800

    Fixing 904 RDoc::usage incompatible with rubygems
    
    Monkey-patch workaround for RDoc so it doesn't get confused by rubygems
    stub executables.
    
    Signed-off-by: Jesse Wolfe <jes5199 at gmail.com>

diff --git a/lib/puppet/util/monkey_patches.rb b/lib/puppet/util/monkey_patches.rb
index e69de29..6e438bc 100644
--- a/lib/puppet/util/monkey_patches.rb
+++ b/lib/puppet/util/monkey_patches.rb
@@ -0,0 +1,8 @@
+module RDoc 
+    def self.caller(skip=nil)
+        in_gem_wrapper = false
+        Kernel.caller.reject { |call|
+            in_gem_wrapper ||= call =~ /#{Regexp.escape $0}:\d+:in `load'/
+        }
+    end
+end
diff --git a/spec/unit/util/monkey_patches.rb b/spec/unit/util/monkey_patches.rb
new file mode 100644
index 0000000..335f90b
--- /dev/null
+++ b/spec/unit/util/monkey_patches.rb
@@ -0,0 +1,103 @@
+#!/usr/bin/env ruby
+
+Dir.chdir(File.dirname(__FILE__)) { (s = lambda { |f| File.exist?(f) ? require(f) : Dir.chdir("..") { s.call(f) } }).call("spec/spec_helper.rb") }
+
+require 'puppet/util/monkey_patches'
+
+describe RDoc do
+    it "should return the call stack if a script is called directly" do
+        stack = [
+            "/usr/lib/ruby/1.8/rdoc/usage.rb:99:in `usage_no_exit'",
+            "/usr/lib/ruby/1.8/rdoc/usage.rb:93:in `usage'",
+            "./puppet/application.rb:295:in `help'",
+            "./puppet/application.rb:207:in `handle_help'",
+            "./puppet/application.rb:141:in `send'",
+            "./puppet/application.rb:141:in `option'", 
+            "/usr/lib/ruby/1.8/optparse.rb:1267:in `call'", 
+            "/usr/lib/ruby/1.8/optparse.rb:1267:in `parse_in_order'", 
+            "/usr/lib/ruby/1.8/optparse.rb:1254:in `catch'", 
+            "/usr/lib/ruby/1.8/optparse.rb:1254:in `parse_in_order'", 
+            "/usr/lib/ruby/1.8/optparse.rb:1248:in `order!'", 
+            "/usr/lib/ruby/1.8/optparse.rb:1339:in `permute!'", 
+            "/usr/lib/ruby/1.8/optparse.rb:1360:in `parse!'", 
+            "./puppet/application.rb:262:in `parse_options'", 
+            "./puppet/application.rb:214:in `run'", 
+            "./puppet/application.rb:306:in `exit_on_fail'", 
+            "./puppet/application.rb:214:in `run'", 
+            "../bin/puppet:71"
+        ]
+
+        old_dollar_zero = $0
+        $0 = "../bin/puppet"
+
+        # Mocha explodes if you try to mock :caller directly
+        Kernel.expects( :mock_caller ).returns( stack )
+        Kernel.instance_eval { alias orig_caller caller      }
+        Kernel.instance_eval { alias caller      mock_caller }
+
+        RDoc.caller.must == stack
+
+        $0 = old_dollar_zero
+        Kernel.instance_eval { alias caller      orig_caller }
+    end
+
+    it "should return a truncated call stack if a script is called from a rubygems stub" do
+        gem_stack = [
+            "/usr/lib/ruby/1.8/rdoc/usage.rb:99:in `usage_no_exit'", 
+            "/usr/lib/ruby/1.8/rdoc/usage.rb:93:in `usage'", 
+            "/usr/lib/ruby/gems/1.8/gems/puppet-0.25.1/lib/puppet/application.rb:295:in `help'", 
+            "/usr/lib/ruby/gems/1.8/gems/puppet-0.25.1/lib/puppet/application.rb:207:in `handle_help'", 
+            "/usr/lib/ruby/gems/1.8/gems/puppet-0.25.1/lib/puppet/application.rb:141:in `send'", 
+            "/usr/lib/ruby/gems/1.8/gems/puppet-0.25.1/lib/puppet/application.rb:141:in `option'", 
+            "/usr/lib/ruby/1.8/optparse.rb:1267:in `call'", 
+            "/usr/lib/ruby/1.8/optparse.rb:1267:in `parse_in_order'", 
+            "/usr/lib/ruby/1.8/optparse.rb:1254:in `catch'", 
+            "/usr/lib/ruby/1.8/optparse.rb:1254:in `parse_in_order'", 
+            "/usr/lib/ruby/1.8/optparse.rb:1248:in `order!'", 
+            "/usr/lib/ruby/1.8/optparse.rb:1339:in `permute!'", 
+            "/usr/lib/ruby/1.8/optparse.rb:1360:in `parse!'", 
+            "/usr/lib/ruby/gems/1.8/gems/puppet-0.25.1/lib/puppet/application.rb:262:in `parse_options'", 
+            "/usr/lib/ruby/gems/1.8/gems/puppet-0.25.1/lib/puppet/application.rb:214:in `run'", 
+            "/usr/lib/ruby/gems/1.8/gems/puppet-0.25.1/lib/puppet/application.rb:306:in `exit_on_fail'", 
+            "/usr/lib/ruby/gems/1.8/gems/puppet-0.25.1/lib/puppet/application.rb:214:in `run'", 
+            "/usr/lib/ruby/gems/1.8/gems/puppet-0.25.1/bin/puppet:71", 
+            "/usr/bin/puppet:19:in `load'", 
+            "/usr/bin/puppet:19"
+        ]
+
+        real_stack = [
+            "/usr/lib/ruby/1.8/rdoc/usage.rb:99:in `usage_no_exit'", 
+            "/usr/lib/ruby/1.8/rdoc/usage.rb:93:in `usage'", 
+            "/usr/lib/ruby/gems/1.8/gems/puppet-0.25.1/lib/puppet/application.rb:295:in `help'", 
+            "/usr/lib/ruby/gems/1.8/gems/puppet-0.25.1/lib/puppet/application.rb:207:in `handle_help'", 
+            "/usr/lib/ruby/gems/1.8/gems/puppet-0.25.1/lib/puppet/application.rb:141:in `send'", 
+            "/usr/lib/ruby/gems/1.8/gems/puppet-0.25.1/lib/puppet/application.rb:141:in `option'", 
+            "/usr/lib/ruby/1.8/optparse.rb:1267:in `call'", 
+            "/usr/lib/ruby/1.8/optparse.rb:1267:in `parse_in_order'", 
+            "/usr/lib/ruby/1.8/optparse.rb:1254:in `catch'", 
+            "/usr/lib/ruby/1.8/optparse.rb:1254:in `parse_in_order'", 
+            "/usr/lib/ruby/1.8/optparse.rb:1248:in `order!'", 
+            "/usr/lib/ruby/1.8/optparse.rb:1339:in `permute!'", 
+            "/usr/lib/ruby/1.8/optparse.rb:1360:in `parse!'", 
+            "/usr/lib/ruby/gems/1.8/gems/puppet-0.25.1/lib/puppet/application.rb:262:in `parse_options'", 
+            "/usr/lib/ruby/gems/1.8/gems/puppet-0.25.1/lib/puppet/application.rb:214:in `run'", 
+            "/usr/lib/ruby/gems/1.8/gems/puppet-0.25.1/lib/puppet/application.rb:306:in `exit_on_fail'", 
+            "/usr/lib/ruby/gems/1.8/gems/puppet-0.25.1/lib/puppet/application.rb:214:in `run'", 
+            "/usr/lib/ruby/gems/1.8/gems/puppet-0.25.1/bin/puppet:71", 
+        ]
+
+        old_dollar_zero = $0
+        $0 = '/usr/bin/puppet'
+
+        # Mocha explodes if you try to mock :caller directly
+        Kernel.expects( :mock_caller ).returns( gem_stack )
+        Kernel.instance_eval { alias orig_caller caller      }
+        Kernel.instance_eval { alias caller      mock_caller }
+
+        RDoc.caller.must == real_stack
+
+        $0 = old_dollar_zero
+        Kernel.instance_eval { alias caller      orig_caller }
+    end
+end
+

-- 
Puppet packaging for Debian