puppet 3.0.0.rc5 → 3.0.0.rc7

data/spec/unit/util/config_timeout_spec.rb

@@ -1,57 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-require 'puppet/util/config_timeout'
-
-
-
-describe Puppet::Util::ConfigTimeout do
-  # NOTE: in the future it might be a good idea to add an explicit "integer" type to
-  #  the settings types, in which case this would no longer be necessary.
-
-
-  class TestConfigTimeout
-    include Puppet::Util::ConfigTimeout
-  end
-
-  let :instance do TestConfigTimeout.new end
-
-
-  context "when the config setting is a String" do
-    context "which contains an integer" do
-      it "should convert the string to an integer" do
-        Puppet[:configtimeout] = "12"
-        instance.timeout_interval.should == 12
-      end
-    end
-
-    context "which does not contain an integer do" do
-      it "should raise an ArgumentError" do
-        Puppet[:configtimeout] = "foo"
-        expect {
-          instance.timeout_interval
-        }.to raise_error(ArgumentError)
-      end
-    end
-  end
-
-  context "when the config setting is an Integer" do
-    it "should return the integer" do
-      Puppet[:configtimeout] = 12
-      instance.timeout_interval.should == 12
-    end
-  end
-
-  context "when the config setting is some other type" do
-    # test a random smattering of types
-    [Hash.new, Array.new, Object.new].each do |obj|
-      context "when the config setting is a #{obj.class}" do
-        it "should raise an ArgumentError" do
-          Puppet[:configtimeout] = Hash.new
-          expect {
-            instance.timeout_interval
-          }.to raise_error(ArgumentError)
-        end
-      end
-    end
-  end
-end

data/tasks/rake/apple.rake

@@ -1,176 +0,0 @@
-# Title:        Rake task to build Apple packages for Puppet.
-# Author:       Gary Larizza
-# Date:         12/5/2011
-# Description:  This task will create a DMG-encapsulated package that will
-#               install Puppet on OS X systems. This happens by building
-#               a directory tree of files that will then be fed to the
-#               packagemaker binary (can be installed by installing the
-#               XCode Tools) which will create the .pkg file.
-#
-require 'fileutils'
-require 'erb'
-require 'find'
-require 'pathname'
-
-# Path to Binaries (Constants)
-TAR           = '/usr/bin/tar'
-CP            = '/bin/cp'
-INSTALL       = '/usr/bin/install'
-DITTO         = '/usr/bin/ditto'
-PACKAGEMAKER  = '/Developer/usr/bin/packagemaker'
-SED           = '/usr/bin/sed'
-
-# Setup task to populate all the variables
-task :setup do
-  @version               = `git describe`.chomp
-  @title                 = "puppet-#{@version}"
-  @reverse_domain        = 'com.puppetlabs.puppet'
-  @package_major_version = @version.split('.')[0]
-  @package_minor_version = @version.split('.')[1] +
-                           @version.split('.')[2].split('-')[0].split('rc')[0]
-  @pm_restart            = 'None'
-  @build_date            = Time.new.strftime("%Y-%m-%dT%H:%M:%SZ")
-end
-
-# method:       make_directory_tree
-# description:  This method sets up the directory structure that packagemaker
-#               needs to build a package. A prototype.plist file (holding
-#               package-specific options) is built from an ERB template located
-#               in the tasks/rake/templates directory.
-def make_directory_tree
-  puppet_tmp      = '/tmp/puppet'
-  @scratch       = "#{puppet_tmp}/#{@title}"
-  @working_tree  = {
-     'scripts'   => "#{@scratch}/scripts",
-     'resources' => "#{@scratch}/resources",
-     'working'   => "#{@scratch}/root",
-     'payload'   => "#{@scratch}/payload",
-  }
-  puts "Cleaning Tree: #{puppet_tmp}"
-  FileUtils.rm_rf(puppet_tmp)
-  @working_tree.each do |key,val|
-    puts "Creating: #{val}"
-    FileUtils.mkdir_p(val)
-  end
-  File.open("#{@scratch}/#{'prototype.plist'}", "w+") do |f|
-    f.write(ERB.new(File.read('tasks/rake/templates/prototype.plist.erb')).result())
-  end
-end
-
-# method:        build_dmg
-# description:   This method builds a package from the directory structure in
-#                /tmp/puppet and puts it in the
-#                /tmp/puppet/puppet-#{version}/payload directory. A DMG is
-#                created, using hdiutil, based on the contents of the
-#                /tmp/puppet/puppet-#{version}/payload directory. The resultant
-#                DMG is placed in the pkg/apple directory.
-#
-def build_dmg
-  # Local Variables
-  dmg_format_code   = 'UDZO'
-  zlib_level        = '9'
-  dmg_format_option = "-imagekey zlib-level=#{zlib_level}"
-  dmg_format        = "#{dmg_format_code} #{dmg_format_option}"
-  dmg_file          = "#{@title}.dmg"
-  package_file      = "#{@title}.pkg"
-  pm_extra_args     = '--verbose --no-recommend --no-relocate'
-  package_target_os = '10.5'
-
-  # Build .pkg file
-  system("sudo #{PACKAGEMAKER} --root #{@working_tree['working']} \
-    --id #{@reverse_domain} \
-    --filter DS_Store \
-    --target #{package_target_os} \
-    --title #{@title} \
-    --info #{@scratch}/prototype.plist \
-    --scripts #{@working_tree['scripts']} \
-    --resources #{@working_tree['resources']} \
-    --version #{@version} \
-    #{pm_extra_args} --out #{@working_tree['payload']}/#{package_file}")
-
-  # Build .dmg file
-  system("sudo hdiutil create -volname #{@title} \
-    -srcfolder #{@working_tree['payload']} \
-    -uid 99 \
-    -gid 99 \
-    -ov \
-    -format #{dmg_format} \
-    #{dmg_file}")
-
-  if File.directory?("#{Pathname.pwd}/pkg/apple")
-    FileUtils.mv("#{Pathname.pwd}/#{dmg_file}", "#{Pathname.pwd}/pkg/apple/#{dmg_file}")
-    puts "moved:   #{dmg_file} has been moved to #{Pathname.pwd}/pkg/apple/#{dmg_file}"
-  else
-    FileUtils.mkdir_p("#{Pathname.pwd}/pkg/apple")
-    FileUtils.mv(dmg_file, "#{Pathname.pwd}/pkg/apple/#{dmg_file}")
-    puts "moved:   #{dmg_file} has been moved to #{Pathname.pwd}/pkg/apple/#{dmg_file}"
-  end
-end
-
-# method:        pack_puppet_source
-# description:   This method copies the puppet source into a directory
-#                structure in /tmp/puppet/puppet-#{version}/root mirroring the
-#                structure on the target system for which the package will be
-#                installed. Anything installed into /tmp/puppet/root will be
-#                installed as the package's payload.
-#
-def pack_puppet_source
-  work          = "#{@working_tree['working']}"
-  puppet_source = Pathname.pwd
-
-  # Make all necessary directories
-  directories = ["#{work}/private/etc/puppet/",
-                 "#{work}/usr/bin",
-                 "#{work}/usr/sbin",
-                 "#{work}/usr/share/doc/puppet",
-                 "#{work}/usr/share/man/man5",
-                 "#{work}/usr/share/man/man8",
-                 "#{work}/usr/lib/ruby/site_ruby/1.8/puppet"]
-  FileUtils.mkdir_p(directories)
-
-  # Install necessary files
-  system("#{INSTALL} -o root -g wheel -m 644 #{puppet_source}/conf/auth.conf #{work}/private/etc/puppet/auth.conf")
-  system("#{DITTO} #{puppet_source}/bin/ #{work}/usr/bin")
-  system("#{DITTO} #{puppet_source}/sbin/ #{work}/usr/sbin")
-  system("#{INSTALL} -o root -g wheel -m 644 #{puppet_source}/man/man5/puppet.conf.5 #{work}/usr/share/man/man5/")
-  system("#{DITTO} #{puppet_source}/man/man8/ #{work}/usr/share/man/man8")
-  system("#{DITTO} #{puppet_source}/lib/ #{work}/usr/lib/ruby/site_ruby/1.8/")
-
-  # Setup a preflight script and replace variables in the files with
-  # the correct paths.
-  system("#{INSTALL} -o root -g wheel -m 644 #{puppet_source}/conf/osx/preflight #{@working_tree['scripts']}")
-  system("#{SED} -i '' \"s\#{SITELIBDIR}\#/usr/lib/ruby/site_ruby/1.8\#g\" #{@working_tree['scripts']}/preflight")
-  system("#{SED} -i '' \"s\#{BINDIR}\#/usr/bin\#g\" #{@working_tree['scripts']}/preflight")
-
-  # Install documentation (matching for files with capital letters)
-  Dir.foreach("#{puppet_source}") do |file|
-    system("#{INSTALL} -o root -g wheel -m 644 #{puppet_source}/#{file} #{work}/usr/share/doc/puppet") if file =~ /^[A-Z][A-Z]/
-  end
-
-  # Set Permissions
-  executable_directories = [ "#{work}/usr/bin",
-                             "#{work}/usr/sbin",
-                             "#{work}/usr/share/man/man8"]
-  FileUtils.chmod_R(0755, executable_directories)
-  FileUtils.chown_R('root', 'wheel', directories)
-  FileUtils.chmod_R(0644, "#{work}/usr/lib/ruby/site_ruby/1.8/")
-  FileUtils.chown_R('root', 'wheel', "#{work}/usr/lib/ruby/site_ruby/1.8/")
-  Find.find("#{work}/usr/lib/ruby/site_ruby/1.8/") do |dir|
-    FileUtils.chmod(0755, dir) if File.directory?(dir)
-  end
-end
-
-namespace :package do
-  desc "Task for building an Apple Package"
-  task :apple => [:setup] do
-    # Test for Root and Packagemaker binary
-    raise "Please run rake as root to build Apple Packages" unless Process.uid == 0
-    raise "Packagemaker must be installed. Please install XCode Tools" unless \
-      File.exists?('/Developer/usr/bin/packagemaker')
-
-    make_directory_tree
-    pack_puppet_source
-    build_dmg
-    FileUtils.chmod_R(0775, "#{Pathname.pwd}/pkg")
-  end
-end

data/tasks/rake/changelog.rake

@@ -1,15 +0,0 @@
-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 --limit=99999`
-    File.open(File.join(CHANGELOG_DIR, "CHANGELOG"), 'w') do |f|
-        f << change_body
-    end
-end

data/tasks/rake/ci.rake

@@ -1,22 +0,0 @@
-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

@@ -1,9 +0,0 @@
-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

@@ -1,63 +0,0 @@
-require 'fileutils'
-require 'puppet/version'
-
-GEM_FILES = FileList[
-    '[A-Z]*',
-    'install.rb',
-    'bin/**/*',
-    'lib/**/*',
-    'conf/**/*',
-    'man/**/*',
-    'examples/**/*',
-    'ext/**/*',
-    'tasks/**/*',
-    'test/**/*',
-    'spec/**/*'
-]
-
-EXECUTABLES = FileList[
-    'bin/**/*',
-    'sbin/**/*'
-]
-
-SBIN = Dir.glob("sbin/*")
-
-spec = Gem::Specification.new do |spec|
-    spec.platform = Gem::Platform::RUBY
-    spec.name = 'puppet'
-    spec.files = GEM_FILES.to_a
-    spec.executables = EXECUTABLES.gsub(/sbin\/|bin\//, '').to_a
-    spec.version = Puppet.version
-    spec.add_dependency('facter', '>= 1.6.11')
-    spec.add_dependency('hiera', '>= 1.0.0rc')
-    spec.add_dependency('hiera-puppet', '>= 1.0.0rc')
-    spec.summary = 'Puppet, an automated configuration management tool'
-    spec.description = 'Puppet, an automated configuration management tool'
-    spec.author = 'Puppet Labs'
-    spec.email = 'puppet@puppetlabs.com'
-    spec.homepage = 'http://puppetlabs.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
-    SBIN.each do |f|
-      FileUtils.copy(f,"bin")
-    end
-end
-
-desc "Create the gem"
-task :gem => :prepare_gem do
-    Dir.mkdir("pkg") rescue nil
-    Gem::Builder.new(spec).build
-    FileUtils.move("puppet-#{Puppet.version}.gem", "pkg")
-    SBIN.each do |f|
-       fn = f.gsub(/sbin\/(.*)/, '\1')
-       FileUtils.rm_r "bin/" + fn
-    end
-end

data/tasks/rake/git_workflow.rake

@@ -1,134 +0,0 @@
-# This set of tasks helps automate the workflow as described on
-# http://projects.puppetlabs.com/projects/puppet/wiki/Development_Lifecycle
-
-
-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"
-
-    # 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 files.length > 1
-        compose = "--compose"
-        subject = "--subject \"#{type} #{name} against #{parent}\""
-    else
-        compose = ""
-        subject = ""
-    end
-
-    # Now send the mail.
-    sh "git send-email #{compose} #{subject} --no-signed-off-by-cc --suppress-from --to puppet-dev@googlegroups.com 00*.patch"
-
-    # Finally, clean up the patches
-    sh "rm 00*.patch"
-end
-