puppet 2.7.8 → 2.7.9

data/spec/integration/util/windows/security_spec.rb

@@ -123,7 +123,7 @@ describe "Puppet::Util::Windows::Security", :if => Puppet.features.microsoft_win
         end
 
         describe "#mode=" do
-          (0000..0700).step(0100).each do |mode|
+          (0000..0700).step(0100) do |mode|
             it "should enforce mode #{mode.to_s(8)}" do
               winsec.set_mode(mode, path)
 

data/spec/unit/application/agent_spec.rb

@@ -437,6 +437,32 @@ describe Puppet::Application::Agent do
         @puppetd.setup_listen
       end
     end
+
+    describe "when setting up for fingerprint" do
+      before(:each) do
+        @puppetd.options.stubs(:[]).with(:fingerprint).returns(true)
+      end
+
+      it "should not setup as an agent" do
+        @puppetd.expects(:setup_agent).never
+        @puppetd.setup
+      end
+
+      it "should not create an agent" do
+        Puppet::Agent.stubs(:new).with(Puppet::Configurer).never
+        @puppetd.setup
+      end
+
+      it "should not daemonize" do
+        @daemon.expects(:daemonize).never
+        @puppetd.setup
+      end
+
+      it "should setup our certificate host" do
+        @puppetd.expects(:setup_host)
+        @puppetd.setup
+      end
+    end
   end
 
 

data/spec/unit/application/apply_spec.rb

@@ -20,7 +20,7 @@ describe Puppet::Application::Apply do
     Puppet::Node.indirection.cache_class = nil
   end
 
-  [:debug,:loadclasses,:verbose,:use_nodes,:detailed_exitcodes].each do |option|
+  [:debug,:loadclasses,:verbose,:use_nodes,:detailed_exitcodes,:catalog].each do |option|
     it "should declare handle_#{option} method" do
       @apply.should respond_to("handle_#{option}".to_sym)
     end
@@ -53,6 +53,17 @@ describe Puppet::Application::Apply do
 
       @apply.handle_logdest("console")
     end
+
+    it "should deprecate --apply" do
+      Puppet.expects(:warning).with do |arg|
+        arg.match(/--apply is deprecated/)
+      end
+
+      command_line = Puppet::Util::CommandLine.new('puppet', ['apply', '--apply', 'catalog.json'])
+      apply = Puppet::Application::Apply.new(command_line)
+      apply.stubs(:run_command)
+      apply.run
+    end
   end
 
   describe "during setup" do

data/spec/unit/face/module/build_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+require 'puppet/face'
+
+describe "puppet module build" do
+  subject { Puppet::Face[:module, :current] }
+
+  describe "option validation" do
+    context "without any options" do
+      it "should require a path" do
+        pattern = /wrong number of arguments/
+        expect { subject.build }.to raise_error ArgumentError, pattern
+      end
+    end
+  end
+
+  describe "inline documentation" do
+    subject { Puppet::Face[:module, :current].get_action :build }
+
+    its(:summary)     { should =~ /build.*module/im }
+    its(:description) { should =~ /build.*module/im }
+    its(:returns)     { should =~ /pathname/i }
+    its(:examples)    { should_not be_empty }
+
+    %w{ license copyright summary description returns examples }.each do |doc|
+      context "of the" do
+        its(doc.to_sym) { should_not =~ /(FIXME|REVISIT|TODO)/ }
+      end
+    end
+  end
+end

data/spec/unit/face/module/changes_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+require 'puppet/face'
+
+describe "puppet module changes" do
+  subject { Puppet::Face[:module, :current] }
+
+  describe "option validation" do
+    context "without any options" do
+      it "should require a path" do
+        pattern = /wrong number of arguments/
+        expect { subject.changes }.to raise_error ArgumentError, pattern
+      end
+    end
+  end
+
+  describe "inline documentation" do
+    subject { Puppet::Face[:module, :current].get_action :changes }
+
+    its(:summary)     { should =~ /modified.*module/im }
+    its(:description) { should =~ /modified.*module/im }
+    its(:returns)     { should =~ /array/i }
+    its(:examples)    { should_not be_empty }
+
+    %w{ license copyright summary description returns examples }.each do |doc|
+      context "of the" do
+        its(doc.to_sym) { should_not =~ /(FIXME|REVISIT|TODO)/ }
+      end
+    end
+  end
+end

data/spec/unit/face/module/clean_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+require 'puppet/face'
+
+describe "puppet module clean" do
+  subject { Puppet::Face[:module, :current] }
+
+  describe "option validation" do
+    context "without any options" do
+      it "should not require any arguments" do
+        Puppet::Module::Tool::Applications::Cleaner.expects(:run).once
+        subject.clean
+      end
+    end
+  end
+
+  describe "inline documentation" do
+    subject { Puppet::Face[:module, :current].get_action :clean }
+
+    its(:summary)     { should =~ /clean.*module/im }
+    its(:description) { should =~ /clean.*module/im }
+    its(:returns)     { should =~ /hash/i }
+    its(:examples)    { should_not be_empty }
+
+    %w{ license copyright summary description returns examples }.each do |doc|
+      context "of the" do
+        its(doc.to_sym) { should_not =~ /(FIXME|REVISIT|TODO)/ }
+      end
+    end
+  end
+end

data/spec/unit/face/module/generate_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+require 'puppet/face'
+
+describe "puppet module generate" do
+  subject { Puppet::Face[:module, :current] }
+
+  describe "option validation" do
+    context "without any options" do
+      it "should require name" do
+        pattern = /wrong number of arguments/
+        expect { subject.generate }.to raise_error ArgumentError, pattern
+      end
+    end
+  end
+
+  describe "inline documentation" do
+    subject { Puppet::Face[:module, :current].get_action :generate }
+
+    its(:summary)     { should =~ /generate.*module/im }
+    its(:description) { should =~ /generate.*module/im }
+    its(:returns)     { should =~ /array/i }
+    its(:examples)    { should_not be_empty }
+
+    %w{ license copyright summary description returns examples }.each do |doc|
+      context "of the" do
+        its(doc.to_sym) { should_not =~ /(FIXME|REVISIT|TODO)/ }
+      end
+    end
+  end
+end

data/spec/unit/face/module/install_spec.rb

@@ -0,0 +1,75 @@
+require 'spec_helper'
+require 'puppet/face'
+require 'puppet/module_tool'
+
+describe "puppet module install" do
+  subject { Puppet::Face[:module, :current] }
+
+  let(:options) do
+    {}
+  end
+
+  describe "option validation" do
+    let(:expected_options) do
+      {
+        :install_dir => File.expand_path("/dev/null/modules"),
+        :module_repository => "http://forge.puppetlabs.com",
+      }
+    end
+
+    context "without any options" do
+      it "should require a name" do
+        pattern = /wrong number of arguments/
+        expect { subject.install }.to raise_error ArgumentError, pattern
+      end
+
+      it "should not require any options" do
+        Puppet::Module::Tool::Applications::Installer.expects(:run).with("puppetlabs-apache", expected_options).once
+        subject.install("puppetlabs-apache")
+      end
+    end
+
+    it "should accept the --force option" do
+      options[:force] = true
+      expected_options.merge!(options)
+      Puppet::Module::Tool::Applications::Installer.expects(:run).with("puppetlabs-apache", expected_options).once
+      subject.install("puppetlabs-apache", options)
+    end
+
+    it "should accept the --install-dir option" do
+      options[:install_dir] = "/foo/puppet/modules"
+      expected_options.merge!(options)
+      Puppet::Module::Tool::Applications::Installer.expects(:run).with("puppetlabs-apache", expected_options).once
+      subject.install("puppetlabs-apache", options)
+    end
+
+    it "should accept the --module-repository option" do
+      options[:module_repository] = "http://forge.example.com"
+      expected_options.merge!(options)
+      Puppet::Module::Tool::Applications::Installer.expects(:run).with("puppetlabs-apache", expected_options).once
+      subject.install("puppetlabs-apache", options)
+    end
+
+    it "should accept the --version option" do
+      options[:version] = "0.0.1"
+      expected_options.merge!(options)
+      Puppet::Module::Tool::Applications::Installer.expects(:run).with("puppetlabs-apache", expected_options).once
+      subject.install("puppetlabs-apache", options)
+    end
+  end
+
+  describe "inline documentation" do
+    subject { Puppet::Face[:module, :current].get_action :install }
+
+    its(:summary)     { should =~ /install.*module/im }
+    its(:description) { should =~ /install.*module/im }
+    its(:returns)     { should =~ /pathname/i }
+    its(:examples)    { should_not be_empty }
+
+    %w{ license copyright summary description returns examples }.each do |doc|
+      context "of the" do
+        its(doc.to_sym) { should_not =~ /(FIXME|REVISIT|TODO)/ }
+      end
+    end
+  end
+end

data/spec/unit/face/module/search_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+require 'puppet/face'
+
+describe "puppet module search" do
+  subject { Puppet::Face[:module, :current] }
+
+  let(:options) do
+    {}
+  end
+
+  describe "option validation" do
+    context "without any options" do
+      it "should require a search term" do
+        pattern = /wrong number of arguments/
+        expect { subject.search }.to raise_error ArgumentError, pattern
+      end
+    end
+
+    it "should accept the --module-repository option" do
+      options[:module_repository] = "http://forge.example.com"
+      Puppet::Module::Tool::Applications::Searcher.expects(:run).with("puppetlabs-apache", options).once
+      subject.search("puppetlabs-apache", options)
+    end
+  end
+
+  describe "inline documentation" do
+    subject { Puppet::Face[:module, :current].get_action :search }
+
+    its(:summary)     { should =~ /search.*module/im }
+    its(:description) { should =~ /search.*module/im }
+    its(:returns)     { should =~ /array/i }
+    its(:examples)    { should_not be_empty }
+
+    %w{ license copyright summary description returns examples }.each do |doc|
+      context "of the" do
+        its(doc.to_sym) { should_not =~ /(FIXME|REVISIT|TODO)/ }
+      end
+    end
+  end
+end

data/spec/unit/face/module_spec.rb

@@ -0,0 +1,3 @@
+# For face related tests, look in the spec/unit/faces/module folder.
+# For integration tests, which test the behavior of module, look in the
+# spec/unit/integration folder.

data/spec/unit/file_bucket/dipper_spec.rb

@@ -123,7 +123,7 @@ describe Puppet::FileBucket::Dipper do
         klass.any_instance.expects(:find).with { |r| request = r }.returns(Puppet::FileBucket::File.new(contents))
 
         dipper.restore(dest, md5).should == md5
-        Digest::MD5.file(dest).hexdigest.should == md5
+        Digest::MD5.hexdigest(Puppet::Util.binread(dest)).should == md5
 
         request.key.should == "md5/#{md5}"
         request.server.should == server

data/spec/unit/module_tool/application_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+require 'puppet/module_tool'
+
+describe Puppet::Module::Tool::Applications::Application do
+  describe 'app' do
+
+    good_versions = %w{ 1.2.4 0.0.1 0.0.0 0.0.2git-8-g3d316d1 0.0.3b1 10.100.10000
+                         0.1.2rc1 0.1.2dev-1 0.1.2svn12345 }
+    bad_versions = %w{ 0.1.2-3 0.1 0 0.1.2.3 dev }
+
+    before do
+      @app = Class.new(described_class).new
+    end
+
+    good_versions.each do |ver|
+      it "should accept version string #{ver}" do
+        @app.instance_eval("@filename=%q{puppetlabs-ntp-#{ver}}")
+        @app.parse_filename!
+      end
+    end
+
+    bad_versions.each do |ver|
+      it "should not accept version string #{ver}" do
+        @app.instance_eval("@filename=%q{puppetlabs-ntp-#{ver}}")
+        lambda { @app.parse_filename! }.should raise_error
+      end
+    end
+  end
+end

data/spec/unit/module_tool/metadata_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+require 'puppet/module_tool'
+
+describe Puppet::Module::Tool::Metadata do
+  context "when using default values" do
+    it "should set license to 'Apache License, Version 2.0'" do
+      metadata = Puppet::Module::Tool::Metadata.new
+      metadata.license.should == "Apache License, Version 2.0"
+    end
+  end
+end

data/spec/unit/module_tool/repository_spec.rb

@@ -0,0 +1,52 @@
+require 'spec_helper'
+require 'net/http'
+require 'puppet/module_tool'
+
+describe Puppet::Module::Tool::Repository do
+  describe 'instances' do
+    before do
+      @repository = described_class.new('http://fake.com')
+    end
+
+    describe '#make_http_request' do
+      before do
+        # Do a mock of the Proxy call so we can do proper expects for
+        # Net::HTTP
+        Net::HTTP.expects(:Proxy).returns(Net::HTTP)
+        Net::HTTP.expects(:start)
+      end
+      context "when not given an :authenticate option" do
+        it "should authenticate" do
+          @repository.expects(:authenticate).never
+          @repository.make_http_request(nil)
+        end
+      end
+      context "when given an :authenticate option" do
+        it "should authenticate" do
+          @repository.expects(:authenticate)
+          @repository.make_http_request(nil, :authenticate => true)
+        end
+      end
+    end
+
+    describe '#authenticate' do
+      it "should set basic auth on the request" do
+        authenticated_request = stub
+        authenticated_request.expects(:basic_auth)
+        @repository.expects(:prompt).twice
+        @repository.authenticate(authenticated_request)
+      end
+    end
+
+    describe '#retrieve' do
+      before do
+        @uri = URI.parse('http://some.url.com')
+      end
+
+      it "should access the cache" do
+        @repository.cache.expects(:retrieve).with(@uri)
+        @repository.retrieve(@uri)
+      end
+    end
+  end
+end

data/spec/unit/module_tool_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+require 'puppet/module_tool'
+
+describe Puppet::Module::Tool do
+  describe 'http_proxy support' do
+    before :each do
+      ENV["http_proxy"] = nil
+    end
+
+    after :each do
+      ENV["http_proxy"] = nil
+    end
+
+    it "should support environment variable for port and host" do
+      ENV["http_proxy"] = "http://test.com:8011"
+      described_class.http_proxy_host.should == "test.com"
+      described_class.http_proxy_port.should == 8011
+    end
+
+    it "should support puppet configuration for port and host" do
+      ENV["http_proxy"] = nil
+      Puppet.settings.stubs(:[]).with(:http_proxy_host).returns('test.com')
+      Puppet.settings.stubs(:[]).with(:http_proxy_port).returns(7456)
+
+      described_class.http_proxy_port.should == 7456
+      described_class.http_proxy_host.should == "test.com"
+    end
+
+    it "should use environment variable before puppet settings" do
+      ENV["http_proxy"] = "http://test1.com:8011"
+      Puppet.settings.stubs(:[]).with(:http_proxy_host).returns('test2.com')
+      Puppet.settings.stubs(:[]).with(:http_proxy_port).returns(7456)
+
+      described_class.http_proxy_host.should == "test1.com"
+      described_class.http_proxy_port.should == 8011
+    end
+  end
+end