puppet 2.6.18 → 2.7.1

data/spec/unit/util/settings_spec.rb

@@ -1,7 +1,5 @@
-#!/usr/bin/env ruby
-
-require File.dirname(__FILE__) + '/../../spec_helper'
-require 'ostruct'
+#!/usr/bin/env rspec
+require 'spec_helper'
 
 describe Puppet::Util::Settings do
   describe "when specifying defaults" do
@@ -130,16 +128,6 @@ describe Puppet::Util::Settings do
       @settings[:myval].should == ""
     end
 
-    it "should flag settings from the CLI" do
-      @settings.handlearg("--myval")
-      @settings.setting(:myval).setbycli.should be_true
-    end
-
-    it "should not flag settings memory" do
-      @settings[:myval] = "12"
-      @settings.setting(:myval).setbycli.should be_false
-    end
-
     it "should clear the cache when setting getopt-specific values" do
       @settings.setdefaults :mysection, :one => ["whah", "yay"], :two => ["$one yay", "bah"]
       @settings[:two].should == "whah yay"
@@ -1116,14 +1104,4 @@ describe Puppet::Util::Settings do
 
     it "should cache the result"
   end
-
-  describe "#writesub" do
-    it "should only pass valid arguments to File.open" do
-      settings = Puppet::Util::Settings.new
-      settings.stubs(:get_config_file_default).with(:privatekeydir).returns(OpenStruct.new(:mode => "750"))
-
-      File.expects(:open).with("/path/to/keydir", "w", 750).returns true
-      settings.writesub(:privatekeydir, "/path/to/keydir")
-    end
-  end
 end

data/spec/unit/util/storage_spec.rb

@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
-
-require File.dirname(__FILE__) + '/../../spec_helper'
+#!/usr/bin/env rspec
+require 'spec_helper'
 
 require 'yaml'
 require 'puppet/util/storage'

data/spec/unit/util/tagging_spec.rb

@@ -1,9 +1,9 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env rspec
 #
 #  Created by Luke Kanies on 2008-01-19.
 #  Copyright (c) 2007. All rights reserved.
 
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 require 'puppet/util/tagging'
 

data/spec/unit/util/user_attr_spec.rb

@@ -1,6 +1,5 @@
-#!/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") }
+#!/usr/bin/env rspec
+require 'spec_helper'
 
 require 'puppet/util/user_attr'
 

data/spec/unit/util/warnings_spec.rb

@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
-
-require File.dirname(__FILE__) + '/../../spec_helper'
+#!/usr/bin/env rspec
+require 'spec_helper'
 
 describe Puppet::Util::Warnings do
   before(:all) do

data/spec/unit/util/zaml_spec.rb

@@ -1,6 +1,5 @@
-#!/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") }
+#!/usr/bin/env rspec
+require 'spec_helper'
 
 require 'puppet/util/monkey_patches'
 
@@ -36,57 +35,28 @@ describe "Pure ruby yaml implementation" do
     end
   }
 
-  it "should handle references to Array in Hash values correctly" do
-    list = [1]
-    data = { "one" => list, "two" => list }
-    data.to_yaml.should =~ /  two: [&*]id001/
-    data.to_yaml.should =~ /  one: [&*]id001/
-    expect { YAML.load(data.to_yaml).should == data }.should_not raise_error
-  end
-
-  it "should handle references to Hash in Hash values correctly" do
-    hash = { 1 => 1 }
-    data = { "one" => hash, "two" => hash }
-    lines = data.to_yaml.split("\n")
-    lines.should be_any {|x| x =~ /--- / }
-    lines.should be_any {|x| x =~ /  one: [*&]id001/ }
-    lines.should be_any {|x| x =~ /  two: [*&]id001/ }
-    expect { YAML.load(data.to_yaml).should == data }.should_not raise_error
+  it "should emit proper labels and backreferences for common objects" do
+    # Note: this test makes assumptions about the names ZAML chooses
+    # for labels.
+    x = [1, 2]
+    y = [3, 4]
+    z = [x, y, x, y]
+    z.to_yaml.should == "--- \n  - &id001\n    - 1\n    - 2\n  - &id002\n    - 3\n    - 4\n  - *id001\n  - *id002"
+    z2 = YAML.load(z.to_yaml)
+    z2.should == z
+    z2[0].should equal(z2[2])
+    z2[1].should equal(z2[3])
   end
 
-  it "should handle references to Scalar in Hash" do
-    str = "hello"
-    data = { "one" => str, "two" => str }
-    lines = data.to_yaml.split("\n")
-    lines.should be_any {|x| x =~ /--- / }
-    lines.should be_any {|x| x =~ /  one: hello/ }
-    lines.should be_any {|x| x =~ /  two: hello/ }
-    expect { YAML.load(data.to_yaml).should == data }.should_not raise_error
-  end
-
-  class Zaml_test_class_A
-    attr_reader :false,:true
-    def initialize
-      @false = @true = 7
-    end
+  it "should emit proper labels and backreferences for recursive objects" do
+    x = [1, 2]
+    x << x
+    x.to_yaml.should == "--- &id001\n  \n  - 1\n  - 2\n  - *id001"
+    x2 = YAML.load(x.to_yaml)
+    x2.should be_a(Array)
+    x2.length.should == 3
+    x2[0].should == 1
+    x2[1].should == 2
+    x2[2].should equal(x2)
   end
-  it "should not blow up when magic strings are used as field names" do
-    data = Zaml_test_class_A.new
-    data.to_yaml.should == %Q{--- !ruby/object:Zaml_test_class_A\n  \"false\": 7\n  \"true\": 7}
-    expect { 
-      r = YAML.load(data.to_yaml)
-      r.class.should == data.class
-      r.true.should == data.true
-      r.false.should == data.false
-    }.should_not raise_error
-  end
-
-  it "should not blow up on back references inside arrays" do
-    s = [1,2]
-    data = [s,s]
-    data.to_yaml.should == %Q{--- \n  - &id001 \n    - 1\n    - 2\n  - *id001}
-    expect { YAML.load(data.to_yaml).should == data }.should_not raise_error
-  end
-
 end
-

data/spec/watchr.rb

@@ -0,0 +1,146 @@
+ENV["WATCHR"] = "1"
+ENV['AUTOTEST'] = 'true'
+
+def run_comp(cmd)
+  puts cmd
+  results = []
+  old_sync = $stdout.sync
+  $stdout.sync = true
+  line = []
+  begin
+    open("| #{cmd}", "r") do |f|
+      until f.eof? do
+        c = f.getc
+        putc c
+        line << c
+        if c == ?\n
+          results << if RUBY_VERSION >= "1.9" then
+                       line.join
+                     else
+                       line.pack "c*"
+                     end
+          line.clear
+        end
+      end
+    end
+  ensure
+    $stdout.sync = old_sync
+  end
+  results.join
+end
+
+def clear
+  #system("clear")
+end
+
+def growl(message, status)
+  # Strip the color codes
+  message.gsub!(/\[\d+m/, '')
+
+  growlnotify = `which growlnotify`.chomp
+  return if growlnotify.empty?
+  title = "Watchr Test Results"
+  image = status == :pass ? "autotest/images/pass.png" : "autotest/images/fail.png"
+  options = "-w -n Watchr --image '#{File.expand_path(image)}' -m '#{message}' '#{title}'"
+  system %(#{growlnotify} #{options} &)
+end
+
+def file2specs(file)
+  %w{spec/unit spec/integration}.collect { |d|
+    file.sub('lib/puppet', d).sub(".rb", "_spec.rb")
+  }.find_all { |f|
+    File.exist?(f)
+  }
+end
+
+def file2test(file)
+  result = file.sub('lib/puppet', 'test')
+  return nil unless File.exist?(result)
+  result
+end
+
+def run_spec(command)
+  clear
+  result = run_comp(command).split("\n").last
+  status = result.include?('0 failures') ? :pass : :fail
+  growl result, status
+end
+
+def run_test(command)
+  clear
+  result = run_comp(command).split("\n").last
+  status = result.include?('0 failures, 0 errors') ? :pass : :fail
+  growl result.split("\n").last rescue nil
+end
+
+def run_test_file(file)
+  run_test(%Q(#{file}))
+end
+
+def run_spec_files(files)
+  files = Array(files)
+  return if files.empty?
+  if File.exist?(File.expand_path("~/.rspec")) then
+    opts = ''                   # use the user defaults
+  else
+    opts = File.readlines('spec/spec.opts').collect { |l| l.chomp }.join(" ")
+  end
+  begin
+    run_spec("rspec #{opts} --tty #{files.join(' ')}")
+  rescue => detail
+    puts "Failed to load #{files}: #{detail}"
+  end
+end
+
+def run_all_tests
+  run_test("rake unit")
+end
+
+def run_all_specs
+  run_spec_files "spec"
+end
+
+def run_suite
+  run_all_specs
+  run_all_tests
+end
+
+watch('spec/spec_helper.rb') { run_all_specs }
+watch(%r{^spec/(unit|integration)/.*\.rb$}) { |md| run_spec_files(md[0]) }
+watch(%r{^lib/puppet/(.*)\.rb$}) { |md|
+  run_spec_files(file2specs(md[0]))
+  if t = file2test(md[0])
+    run_test_file(t)
+  end
+}
+watch(%r{^spec/lib/spec.*}) { |md| run_all_specs }
+watch(%r{^spec/lib/monkey_patches/.*}) { |md| run_all_specs }
+watch(%r{test/.+\.rb}) { |md|
+  if md[0] =~ /\/lib\//
+    run_all_tests
+  else
+    run_test_file(md[0])
+  end
+}
+
+# Ctrl-\
+Signal.trap 'QUIT' do
+  puts " --- Running all tests ---\n\n"
+  run_suite
+end
+
+@interrupted = false
+
+# Ctrl-C
+Signal.trap 'INT' do
+  if @interrupted
+    @wants_to_quit = true
+    abort("\n")
+  else
+    puts "Interrupt a second time to quit; wait for rerun of tests"
+    @interrupted = true
+    Kernel.sleep 1.5
+    # raise Interrupt, nil # let the run loop catch it
+    run_suite
+  end
+end

data/tasks/rake/gem.rake

@@ -1,4 +1,4 @@
-require 'ftools'
+require 'fileutils'
 
 GEM_FILES = FileList[
     '[A-Z]*',
@@ -44,7 +44,7 @@ end
 desc "Prepare binaries for gem creation"
 task :prepare_gem do
     SBIN.each do |f|
-      File.copy(f,"bin")
+      FileUtils.copy(f,"bin")
     end
 end
 
@@ -52,8 +52,9 @@ desc "Create the gem"
 task :create_gem => :prepare_gem do
     Dir.mkdir("pkg") rescue nil
     Gem::Builder.new(spec).build
-    File.move("puppet-#{Puppet::PUPPETVERSION}.gem", "pkg")
+    FileUtils.move("puppet-#{Puppet::PUPPETVERSION}.gem", "pkg")
     SBIN.each do |f|
-       File.unlink("bin/" + f.gsub(/sbin\//, ''))
+       fn = f.gsub(/sbin\/(.*)/, '\1')
+       FileUtils.rm_r "bin/" + fn
     end
 end

data/tasks/rake/git_workflow.rake

@@ -5,82 +5,82 @@
 def find_start(start)
 # This is a case statement, as we might want to map certain
 # git tags to starting points that are not currently in git.
-	case start
-		when nil?:
-		when @next_release: return "master"
-		else return start
-	end
+  case start
+    when nil?;
+    when @next_release; return "master"
+    else return start
+  end
 end
 
 desc "Set up git for working with Puppet"
 task :git_setup do
-	# This should be changed as new versions get released
-	@next_release = '0.26.x'
-	@remote = {}
-	default_remote = {}
-	default_remote[:url] = 'git://github.com/reductivelabs/puppet'
-	default_remote[:name] = 'origin'
-	@remote[:name] = %x{git config puppet.defaultremote}.chomp
-	@remote[:name] = @remote[:name].empty? ? default_remote[:name] : @remote[:name]
-	@remote[:url] = default_remote[:url] if @remote[:name] == default_remote[:name]
-	default_fetch = '+refs/heads/*:refs/remotes/puppet/*'
-	@remote[:fetch] = %x{git config puppet.#{@remote[:name]}.fetch}.chomp
-	@remote[:fetch] = @remote[:fetch].empty? ?  default_fetch : @remote[:fetch]
+  # This should be changed as new versions get released
+  @next_release = '0.26.x'
+  @remote = {}
+  default_remote = {}
+  default_remote[:url] = 'git://github.com/reductivelabs/puppet'
+  default_remote[:name] = 'origin'
+  @remote[:name] = %x{git config puppet.defaultremote}.chomp
+  @remote[:name] = @remote[:name].empty? ? default_remote[:name] : @remote[:name]
+  @remote[:url] = default_remote[:url] if @remote[:name] == default_remote[:name]
+  default_fetch = '+refs/heads/*:refs/remotes/puppet/*'
+  @remote[:fetch] = %x{git config puppet.#{@remote[:name]}.fetch}.chomp
+  @remote[:fetch] = @remote[:fetch].empty? ?  default_fetch : @remote[:fetch]
 end
 
 desc "Start work on a feature"
 task :start_feature, [:feature,:remote,:branch] => :git_setup do |t, args|
-	args.with_defaults(:remote => @remote[:name])
-	args.with_defaults(:branch => @next_release)
-	start_at = find_start(args.branch)
-	branch = "feature/#{start_at}/#{args.feature}"
-	sh "git checkout -b #{branch} #{start_at}" do |ok, res|
-		if ! ok
-			raise <<EOS
+  args.with_defaults(:remote => @remote[:name])
+  args.with_defaults(:branch => @next_release)
+  start_at = find_start(args.branch)
+  branch = "feature/#{start_at}/#{args.feature}"
+  sh "git checkout -b #{branch} #{start_at}" do |ok, res|
+    if ! ok
+      raise <<EOS
 Was not able to create branch for #{args.feature} on branch #{args.branch}, starting at #{start_at}: error code was: #{res.exitstatus}
 EOS
-		end
-	end
-	sh "git config branch.#{branch}.remote #{args.remote}" do |ok, res|
-		raise "Could not set remote: #{$?}" unless ok
-	end
-
-	sh "git config branch.#{branch}.merge refs/heads/#{branch}" do |ok, res|
-		raise "Could not configure merge: #{$?}" unless ok
-	end
+    end
+  end
+  sh "git config branch.#{branch}.remote #{args.remote}" do |ok, res|
+    raise "Could not set remote: #{$?}" unless ok
+  end
+
+  sh "git config branch.#{branch}.merge refs/heads/#{branch}" do |ok, res|
+    raise "Could not configure merge: #{$?}" unless ok
+  end
 end
 
 desc "Do git prep to start work on a Redmine ticket"
 task :start_ticket, [:ticket, :remote, :branch] => :git_setup do |t, args|
-	args.with_defaults(:remote => @remote[:name])
-	args.with_defaults(:branch => @next_release)
-	start_at = find_start(args.branch)
-	branch = "tickets/#{start_at}/#{args.ticket}"
-	sh "git checkout -b #{branch} #{start_at}" do |ok, res|
-		unless ok
-			raise <<EOS
+  args.with_defaults(:remote => @remote[:name])
+  args.with_defaults(:branch => @next_release)
+  start_at = find_start(args.branch)
+  branch = "tickets/#{start_at}/#{args.ticket}"
+  sh "git checkout -b #{branch} #{start_at}" do |ok, res|
+    unless ok
+      raise <<EOS
 Was not able to create branch for ticket #{args.ticket} on branch #{args.branch}, starting at #{start_at}: error code was: #{$?}
 Git command used was: #{command}
 EOS
-		end
-	end
+    end
+  end
     sh "git config branch.#{branch}.remote #{args.remote}" do |ok, res|
-    	raise "Could not set remote: #{$?}" unless ok
-	end
+      raise "Could not set remote: #{$?}" unless ok
+  end
 
     sh "git config branch.#{branch}.merge refs/heads/#{branch}" do |ok, res|
-    	raise "Could not configure merge: #{$?}" unless ok
-	end
+      raise "Could not configure merge: #{$?}" unless ok
+  end
 end
 
 # This isn't very useful by itself, but we might enhance it later, or use it
 # in a dependency for a more complex task.
 desc "Push out changes"
 task :push_changes, [:remote] do |t, arg|
-	branch = %x{git branch | grep "^" | awk '{print $2}'}
-	sh "git push #{arg.remote} #{branch}" do |ok, res|
-		raise "Unable to push to #{arg.remote}" unless ok
-	end
+  branch = %x{git branch | grep "^" | awk '{print $2}'}
+  sh "git push #{arg.remote} #{branch}" do |ok, res|
+    raise "Unable to push to #{arg.remote}" unless ok
+  end
 end
 
 desc "Send patch information to the puppet-dev list"
@@ -103,10 +103,21 @@ task :mail_patches do
     # Create all of the patches
     sh "git format-patch -C -M -s -n --subject-prefix='PATCH/puppet' #{parent}..HEAD"
 
+    # Add info to the patches
+    additional_info = "Local-branch: #{branch}\n"
+    files = Dir.glob("00*.patch")
+    files.each do |file|
+        contents = File.read(file)
+        contents.sub!(/^---\n/, "---\n#{additional_info}")
+        File.open(file, 'w') do |file_handle|
+            file_handle.print contents
+        end
+    end
+
     # And then mail them out.
 
     # If we've got more than one patch, add --compose
-    if Dir.glob("00*.patch").length > 1
+    if files.length > 1
         compose = "--compose"
         subject = "--subject \"#{type} #{name} against #{parent}\""
     else