puppet 2.7.25 → 2.7.26

data/ext/packaging/tasks/update.rake

@@ -2,8 +2,8 @@ namespace :package do
   desc "Update your clone of the packaging repo with `git pull`"
   task :update do
     cd 'ext/packaging' do
-      remote = @build.packaging_url.split(' ')[0]
-      branch = @build.packaging_url.split(' ')[1].split('=')[1]
+      remote = Pkg::Config.packaging_url.split(' ')[0]
+      branch = Pkg::Config.packaging_url.split(' ')[1].split('=')[1]
       if branch.nil? or remote.nil?
         STDERR.puts "Couldn't parse the packaging repo URL from 'ext/build_defaults.yaml'."
         STDERR.puts "Normally this is a string in the format git@github.com:<User>/<packaging_repo> --branch=<branch>"

data/ext/packaging/tasks/vendor_gems.rake

@@ -1,10 +1,10 @@
 # This is an optional pre-tar-task, so we only want to present it if we're
 # using it
-if @build.pre_tar_task
+if Pkg::Config.pre_tar_task
   namespace :package do
     desc "vendor gems required by project"
     task :vendor_gems do
-      check_tool("bundle")
+      Pkg::Util::Tool.check_tool("bundle")
       require 'bundler'
 
       class UI

data/ext/packaging/tasks/version.rake

@@ -12,51 +12,21 @@
 # revisiting this task and improving it substantially,
 # and/or standardizing the expected version file format.
 namespace :package do
-  desc "Update the version in #{@build.version_file} to current and commit."
-  task :versionbump, :workdir do |t, args|
-    version = ENV['VERSION'] || @build.version.to_s.strip
-    new_version = '"' + version + '"'
-
-    version_file = "#{args.workdir ? args.workdir + '/' : ''}#{@build.version_file}"
-
-    # Read the previous version file in...
-    contents = IO.read(version_file)
-
-    # Match version files containing 'VERSION = "x.x.x"' and just x.x.x
-    if version_string = contents.match(/VERSION =.*/)
-      old_version = version_string.to_s.split()[-1]
-    else
-      old_version = contents
-    end
-
-    puts "Updating #{old_version} to #{new_version} in #{version_file}"
-    if contents.match("@DEVELOPMENT_VERSION@")
-      contents.gsub!("@DEVELOPMENT_VERSION@", version)
-    elsif contents.match('version\s*=\s*[\'"]DEVELOPMENT[\'"]')
-      contents.gsub!(/version\s*=\s*['"]DEVELOPMENT['"]/, "version = '#{version}'")
-    elsif contents.match("VERSION = #{old_version}")
-      contents.gsub!("VERSION = #{old_version}", "VERSION = #{new_version}")
-    elsif contents.match("#{@build.project.upcase}VERSION = #{old_version}")
-      contents.gsub!("#{@build.project.upcase}VERSION = #{old_version}", "#{@build.project.upcase}VERSION = #{new_version}")
-    else
-      contents.gsub!(old_version, @build.version)
-    end
-
-    # ...and write it back on out.
-    File.open(version_file, 'w') {|f| f.write contents }
-  end
-
-  desc "Set and commit the version in #{@build.version_file}, requires VERSION."
+  desc "Set and commit the version in #{Pkg::Config.version_file}, requires VERSION."
   task :versionset do
     check_var('VERSION', ENV['VERSION'])
-    Rake::Task["package:versionbump"].invoke
-    git_commit_file(@build.version_file, "update to #{ENV['VERSION']}")
+    Pkg::Util::Version.versionbump
+    git_commit_file(Pkg::Config.version_file, "update to #{ENV['VERSION']}")
+  end
+
+  task :versionbump, :workdir do |t, args|
+    Pkg::Util::Version.versionbump(args.workdir)
   end
 
   # A set of tasks for printing the version
   [:version, :rpmversion, :rpmrelease, :debversion, :release].each do |task|
     task "#{task}" do
-      STDOUT.puts self.instance_variable_get("@#{task}")
+      STDOUT.puts Pkg::Config.instance_variable_get("@#{task}")
     end
   end
 end

data/ext/packaging/tasks/z_data_dump.rake

@@ -17,9 +17,9 @@ namespace :pl do
   task :write_build_params do
     if ENV['TASK']
       task_args = ENV['TASK'].split(' ')
-      @build.task = { :task => task_args[0], :args => task_args[1..-1] }
+      Pkg::Config.task = { :task => task_args[0], :args => task_args[1..-1] }
     end
-    @build.params_to_yaml(ENV['OUTPUT_DIR'])
+    Pkg::Config.config_to_yaml(ENV['OUTPUT_DIR'])
   end
 
   ##
@@ -27,7 +27,39 @@ namespace :pl do
   #
   desc "Print all package build parameters"
   task :print_build_params do
-    @build.print_params
+    Pkg::Config.print_config
+  end
+
+  ##
+  # Print a parameter passed as an argument to STDOUT.
+  desc "Print a build parameter"
+  task :print_build_param, :param do |t, args|
+    # We want a string that is the from "@<param name>"
+    if param = args.param
+      getter = param.dup
+      if param[0] == ':'
+        getter = param[1..-1]
+        param[0] = "@"
+      elsif param[0] == "@"
+        getter = param[1..-1]
+      else
+        param.insert(0, "@")
+      end
+
+      # We want to fail if the param passed is bogus, print 'nil' if its not
+      # set, and print the value if its set.
+      if Pkg::Config.respond_to?(getter)
+        if val = Pkg::Config.instance_variable_get(param)
+          puts val
+        else
+          puts 'nil'
+        end
+      else
+        fail "Could not locate a build parameter called #{param}. For a list of available parameters, do `rake pl:print_build_params`"
+      end
+    else
+      fail "To print a build parameter, pass the param name as a rake argument. Ex: rake pl:print_build_param[:version]"
+    end
   end
 end
 

data/ext/packaging/templates/downstream.xml.erb

@@ -24,7 +24,7 @@ When DOWNSTREAM_JOB is passed to the packaging repo, this job is created to wrap
     <hudson.tasks.Shell>
       <command>#!/bin/bash
 ## We have to check if this has been triggered by a successful package and repo build
-curl -s &quot;http://<%= "#{@build.jenkins_build_host}" %>/job/<%= "#{@build.project}-repo-#{@build.build_date}-#{@build.ref}" %>/lastBuild/api/json&quot; | grep result\&quot;:\&quot;SUCCESS\&quot; &gt; /dev/null
+curl -s &quot;http://<%= "#{Pkg::Config.jenkins_build_host}" %>/job/<%= "#{Pkg::Config.project}-repo-#{Pkg::Config.build_date}-#{Pkg::Config.ref}" %>/lastBuild/api/json&quot; | grep result\&quot;:\&quot;SUCCESS\&quot; &gt; /dev/null
 
 UPSTREAM_BUILD_STATUS=$?
 
@@ -37,7 +37,7 @@ else
 fi
 
 # This URI was passed in as an argument to the original rake package call
-curl --fail -i &quot;<%= escape_html(add_param_to_uri(ENV['DOWNSTREAM_JOB'], "PACKAGE_BUILD_STATUS=$UPSTREAM_BUILD_STATUS")) %>&quot;</command>
+curl -v --fail -i &quot;<%= escape_html(add_param_to_uri(add_param_to_uri(ENV['DOWNSTREAM_JOB'], "PACKAGE_BUILD_STATUS=$UPSTREAM_BUILD_STATUS"), "PACKAGE_BUILD_URL=#{ENV["PACKAGE_BUILD_URL"]}")) %>&quot;</command>
     </hudson.tasks.Shell>
   </builders>
   <publishers/>

data/ext/packaging/templates/packaging.xml.erb

@@ -55,17 +55,17 @@ pl:jenkins:uber_build NOTIFY=foo@puppetlabs.com
   <properties>
     <jp.ikedam.jenkins.plugins.groovy__label__assignment.GroovyLabelAssignmentProperty plugin="groovy-label-assignment@1.0.0">
       <groovyScript>def labelMap = [
-        <% @build.cows.split(' ').each do |cow| %>
+        <% Pkg::Config.cows.split(' ').each do |cow| %>
           <% if cow =~ /cumulus/ %>
         &quot;pl_deb COW=<%= cow %>&quot;: &quot;cumulus&quot;,
           <% else %>
         &quot;pl_deb COW=<%= cow %>&quot;: &quot;deb&quot;,
           <% end %>
         <% end %>
-        <% @build.final_mocks.split(' ').each do |mock| %>&quot;pl_mock MOCK=<%= mock %>&quot;: &quot;rpm&quot;,<% end %>
+        <% Pkg::Config.final_mocks.split(' ').each do |mock| %>&quot;pl_mock MOCK=<%= mock %>&quot;: &quot;rpm&quot;,<% end %>
         &quot;package_tar&quot;: &quot;rpm&quot;,
-        <% if @build.build_gem then %>&quot;package_gem&quot;: &quot;gem&quot;,<% end %>
-        <% if @build.build_dmg then %>&quot;package_apple&quot;: &quot;dmg&quot;,<% end %>
+        <% if Pkg::Config.build_gem then %>&quot;package_gem&quot;: &quot;gem&quot;,<% end %>
+        <% if Pkg::Config.build_dmg then %>&quot;package_apple&quot;: &quot;dmg&quot;,<% end %>
 ];
 return labelMap.get(binding.getVariables().get(&quot;command&quot;));</groovyScript>
     </jp.ikedam.jenkins.plugins.groovy__label__assignment.GroovyLabelAssignmentProperty>
@@ -107,11 +107,11 @@ return labelMap.get(binding.getVariables().get(&quot;command&quot;));</groovyScr
     <hudson.matrix.TextAxis>
       <name>command</name>
       <values>
-        <% @build.cows.split(' ').each do |cow| %><string>pl_deb COW=<%= cow %></string><% end %>
-        <% @build.final_mocks.split(' ').each do |mock| %><string>pl_mock MOCK=<%= mock %></string><% end %>
+        <% Pkg::Config.cows.split(' ').each do |cow| %><string>pl_deb COW=<%= cow %></string><% end %>
+        <% Pkg::Config.final_mocks.split(' ').each do |mock| %><string>pl_mock MOCK=<%= mock %></string><% end %>
         <string>package_tar</string>
-        <% if @build.build_gem then %><string>package_gem</string><% end %>
-        <% if @build.build_dmg then %><string>package_apple</string><% end %>
+        <% if Pkg::Config.build_gem then %><string>package_gem</string><% end %>
+        <% if Pkg::Config.build_dmg then %><string>package_apple</string><% end %>
       </values>
     </hudson.matrix.TextAxis>
   </axes>
@@ -166,7 +166,7 @@ def get_jenkins_build_time() {
 
 // Assemble metrics to post to build metrics server
 
-app_server    = &quot;<%= @build.metrics_url %>&quot;
+app_server    = &quot;<%= Pkg::Config.metrics_url %>&quot;
 task_metrics  = manager.build.getEnvironment(manager.listener)[&apos;METRICS&apos;]
 charset       = &quot;UTF-8&quot;
 
@@ -289,12 +289,12 @@ try {
       <behavior>0</behavior>
     </org.jvnet.hudson.plugins.groovypostbuild.GroovyPostbuildRecorder>
     <hudson.tasks.ArtifactArchiver>
-      <artifacts>**/PROJECT_BUNDLE</artifacts>
+      <artifacts>**/PROJECT_BUNDLE, **/BUILD_PROPERTIES</artifacts>
       <latestOnly>false</latestOnly>
       <allowEmptyArchive>false</allowEmptyArchive>
-    </hudson.tasks.ArtifactArchiver><% if @build.notify %>
+    </hudson.tasks.ArtifactArchiver><% if Pkg::Config.notify %>
     <hudson.tasks.Mailer plugin="mailer@1.4">
-      <recipients><%= "#{@build.notify}" %></recipients>
+      <recipients><%= "#{Pkg::Config.notify}" %></recipients>
       <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
       <sendToIndividuals>false</sendToIndividuals>
     </hudson.tasks.Mailer><% end %>
@@ -304,7 +304,7 @@ try {
           <configs>
             <hudson.plugins.parameterizedtrigger.CurrentBuildParameters/>
           </configs>
-          <projects><%= "#{@build.project}-repo-#{@build.build_date}-#{@build.ref}" %></projects>
+          <projects><%= "#{Pkg::Config.project}-repo-#{Pkg::Config.build_date}-#{Pkg::Config.ref}" %></projects>
           <condition>ALWAYS</condition>
           <triggerWithNoParameters>false</triggerWithNoParameters>
         </hudson.plugins.parameterizedtrigger.BuildTriggerConfig>

data/ext/packaging/templates/repo.xml.erb

@@ -31,8 +31,8 @@ This job will trigger the downstream job supplied with DOWNSTREAM_JOB if passed
   <concurrentBuild>false</concurrentBuild>
   <builders>
     <hudson.plugins.copyartifact.CopyArtifact plugin="copyartifact@1.25">
-      <projectName><%= "#{@build.project}-packaging-#{@build.build_date}-#{@build.ref}" %>/command=package_tar</projectName>
-      <filter>**/PROJECT_BUNDLE</filter>
+      <projectName><%= "#{Pkg::Config.project}-packaging-#{Pkg::Config.build_date}-#{Pkg::Config.ref}" %>/command=package_tar</projectName>
+      <filter>**/PROJECT_BUNDLE, **/BUILD_PROPERTIES</filter>
       <target></target>
       <selector class="hudson.plugins.copyartifact.TriggeredBuildSelector">
         <fallbackToLastSuccessful>true</fallbackToLastSuccessful>
@@ -42,7 +42,7 @@ This job will trigger the downstream job supplied with DOWNSTREAM_JOB if passed
     <hudson.tasks.Shell>
       <command>#!/bin/bash
 ## We have to check if this has been triggered by a successful package build
-curl -s &quot;http://<%= "#{@build.jenkins_build_host}" %>/job/<%= "#{@build.project}-packaging-#{@build.build_date}-#{@build.ref}" %>/lastBuild/api/json&quot; | grep result\&quot;:\&quot;SUCCESS\&quot; > /dev/null
+curl -s &quot;http://<%= "#{Pkg::Config.jenkins_build_host}" %>/job/<%= "#{Pkg::Config.project}-packaging-#{Pkg::Config.build_date}-#{Pkg::Config.ref}" %>/lastBuild/api/json&quot; | grep result\&quot;:\&quot;SUCCESS\&quot; > /dev/null
 
 PACKAGE_BUILD_RESULT=$?
 
@@ -50,7 +50,7 @@ set -e
 
 if [ $PACKAGE_BUILD_RESULT -eq 0 ] ; then
   echo &quot;Detected upstream package build success. Building repos.&quot;
-  ### We've retrieved the git bundle from the tarball build, so now we clone it
+  ### We&apos;ve retrieved the git bundle from the tarball build, so now we clone it
   ### and use it to trigger our repo creation
   #
   # PROJECT_BUNDLE is a tarball containing a bundle file and git_repo is the
@@ -59,6 +59,8 @@ if [ $PACKAGE_BUILD_RESULT -eq 0 ] ; then
 
   [ -f &quot;PROJECT_BUNDLE&quot; ] || exit 1
 
+  [ -f &quot;BUILD_PROPERTIES&quot; ] || exit 1
+
   [ -d project ] &amp;&amp; rm -rf project
 
   mkdir project &amp;&amp; tar -xzf PROJECT_BUNDLE -C project/
@@ -72,8 +74,8 @@ if [ $PACKAGE_BUILD_RESULT -eq 0 ] ; then
       rake package:bootstrap --trace
 
       ### Run repo creation
-      rake pl:jenkins:rpm_repos --trace
-      rake pl:jenkins:deb_repos --trace
+      rake PARAMS_FILE=../../BUILD_PROPERTIES pl:jenkins:rpm_repos --trace
+      rake PARAMS_FILE=../../BUILD_PROPERTIES pl:jenkins:deb_repos --trace
 
     popd
   popd
@@ -87,7 +89,7 @@ fi
   </builders><% if ENV['DOWNSTREAM_JOB'] %>
   <publishers>
     <hudson.tasks.BuildTrigger>
-      <childProjects><%= "#{@build.project}-downstream-#{@build.build_date}-#{@build.ref}" %></childProjects>
+      <childProjects><%= "#{Pkg::Config.project}-downstream-#{Pkg::Config.build_date}-#{Pkg::Config.ref}" %></childProjects>
       <threshold>
         <name>FAILURE</name>
         <ordinal>2</ordinal>

data/lib/puppet/indirector/facts/facter.rb

@@ -45,7 +45,7 @@ class Puppet::Node::Facts::Facter < Puppet::Indirector::Code
         begin
           Puppet.info "Loading facts in #{fqfile}"
           Timeout::timeout(self.timeout) do
-            load file
+            load File.join('.', file)
           end
         rescue SystemExit,NoMemoryError
           raise

data/lib/puppet/version.rb

@@ -6,7 +6,7 @@
 # Raketasks and such to set the version based on the output of `git describe`
 #
 module Puppet
-  PUPPETVERSION = '2.7.25'
+  PUPPETVERSION = '2.7.26'
 
   def self.version
     @puppet_version || PUPPETVERSION

data/spec/unit/indirector/facts/facter_spec.rb

@@ -123,8 +123,8 @@ describe Puppet::Node::Facts::Facter do
 
     Dir.expects(:glob).with("*.rb").returns %w{a.rb b.rb}
 
-    Puppet::Node::Facts::Facter.expects(:load).with("a.rb")
-    Puppet::Node::Facts::Facter.expects(:load).with("b.rb")
+    Puppet::Node::Facts::Facter.expects(:load).with File.join('.', 'a.rb')
+    Puppet::Node::Facts::Facter.expects(:load).with File.join('.', 'b.rb')
 
     Puppet::Node::Facts::Facter.load_facts_in_dir("mydir")
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppet
 version: !ruby/object:Gem::Version
-  version: 2.7.25
+  version: 2.7.26
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-07 00:00:00.000000000 Z
+date: 2014-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facter
@@ -33,13 +33,13 @@ executables:
 - filebucket
 - pi
 - puppet
-- puppetdoc
-- ralsh
 - puppetca
 - puppetd
+- puppetdoc
 - puppetmasterd
 - puppetqd
 - puppetrun
+- ralsh
 extensions: []
 extra_rdoc_files: []
 files:
@@ -54,7 +54,12 @@ files:
 - bin/filebucket
 - bin/pi
 - bin/puppet
+- bin/puppetca
+- bin/puppetd
 - bin/puppetdoc
+- bin/puppetmasterd
+- bin/puppetqd
+- bin/puppetrun
 - bin/ralsh
 - lib/puppet.rb
 - lib/puppet/agent.rb
@@ -1040,17 +1045,41 @@ files:
 - ext/osx/file_mapping.yaml
 - ext/osx/preflight.erb
 - ext/osx/prototype.plist.erb
+- ext/packaging/Gemfile
+- ext/packaging/Gemfile.lock
 - ext/packaging/LICENSE
 - ext/packaging/README-Solaris.md
 - ext/packaging/README.md
+- ext/packaging/lib/packaging.rb
+- ext/packaging/lib/packaging/config.rb
+- ext/packaging/lib/packaging/config/params.rb
+- ext/packaging/lib/packaging/tar.rb
+- ext/packaging/lib/packaging/util.rb
+- ext/packaging/lib/packaging/util/date.rb
+- ext/packaging/lib/packaging/util/file.rb
+- ext/packaging/lib/packaging/util/jira.rb
+- ext/packaging/lib/packaging/util/net.rb
+- ext/packaging/lib/packaging/util/rake_utils.rb
+- ext/packaging/lib/packaging/util/serialization.rb
+- ext/packaging/lib/packaging/util/tool.rb
+- ext/packaging/lib/packaging/util/version.rb
 - ext/packaging/packaging.rake
+- ext/packaging/spec/fixtures/config/ext/build_defaults.yaml
+- ext/packaging/spec/fixtures/config/ext/project_data.yaml
+- ext/packaging/spec/fixtures/config/params.yaml
+- ext/packaging/spec/fixtures/util/pre_tasks.yaml
+- ext/packaging/spec/lib/packaging/config_spec.rb
+- ext/packaging/spec/lib/packaging/tar_spec.rb
+- ext/packaging/spec/lib/packaging/util/file_spec.rb
+- ext/packaging/spec/lib/packaging/util/jira_spec.rb
+- ext/packaging/spec/lib/packaging/util/net_spec.rb
+- ext/packaging/spec/lib/packaging/util/rake_utils_spec.rb
+- ext/packaging/spec/lib/packaging/util/version_spec.rb
+- ext/packaging/spec/lib/packaging_spec.rb
 - ext/packaging/spec/spec_helper.rb
 - ext/packaging/spec/tasks/00_utils_spec.rb
-- ext/packaging/spec/tasks/build_object_spec.rb
 - ext/packaging/static_artifacts/PackageInfo.plist
 - ext/packaging/tasks/00_utils.rake
-- ext/packaging/tasks/10_setupvars.rake
-- ext/packaging/tasks/20_setupextravars.rake
 - ext/packaging/tasks/30_metrics.rake
 - ext/packaging/tasks/apple.rake
 - ext/packaging/tasks/build.rake
@@ -1063,6 +1092,7 @@ files:
 - ext/packaging/tasks/ips.rake
 - ext/packaging/tasks/jenkins.rake
 - ext/packaging/tasks/jenkins_dynamic.rake
+- ext/packaging/tasks/load_extras.rake
 - ext/packaging/tasks/mock.rake
 - ext/packaging/tasks/pe_deb.rake
 - ext/packaging/tasks/pe_remote.rake
@@ -1079,7 +1109,7 @@ files:
 - ext/packaging/tasks/sign.rake
 - ext/packaging/tasks/tag.rake
 - ext/packaging/tasks/tar.rake
-- ext/packaging/tasks/template.rake
+- ext/packaging/tasks/tickets.rake
 - ext/packaging/tasks/update.rake
 - ext/packaging/tasks/vendor_gems.rake
 - ext/packaging/tasks/version.rake
@@ -2012,11 +2042,6 @@ files:
 - spec/unit/util/zaml_spec.rb
 - spec/unit/util_spec.rb
 - spec/watchr.rb
-- bin/puppetca
-- bin/puppetd
-- bin/puppetmasterd
-- bin/puppetqd
-- bin/puppetrun
 homepage: http://puppetlabs.com
 licenses: []
 post_install_message: 

data/ext/packaging/spec/tasks/build_object_spec.rb

@@ -1,178 +0,0 @@
-# -*- ruby -*-
-require 'spec_helper'
-load_task '00_utils.rake'
-load_task 'build.rake'
-require 'yaml'
-
-describe Build::BuildInstance do
-  Build_Params = [:apt_host,
-                  :apt_repo_path,
-                  :apt_repo_url,
-                  :author,
-                  :benchmark,
-                  :build_date,
-                  :build_defaults,
-                  :build_dmg,
-                  :build_doc,
-                  :build_gem,
-                  :build_ips,
-                  :build_pe,
-                  :builder_data_file,
-                  :certificate_pem,
-                  :cows,
-                  :db_table,
-                  :deb_build_host,
-                  :debversion,
-                  :debug,
-                  :default_cow,
-                  :default_mock,
-                  :description,
-                  :dmg_path,
-                  :email,
-                  :files,
-                  :final_mocks,
-                  :freight_conf,
-                  :gem_default_executables,
-                  :gem_dependencies,
-                  :gem_description,
-                  :gem_devel_dependencies,
-                  :gem_development_dependencies,
-                  :gem_excludes,
-                  :gem_executables,
-                  :gem_files,
-                  :gem_forge_project,
-                  :gem_name,
-                  :gem_platform_dependencies,
-                  :gem_rdoc_options,
-                  :gem_require_path,
-                  :gem_runtime_dependencies,
-                  :gem_summary,
-                  :gem_test_files,
-                  :gemversion,
-                  :gpg_key,
-                  :gpg_name,
-                  :homepage,
-                  :ips_build_host,
-                  :ips_host,
-                  :ips_inter_cert,
-                  :ips_package_host,
-                  :ips_path,
-                  :ips_repo,
-                  :ips_store,
-                  :ipsversion,
-                  :jenkins_build_host,
-                  :jenkins_packaging_job,
-                  :jenkins_repo_path,
-                  :metrics,
-                  :metrics_url,
-                  :name,
-                  :notify,
-                  :project,
-                  :origversion,
-                  :osx_build_host,
-                  :packager,
-                  :packaging_repo,
-                  :packaging_url,
-                  :pbuild_conf,
-                  :pe_name,
-                  :pe_version,
-                  :pg_major_version,
-                  :pre_tar_task,
-                  :privatekey_pem,
-                  :random_mockroot,
-                  :rc_mocks,
-                  :release,
-                  :rpm_build_host,
-                  :rpmrelease,
-                  :rpmversion,
-                  :ref,
-                  :sign_tar,
-                  :summary,
-                  :tar_excludes,
-                  :tar_host,
-                  :tarball_path,
-                  :team,
-                  :templates,
-                  :update_version_file,
-                  :version,
-                  :version_file,
-                  :version_strategy,
-                  :yum_host,
-                  :yum_repo_path]
-
-  before :each do
-    @build = Build::BuildInstance.new
-  end
-
-  describe "#new" do
-    Build_Params.each do |param|
-      it "should have r/w accessors for #{param}" do
-        @build.should respond_to(param)
-        @build.should respond_to("#{param.to_s}=")
-      end
-    end
-  end
-
-  describe "#set_params_from_hash" do
-    good_params = { :yum_host => 'foo', :pe_name => 'bar' }
-    context "given a valid params hash #{good_params}" do
-      it "should set instance variable values for each param" do
-        good_params.each do |param, value|
-          @build.should_receive(:instance_variable_set).with("@#{param}", value)
-        end
-        @build.set_params_from_hash(good_params)
-      end
-    end
-
-    bad_params = { :foo => 'bar' }
-    context "given an invalid params hash #{bad_params}" do
-      bad_params.each do |param, value|
-        it "should print a warning that param '#{param}' is not valid" do
-          @build.should_receive(:warn).with(/No build data parameter found for '#{param}'/)
-          @build.set_params_from_hash(bad_params)
-        end
-
-        it "should not try to set instance variable @:#{param}" do
-          @build.should_not_receive(:instance_variable_set).with("@#{param}", value)
-          @build.set_params_from_hash(bad_params)
-        end
-      end
-    end
-
-    mixed_params = { :sign_tar => TRUE, :baz => 'qux' }
-    context "given a hash with both valid and invalid params" do
-      it "should set the valid param" do
-        @build.should_receive(:instance_variable_set).with("@sign_tar", TRUE)
-        @build.set_params_from_hash(mixed_params)
-      end
-
-      it "should issue a warning that the invalid param is not valid" do
-        @build.should_receive(:warn).with(/No build data parameter found for 'baz'/)
-        @build.set_params_from_hash(mixed_params)
-      end
-
-      it "should not try to set instance variable @:baz" do
-        @build.should_not_receive(:instance_variable_set).with("@baz", "qux")
-        @build.set_params_from_hash(mixed_params)
-      end
-    end
-  end
-
-  describe "#params" do
-    it "should return a hash containing keys for all build parameters" do
-      params = @build.params
-      Build_Params.each { |param| params.has_key?(param).should == TRUE }
-    end
-  end
-
-  describe "#params_to_yaml" do
-    it "should write a valid yaml file" do
-      file = mock('file')
-      File.should_receive(:open).with(anything(), 'w').and_yield(file)
-      file.should_receive(:puts).with(instance_of(String))
-      YAML.should_receive(:load_file).with(file)
-      expect { YAML.load_file(file) }.to_not raise_error
-      @build.params_to_yaml
-    end
-  end
-end