puppet 0.25.1 → 0.25.2

data/spec/unit/util/queue.rb

@@ -19,16 +19,24 @@ end
 
 mod = Puppet::Util::Queue
 client_classes = { :default => make_test_client_class('Bogus::Default'), :setup => make_test_client_class('Bogus::Setup') }
-mod.register_queue_type(client_classes[:default], :default)
-mod.register_queue_type(client_classes[:setup], :setup)
 
 describe Puppet::Util::Queue do
+    before :all do
+        mod.register_queue_type(client_classes[:default], :default)
+        mod.register_queue_type(client_classes[:setup], :setup)
+    end
+
     before :each do
         @class = Class.new do
             extend mod
         end
     end
 
+    after :all do
+        instances = mod.instance_hash(:queue_clients)
+        [:default, :setup, :bogus, :aardvark, :conflict, :test_a, :test_b].each{ |x| instances.delete(x) }
+    end
+
     context 'when determining a type name from a class' do
         it 'should handle a simple one-word class name' do
             mod.queue_type_from_class(make_test_client_class('Foo')).should == :foo

data/spec/unit/util/selinux.rb

@@ -27,7 +27,12 @@ describe Puppet::Util::SELinux do
              Selinux.expects(:is_selinux_enabled).returns 0
              selinux_support?.should be_false
         end
-    end
+ 
+        it "should return nil if /proc/mounts does not exist" do
+            File.stubs(:open).with("/proc/mounts").raises("No such file or directory - /proc/mounts")
+            read_mounts.should == nil
+        end
+   end
 
     describe "filesystem detection" do
         before :each do
@@ -61,6 +66,42 @@ describe Puppet::Util::SELinux do
             selinux_label_support?('/mnt/nfs/testfile').should be_false
         end
 
+        it "should follow symlinks when determining file systems" do
+            self.stubs(:realpath).with('/mnt/symlink/testfile').returns('/mnt/nfs/dest/testfile')
+
+            selinux_label_support?('/mnt/symlink/testfile').should be_false
+        end
+
+    end
+
+    describe "realpath" do
+        it "should handle files that don't exist" do
+
+            # Since I'm stubbing Pathname.new for this test, 
+            # I need to also stub the internal calls to Pathname.new,
+            # which happen in Pathname.dirname and Parthname.basename
+            # I want those to return real Pathname objects,
+            # so I'm creating them before the stub is in place.
+            realpaths = Hash.new {|hash, path| hash[path] = Pathname.new(path) }
+            paths = ['symlink', '/mnt']
+            paths.each { |path| realpaths[path] }
+
+            realpaths['/mnt/symlink'] = stubs "Pathname"
+            realpaths['/mnt/symlink'].stubs(:realpath).returns(realpaths['/mnt/nfs/dest'])
+            realpaths['/mnt/symlink'].stubs(:exist?).returns(true)
+
+            realpaths['/mnt/symlink/nonexistant'] = stubs "Pathname"
+            realpaths['/mnt/symlink/nonexistant'].stubs(:realpath).raises(Errno::ENOENT)
+            realpaths['/mnt/symlink/nonexistant'].stubs(:exist?).returns(false)
+            realpaths['/mnt/symlink/nonexistant'].stubs(:dirname).returns(realpaths['/mnt/symlink'])
+            realpaths['/mnt/symlink/nonexistant'].stubs(:basename).returns(realpaths['nonexistant'])
+
+            realpaths.each do |path, value|
+                Pathname.stubs(:new).with(path).returns(value)
+            end
+
+            realpath('/mnt/symlink/nonexistant').should == '/mnt/nfs/dest/nonexistant'
+        end
     end
 
     describe "get_selinux_current_context" do
@@ -153,11 +194,29 @@ describe Puppet::Util::SELinux do
     end
 
     describe "set_selinux_context" do
-        it "should return nil if there is no SELinux support" do
+         before :each do
+            fh = stub 'fh', :close => nil
+            File.stubs(:open).with("/proc/mounts").returns fh
+            fh.stubs(:read_nonblock).returns(
+                "rootfs / rootfs rw 0 0\n"+
+                "/dev/root / ext3 rw,relatime,errors=continue,user_xattr,acl,data=ordered 0 0\n"+
+                "/dev /dev tmpfs rw,relatime,mode=755 0 0\n"+
+                "/proc /proc proc rw,relatime 0 0\n"+
+                "/sys /sys sysfs rw,relatime 0 0\n"
+                ).then.raises EOFError
+        end
+
+       it "should return nil if there is no SELinux support" do
             self.expects(:selinux_support?).returns false
             set_selinux_context("/foo", "user_u:role_r:type_t:s0").should be_nil
         end
 
+        it "should return nil if selinux_label_support returns false" do
+            self.expects(:selinux_support?).returns true
+            self.expects(:selinux_label_support?).with("/foo").returns false
+            set_selinux_context("/foo", "user_u:role_r:type_t:s0").should be_nil
+        end
+
         it "should use lsetfilecon to set a context" do
             self.expects(:selinux_support?).returns true
             Selinux.expects(:lsetfilecon).with("/foo", "user_u:role_r:type_t:s0").returns 0

data/spec/unit/util/settings.rb

@@ -579,6 +579,25 @@ describe Puppet::Util::Settings do
             # and we should now have the new value in memory
             @settings[:two].should == "disk-replace"
         end
+
+        it "should retain in-memory values if the file has a syntax error" do
+            # Init the value
+            text = "[main]\none = initial-value\n"
+            @settings.expects(:read_file).returns(text)
+            @settings.parse
+            @settings[:one].should == "initial-value"
+
+            # Now replace the value with something bogus
+            text = "[main]\nkenny = killed-by-what-follows\n1 is 2, blah blah florp\n"
+            @settings.expects(:read_file).returns(text)
+            @settings.parse
+
+            # The originally-overridden value should not be replaced with the default
+            @settings[:one].should == "initial-value"
+
+            # and we should not have the new value in memory
+            @settings[:kenny].should be_nil
+        end
     end
 
     it "should provide a method for creating a catalog of resources from its configuration" do

data/spec/unit/util/settings/file_setting.rb

@@ -169,18 +169,43 @@ describe Puppet::Util::Settings::FileSetting do
             @file.to_resource[:mode].should == 0755
         end
 
+        it "should not set the mode on a the file if manage_internal_file_permissions is disabled" do
+            Puppet[:manage_internal_file_permissions] = false
+
+            @file.stubs(:mode).returns(0755)
+
+            @file.to_resource[:mode].should == nil
+        end
+
         it "should set the owner if running as root and the owner is provided" do
             Puppet.features.expects(:root?).returns true
             @file.stubs(:owner).returns "foo"
             @file.to_resource[:owner].should == "foo"
         end
 
+        it "should not set the owner if manage_internal_file_permissions is disabled" do
+            Puppet[:manage_internal_file_permissions] = false
+            Puppet.features.stubs(:root?).returns true
+            @file.stubs(:owner).returns "foo"
+
+            @file.to_resource[:owner].should == nil
+        end
+
         it "should set the group if running as root and the group is provided" do
             Puppet.features.expects(:root?).returns true
             @file.stubs(:group).returns "foo"
             @file.to_resource[:group].should == "foo"
         end
 
+        it "should not set the group if manage_internal_file_permissions is disabled" do
+            Puppet[:manage_internal_file_permissions] = false
+            Puppet.features.stubs(:root?).returns true
+            @file.stubs(:group).returns "foo"
+
+            @file.to_resource[:group].should == nil
+        end
+
+
         it "should not set owner if not running as root" do
             Puppet.features.expects(:root?).returns false
             @file.stubs(:owner).returns "foo"

data/spec/unit/util/tagging.rb

@@ -89,4 +89,14 @@ describe Puppet::Util::Tagging, "when adding tags" do
     it "should indicate when the object is not tagged with a provided tag" do
         @tagger.should_not be_tagged("one")
     end
+
+    it "should indicate when the object is tagged with any tag in an array" do
+        @tagger.tag("one")
+        @tagger.should be_tagged("one","two","three")
+    end
+
+    it "should indicate when the object is not tagged with any tag in an array" do
+        @tagger.tag("one")
+        @tagger.should_not be_tagged("two","three")
+    end
 end

data/tasks/rake/changelog.rake

@@ -0,0 +1,15 @@
+desc "Create a ChangeLog based on git commits."
+task :changelog do
+    begin
+         gitc = %x{which git-changelog}
+    rescue 
+        puts "This task needs the git-changelog binary - http://github.com/ReinH/git-changelog"
+    end
+
+    CHANGELOG_DIR = "#{Dir.pwd}"
+    mkdir(CHANGELOG_DIR) unless File.directory?(CHANGELOG_DIR)
+    change_body = `git-changelog --no-limit -a`
+    File.open(File.join(CHANGELOG_DIR, "CHANGELOG"), 'w') do |f|
+        f << change_body
+    end
+end

data/tasks/rake/ci.rake

@@ -0,0 +1,22 @@
+desc "Prep CI RSpec tests"
+task :ci_prep do
+    require 'rubygems'
+    begin
+        gem 'ci_reporter'
+        require 'ci/reporter/rake/rspec'
+        require 'ci/reporter/rake/test_unit'
+        ENV['CI_REPORTS'] = 'results'
+    rescue LoadError
+       puts 'Missing ci_reporter gem. You must have the ci_reporter gem installed to run the CI spec tests'
+    end 
+end
+
+desc "Run the CI RSpec tests"
+task :ci_spec => [:ci_prep, 'ci:setup:rspec', :spec] do
+    sh "exit 0"
+end
+
+desc "Run CI Unit tests"
+task :ci_unit => [:ci_prep, 'ci:setup:testunit'] do
+    sh "cd test; rake test; exit 0"
+end

data/tasks/rake/dailybuild.rake

@@ -0,0 +1,9 @@
+desc "Create a Puppet daily build"
+task :daily => :changelog do
+  version = "puppet" + "-" + Time.now.localtime.strftime("%Y%m%d")
+  sh "git archive --format=tar --prefix=#{version}/ HEAD^{tree} >#{version}.tar"
+  sh "pax -waf #{version}.tar -s ':^:#{version}/:' ChangeLog"
+  sh "rm ChangeLog"
+  sh "gzip -f -9 #{version}.tar"
+end
+

data/tasks/rake/gem.rake

@@ -0,0 +1,46 @@
+GEM_FILES = FileList[
+    '[A-Z]*',
+    'install.rb',
+    'bin/**/*',
+    'lib/**/*',
+    'conf/**/*',
+    'man/**/*',
+    'examples/**/*',
+    'ext/**/*',
+    'tasks/**/*',
+    'test/**/*',
+    'spec/**/*'
+]
+
+spec = Gem::Specification.new do |spec|
+    spec.platform = Gem::Platform::RUBY
+    spec.name = 'puppet'
+    spec.files = GEM_FILES.to_a
+    spec.executables = %w{puppetca puppetd puppetmasterd puppetqd puppetrun filebucket pi puppet puppetdoc ralsh} 
+    spec.version = Puppet::PUPPETVERSION
+    spec.add_dependency('facter', '>= 1.5.1')
+    spec.summary = 'Puppet, an automated configuration management tool'
+    spec.author = 'Reductive Labs'
+    spec.email = 'puppet@reductivelabs.com'
+    spec.homepage = 'http://reductivelabs.com'
+    spec.rubyforge_project = 'puppet'
+    spec.has_rdoc = true
+    spec.rdoc_options <<
+        '--title' <<  'Puppet - Configuration Management' <<
+        '--main' << 'README' <<
+        '--line-numbers'
+end
+
+desc "Prepare binaries for gem creation"
+task :prepare_gem do
+    sh "mv sbin/* bin"
+end
+
+desc "Create the gem"
+task :create_gem => :prepare_gem do
+    sh "mkdir -p pkg"
+    Gem::Builder.new(spec).build
+    sh "mv *.gem pkg"
+    sh "rm bin/*"
+    sh "git reset --hard"
+end

data/tasks/rake/git_workflow.rake

@@ -0,0 +1,121 @@
+# This set of tasks helps automate the workflow as described on
+# http://reductivelabs.com/trac/puppet/wiki/Development/DevelopmentLifecycle
+
+
+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
+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]
+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
+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
+
+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
+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
+    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
+
+# 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
+end
+
+desc "Send patch information to the puppet-dev list"
+task :mail_patches do
+    if Dir.glob("00*.patch").length > 0
+        raise "Patches already exist matching '00*.patch'; clean up first"
+    end
+
+    unless %x{git status} =~ /On branch (.+)/
+        raise "Could not get branch from 'git status'"
+    end
+    branch = $1
+
+    unless branch =~ %r{^([^\/]+)/([^\/]+)/([^\/]+)$}
+        raise "Branch name does not follow <type>/<parent>/<name> model; cannot autodetect parent branch"
+    end
+
+    type, parent, name = $1, $2, $3
+
+    # Create all of the patches
+    sh "git format-patch -C -M -s -n --subject-prefix='PATCH/puppet' #{parent}..HEAD"
+
+    # And then mail them out.
+
+    # If we've got more than one patch, add --compose
+    if Dir.glob("00*.patch").length > 1
+        compose = "--compose"
+    else
+        compose = ""
+    end
+
+    # Now send the mail.
+    sh "git send-email #{compose} --no-signed-off-by-cc --suppress-from --to puppet-dev@googlegroups.com 00*.patch"
+
+    # Finally, clean up the patches
+    sh "rm 00*.patch"
+end
+

data/tasks/rake/metrics.rake

@@ -0,0 +1,6 @@
+begin
+    require 'metric_fu'
+rescue LoadError
+    # Metric-fu not installed
+    # http://metric-fu.rubyforge.org/
+end

data/tasks/rake/sign.rake

@@ -0,0 +1,14 @@
+desc "Sign to the package with the Reductive Labs release key"
+task :sign_packages do
+
+version = Puppet::PUPPETVERSION
+
+# Sign package
+
+sh "gpg --homedir $HOME/release_key --detach-sign --output pkg/puppet-#{version}.tar.gz.sign --armor pkg/puppet-#{version}.tar.gz"
+
+# Sign gem
+
+sh "gpg --homedir $HOME/release_key --detach-sign --output pkg/puppet-#{version}.gem.sign --armor pkg/puppet-#{version}.gem"
+
+end

data/tasks/rake/testbranch.rake

@@ -0,0 +1,16 @@
+desc "Rebuild the 'testng' branch"
+task :testbranch do
+    TEST_SERIES = %x{git config --get puppet.testseriesfile}.chomp
+
+    sh 'git checkout master'
+    if %x{git branch}.split("\n").detect { |l| l =~ /\s+testing$/ }
+        sh 'git branch -D testing'
+    end
+    sh 'git checkout -b testing'
+    File.readlines(TEST_SERIES).each do |line|
+        line.chomp!
+
+        # Always create a commit for our merge
+        sh "git merge --no-ff #{line}"
+    end
+end