puppet 3.0.0.rc8 → 3.0.0

data/ext/packaging/tasks/ship.rake

@@ -15,15 +15,17 @@ namespace :pl do
     rsync_to('pkg/deb/', @apt_host, @apt_repo_path)
   end
 
-  desc "Update remote ips repository on #{@ips_host}"
-  task :update_ips_repo do
-    rsync_to('pkg/ips/pkgs', @ips_host, @ips_store)
-    remote_ssh_cmd(@ips_host, "pkgrecv -s #{@ips_store}/pkgs/#{@name}@#{@ipsversion}.p5p -d #{@ips_repo} \\*")
-    remote_ssh_cmd(@ips_host, "pkgrepo refresh -s #{@ips_repo}")
-    remote_ssh_cmd(@ips_host, "/usr/sbin/svcadm restart svc:/application/pkg/server")
+  if @build_ips
+    desc "Update remote ips repository on #{@ips_host}"
+    task :update_ips_repo do
+      rsync_to('pkg/ips/pkgs', @ips_host, @ips_store)
+      remote_ssh_cmd(@ips_host, "pkgrecv -s #{@ips_store}/pkgs/#{@name}@#{@ipsversion}.p5p -d #{@ips_repo} \\*")
+      remote_ssh_cmd(@ips_host, "pkgrepo refresh -s #{@ips_repo}")
+      remote_ssh_cmd(@ips_host, "/usr/sbin/svcadm restart svc:/application/pkg/server")
+    end
   end
 
-  if @build_gem == TRUE or @build_gem == 'true' or @build_gem == 'TRUE'
+  if @build_gem
     desc "Ship built gem to rubygems"
     task :ship_gem do
       ship_gem("pkg/#{@name}-#{@gemversion}.gem")

data/ext/packaging/tasks/sign.rake

@@ -29,6 +29,7 @@ namespace :pl do
       STDERR.puts "No tarball exists. Try rake package:tar?"
       exit 1
     end
+    load_keychain if has_tool('keychain')
     gpg_sign_file "pkg/#{@name}-#{@version}.tar.gz"
   end
 
@@ -42,11 +43,13 @@ namespace :pl do
     sign_modern modern_rpms
   end
 
-  desc "Sign ips package, Defaults to PL Key, pass KEY to override"
-  task :sign_ips do
-    ips_pkgs    = Dir["pkg/ips/pkgs/*.p5p"].join(' ')
-    puts "Signing ips packages..."
-    sign_ips ips_pkgs
+  if @build_ips
+    desc "Sign ips package, Defaults to PL Key, pass KEY to override"
+    task :sign_ips do
+      ips_pkgs    = Dir["pkg/ips/pkgs/*.p5p"].join(' ')
+      puts "Signing ips packages..."
+      sign_ips ips_pkgs
+    end
   end
 
   desc "Check if all rpms are signed"
@@ -68,7 +71,7 @@ namespace :pl do
 
   desc "Sign generated debian changes files. Defaults to PL Key, pass KEY to override"
   task :sign_deb_changes do
-    restart_keychain
+    load_keychain if has_tool('keychain')
     sign_deb_changes("pkg/deb/*/*.changes") unless Dir["pkg/deb/*/*.changes"].empty?
     sign_deb_changes("pkg/deb/*.changes") unless Dir["pkg/deb/*.changes"].empty?
   end

data/ext/packaging/tasks/tag.rake

@@ -0,0 +1,8 @@
+namespace 'pl' do
+  desc "Tag this repository, requires a TAG, e.g. TAG=1.1.1"
+  task "tag" do
+    check_var('TAG', ENV['TAG'])
+    git_tag(ENV['TAG'])
+  end
+end
+

data/ext/packaging/tasks/version.rake

@@ -0,0 +1,20 @@
+namespace :package do
+  desc "Update the version in #{@version_file} to current and commit."
+  task :versionbump  do
+    old_version =  get_version_file_version
+    contents = IO.read(@version_file)
+    new_version = '"' + @version.to_s.strip + '"'
+    if contents.match("VERSION = #{old_version}")
+      contents.gsub!("VERSION = #{old_version}", "VERSION = #{new_version}")
+    elsif contents.match("#{@name.upcase}VERSION = #{old_version}")
+      contents.gsub!("#{@name.upcase}VERSION = #{old_version}", "#{@name.upcase}VERSION = #{new_version}")
+    else
+      contents.gsub!(old_version, @version)
+    end
+    file = File.open(@version_file, 'w')
+    file.write contents
+    file.close
+    git_commit_file(@version_file)
+  end
+end
+

data/lib/puppet/reports/http.rb

@@ -5,9 +5,10 @@ require 'uri'
 Puppet::Reports.register_report(:http) do
 
   desc <<-DESC
-  Send report information via HTTP to the `reporturl`. Each host sends
-  its report as a YAML dump and this sends this YAML to a client via HTTP POST.
-  The YAML is the body of the request.
+    Send reports via HTTP or HTTPS. This report processor submits reports as
+    POST requests to the address in the `reporturl` setting. The body of each POST
+    request is the YAML dump of a Puppet::Transaction::Report object, and the
+    Content-Type is set as `application/x-yaml`.
   DESC
 
   def process

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 = '3.0.0-rc8'
+  PUPPETVERSION = '3.0.0'
 
   def self.version
     @puppet_version || PUPPETVERSION

data/spec/integration/application/apply_spec.rb

@@ -1,4 +1,4 @@
-#! /usr/bin/env ruby -S rspec
+#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet_spec/files'
 require 'puppet/application/apply'

data/spec/integration/application/doc_spec.rb

@@ -1,4 +1,4 @@
-#! /usr/bin/env ruby -S rspec
+#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet_spec/files'
 require 'puppet/application/doc'

data/spec/integration/configurer_spec.rb

@@ -1,4 +1,4 @@
-#! /usr/bin/env ruby -S rspec
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/configurer'

data/spec/integration/defaults_spec.rb

@@ -1,4 +1,4 @@
-#! /usr/bin/env ruby -S rspec
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/defaults'

data/spec/integration/faces/ca_spec.rb

@@ -1,4 +1,4 @@
-#! /usr/bin/env ruby -S rspec
+#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet/face'
 

data/spec/integration/faces/documentation_spec.rb

@@ -1,4 +1,4 @@
-#! /usr/bin/env ruby -S rspec
+#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet/face'
 

data/spec/integration/file_bucket/file_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby
 
 require 'spec_helper'
 

data/spec/integration/file_serving/content_spec.rb

@@ -1,4 +1,4 @@
-#! /usr/bin/env ruby -S rspec
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/file_serving/content'

data/spec/integration/file_serving/fileset_spec.rb

@@ -1,4 +1,4 @@
-#! /usr/bin/env ruby -S rspec
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/file_serving/fileset'

data/spec/integration/file_serving/metadata_spec.rb

@@ -1,4 +1,4 @@
-#! /usr/bin/env ruby -S rspec
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/file_serving/metadata'

data/spec/integration/file_serving/terminus_helper_spec.rb

@@ -1,4 +1,4 @@
-#! /usr/bin/env ruby -S rspec
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/file_serving/terminus_helper'

data/spec/integration/indirector/catalog/compiler_spec.rb

@@ -1,4 +1,4 @@
-#! /usr/bin/env ruby -S rspec
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/resource/catalog'

data/spec/integration/indirector/catalog/queue_spec.rb

@@ -1,4 +1,4 @@
-#! /usr/bin/env ruby -S rspec
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/resource/catalog'

data/spec/integration/indirector/direct_file_server_spec.rb

@@ -1,4 +1,4 @@
-#! /usr/bin/env ruby -S rspec
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/indirector/file_content/file'

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

@@ -1,4 +1,4 @@
-#! /usr/bin/env ruby -S rspec
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet_spec/compiler'

data/spec/integration/indirector/file_content/file_server_spec.rb

@@ -1,4 +1,4 @@
-#! /usr/bin/env ruby -S rspec
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/indirector/file_content/file_server'

data/spec/integration/indirector/file_metadata/file_server_spec.rb

@@ -1,4 +1,4 @@
-#! /usr/bin/env ruby -S rspec
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/indirector/file_metadata/file_server'

data/spec/integration/indirector/node/ldap_spec.rb

@@ -1,4 +1,4 @@
-#! /usr/bin/env ruby -S rspec
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/indirector/node/ldap'

data/spec/integration/network/formats_spec.rb

@@ -1,4 +1,4 @@
-#! /usr/bin/env ruby -S rspec
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/network/formats'

data/spec/integration/network/server/mongrel_spec.rb

@@ -1,4 +1,4 @@
-#! /usr/bin/env ruby -S rspec
+#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet/network/server'
 require 'net/http'

data/spec/integration/network/server/webrick_spec.rb

@@ -1,4 +1,4 @@
-#! /usr/bin/env ruby -S rspec
+#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet/network/server'
 require 'puppet/ssl/certificate_authority'

data/spec/integration/node/environment_spec.rb

@@ -1,4 +1,4 @@
-#! /usr/bin/env ruby -S rspec
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet_spec/files'

data/spec/integration/node/facts_spec.rb

@@ -1,4 +1,4 @@
-#! /usr/bin/env ruby -S rspec
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 describe Puppet::Node::Facts do

data/spec/integration/node_spec.rb

@@ -1,4 +1,4 @@
-#! /usr/bin/env ruby -S rspec
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/node'

data/spec/integration/parser/collector_spec.rb

@@ -1,4 +1,4 @@
-#! /usr/bin/env ruby -S rspec
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/parser/collector'

data/spec/integration/parser/compiler_spec.rb

@@ -1,4 +1,4 @@
-#! /usr/bin/env ruby -S rspec
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 describe Puppet::Parser::Compiler do

data/spec/integration/parser/functions/require_spec.rb

@@ -1,4 +1,4 @@
-#! /usr/bin/env ruby -S rspec
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 describe "The require function" do

data/spec/integration/parser/functions_spec.rb

@@ -1,4 +1,4 @@
-#! /usr/bin/env ruby -S rspec
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 describe Puppet::Parser::Functions do

data/spec/integration/parser/parser_spec.rb

@@ -1,4 +1,4 @@
-#! /usr/bin/env ruby -S rspec
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 describe Puppet::Parser::Parser do

data/spec/integration/parser/ruby_manifest_spec.rb

@@ -1,4 +1,4 @@
-#! /usr/bin/env ruby -S rspec
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'tempfile'

data/spec/integration/provider/mailalias/aliases_spec.rb

@@ -1,4 +1,4 @@
-#! /usr/bin/env ruby -S rspec
+#! /usr/bin/env ruby
 require 'spec_helper'
 require 'shared_behaviours/all_parsedfile_providers'
 

data/spec/integration/provider/package_spec.rb

@@ -1,4 +1,4 @@
-#! /usr/bin/env ruby -S rspec
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 describe "Package provider" do

data/spec/integration/provider/service/init_spec.rb

@@ -1,4 +1,4 @@
-#! /usr/bin/env ruby -S rspec
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 provider = Puppet::Type.type(:service).provider(:init)

data/spec/integration/provider/ssh_authorized_key_spec.rb

@@ -1,4 +1,4 @@
-#! /usr/bin/env ruby -S rspec
+#! /usr/bin/env ruby
 
 require 'spec_helper'
 require 'puppet/file_bucket/dipper'

data/spec/integration/reference/providers_spec.rb

@@ -1,4 +1,4 @@
-#! /usr/bin/env ruby -S rspec
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/util/reference'

data/spec/integration/reports_spec.rb

@@ -1,4 +1,4 @@
-#! /usr/bin/env ruby -S rspec
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/reports'

data/spec/integration/resource/catalog_spec.rb

@@ -1,4 +1,4 @@
-#! /usr/bin/env ruby -S rspec
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 describe Puppet::Resource::Catalog do

data/spec/integration/resource/type_collection_spec.rb

@@ -1,4 +1,4 @@
-#! /usr/bin/env ruby -S rspec
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet_spec/files'

data/spec/integration/ssl/certificate_authority_spec.rb

@@ -1,4 +1,4 @@
-#! /usr/bin/env ruby -S rspec
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/ssl/certificate_authority'

data/spec/integration/ssl/certificate_request_spec.rb

@@ -1,4 +1,4 @@
-#! /usr/bin/env ruby -S rspec
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/ssl/certificate_request'

data/spec/integration/ssl/certificate_revocation_list_spec.rb

@@ -1,4 +1,4 @@
-#! /usr/bin/env ruby -S rspec
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/ssl/certificate_revocation_list'

data/spec/integration/ssl/host_spec.rb

@@ -1,4 +1,4 @@
-#! /usr/bin/env ruby -S rspec
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/ssl/host'

data/spec/integration/transaction/report_spec.rb

@@ -1,4 +1,4 @@
-#! /usr/bin/env ruby -S rspec
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 describe Puppet::Transaction::Report do

data/spec/integration/transaction_spec.rb

@@ -1,4 +1,4 @@
-#! /usr/bin/env ruby -S rspec
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/transaction'

data/spec/integration/type/exec_spec.rb

@@ -1,4 +1,4 @@
-#! /usr/bin/env ruby -S rspec
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet_spec/files'

data/spec/integration/type/file_spec.rb

@@ -1,4 +1,4 @@
-#! /usr/bin/env ruby -S rspec
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet_spec/files'

data/spec/integration/type/package_spec.rb

@@ -1,4 +1,4 @@
-#! /usr/bin/env ruby -S rspec
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 describe Puppet::Type.type(:package), "when choosing a default package provider" do

data/spec/integration/type/tidy_spec.rb

@@ -1,4 +1,4 @@
-#! /usr/bin/env ruby -S rspec
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet_spec/files'