puppet 2.6.0 → 2.6.1

data/man/man8/ralsh.8

@@ -1,122 +1,85 @@
-.TH   "" "" ""
-.SH NAME
- \- 
-.\" Man page generated from reStructeredText.
-.
-.SH SYNOPSIS
-.sp
-Use the Puppet RAL to directly interact with the system.
-.SH USAGE
-.INDENT 0.0
-.INDENT 3.5
-.INDENT 0.0
-.TP
-.B puppet resource [\-h|\-\-help] [\-d|\-\-debug] [\-v|\-\-verbose] [\-e|\-\-edit]
-.
-[\-H|\-\-host <host>] [\-p|\-\-param <param>] [\-t|\-\-types]
-type <name>
-.UNINDENT
-.UNINDENT
-.UNINDENT
-.SH DESCRIPTION
-.sp
-This command provides simple facilities for converting current system
-state into Puppet code, along with some ability to use Puppet to affect
-the current state.
-.sp
-By default, you must at least provide a type to list, which case puppet
-resource will tell you everything it knows about all instances of that
-type. You can optionally specify an instance name, and puppet resource
-will only describe that single instance.
-.sp
-You can also add +\-\-edit+ as an argument, and puppet resource will write
-its output to a file, open that file in an editor, and then apply the
-file as a Puppet transaction. You can easily use this to use Puppet to
-make simple changes to a system.
-.SH OPTIONS
-.sp
-Note that any configuration parameter that\(aqs valid in the configuration
-file is also a valid long argument. For example, \(aqssldir\(aq is a valid
-configuration parameter, so you can specify \(aq\-\-ssldir <directory>\(aq as an
-argument.
-.sp
-See the configuration file documentation at
-\fI\%http://docs.puppetlabs.com/references/stable/configuration.html\fP for the
-full list of acceptable parameters. A commented list of all
-configuration options can also be generated by running puppet with
-\(aq\-\-genconfig\(aq.
-.sp
-debug: Enable full debugging.
-.sp
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "RALSH" "8" "August 2010" "" ""
+Use the Puppet RAL to directly interact with the system\.puppet resource [\-h|\-\-help] [\-d|\-\-debug] [\-v|\-\-verbose] [\-e|\-\-edit]
+.
+.IP "" 4
+.
+.nf
+
+              [\-H|\-\-host <host>] [\-p|\-\-param <param>] [\-t|\-\-types]
+              type <name>
+.
+.fi
+.
+.IP "" 0
+This command provides simple facilities for converting current system state into Puppet code, along with some ability to use Puppet to affect the current state\.
+.
+.P
+By default, you must at least provide a type to list, which case puppet resource will tell you everything it knows about all instances of that type\. You can optionally specify an instance name, and puppet resource will only describe that single instance\.
+.
+.P
+You can also add +\-\-edit+ as an argument, and puppet resource will write its output to a file, open that file in an editor, and then apply the file as a Puppet transaction\. You can easily use this to use Puppet to make simple changes to a system\.Note that any configuration parameter that\'s valid in the configuration file is also a valid long argument\. For example, \'ssldir\' is a valid configuration parameter, so you can specify \'\-\-ssldir \fIdirectory\fR\' as an argument\.
+.
+.P
+See the configuration file documentation at http://docs\.puppetlabs\.com/references/stable/configuration\.html for the full list of acceptable parameters\. A commented list of all configuration options can also be generated by running puppet with \'\-\-genconfig\'\.
+.
+.P
+debug: Enable full debugging\.
+.
+.P
 edit:
-.INDENT 0.0
-.INDENT 3.5
-.sp
-Write the results of the query to a file, open the file in an editor,
-and read the file back in as an executable Puppet manifest.
-.UNINDENT
-.UNINDENT
-.sp
+.
+.P
+Write the results of the query to a file, open the file in an editor, and read the file back in as an executable Puppet manifest\.
+.
+.P
 host:
-.INDENT 0.0
-.INDENT 3.5
-.sp
-When specified, connect to the resource server on the named host
-and retrieve the list of resouces of the type specified.
-.UNINDENT
-.UNINDENT
-.sp
+.
+.P
+When specified, connect to the resource server on the named host and retrieve the list of resouces of the type specified\.
+.
+.P
 help:
-.INDENT 0.0
-.INDENT 3.5
-.sp
-Print this help message.
-.UNINDENT
-.UNINDENT
-.sp
+.
+.P
+Print this help message\.
+.
+.P
 param:
-.INDENT 0.0
-.INDENT 3.5
-.sp
-Add more parameters to be outputted from queries.
-.UNINDENT
-.UNINDENT
-.sp
+.
+.P
+Add more parameters to be outputted from queries\.
+.
+.P
 types:
-.INDENT 0.0
-.INDENT 3.5
-.sp
-List all available types.
-.UNINDENT
-.UNINDENT
-.sp
-verbose: Print extra information.
-.SH EXAMPLE
-.sp
-This example uses \fBpuppet resource\fP to return Puppet configuration for
-the user \fBluke\fP:
-.sp
+.
+.P
+List all available types\.
+.
+.P
+verbose:
+.
+.P
+Print extra information\.This example uses \fBpuppet resource\fR to return Puppet configuration for the user \fBluke\fR:
+.
+.IP "" 4
+.
 .nf
-.ft C
-$ puppet resource user luke
-user { \(aqluke\(aq:
-  home => \(aq/home/luke\(aq,
-  uid => \(aq100\(aq,
-  ensure => \(aqpresent\(aq,
-  comment => \(aqLuke Kanies,,,\(aq,
-  gid => \(aq1000\(aq,
-  shell => \(aq/bin/bash\(aq,
-  groups => [\(aqsysadmin\(aq,\(aqaudio\(aq,\(aqvideo\(aq,\(aqpuppet\(aq]
-}
-.ft P
+
+ $ puppet resource user luke
+ user { \'luke\':
+   home => \'/home/luke\',
+   uid => \'100\',
+   ensure => \'present\',
+   comment => \'Luke Kanies,,,\',
+   gid => \'1000\',
+   shell => \'/bin/bash\',
+   groups => [\'sysadmin\',\'audio\',\'video\',\'puppet\']
+ }
+.
 .fi
-.SH AUTHOR
-.sp
-Luke Kanies
-.SH COPYRIGHT
-.sp
-Copyright (c) 2005\-2007 Reductive Labs, LLC Licensed under the GNU
-Public License
-.\" Generated by docutils manpage writer.
-.\" 
 .
+.IP "" 0
+Luke KaniesCopyright (c) 2005\-2007 Reductive Labs, LLC Licensed under the GNU Public License

data/spec/integration/indirector/bucket_file/rest_spec.rb

@@ -17,6 +17,7 @@ describe "Filebucket REST Terminus" do
 
     Puppet.settings[:confdir] = @dir
     Puppet.settings[:vardir] = @dir
+    Puppet.settings[:group] = Process.gid
     Puppet.settings[:server] = "127.0.0.1"
     Puppet.settings[:masterport] = "34343"
 

data/spec/integration/indirector/certificate/rest_spec.rb

@@ -17,6 +17,7 @@ describe "Certificate REST Terminus" do
 
     Puppet.settings[:confdir] = @dir
     Puppet.settings[:vardir] = @dir
+    Puppet.settings[:group] = Process.gid
     Puppet.settings[:server] = "127.0.0.1"
     Puppet.settings[:masterport] = "34343"
 

data/spec/integration/indirector/certificate_request/rest_spec.rb

@@ -19,6 +19,7 @@ describe "Certificate Request REST Terminus" do
 
     Puppet.settings[:confdir] = @dir
     Puppet.settings[:vardir] = @dir
+    Puppet.settings[:group] = Process.gid
     Puppet.settings[:server] = "127.0.0.1"
     Puppet.settings[:masterport] = "34343"
 

data/spec/integration/indirector/certificate_revocation_list/rest_spec.rb

@@ -17,6 +17,7 @@ describe "Certificate REST Terminus" do
 
     Puppet.settings[:confdir] = @dir
     Puppet.settings[:vardir] = @dir
+    Puppet.settings[:group] = Process.gid
     Puppet.settings[:server] = "127.0.0.1"
     Puppet.settings[:masterport] = "34343"
 

data/spec/integration/indirector/report/rest_spec.rb

@@ -17,6 +17,7 @@ describe "Report REST Terminus" do
 
     Puppet.settings[:confdir] = @dir
     Puppet.settings[:vardir] = @dir
+    Puppet.settings[:group] = Process.gid
     Puppet.settings[:server] = "127.0.0.1"
     Puppet.settings[:masterport] = "34343"
 

data/spec/integration/indirector/rest_spec.rb

@@ -39,6 +39,7 @@ describe Puppet::Indirector::REST do
 
     Puppet.settings[:confdir] = @dir
     Puppet.settings[:vardir] = @dir
+    Puppet.settings[:group] = Process.gid
     Puppet.settings[:server] = "127.0.0.1"
     Puppet.settings[:masterport] = "34343"
 

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

@@ -18,6 +18,7 @@ describe Puppet::Network::Server do
 
       Puppet.settings[:confdir] = @dir
       Puppet.settings[:vardir] = @dir
+      Puppet.settings[:group] = Process.gid
 
       Puppet::SSL::Host.ca_location = :local
 

data/spec/integration/parser/compiler_spec.rb

@@ -26,4 +26,47 @@ describe Puppet::Parser::Compiler do
 
     @compiler.catalog.version.should == version
   end
+
+  describe "when resolving class references" do
+    it "should favor local scope, even if there's an included class in topscope" do
+      Puppet[:code] = <<-PP
+        class experiment {
+          class baz {
+          }
+          notify {"x" : require => Class[Baz] }
+        }
+        class baz {
+        }
+        include baz
+        include experiment
+        include experiment::baz
+      PP
+
+      catalog = Puppet::Parser::Compiler.compile(Puppet::Node.new("mynode"))
+
+      notify_resource = catalog.resource( "Notify[x]" )
+
+      notify_resource[:require].title.should == "Experiment::Baz"
+    end
+
+    it "should favor local scope, even if there's an unincluded class in topscope" do
+      Puppet[:code] = <<-PP
+        class experiment {
+          class baz {
+          }
+          notify {"x" : require => Class[Baz] }
+        }
+        class baz {
+        }
+        include experiment
+        include experiment::baz
+      PP
+
+      catalog = Puppet::Parser::Compiler.compile(Puppet::Node.new("mynode"))
+
+      notify_resource = catalog.resource( "Notify[x]" )
+
+      notify_resource[:require].title.should == "Experiment::Baz"
+    end
+  end
 end

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

@@ -2,7 +2,6 @@
 
 require File.dirname(__FILE__) + '/../../../spec_helper'
 
-require 'puppettest'
 require 'puppettest/support/utils'
 require 'puppettest/fileparsing'
 
@@ -11,15 +10,16 @@ provider_class = Puppet::Type.type(:mailalias).provider(:aliases)
 describe provider_class do
   include PuppetTest
   include PuppetTest::FileParsing
+  include PuppetTest::Support::Utils
 
   before :each do
     @provider = provider_class
   end
 
   # #1560
-  PuppetTest.fakedata("data/providers/mailalias/aliases").each { |file|
-    it "should be able to parse the examples in #{file}" do
+  it "should be able to parse the mailalias examples" do
+    fakedata("data/providers/mailalias/aliases").each { |file|
       fakedataparse(file)
-    end
-  }
+    }
+  end
 end

data/spec/integration/ssl/certificate_authority_spec.rb

@@ -17,6 +17,7 @@ describe Puppet::SSL::CertificateAuthority do
 
     Puppet.settings[:confdir] = @dir
     Puppet.settings[:vardir] = @dir
+    Puppet.settings[:group] = Process.gid
 
     Puppet::SSL::Host.ca_location = :local
     @ca = Puppet::SSL::CertificateAuthority.new

data/spec/integration/ssl/certificate_request_spec.rb

@@ -21,6 +21,7 @@ describe Puppet::SSL::CertificateRequest do
 
     Puppet.settings[:confdir] = @dir
     Puppet.settings[:vardir] = @dir
+    Puppet.settings[:group] = Process.gid
 
     Puppet::SSL::Host.ca_location = :none
 

data/spec/integration/ssl/certificate_revocation_list_spec.rb

@@ -17,6 +17,7 @@ describe Puppet::SSL::CertificateRevocationList do
 
     Puppet.settings[:confdir] = @dir
     Puppet.settings[:vardir] = @dir
+    Puppet.settings[:group] = Process.gid
 
     Puppet::SSL::Host.ca_location = :local
   end

data/spec/integration/ssl/host_spec.rb

@@ -17,6 +17,7 @@ describe Puppet::SSL::Host do
 
     Puppet.settings[:confdir] = @dir
     Puppet.settings[:vardir] = @dir
+    Puppet.settings[:group] = Process.gid
 
     Puppet::SSL::Host.ca_location = :local
 

data/spec/monkey_patches/add_confine_and_runnable_to_rspec_dsl.rb

@@ -5,7 +5,6 @@ dir = File.expand_path(File.dirname(__FILE__))
 end
 
 require 'spec'
-require 'puppettest'
 require 'puppettest/runnable_test'
 
 module Spec

data/spec/monkey_patches/publicize_methods.rb

@@ -0,0 +1,11 @@
+# Some monkey-patching to allow us to test private methods.
+class Class
+    def publicize_methods(*methods)
+        saved_private_instance_methods = methods.empty? ? self.private_instance_methods : methods
+
+        self.class_eval { public(*saved_private_instance_methods) }
+        yield
+        self.class_eval { private(*saved_private_instance_methods) }
+    end
+end
+

data/spec/shared_behaviours/file_serving.rb

@@ -15,7 +15,7 @@ describe "Puppet::FileServing::Files", :shared => true do
     @test_class.find(uri)
   end
 
-  it "should use the rest terminus when the 'puppet' URI scheme is used, no host name is present, and the process name is not 'puppet'" do
+  it "should use the rest terminus when the 'puppet' URI scheme is used, no host name is present, and the process name is not 'puppet' or 'apply'" do
     uri = "puppet:///fakemod/my/file"
     Puppet.settings.stubs(:value).returns "foo"
     Puppet.settings.stubs(:value).with(:name).returns("puppetd")
@@ -35,6 +35,17 @@ describe "Puppet::FileServing::Files", :shared => true do
     @test_class.find(uri)
   end
 
+  it "should use the file_server terminus when the 'puppet' URI scheme is used, no host name is present, and the process name is 'apply'" do
+    uri = "puppet:///fakemod/my/file"
+    Puppet::Node::Environment.stubs(:new).returns(stub("env", :name => "testing", :module => nil, :modulepath => []))
+    Puppet.settings.stubs(:value).returns ""
+    Puppet.settings.stubs(:value).with(:name).returns("apply")
+    Puppet.settings.stubs(:value).with(:fileserverconfig).returns("/whatever")
+    @indirection.terminus(:file_server).expects(:find)
+    @indirection.terminus(:file_server).stubs(:authorized?).returns(true)
+    @test_class.find(uri)
+  end
+
   it "should use the file terminus when the 'file' URI scheme is used" do
     uri = "file:///fakemod/my/file"
     @indirection.terminus(:file).expects(:find)

data/spec/spec_helper.rb

@@ -6,20 +6,11 @@ dir = File.expand_path(File.dirname(__FILE__))
 $LOAD_PATH.unshift("#{dir}/")
 $LOAD_PATH.unshift("#{dir}/lib") # a spec-specific test lib dir
 $LOAD_PATH.unshift("#{dir}/../lib")
-$LOAD_PATH.unshift("#{dir}/../test/lib")  # Add the old test dir, so that we can still find our local mocha and spec
 
-# include any gems in vendor/gems
-Dir["#{dir}/../vendor/gems/**"].each do |path|
-  libpath = File.join(path, "lib")
-  if File.directory?(libpath)
-    $LOAD_PATH.unshift(libpath)
-  else
-    $LOAD_PATH.unshift(path)
-  end
-end
+# Don't want puppet getting the command line arguments for rake or autotest
+ARGV.clear
 
-require 'puppettest'
-require 'puppettest/runnable_test'
+require 'puppet'
 require 'mocha'
 gem 'rspec', '>=1.2.9'
 require 'spec/autorun'
@@ -29,17 +20,13 @@ module PuppetSpec
   FIXTURE_DIR = File.join(dir = File.expand_path(File.dirname(__FILE__)), "fixtures") unless defined?(FIXTURE_DIR)
 end
 
-# load any monkey-patches
-Dir["#{dir}/monkey_patches/*.rb"].map { |file| require file }
+require 'monkey_patches/alias_should_to_must'
+require 'monkey_patches/add_confine_and_runnable_to_rspec_dsl'
+require 'monkey_patches/publicize_methods'
 
 Spec::Runner.configure do |config|
   config.mock_with :mocha
 
-#  config.prepend_before :all do
-#      setup_mocks_for_rspec
-#      setup if respond_to? :setup
-#  end
-#
   config.prepend_after :each do
     Puppet.settings.clear
     Puppet::Node::Environment.clear
@@ -88,10 +75,4 @@ Spec::Runner.configure do |config|
   end
 end
 
-# We need this because the RAL uses 'should' as a method.  This
-# allows us the same behaviour but with a different method name.
-class Object
-  alias :must :should
-end
-
 end