[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 26e74867af84528bb527c4ec848aae258e8569c1
Author: Markus Roberts <Markus at reality.com>
Date:   Tue Dec 22 16:08:53 2009 -0800

    Fixing failing tests

diff --git a/lib/puppet/application/ralsh.rb b/lib/puppet/application/ralsh.rb
index 2a0f008..b9f7a58 100644
--- a/lib/puppet/application/ralsh.rb
+++ b/lib/puppet/application/ralsh.rb
@@ -42,7 +42,6 @@ Puppet::Application.new(:ralsh) do
         typeobj = Puppet::Type.type(type) or raise "Could not find type #{type}"
         name = ARGV.shift
         params = {}
-
         ARGV.each do |setting|
             if setting =~ /^(\w+)=(.+)$/
                 params[$1] = $2
diff --git a/spec/unit/application/ralsh.rb b/spec/unit/application/ralsh.rb
index dbc196c..b0fa3bd 100755
--- a/spec/unit/application/ralsh.rb
+++ b/spec/unit/application/ralsh.rb
@@ -132,17 +132,34 @@ describe "ralsh" do
 
     describe "when running" do
 
+        def set_args(args)
+            (ARGV.clear << args).flatten!
+        end
+
+        def push_args(*args)
+            @args_stack ||= []
+            @args_stack << ARGV.dup
+            set_args(args)
+        end
+
+        def pop_args
+            set_args(@args_stack.pop)
+        end
+
         before :each do
             @type = stub_everything 'type', :properties => []
-            ARGV.stubs(:shift).returns("type")
-            ARGV.stubs(:length).returns(1).then.returns(0)
+            push_args('type')
             Puppet::Type.stubs(:type).returns(@type)
         end
 
-        it "should raise an error if no type is given" do
-            ARGV.stubs(:length).returns(0)
+        after :each do
+            pop_args
+        end
 
+        it "should raise an error if no type is given" do
+            push_args
             lambda { @ralsh.main }.should raise_error
+            pop_args
         end
 
         it "should raise an error when editing a remote host" do
@@ -186,11 +203,10 @@ describe "ralsh" do
             end
 
             it "should describe the given resource" do
-                ARGV.stubs(:shift).returns("type").then.returns('name')
-                ARGV.stubs(:length).returns(1).then.returns(1).then.returns(0)
+                push_args('type','name')
                 @client.expects(:describe).returns(stub_everything)
-
                 @ralsh.main
+                pop_args
             end
         end
 
@@ -208,30 +224,31 @@ describe "ralsh" do
 
             describe 'but with a given name' do
                 before :each do
-                    ARGV.stubs(:shift).returns("type").then.returns('name')
-                    ARGV.stubs(:length).returns(1).then.returns(1).then.returns(0)
-                    @object = stub_everything 'object', :to_trans => stub_everything('transportable')
-                    @type.stubs(:new).returns(@object)
-                    @object.stubs(:retrieve)
+                    push_args('type','name')
+                    @type.stubs(:new).returns(:bob)
                 end
 
-                it "should retrieve a specific instance" do
-                    @type.expects(:new).returns(@object)
-                    @object.expects(:retrieve)
+                after :each do
+                    pop_args
+                end
 
-                    @ralsh.main
+                it "should retrieve a specific instance if it exists" do
+                    pending
                 end
 
-                it "should add given parameters to object" do
-                    ARGV.stubs(:each).yields('param=temp')
-                    ARGV.stubs(:length).returns(1).then.returns(1).then.returns(1)
-                    Puppet::Resource::Catalog.stubs(:new).returns(stub_everything)
-                    @object.expects(:[]=).with('param','temp')
 
+                it "should create a stub instance if it doesn't exist" do
+                    pending
+                end
+
+                it "should add given parameters to the object" do
+                    push_args('type','name','param=temp')
+                    pending
+                    @object.expects(:[]=).with('param','temp')
                     @ralsh.main
+                    pop_args
                 end
             end
         end
-
     end
 end

-- 
Puppet packaging for Debian