puppet 2.7.19 → 2.7.20.rc1

data/conf/osx/preflight

@@ -1,24 +0,0 @@
-#!/bin/bash
-#
-# Make sure that old puppet cruft is removed
-# This also allows us to downgrade puppet as
-# it's more likely that installing old versions
-# over new will cause issues.
-#
-# ${3} is the destination volume so that this works correctly
-# when being installed to volumes other than the current OS.
-
-/bin/rm -Rf "${3}{SITELIBDIR}/puppet"
-/bin/rm -Rf "${3}{SITELIBDIR}/puppet.rb"
-
-# remove old doc files
-
-/bin/rm -Rf "${3}/usr/share/doc/puppet"
-
-# In puppet 0.24.x these executables lived in bindir, but in 0.25.x they
-# have been moved to sbindir. This cleans out old ones before installing.
-/bin/rm -Rf "${3}{BINDIR}/puppetca"
-/bin/rm -Rf "${3}{BINDIR}/puppetd"
-/bin/rm -Rf "${3}{BINDIR}/puppetmasterd"
-/bin/rm -Rf "${3}{BINDIR}/puppetqd"
-/bin/rm -Rf "${3}{BINDIR}/puppetrun"

data/spec/spec.opts

@@ -1,4 +0,0 @@
---format
-s
---colour
---backtrace

data/spec/unit/file_collection/lookup_spec.rb

@@ -1,45 +0,0 @@
-#!/usr/bin/env rspec
-require 'spec_helper'
-require 'puppet/file_collection/lookup'
-
-class LookupTester
-  include Puppet::FileCollection::Lookup
-end
-
-describe Puppet::FileCollection::Lookup do
-  before do
-    @tester = LookupTester.new
-
-    @file_collection = mock 'file_collection'
-    Puppet::FileCollection.stubs(:collection).returns @file_collection
-  end
-
-  it "should use the file collection to determine the index of the file name" do
-    @file_collection.expects(:index).with("/my/file").returns 50
-
-    @tester.file = "/my/file"
-    @tester.file_index.should == 50
-  end
-
-  it "should return nil as the file name if no index is set" do
-    @tester.file.should be_nil
-  end
-
-  it "should use the file collection to convert the index to a file name" do
-    @file_collection.expects(:path).with(25).returns "/path/to/file"
-
-    @tester.file_index = 25
-
-    @tester.file.should == "/path/to/file"
-  end
-
-  it "should support a line attribute" do
-    @tester.line = 50
-    @tester.line.should == 50
-  end
-
-  it "should default to the global file collection" do
-    Puppet::FileCollection.expects(:collection).returns "collection"
-    @tester.file_collection.should == "collection"
-  end
-end

data/spec/unit/file_collection_spec.rb

@@ -1,52 +0,0 @@
-#!/usr/bin/env rspec
-require 'spec_helper'
-
-require 'puppet/file_collection'
-
-describe Puppet::FileCollection do
-  before do
-    @collection = Puppet::FileCollection.new
-  end
-
-  it "should be able to convert a file name into an index" do
-    @collection.index("/my/file").should be_instance_of(Fixnum)
-  end
-
-  it "should be able to convert an index into a file name" do
-    index = @collection.index("/path/to/file")
-    @collection.path(index).should == "/path/to/file"
-  end
-
-  it "should always give the same file name for a given index" do
-    index = @collection.index("/path/to/file")
-    @collection.path(index).should == @collection.path(index)
-  end
-
-  it "should always give the same index for a given file name" do
-    @collection.index("/my/file").should == @collection.index("/my/file")
-  end
-
-  it "should always correctly relate a file name and its index even when multiple files are in the collection" do
-    indexes = %w{a b c d e f}.inject({}) do |hash, letter|
-      hash[letter] = @collection.index("/path/to/file/#{letter}")
-      hash
-    end
-
-    indexes.each do |letter, index|
-      @collection.index("/path/to/file/#{letter}").should == indexes[letter]
-      @collection.path(index).should == @collection.path(index)
-    end
-  end
-
-  it "should return nil as the file name when an unknown index is provided" do
-    @collection.path(50).should be_nil
-  end
-
-  it "should provide a global collection" do
-    Puppet::FileCollection.collection.should be_instance_of(Puppet::FileCollection)
-  end
-
-  it "should reuse the global collection" do
-    Puppet::FileCollection.collection.should equal(Puppet::FileCollection.collection)
-  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.4'
-
-  # 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/test/puppet/errortest.rb

@@ -1,19 +0,0 @@
-#!/usr/bin/env ruby
-
-require File.expand_path(File.dirname(__FILE__) + '/../lib/puppettest')
-
-require 'puppet'
-require 'puppettest'
-
-class TestError < Test::Unit::TestCase
-  include PuppetTest
-
-  def test_errorisstring
-    error = nil
-    assert_nothing_raised {
-      error = Puppet::ParseError.new("This is an error")
-    }
-    assert_instance_of(String, error.to_s)
-  end
-end
-