puppet 2.7.26 → 3.0.0.rc4

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

@@ -37,7 +37,8 @@ describe "puppet module install" do
       end
 
       it "should not require any options" do
-        Puppet::ModuleTool::Applications::Installer.expects(:run).with("puppetlabs-apache", expected_options).once
+        expects_installer_run_with("puppetlabs-apache", expected_options)
+
         subject.install("puppetlabs-apache")
       end
     end
@@ -45,7 +46,9 @@ describe "puppet module install" do
     it "should accept the --force option" do
       options[:force] = true
       expected_options.merge!(options)
-      Puppet::ModuleTool::Applications::Installer.expects(:run).with("puppetlabs-apache", expected_options).once
+
+      expects_installer_run_with("puppetlabs-apache", expected_options)
+
       subject.install("puppetlabs-apache", options)
     end
 
@@ -54,35 +57,38 @@ describe "puppet module install" do
       expected_options.merge!(options)
       expected_options[:modulepath] = "#{options[:target_dir]}#{sep}#{fakemodpath}"
 
-      Puppet::ModuleTool::Applications::Installer.expects(:run).with("puppetlabs-apache", expected_options).once
+      expects_installer_run_with("puppetlabs-apache", expected_options)
+
       subject.install("puppetlabs-apache", options)
     end
 
     it "should accept the --version option" do
       options[:version] = "0.0.1"
       expected_options.merge!(options)
-      Puppet::ModuleTool::Applications::Installer.expects(:run).with("puppetlabs-apache", expected_options).once
+
+      expects_installer_run_with("puppetlabs-apache", expected_options)
+
       subject.install("puppetlabs-apache", options)
     end
 
     it "should accept the --ignore-dependencies option" do
       options[:ignore_dependencies] = true
       expected_options.merge!(options)
-      Puppet::ModuleTool::Applications::Installer.expects(:run).with("puppetlabs-apache", expected_options).once
+
+      expects_installer_run_with("puppetlabs-apache", expected_options)
+
       subject.install("puppetlabs-apache", options)
     end
 
     describe "when modulepath option is passed" do
-      let(:expected_options) { { :modulepath => fakemodpath, :environment => 'production' } }
+      let(:expected_options) { { :modulepath => fakemodpath, :environment => Puppet[:environment] } }
       let(:options)          { { :modulepath => fakemodpath } }
 
       describe "when target-dir option is not passed" do
         it "should set target-dir to be first path from modulepath" do
           expected_options[:target_dir] = fakefirstpath
 
-          Puppet::ModuleTool::Applications::Installer.
-            expects(:run).
-            with("puppetlabs-apache", expected_options)
+          expects_installer_run_with("puppetlabs-apache", expected_options)
 
           Puppet::Face[:module, :current].install("puppetlabs-apache", options)
 
@@ -96,31 +102,18 @@ describe "puppet module install" do
           expected_options[:target_dir] = expanded_path
           expected_options[:modulepath] = "modules"
 
-          Puppet::ModuleTool::Applications::Installer.expects(:run).with("puppetlabs-apache", expected_options).once
-          subject.install("puppetlabs-apache", options)
+          expects_installer_run_with("puppetlabs-apache", expected_options)
+          Puppet::Face[:module, :current].install("puppetlabs-apache", options)
         end
       end
 
       describe "when target-dir option is passed" do
-        it "should expand the target directory when target_dir is set" do
-          options[:target_dir] = "modules"
-          expanded_path = File.expand_path("modules")
-          expected_options.merge!(options)
-          expected_options[:target_dir] = expanded_path
-          expected_options[:modulepath] = "modules#{sep}#{fakemodpath}"
-
-          Puppet::ModuleTool::Applications::Installer.expects(:run).with("puppetlabs-apache", expected_options).once
-          subject.install("puppetlabs-apache", options)
-        end
-
         it "should set target-dir to be first path of modulepath" do
           options[:target_dir] = fakedirpath
           expected_options[:target_dir] = fakedirpath
           expected_options[:modulepath] = "#{fakedirpath}#{sep}#{fakemodpath}"
 
-          Puppet::ModuleTool::Applications::Installer.
-            expects(:run).
-            with("puppetlabs-apache", expected_options)
+          expects_installer_run_with("puppetlabs-apache", expected_options)
 
           Puppet::Face[:module, :current].install("puppetlabs-apache", options)
 
@@ -139,9 +132,7 @@ describe "puppet module install" do
           expected_options[:target_dir] = fakefirstpath
           expected_options[:modulepath] = fakemodpath
 
-          Puppet::ModuleTool::Applications::Installer.
-            expects(:run).
-            with("puppetlabs-apache", expected_options)
+          expects_installer_run_with("puppetlabs-apache", expected_options)
 
           Puppet::Face[:module, :current].install("puppetlabs-apache", options)
         end
@@ -153,13 +144,22 @@ describe "puppet module install" do
           expected_options[:target_dir] = fakedirpath
           expected_options[:modulepath] = "#{options[:target_dir]}#{sep}#{fakemodpath}"
 
-          Puppet::ModuleTool::Applications::Installer.
-            expects(:run).
-            with("puppetlabs-apache", expected_options)
+          expects_installer_run_with("puppetlabs-apache", expected_options)
 
           Puppet::Face[:module, :current].install("puppetlabs-apache", options)
           Puppet.settings[:modulepath].should == expected_options[:modulepath]
         end
+
+        it "should expand the target directory when target_dir is set" do
+          options[:target_dir] = "modules"
+          expanded_path = File.expand_path("modules")
+          expected_options.merge!(options)
+          expected_options[:target_dir] = expanded_path
+          expected_options[:modulepath] = "#{expanded_path}#{sep}#{fakemodpath}"
+
+          expects_installer_run_with("puppetlabs-apache", expected_options)
+          Puppet::Face[:module, :current].install("puppetlabs-apache", options)
+        end
       end
     end
   end
@@ -178,4 +178,19 @@ describe "puppet module install" do
       end
     end
   end
+
+  def expects_installer_run_with(name, options)
+    installer = mock("Installer")
+    install_dir = mock("InstallDir")
+    forge = mock("Forge")
+
+    Puppet::Forge.expects(:new).with("PMT", subject.version).returns(forge)
+    Puppet::ModuleTool::InstallDirectory.expects(:new).
+      with(Pathname.new(expected_options[:target_dir])).
+      returns(install_dir)
+    Puppet::ModuleTool::Applications::Installer.expects(:new).
+      with("puppetlabs-apache", forge, install_dir, expected_options).
+      returns(installer)
+    installer.expects(:run)
+  end
 end

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

@@ -5,7 +5,7 @@ require 'puppet/face'
 require 'puppet/module_tool'
 require 'puppet_spec/modules'
 
-describe "puppet module list", :fails_on_windows => true do
+describe "puppet module list" do
   include PuppetSpec::Files
 
   before do
@@ -37,36 +37,36 @@ describe "puppet module list", :fails_on_windows => true do
 
     Puppet::Face[:module, :current].list.should == {
       @modpath1 => [
-        Puppet::Module.new('bar', :environment => env, :path => barmod1.path),
-        Puppet::Module.new('foo', :environment => env, :path => foomod1.path)
+        Puppet::Module.new('bar', barmod1.path, env),
+        Puppet::Module.new('foo', foomod1.path, env)
       ],
-      @modpath2 => [Puppet::Module.new('foo', :environment => env, :path => foomod2.path)]
+      @modpath2 => [Puppet::Module.new('foo', foomod2.path, env)]
     }
   end
 
   it "should use the specified environment" do
-    PuppetSpec::Modules.create('foo', @modpath1)
-    PuppetSpec::Modules.create('bar', @modpath1)
+    foomod = PuppetSpec::Modules.create('foo', @modpath1)
+    barmod = PuppetSpec::Modules.create('bar', @modpath1)
 
     usedenv = Puppet::Node::Environment.new('useme')
     usedenv.modulepath = [@modpath1, @modpath2]
 
     Puppet::Face[:module, :current].list(:environment => 'useme').should == {
       @modpath1 => [
-        Puppet::Module.new('bar', :environment => usedenv),
-        Puppet::Module.new('foo', :environment => usedenv)
+        Puppet::Module.new('bar', barmod.path, usedenv),
+        Puppet::Module.new('foo', foomod.path, usedenv)
       ],
       @modpath2 => []
     }
   end
 
   it "should use the specified modulepath" do
-    PuppetSpec::Modules.create('foo', @modpath1)
-    PuppetSpec::Modules.create('bar', @modpath2)
+    foomod = PuppetSpec::Modules.create('foo', @modpath1)
+    barmod = PuppetSpec::Modules.create('bar', @modpath2)
 
     Puppet::Face[:module, :current].list(:modulepath => "#{@modpath1}#{File::PATH_SEPARATOR}#{@modpath2}").should == {
-      @modpath1 => [ Puppet::Module.new('foo') ],
-      @modpath2 => [ Puppet::Module.new('bar') ]
+      @modpath1 => [ Puppet::Module.new('foo', foomod.path, Puppet::Node::Environment.new) ],
+      @modpath2 => [ Puppet::Module.new('bar', barmod.path, Puppet::Node::Environment.new) ]
     }
   end
 
@@ -82,8 +82,8 @@ describe "puppet module list", :fails_on_windows => true do
     # to have a different object_id than the env above
     env = Puppet::Node::Environment.new('myenv')
     list.should == {
-      @modpath1 => [ Puppet::Module.new('foo', :environment => env, :path => foomod1.path) ],
-      @modpath2 => [ Puppet::Module.new('bar', :environment => env, :path => barmod2.path) ]
+      @modpath1 => [ Puppet::Module.new('foo', foomod1.path, env) ],
+      @modpath2 => [ Puppet::Module.new('bar', barmod2.path, env) ]
     }
   end
 
@@ -115,16 +115,14 @@ describe "puppet module list", :fails_on_windows => true do
 
       dependency_tree = Puppet::Face[:module, :current].list
 
-      output = Puppet::Face[:module, :current].list_when_rendering_console(
-        dependency_tree,
-        {}
-      )
+      output = Puppet::Face[:module, :current].
+        list_when_rendering_console(dependency_tree, {})
 
       output.should == <<-HEREDOC.gsub('        ', '')
         #{modpath}
         ├── metaman-metadata (\e[0;36mv9.9.9\e[0m)
         └── nometadata (\e[0;36m???\e[0m)
-      HEREDOC
+        HEREDOC
     end
 
     it "should print the modulepaths in the order they are in the modulepath setting" do
@@ -175,8 +173,7 @@ describe "puppet module list", :fails_on_windows => true do
         └─┬ puppetlabs-other_mod (\e[0;36mv1.0.0\e[0m)
           └── puppetlabs-dependable (\e[0;36mv0.0.5\e[0m)
         #{@modpath2} (no modules installed)
-      HEREDOC
+        HEREDOC
     end
   end
-
 end

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

@@ -3,7 +3,7 @@ require 'puppet/face'
 require 'puppet/application/module'
 require 'puppet/module_tool'
 
-describe "puppet module search", :fails_on_windows => true do
+describe "puppet module search" do
   subject { Puppet::Face[:module, :current] }
 
   let(:options) do
@@ -21,13 +21,27 @@ describe "puppet module search", :fails_on_windows => true do
     before { Puppet::Util::Terminal.stubs(:width).returns(100) }
 
     it 'should output nothing when receiving an empty dataset' do
-      subject.render([], ['apache', {}]).should == "No results found for 'apache'."
+      subject.render({:answers => [], :result => :sucess}, ['apache', {}]).should == "No results found for 'apache'."
+    end
+
+    it 'should return error and exit when error returned' do
+      results = {
+        :result => :failure,
+        :error => {
+          :oneline => 'Something failed',
+          :multiline => 'Something failed',
+        }
+      }
+      expect { subject.render(results, ['apache', {}]) }.to raise_error 'Something failed'
     end
 
     it 'should output a header when receiving a non-empty dataset' do
-      results = [
-        {'full_name' => '', 'author' => '', 'desc' => '', 'tag_list' => [] },
-      ]
+      results = {
+        :result => :success,
+        :answers => [
+          {'full_name' => '', 'author' => '', 'desc' => '', 'tag_list' => [] },
+        ],
+      }
 
       subject.render(results, ['apache', {}]).should =~ /NAME/
       subject.render(results, ['apache', {}]).should =~ /DESCRIPTION/
@@ -36,9 +50,12 @@ describe "puppet module search", :fails_on_windows => true do
     end
 
     it 'should output the relevant fields when receiving a non-empty dataset' do
-      results = [
-        {'full_name' => 'Name', 'author' => 'Author', 'desc' => 'Summary', 'tag_list' => ['tag1', 'tag2'] },
-      ]
+      results = {
+        :result => :success,
+        :answers => [
+          {'full_name' => 'Name', 'author' => 'Author', 'desc' => 'Summary', 'tag_list' => ['tag1', 'tag2'] },
+        ]
+      }
 
       subject.render(results, ['apache', {}]).should =~ /Name/
       subject.render(results, ['apache', {}]).should =~ /Author/
@@ -48,53 +65,65 @@ describe "puppet module search", :fails_on_windows => true do
     end
 
     it 'should elide really long descriptions' do
-      results = [
-        {
-          'full_name' => 'Name',
-          'author' => 'Author',
-          'desc' => 'This description is really too long to fit in a single data table, guys -- we should probably set about truncating it',
-          'tag_list' => ['tag1', 'tag2'],
-        },
-      ]
+      results = {
+        :result => :success,
+        :answers => [
+          {
+            'full_name' => 'Name',
+            'author' => 'Author',
+            'desc' => 'This description is really too long to fit in a single data table, guys -- we should probably set about truncating it',
+            'tag_list' => ['tag1', 'tag2'],
+          },
+        ]
+      }
 
       subject.render(results, ['apache', {}]).should =~ /\.{3}  @Author/
     end
 
     it 'should never truncate the module name' do
-      results = [
-        {
-          'full_name' => 'This-module-has-a-really-really-long-name',
-          'author' => 'Author',
-          'desc' => 'Description',
-          'tag_list' => ['tag1', 'tag2'],
-        },
-      ]
+      results = {
+        :result => :success,
+        :answers => [
+          {
+            'full_name' => 'This-module-has-a-really-really-long-name',
+            'author' => 'Author',
+            'desc' => 'Description',
+            'tag_list' => ['tag1', 'tag2'],
+          },
+        ]
+      }
 
       subject.render(results, ['apache', {}]).should =~ /This-module-has-a-really-really-long-name/
     end
 
     it 'should never truncate the author name' do
-      results = [
-        {
-          'full_name' => 'Name',
-          'author' => 'This-author-has-a-really-really-long-name',
-          'desc' => 'Description',
-          'tag_list' => ['tag1', 'tag2'],
-        },
-      ]
+      results = {
+        :result => :success,
+        :answers => [
+          {
+            'full_name' => 'Name',
+            'author' => 'This-author-has-a-really-really-long-name',
+            'desc' => 'Description',
+            'tag_list' => ['tag1', 'tag2'],
+          },
+        ]
+      }
 
       subject.render(results, ['apache', {}]).should =~ /@This-author-has-a-really-really-long-name/
     end
 
     it 'should never remove tags that match the search term' do
-      results = [
-        {
-          'full_name' => 'Name',
-          'author' => 'Author',
-          'desc' => 'Description',
-          'tag_list' => ['Supercalifragilisticexpialidocious'] + (1..100).map { |i| "tag#{i}" },
-        },
-      ]
+      results = {
+        :results => :success,
+        :answers => [
+          {
+            'full_name' => 'Name',
+            'author' => 'Author',
+            'desc' => 'Description',
+            'tag_list' => ['Supercalifragilisticexpialidocious'] + (1..100).map { |i| "tag#{i}" },
+          },
+        ]
+      }
 
       subject.render(results, ['Supercalifragilisticexpialidocious', {}]).should =~ /Supercalifragilisticexpialidocious/
       subject.render(results, ['Supercalifragilisticexpialidocious', {}]).should_not =~ /tag/
@@ -114,14 +143,17 @@ describe "puppet module search", :fails_on_windows => true do
              "Name          This description is really too long to fit in a single data table, guys -- we should probably set about trunca...  @JohnnyApples  tag1 tag2 taggitty3#{' '*37}\n"
     }.each do |width, expectation|
       it "should resize the table to fit the screen, when #{width} columns" do
-        results = [
-          {
-            'full_name' => 'Name',
-            'author' => 'JohnnyApples',
-            'desc' => 'This description is really too long to fit in a single data table, guys -- we should probably set about truncating it',
-            'tag_list' => ['tag1', 'tag2', 'taggitty3'],
-          },
-        ]
+        results = {
+          :result => :success,
+          :answers => [
+            {
+              'full_name' => 'Name',
+              'author' => 'JohnnyApples',
+              'desc' => 'This description is really too long to fit in a single data table, guys -- we should probably set about truncating it',
+              'tag_list' => ['tag1', 'tag2', 'taggitty3'],
+            },
+          ]
+        }
 
         Puppet::Util::Terminal.expects(:width).returns(width)
         result = subject.render(results, ['apache', {}])
@@ -140,8 +172,14 @@ describe "puppet module search", :fails_on_windows => true do
     end
 
     it "should accept the --module-repository option" do
+      forge = mock("Puppet::Forge")
+      searcher = mock("Searcher")
       options[:module_repository] = "http://forge.example.com"
-      Puppet::ModuleTool::Applications::Searcher.expects(:run).with("puppetlabs-apache", options).once
+
+      Puppet::Forge.expects(:new).with("PMT", subject.version).returns(forge)
+      Puppet::ModuleTool::Applications::Searcher.expects(:new).with("puppetlabs-apache", forge, has_entries(options)).returns(searcher)
+      searcher.expects(:run)
+
       subject.search("puppetlabs-apache", options)
     end
   end

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

@@ -25,7 +25,7 @@ describe "puppet module uninstall" do
     it "should accept the --environment option" do
       options[:environment] = "development"
       expected_options = { :environment => 'development' }
-      Puppet::ModuleTool::Applications::Uninstaller.expects(:run).with("puppetlabs-apache", expected_options).once
+      Puppet::ModuleTool::Applications::Uninstaller.expects(:run).with("puppetlabs-apache", has_entries(expected_options)).once
       subject.uninstall("puppetlabs-apache", options)
     end
 
@@ -35,7 +35,7 @@ describe "puppet module uninstall" do
         :modulepath => '/foo/puppet/modules',
         :environment => 'production',
       }
-      Puppet::ModuleTool::Applications::Uninstaller.expects(:run).with("puppetlabs-apache", expected_options).once
+      Puppet::ModuleTool::Applications::Uninstaller.expects(:run).with("puppetlabs-apache", has_entries(expected_options)).once
       subject.uninstall("puppetlabs-apache", options)
     end
 
@@ -45,7 +45,7 @@ describe "puppet module uninstall" do
         :version => '1.0.0',
         :environment => 'production',
       }
-      Puppet::ModuleTool::Applications::Uninstaller.expects(:run).with("puppetlabs-apache", expected_options).once
+      Puppet::ModuleTool::Applications::Uninstaller.expects(:run).with("puppetlabs-apache", has_entries(expected_options)).once
       subject.uninstall("puppetlabs-apache", options)
     end
 
@@ -55,7 +55,7 @@ describe "puppet module uninstall" do
         :environment => 'production',
         :force => true,
       }
-      Puppet::ModuleTool::Applications::Uninstaller.expects(:run).with("puppetlabs-apache", expected_options).once
+      Puppet::ModuleTool::Applications::Uninstaller.expects(:run).with("puppetlabs-apache", has_entries(expected_options)).once
       subject.uninstall("puppetlabs-apache", options)
     end
   end