From 2d459fc5dcf13a0aadf4556a80d7bb6c57dad033 Mon Sep 17 00:00:00 2001 From: Matt Robinson Date: Wed, 13 Apr 2011 14:58:34 -0700 Subject: (#6830) Fix string method sub call on a symbol for Ruby 1.9 Ruby 1.9 is less forgiving about treating symbols like strings. Reviewed-by: Daniel Pittman --- lib/puppet/interface/option_builder.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/puppet/interface/option_builder.rb b/lib/puppet/interface/option_builder.rb index 83a1906b0..2240b3e4a 100644 --- a/lib/puppet/interface/option_builder.rb +++ b/lib/puppet/interface/option_builder.rb @@ -19,7 +19,7 @@ class Puppet::Interface::OptionBuilder Puppet::Interface::Option.instance_methods.grep(/=$/).each do |setter| next if setter =~ /^=/ # special case, darn it... - dsl = setter.sub(/=$/, '') + dsl = setter.to_s.sub(/=$/, '') define_method(dsl) do |value| @option.send(setter, value) end end end -- cgit From 64c12bd7ef38979ff756f97fc72adc737fe7b608 Mon Sep 17 00:00:00 2001 From: Matt Robinson Date: Wed, 13 Apr 2011 15:00:00 -0700 Subject: (#6830) Fix UTF-8 encoding issue for Ruby 1.9 If you're going to use special characters in a file and use Ruby 1.9 you need to specify the character encoding at the top of the file. Reviewed-by: Daniel Pittman --- spec/shared_behaviours/things_that_declare_options.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/spec/shared_behaviours/things_that_declare_options.rb b/spec/shared_behaviours/things_that_declare_options.rb index f7512dec0..ac358eacd 100755 --- a/spec/shared_behaviours/things_that_declare_options.rb +++ b/spec/shared_behaviours/things_that_declare_options.rb @@ -1,3 +1,4 @@ +# encoding: UTF-8 shared_examples_for "things that declare options" do it "should support options without arguments" do subject = add_options_to { option "--bar" } -- cgit From 4ef622e0874c53c8060531d43da06f0fd6fddc36 Mon Sep 17 00:00:00 2001 From: Matt Robinson Date: Wed, 13 Apr 2011 15:00:56 -0700 Subject: (#6830) Fix sha1 to digest/sha1 require issue for Ruby 1.9 Reviewed-by: Daniel Pittman --- lib/puppet/parser/functions/sha1.rb | 2 +- lib/puppet/transaction.rb | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/puppet/parser/functions/sha1.rb b/lib/puppet/parser/functions/sha1.rb index 10cc55cfe..1e7d5abe4 100644 --- a/lib/puppet/parser/functions/sha1.rb +++ b/lib/puppet/parser/functions/sha1.rb @@ -1,5 +1,5 @@ Puppet::Parser::Functions::newfunction(:sha1, :type => :rvalue, :doc => "Returns a SHA1 hash value from a provided string.") do |args| - require 'sha1' + require 'digest/sha1' Digest::SHA1.hexdigest(args[0]) end diff --git a/lib/puppet/transaction.rb b/lib/puppet/transaction.rb index 0533273d9..d7845fbc9 100644 --- a/lib/puppet/transaction.rb +++ b/lib/puppet/transaction.rb @@ -4,7 +4,7 @@ require 'puppet' require 'puppet/util/tagging' require 'puppet/application' -require 'sha1' +require 'digest/sha1' class Puppet::Transaction require 'puppet/transaction/event' @@ -255,13 +255,13 @@ class Puppet::Transaction # We want to monitor changes in the relationship graph of our # catalog but this is complicated by the fact that the catalog - # both is_a graph and has_a graph, by the fact that changes to + # both is_a graph and has_a graph, by the fact that changes to # the structure of the object can have adverse serialization # effects, by threading issues, by order-of-initialization issues, - # etc. + # etc. # # Since the proper lifetime/scope of the monitoring is a transaction - # and the transaction is already commiting a mild law-of-demeter + # and the transaction is already commiting a mild law-of-demeter # transgression, we cut the Gordian knot here by simply wrapping the # transaction's view of the resource graph to capture and maintain # the information we need. Nothing outside the transaction needs -- cgit