Syntax fixes for ruby 1.8

Author: DavidS

lib/puppet/parser/functions/member.rb

@@ -44,7 +44,7 @@ module Puppet::Parser::Functions
     end
 
     if arguments[1].is_a? String or arguments[1].is_a? Fixnum
-      item = Array(arguments[1])
+      item = [arguments[1]]
     else
       item = arguments[1]
     end

spec/functions/deep_merge_spec.rb

@@ -14,30 +14,30 @@
 
   describe 'when arguments have key collisions' do
     it 'should prefer values from the last hash' do
-      is_expected.to run
+      is_expected.to run \
         .with_params(
           {'key1' => 'value1', 'key2' => 'value2' },
-          {'key2' => 'replacement_value', 'key3' => 'value3'})
+          {'key2' => 'replacement_value', 'key3' => 'value3'}) \
         .and_return(
           {'key1' => 'value1', 'key2' => 'replacement_value', 'key3' => 'value3'})
     end
-    it { is_expected.to run
-      .with_params({'key1' => 'value1'}, {'key1' => 'value2'}, {'key1' => 'value3'})
+    it { is_expected.to run \
+      .with_params({'key1' => 'value1'}, {'key1' => 'value2'}, {'key1' => 'value3'}) \
       .and_return({'key1' => 'value3' })
     }
   end
 
   describe 'when arguments have subhashes' do
-    it { is_expected.to run
-      .with_params({'key1' => 'value1'}, {'key2' => 'value2', 'key3' => {'subkey1' => 'value4'}})
+    it { is_expected.to run \
+      .with_params({'key1' => 'value1'}, {'key2' => 'value2', 'key3' => {'subkey1' => 'value4'}}) \
       .and_return( {'key1' => 'value1', 'key2' => 'value2', 'key3' => {'subkey1' => 'value4'}})
     }
-    it { is_expected.to run
-      .with_params({'key1' => {'subkey1' => 'value1'}}, {'key1' => {'subkey2' => 'value2'}})
+    it { is_expected.to run \
+      .with_params({'key1' => {'subkey1' => 'value1'}}, {'key1' => {'subkey2' => 'value2'}}) \
       .and_return( {'key1' => {'subkey1' => 'value1', 'subkey2' => 'value2'}})
     }
-    it { is_expected.to run
-      .with_params({'key1' => {'subkey1' => {'subsubkey1' => 'value1'}}}, {'key1' => {'subkey1' => {'subsubkey1' => 'value2'}}})
+    it { is_expected.to run \
+      .with_params({'key1' => {'subkey1' => {'subsubkey1' => 'value1'}}}, {'key1' => {'subkey1' => {'subsubkey1' => 'value2'}}}) \
       .and_return( {'key1' => {'subkey1' => {'subsubkey1' => 'value2'}}})
     }
   end

spec/functions/delete_spec.rb

@@ -36,12 +36,12 @@
     it { is_expected.to run.with_params({}, '').and_return({}) }
     it { is_expected.to run.with_params({}, 'key').and_return({}) }
     it { is_expected.to run.with_params({'key' => 'value'}, 'key').and_return({}) }
-    it { is_expected.to run
-      .with_params({'key1' => 'value1', 'key2' => 'value2', 'key3' => 'value3'}, 'key2')
+    it { is_expected.to run \
+      .with_params({'key1' => 'value1', 'key2' => 'value2', 'key3' => 'value3'}, 'key2') \
       .and_return( {'key1' => 'value1', 'key3' => 'value3'})
     }
-    it { is_expected.to run
-      .with_params({'key1' => 'value1', 'key2' => 'value2', 'key3' => 'value3'}, ['key1', 'key2'])
+    it { is_expected.to run \
+      .with_params({'key1' => 'value1', 'key2' => 'value2', 'key3' => 'value3'}, ['key1', 'key2']) \
       .and_return( {'key3' => 'value3'})
     }
   end

spec/functions/delete_undef_values_spec.rb

@@ -37,8 +37,8 @@
           pending("review behaviour when being passed undef as #{undef_value.inspect}") if undef_value == nil
         end
         it { is_expected.to run.with_params({'key' => undef_value}).and_return({}) }
-        it { is_expected.to run
-          .with_params({'key1' => 'value1', 'undef_key' => undef_value, 'key2' => 'value2'})
+        it { is_expected.to run \
+          .with_params({'key1' => 'value1', 'undef_key' => undef_value, 'key2' => 'value2'}) \
           .and_return({'key1' => 'value1', 'key2' => 'value2'})
         }
       end

spec/functions/parseyaml_spec.rb

@@ -5,6 +5,11 @@
   it { is_expected.not_to eq(nil) }
   it { is_expected.to run.with_params().and_raise_error(Puppet::ParseError, /wrong number of arguments/i) }
   it { is_expected.to run.with_params('', '').and_raise_error(Puppet::ParseError, /wrong number of arguments/i) }
-  it { is_expected.to run.with_params('["one"').and_raise_error(Psych::SyntaxError) }
   it { is_expected.to run.with_params('["one", "two", "three"]').and_return(['one', 'two', 'three']) }
+  context 'when running on modern rubies', :unless => RUBY_VERSION == '1.8.7' do
+    it { is_expected.to run.with_params('["one"').and_raise_error(Psych::SyntaxError) }
+  end
+  context 'when running on ruby 1.8.7, which does not have Psych', :if => RUBY_VERSION == '1.8.7' do
+    it { is_expected.to run.with_params('["one"').and_raise_error(ArgumentError) }
+  end
 end

spec/functions/time_spec.rb

@@ -16,6 +16,13 @@
     it { is_expected.to run.with_params({}).and_return(1160727311) }
     it { is_expected.to run.with_params('foo').and_return(1160727311) }
     it { is_expected.to run.with_params('UTC').and_return(1160727311) }
-    it { is_expected.to run.with_params('America/Los_Angeles').and_return(1160727311) }
+
+    context 'when running on modern rubies', :unless => RUBY_VERSION == '1.8.7' do
+      it { is_expected.to run.with_params('America/Los_Angeles').and_return(1160727311) }
+    end
+
+    context 'when running on ruby 1.8.7, which garbles the TZ', :if => RUBY_VERSION == '1.8.7' do
+      it { is_expected.to run.with_params('America/Los_Angeles').and_return(1160702111) }
+    end
   end
 end

spec/functions/validate_integer_spec.rb

@@ -13,6 +13,15 @@
       it { is_expected.to run.with_params([0, 1, 2, invalid, 3, 4], 10, -10).and_raise_error(Puppet::ParseError, /to be an Integer/) }
     end
 
+    context 'when running on modern rubies', :unless => RUBY_VERSION == '1.8.7' do
+      it { is_expected.to run.with_params([0, 1, 2, {1=>2}, 3, 4], 10, -10).and_raise_error(Puppet::ParseError, /to be an Integer/) }
+    end
+
+    context 'when running on ruby, which munges hashes weirdly', :if => RUBY_VERSION == '1.8.7' do
+      it { is_expected.to run.with_params([0, 1, 2, {1=>2}, 3, 4], 10, -10).and_raise_error(Puppet::ParseError) }
+      it { is_expected.to run.with_params([0, 1, 2, {0=>2}, 3, 4], 10, -10).and_raise_error(Puppet::ParseError) }
+    end
+
     it { is_expected.to run.with_params(1, '').and_raise_error(Puppet::ParseError, /to be unset or an Integer/) }
     it { is_expected.to run.with_params(1, 2, '').and_raise_error(Puppet::ParseError, /to be unset or an Integer/) }
     it { is_expected.to run.with_params(1, 2, 3).and_raise_error(Puppet::ParseError, /second argument to be larger than third argument/) }

spec/functions/validate_numeric_spec.rb

@@ -10,7 +10,15 @@
       it { is_expected.to run.with_params(invalid).and_raise_error(Puppet::ParseError, /to be a Numeric/) }
       it { is_expected.to run.with_params(invalid, 10.0).and_raise_error(Puppet::ParseError, /to be a Numeric/) }
       it { is_expected.to run.with_params(invalid, 10.0, -10.0).and_raise_error(Puppet::ParseError, /to be a Numeric/) }
-      it { is_expected.to run.with_params([0, 1, 2, invalid, 3, 4], 10.0, -10.0).and_raise_error(Puppet::ParseError, /to be a Numeric/) }
+    end
+
+    context 'when running on modern rubies', :unless => RUBY_VERSION == '1.8.7' do
+      it { is_expected.to run.with_params([0, 1, 2, {1=>2}, 3, 4], 10, -10).and_raise_error(Puppet::ParseError, /to be a Numeric/) }
+    end
+
+    context 'when running on ruby, which munges hashes weirdly', :if => RUBY_VERSION == '1.8.7' do
+      it { is_expected.to run.with_params([0, 1, 2, {1=>2}, 3, 4], 10, -10).and_raise_error(Puppet::ParseError) }
+      it { is_expected.to run.with_params([0, 1, 2, {0=>2}, 3, 4], 10, -10).and_raise_error(Puppet::ParseError) }
     end
 
     it { is_expected.to run.with_params(1, '').and_raise_error(Puppet::ParseError, /to be unset or a Numeric/) }