puppet 2.7.14 → 2.7.16

data/spec/unit/node/environment_spec.rb

@@ -161,12 +161,17 @@ describe Puppet::Node::Environment do
     end
 
     it "should be able to return an individual module that exists in its module path" do
+      env.stubs(:modules).returns [Puppet::Module.new('one'), Puppet::Module.new('two'), Puppet::Module.new('three')]
 
-      mod = mock 'module'
-      Puppet::Module.expects(:new).with("one", :environment => env).returns mod
-      mod.expects(:exist?).returns true
+      mod = env.module('one')
+      mod.should be_a(Puppet::Module)
+      mod.name.should == 'one'
+    end
+
+    it "should not return a module if the module doesn't exist" do
+      env.stubs(:modules).returns [Puppet::Module.new('one'), Puppet::Module.new('two'), Puppet::Module.new('three')]
 
-      env.module("one").should equal(mod)
+      env.module('four').should be_nil
     end
 
     it "should return nil if asked for a module that does not exist in its path" do

data/spec/unit/parser/ast/leaf_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#!/usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 describe Puppet::Parser::AST::Leaf do
@@ -95,7 +95,7 @@ describe Puppet::Parser::AST::Undef do
   end
 
   it "should not match undef with an empty string" do
-    @undef.evaluate_match("", @scope).should be_false
+    @undef.evaluate_match("", @scope).should be_true
   end
 end
 

data/spec/unit/parser/ast_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#!/usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 require 'puppet/parser/ast'
@@ -102,9 +102,9 @@ describe 'AST Generic Child' do
       @evaluateable.evaluate_match(parameter, @scope)
     end
 
-    it "should not match '' if value is undef" do
+    it "should match '' if value is undef" do
       @evaluateable.value = :undef
-      @evaluateable.evaluate_match('', @scope).should be_false
+      @evaluateable.evaluate_match('', @scope).should be_true
     end
   end
 end

data/spec/unit/parser/compiler_spec.rb

@@ -741,23 +741,6 @@ describe Puppet::Parser::Compiler do
 
       @compiler.send(:evaluate_ast_node)
     end
-
-    it "should set the node's scope as the top scope" do
-      node_resource = stub 'node resource', :ref => "Node[c]", :evaluate => nil, :type => "node"
-      node_class = stub 'node', :name => "c", :ensure_in_catalog => node_resource
-
-      @compiler.known_resource_types.stubs(:node).with("c").returns(node_class)
-
-      # The #evaluate method normally does this.
-      scope = stub 'scope', :source => "mysource"
-      @compiler.topscope.expects(:class_scope).with(node_class).returns(scope)
-      node_resource.stubs(:evaluate)
-      @compiler.stubs :create_settings_scope
-
-      @compiler.compile
-
-      @compiler.topscope.should equal(scope)
-    end
   end
 
   describe "when managing resource overrides" do

data/spec/unit/parser/lexer_spec.rb

@@ -406,6 +406,44 @@ describe Puppet::Parser::Lexer::TOKENS[:RETURN] do
   end
 end
 
+shared_examples_for "variable names in the lexer" do |prefix|
+  # Watch out - a regex might match a *prefix* on these, not just the whole
+  # word, so make sure you don't have false positive or negative results based
+  # on that.
+  legal   = %w{f foo f::b foo::b f::bar foo::bar 3 foo3 3foo}
+  illegal = %w{f- f-o -f f::-o f::o- f::o-o}
+
+  ["", "::"].each do |global_scope|
+    legal.each do |name|
+      var = prefix + global_scope + name
+      it "should accept #{var.inspect} as a valid variable name" do
+        (subject.regex.match(var) || [])[0].should == var
+      end
+    end
+
+    illegal.each do |name|
+      var = prefix + global_scope + name
+      it "should NOT accept #{var.inspect} as a valid variable name" do
+        (subject.regex.match(var) || [])[0].should_not == var
+      end
+    end
+  end
+end
+
+describe Puppet::Parser::Lexer::TOKENS[:DOLLAR_VAR] do
+  its(:skip_text) { should be_false }
+  its(:incr_line) { should be_false }
+
+  it_should_behave_like "variable names in the lexer", '$'
+end
+
+describe Puppet::Parser::Lexer::TOKENS[:VARIABLE] do
+  its(:skip_text) { should be_false }
+  its(:incr_line) { should be_false }
+
+  it_should_behave_like "variable names in the lexer", ''
+end
+
 def tokens_scanned_from(s)
   lexer = Puppet::Parser::Lexer.new
   lexer.string = s
@@ -663,11 +701,16 @@ describe "Puppet::Parser::Lexer in the old tests" do
   end
 
   it "should correctly lex variables" do
-    ["$variable", "$::variable", "$qualified::variable", "$further::qualified::variable", "$hyphenated-variable", "$-variable-with-leading-dash"].each do |string|
+    ["$variable", "$::variable", "$qualified::variable", "$further::qualified::variable"].each do |string|
       tokens_scanned_from(string).should be_like([:VARIABLE,string.sub(/^\$/,'')])
     end
   end
 
+  it "should end variables at `-`" do
+    tokens_scanned_from('$hyphenated-variable').
+      should be_like [:VARIABLE, "hyphenated"], [:MINUS, '-'], [:NAME, 'variable']
+  end
+
   it "should not include whitespace in a variable" do
     tokens_scanned_from("$foo bar").should_not be_like([:VARIABLE, "foo bar"])
   end
@@ -681,7 +724,7 @@ describe "Puppet::Parser::Lexer in the old tests when lexing example files" do
     it "should correctly lex #{file}" do
       lexer = Puppet::Parser::Lexer.new
       lexer.file = file
-      lambda { lexer.fullscan }.should_not raise_error
+      expect { lexer.fullscan }.should_not raise_error
     end
   end
 end

data/spec/unit/parser/scope_spec.rb

@@ -280,6 +280,22 @@ describe Puppet::Parser::Scope do
         end
       end
 
+      it "finds values in its included scope for a defined type (DEPRECATED)" do
+        expect_the_message_to_be('foo_msg') do <<-MANIFEST
+            node default {
+              include foo
+            }
+            class foo {
+              $var = "foo_msg"
+              bar { "testing": }
+            }
+            define bar() {
+              notify { 'something': message => $var, }
+            }
+          MANIFEST
+        end
+      end
+
       it "recognizes a dynamically scoped boolean (DEPRECATED)" do
         expect_the_message_to_be(true) do <<-MANIFEST
             node default {
@@ -337,32 +353,33 @@ describe Puppet::Parser::Scope do
         end
       end
 
-      it "finds top scope when the class is included before the node defines the var" do
-        expect_the_message_to_be('top_msg') do <<-MANIFEST
-            $var = "top_msg"
-            node parent {
-              include foo
-            }
-            node default inherits parent {
-              $var = "default_msg"
+      it "finds values in its local scope" do
+        expect_the_message_to_be('local_msg') do <<-MANIFEST
+            node default {
+              include baz
             }
             class foo {
+            }
+            class bar inherits foo {
+              $var = "local_msg"
               notify { 'something': message => $var, }
             }
+            class baz {
+              include bar
+            }
           MANIFEST
         end
       end
 
-
-      it "should find values in its local scope" do
-        expect_the_message_to_be('local_msg') do <<-MANIFEST
+      it "finds values in its inherited scope" do
+        expect_the_message_to_be('foo_msg') do <<-MANIFEST
             node default {
               include baz
             }
             class foo {
+              $var = "foo_msg"
             }
             class bar inherits foo {
-              $var = "local_msg"
               notify { 'something': message => $var, }
             }
             class baz {
@@ -372,7 +389,40 @@ describe Puppet::Parser::Scope do
         end
       end
 
-      it "should find values in its inherited scope" do
+      it "prefers values in its local scope over values in the inherited scope" do
+        expect_the_message_to_be('local_msg') do <<-MANIFEST
+            include bar
+
+            class foo {
+              $var = "inherited"
+            }
+
+            class bar inherits foo {
+              $var = "local_msg"
+              notify { 'something': message => $var, }
+            }
+          MANIFEST
+        end
+      end
+
+      it "finds a qualified variable by following parent scopes of the specified scope" do
+        expect_the_message_to_be("from node") do <<-MANIFEST
+            class c {
+              notify { 'something': message => "$a::b" }
+            }
+            
+            class a { }
+
+            node default {
+              $b = "from node"
+              include a
+              include c
+            }
+          MANIFEST
+        end
+      end
+
+      it "finds values in its inherited scope when the inherited class is qualified to the top" do
         expect_the_message_to_be('foo_msg') do <<-MANIFEST
             node default {
               include baz
@@ -380,7 +430,7 @@ describe Puppet::Parser::Scope do
             class foo {
               $var = "foo_msg"
             }
-            class bar inherits foo {
+            class bar inherits ::foo {
               notify { 'something': message => $var, }
             }
             class baz {
@@ -390,6 +440,96 @@ describe Puppet::Parser::Scope do
         end
       end
 
+      it "prefers values in its local scope over values in the inherited scope when the inherited class is fully qualified" do
+        expect_the_message_to_be('local_msg') do <<-MANIFEST
+            include bar
+
+            class foo {
+              $var = "inherited"
+            }
+
+            class bar inherits ::foo {
+              $var = "local_msg"
+              notify { 'something': message => $var, }
+            }
+          MANIFEST
+        end
+      end
+
+      it "finds values in top scope when the inherited class is qualified to the top" do
+        expect_the_message_to_be('top msg') do <<-MANIFEST
+            $var = "top msg"
+            class foo {
+            }
+
+            class bar inherits ::foo {
+              notify { 'something': message => $var, }
+            }
+
+            include bar
+          MANIFEST
+        end
+      end
+
+      it "finds values in its inherited scope when the inherited class is a nested class that shadows another class at the top" do
+        expect_the_message_to_be('inner baz') do <<-MANIFEST
+            node default {
+              include foo::bar
+            }
+            class baz {
+              $var = "top baz"
+            }
+            class foo {
+              class baz {
+                $var = "inner baz"
+              }
+
+              class bar inherits baz {
+                notify { 'something': message => $var, }
+              }
+            }
+          MANIFEST
+        end
+      end
+
+      it "finds values in its inherited scope when the inherited class is qualified to a nested class and qualified to the top" do
+        expect_the_message_to_be('top baz') do <<-MANIFEST
+            node default {
+              include foo::bar
+            }
+            class baz {
+              $var = "top baz"
+            }
+            class foo {
+              class baz {
+                $var = "inner baz"
+              }
+
+              class bar inherits ::baz {
+                notify { 'something': message => $var, }
+              }
+            }
+          MANIFEST
+        end
+      end
+
+      it "finds values in its inherited scope when the inherited class is qualified" do
+        expect_the_message_to_be('foo_msg') do <<-MANIFEST
+            node default {
+              include bar
+            }
+            class foo {
+              class baz {
+                $var = "foo_msg"
+              }
+            }
+            class bar inherits foo::baz {
+              notify { 'something': message => $var, }
+            }
+          MANIFEST
+        end
+      end
+
       it "prefers values in its inherited scope over those in the node (with intermediate inclusion)" do
         expect_the_message_to_be('foo_msg') do <<-MANIFEST
             node default {
@@ -530,6 +670,33 @@ describe Puppet::Parser::Scope do
           MANIFEST
         end
       end
+
+      it "finds top scope variables referenced inside a defined type" do
+        expect_the_message_to_be('top_msg') do <<-MANIFEST
+            $var = "top_msg"
+            node default {
+              foo { "testing": }
+            }
+            define foo() {
+              notify { 'something': message => $var, }
+            }
+          MANIFEST
+        end
+      end
+
+      it "finds node scope variables referenced inside a defined type" do
+        expect_the_message_to_be('node_msg') do <<-MANIFEST
+            $var = "top_msg"
+            node default {
+              $var = "node_msg"
+              foo { "testing": }
+            }
+            define foo() {
+              notify { 'something': message => $var, }
+            }
+          MANIFEST
+        end
+      end
     end
   end
 

data/spec/unit/provider/package/gem_spec.rb

@@ -101,7 +101,6 @@ describe provider_class do
     end
   end
 
-
   describe "#instances" do
     before do
       provider_class.stubs(:command).with(:gemcmd).returns "/my/gem"
@@ -123,5 +122,22 @@ describe provider_class do
         {:ensure => ["0.8.7", "0.6.9"], :provider => :gem, :name => 'vagrant'}
       ]
     end
+
+    it "should not fail when an unmatched line is returned" do
+      provider_class.expects(:execute).with(%w{/my/gem list --local}).
+        returns(File.read(my_fixture('line-with-1.8.5-warning')))
+
+      provider_class.instances.map {|p| p.properties}.
+        should == [{:provider=>:gem, :ensure=>["0.3.2"], :name=>"columnize"},
+                   {:provider=>:gem, :ensure=>["1.1.3"], :name=>"diff-lcs"},
+                   {:provider=>:gem, :ensure=>["0.0.1"], :name=>"metaclass"},
+                   {:provider=>:gem, :ensure=>["0.10.5"], :name=>"mocha"},
+                   {:provider=>:gem, :ensure=>["0.8.7"], :name=>"rake"},
+                   {:provider=>:gem, :ensure=>["2.9.0"], :name=>"rspec-core"},
+                   {:provider=>:gem, :ensure=>["2.9.1"], :name=>"rspec-expectations"},
+                   {:provider=>:gem, :ensure=>["2.9.0"], :name=>"rspec-mocks"},
+                   {:provider=>:gem, :ensure=>["0.9.0"], :name=>"rubygems-bundler"},
+                   {:provider=>:gem, :ensure=>["1.11.3.3"], :name=>"rvm"}]
+    end
   end
 end

data/spec/unit/provider/package/pkg_spec.rb

@@ -29,20 +29,39 @@ describe Puppet::Type.type(:package).provider(:pkg) do
   describe "when calling instances" do
     it "should correctly parse lines with preferred publisher" do
       described_class.expects(:pkg).with(:list,'-H').returns File.read(my_fixture('simple'))
-      @instances = described_class.instances.map { |p| Hash.new(:name => p.get(:name), :ensure => p.get(:ensure)) }
+      @instances = described_class.instances.map { |p| {:name => p.get(:name), :ensure => p.get(:ensure)} }
       @instances.size.should == 4
-      @instances[0].should == Hash.new(:name => 'SUNPython', :ensure => :present)
-      @instances[1].should == Hash.new(:name => 'SUNWbind', :ensure => :present)
-      @instances[2].should == Hash.new(:name => 'SUNWdistro-license-copyright', :ensure => :present)
-      @instances[3].should == Hash.new(:name => 'SUNWfppd', :ensure => :present)
+      @instances[0].should == {:name => 'SUNPython', :ensure => :present}
+      @instances[1].should == {:name => 'SUNWbind', :ensure => :present}
+      @instances[2].should == {:name => 'SUNWdistro-license-copyright', :ensure => :present}
+      @instances[3].should == {:name => 'SUNWfppd', :ensure => :present}
     end
 
     it "should correctly parse lines with non preferred publisher" do
       described_class.expects(:pkg).with(:list,'-H').returns File.read(my_fixture('publisher'))
-      @instances = described_class.instances.map { |p| Hash.new(:name => p.get(:name), :ensure => p.get(:ensure)) }
+      @instances = described_class.instances.map { |p| {:name => p.get(:name), :ensure => p.get(:ensure)} }
       @instances.size.should == 2
-      @instances[0].should == Hash.new(:name => 'SUNWpcre', :ensure => :present)
-      @instances[1].should == Hash.new(:name => 'service/network/ssh', :ensure => :present)
+      @instances[0].should == {:name => 'SUNWpcre', :ensure => :present}
+      @instances[1].should == {:name => 'service/network/ssh', :ensure => :present}
+    end
+
+    it "should correctly parse lines on solaris 11" do
+      described_class.expects(:pkg).with(:list, '-H').returns File.read(my_fixture('solaris11'))
+      described_class.expects(:warning).never
+      @instances = described_class.instances.map { |p| {:name => p.get(:name), :ensure => p.get(:ensure) }}
+      @instances.size.should == 12
+      @instances[0].should == {:name => 'compress/zip', :ensure => :present}
+      @instances[1].should == {:name => 'archiver/gnu-tar', :ensure => :present}
+      @instances[2].should == {:name => 'compress/bzip2', :ensure => :present}
+      @instances[3].should == {:name => 'compress/gzip', :ensure => :present}
+      @instances[4].should == {:name => 'compress/p7zip', :ensure => :present}
+      @instances[5].should == {:name => 'compress/unzip', :ensure => :present}
+      @instances[6].should == {:name => 'compress/zip', :ensure => :present}
+      @instances[7].should == {:name => 'x11/library/toolkit/libxaw7', :ensure => :present}
+      @instances[8].should == {:name => 'x11/library/toolkit/libxt', :ensure => :present}
+      @instances[9].should == {:name => 'shell/bash', :ensure => :present}
+      @instances[10].should == {:name => 'shell/zsh', :ensure => :present}
+      @instances[11].should == {:name => 'security/sudo', :ensure => :present}
     end
 
     it "should warn about incorrect lines" do
@@ -52,25 +71,54 @@ describe Puppet::Type.type(:package).provider(:pkg) do
       described_class.expects(:warning).with "Failed to match 'pkg list' line #{error_line.inspect}"
       described_class.instances
     end
+
+    it "should warn about unknown package status" do
+      described_class.expects(:pkg).with(:list,'-H').returns File.read(my_fixture('unknown_status'))
+      described_class.expects(:warning).with "unknown package state for compress/unzip: x--"
+      described_class.instances
+    end
   end
 
   describe "when query a package" do
-    it "should find the package" do
-      @provider.stubs(:pkg).with(:list,'-H','dummy').returns File.read(my_fixture('dummy'))
-      @provider.query.should == {
-        :name     => 'dummy',
-        :ensure   => :present,
-        :version  => '2.5.5-0.111',
-        :status   => "installed",
-        :provider => :pkg,
-      }
+
+    context "on solaris 10" do
+      it "should find the package" do
+        @provider.stubs(:pkg).with(:list,'-H','dummy').returns File.read(my_fixture('dummy_solaris10'))
+        @provider.query.should == {
+          :name     => 'dummy',
+          :ensure   => :present,
+          :version  => '2.5.5-0.111',
+          :status   => "installed",
+          :provider => :pkg,
+        }
+      end
+
+      it "should return :absent when the package is not found" do
+        # I dont know what the acutal error looks like, but according to type/pkg.rb we're just
+        # reacting on the Exception anyways
+        @provider.expects(:pkg).with(:list, "-H", "dummy").raises Puppet::ExecutionFailure, 'Not found'
+        @provider.query.should == {:ensure => :absent, :name => "dummy"}
+      end
     end
 
-    it "should return :absent when the package is not found" do
-      # I dont know what the acutal error looks like, but according to type/pkg.rb we're just
-      # reacting on the Exception anyways
-      @provider.expects(:pkg).with(:list, "-H", "dummy").raises Puppet::ExecutionFailure, 'Not found'
-      @provider.query.should == {:ensure => :absent, :name => "dummy"}
+    context "on solaris 11" do
+      it "should find the package" do
+        @provider.stubs(:pkg).with(:list,'-H','dummy').returns File.read(my_fixture('dummy_solaris11'))
+        @provider.query.should == {
+          :name     => 'dummy',
+          :ensure   => :present,
+          :version  => '1.0.6-0.175.0.0.0.2.537',
+          :status   => "installed",
+          :provider => :pkg,
+        }
+      end
+
+      it "should return :absent when the package is not found" do
+        # I dont know what the acutal error looks like, but according to type/pkg.rb we're just
+        # reacting on the Exception anyways
+        @provider.expects(:pkg).with(:list, "-H", "dummy").raises Puppet::ExecutionFailure, 'Not found'
+        @provider.query.should == {:ensure => :absent, :name => "dummy"}
+      end
     end
 
     it "should return :absent when the packageline cannot be parsed" do