puppet 2.7.22 → 2.7.23

data/spec/unit/parser/parser_spec.rb

@@ -32,11 +32,21 @@ describe Puppet::Parser do
     parser.known_resource_types.should equal(rtc)
   end
 
-  it "should delegate importing to the known resource type loader" do
-    parser = Puppet::Parser::Parser.new "development"
-    parser.known_resource_types.loader.expects(:import).with("newfile", "current_file")
-    parser.lexer.expects(:file).returns "current_file"
-    parser.import("newfile")
+  context "when importing" do
+    it "uses the directory of the currently parsed file" do
+      @parser.lexer.stubs(:file).returns "/tmp/current_file"
+
+      @parser.known_resource_types.loader.expects(:import).with("newfile", "/tmp")
+
+      @parser.import("newfile")
+    end
+
+    it "uses the current working directory, when there is no file being parsed" do
+      @parser.known_resource_types.loader.expects(:import).with('one', Dir.pwd)
+      @parser.known_resource_types.loader.expects(:import).with('two', Dir.pwd)
+
+      @parser.parse("import 'one', 'two'")
+    end
   end
 
   describe "when parsing files" do

data/spec/unit/parser/type_loader_spec.rb

@@ -31,8 +31,8 @@ describe Puppet::Parser::TypeLoader do
     end
 
     it "should attempt to import each generated name" do
-      @loader.expects(:import).with("foo/bar",nil).returns([])
-      @loader.expects(:import).with("foo",nil).returns([])
+      @loader.expects(:import_from_modules).with("foo/bar", anything).returns([])
+      @loader.expects(:import_from_modules).with("foo", anything).returns([])
       @loader.try_load_fqname(:hostclass, "foo::bar") { |f| false }
     end
   end
@@ -45,50 +45,30 @@ describe Puppet::Parser::TypeLoader do
     end
 
     it "should return immediately when imports are being ignored" do
-      Puppet::Parser::Files.expects(:find_manifests).never
+      Puppet::Parser::Files.expects(:find_manifests_in_modules).never
       Puppet[:ignoreimport] = true
-      @loader.import("foo").should be_nil
+      @loader.import("foo", "/path").should be_nil
     end
 
     it "should find all manifests matching the file or pattern" do
-      Puppet::Parser::Files.expects(:find_manifests).with { |pat, opts| pat == "myfile" }.returns ["modname", %w{one}]
-      @loader.import("myfile")
-    end
-
-    it "should use the directory of the current file if one is set" do
-      Puppet::Parser::Files.expects(:find_manifests).with { |pat, opts| opts[:cwd] == make_absolute("/current") }.returns ["modname", %w{one}]
-      @loader.import("myfile", make_absolute("/current/file"))
+      Puppet::Parser::Files.expects(:find_manifests_in_modules).with("myfile", anything).returns ["modname", %w{one}]
+      @loader.import("myfile", "/path")
     end
 
     it "should pass the environment when looking for files" do
-      Puppet::Parser::Files.expects(:find_manifests).with { |pat, opts| opts[:environment] == @loader.environment }.returns ["modname", %w{one}]
-      @loader.import("myfile")
+      Puppet::Parser::Files.expects(:find_manifests_in_modules).with(anything, @loader.environment).returns ["modname", %w{one}]
+      @loader.import("myfile", "/path")
     end
 
     it "should fail if no files are found" do
-      Puppet::Parser::Files.expects(:find_manifests).returns [nil, []]
-      lambda { @loader.import("myfile") }.should raise_error(Puppet::ImportError)
+      Puppet::Parser::Files.expects(:find_manifests_in_modules).returns [nil, []]
+      lambda { @loader.import("myfile", "/path") }.should raise_error(Puppet::ImportError)
     end
 
     it "should parse each found file" do
-      Puppet::Parser::Files.expects(:find_manifests).returns ["modname", [make_absolute("/one")]]
+      Puppet::Parser::Files.expects(:find_manifests_in_modules).returns ["modname", [make_absolute("/one")]]
       @loader.expects(:parse_file).with(make_absolute("/one")).returns(Puppet::Parser::AST::Hostclass.new(''))
-      @loader.import("myfile")
-    end
-
-    it "should make each file qualified before attempting to parse it" do
-      Puppet::Parser::Files.expects(:find_manifests).returns ["modname", %w{one}]
-      @loader.expects(:parse_file).with(make_absolute("/current/one")).returns(Puppet::Parser::AST::Hostclass.new(''))
-      @loader.import("myfile", make_absolute("/current/file"))
-    end
-
-    it "should not attempt to import files that have already been imported" do
-      Puppet::Parser::Files.expects(:find_manifests).returns ["modname", %w{/one}]
-      Puppet::Parser::Parser.any_instance.expects(:parse).once.returns(Puppet::Parser::AST::Hostclass.new(''))
-      @loader.import("myfile")
-
-      # This will fail if it tries to reimport the file.
-      @loader.import("myfile")
+      @loader.import("myfile", "/path")
     end
   end
 
@@ -209,10 +189,11 @@ describe Puppet::Parser::TypeLoader do
     end
   end
 
+
   it "should be able to add classes to the current resource type collection" do
     file = tmpfile("simple_file.pp")
     File.open(file, "w") { |f| f.puts "class foo {}" }
-    @loader.import(file)
+    @loader.import(File.basename(file), File.dirname(file))
 
     @loader.known_resource_types.hostclass("foo").should be_instance_of(Puppet::Resource::Type)
   end

data/spec/unit/resource/type_collection_spec.rb

@@ -55,6 +55,14 @@ describe Puppet::Resource::TypeCollection do
     @code.node("foo").should equal(node)
   end
 
+  it "should fail if a duplicate node is added" do
+    @code.add(Puppet::Resource::Type.new(:node, "foo"))
+
+    expect do
+      @code.add(Puppet::Resource::Type.new(:node, "foo"))
+    end.to raise_error(Puppet::ParseError, /cannot redefine/)
+  end
+
   it "should store hostclasses as hostclasses" do
     klass = Puppet::Resource::Type.new(:hostclass, "foo")
 
@@ -62,6 +70,16 @@ describe Puppet::Resource::TypeCollection do
     @code.hostclass("foo").should equal(klass)
   end
 
+  it "merge together hostclasses of the same name" do
+    klass1 = Puppet::Resource::Type.new(:hostclass, "foo", :doc => "first")
+    klass2 = Puppet::Resource::Type.new(:hostclass, "foo", :doc => "second")
+
+    @code.add(klass1)
+    @code.add(klass2)
+
+    @code.hostclass("foo").doc.should == "firstsecond"
+  end
+
   it "should store definitions as definitions" do
     define = Puppet::Resource::Type.new(:definition, "foo")
 
@@ -69,13 +87,12 @@ describe Puppet::Resource::TypeCollection do
     @code.definition("foo").should equal(define)
   end
 
-  it "should merge new classes with existing classes of the same name" do
-    loader = Puppet::Resource::TypeCollection.new("env")
-    first = Puppet::Resource::Type.new(:hostclass, "foo")
-    second = Puppet::Resource::Type.new(:hostclass, "foo")
-    loader.add first
-    first.expects(:merge).with(second)
-    loader.add(second)
+  it "should fail if a duplicate definition is added" do
+    @code.add(Puppet::Resource::Type.new(:definition, "foo"))
+
+    expect do
+      @code.add(Puppet::Resource::Type.new(:definition, "foo"))
+    end.to raise_error(Puppet::ParseError, /cannot be redefined/)
   end
 
   it "should remove all nodes, classes, and definitions when cleared" do
@@ -170,58 +187,27 @@ describe Puppet::Resource::TypeCollection do
   end
 
   %w{hostclass node definition}.each do |data|
-    before do
-      @instance = Puppet::Resource::Type.new(data, "foo")
-    end
-
-    it "should have a method for adding a #{data}" do
-      Puppet::Resource::TypeCollection.new("env").should respond_to("add_#{data}")
-    end
+    describe "behavior of add for #{data}" do
 
-    it "should use the name of the instance to add it" do
-      loader = Puppet::Resource::TypeCollection.new("env")
-      loader.send("add_#{data}", @instance)
-      loader.send(data, @instance.name).should equal(@instance)
-    end
-
-    unless data == "hostclass"
-      it "should fail to add a #{data} when one already exists" do
+      it "should return the added #{data}" do
         loader = Puppet::Resource::TypeCollection.new("env")
-        loader.add @instance
-        lambda { loader.add(@instance) }.should raise_error(Puppet::ParseError)
-      end
-    end
+        instance = Puppet::Resource::Type.new(data, "foo")
 
-    it "should return the added #{data}" do
-      loader = Puppet::Resource::TypeCollection.new("env")
-
-      loader.add(@instance).should equal(@instance)
-    end
+        loader.add(instance).should equal(instance)
+      end
 
-    it "should be able to retrieve #{data} by name" do
-      loader = Puppet::Resource::TypeCollection.new("env")
-      instance = Puppet::Resource::Type.new(data, "bar")
-      loader.add instance
-      loader.send(data, "bar").should equal(instance)
-    end
+      it "should retrieve #{data} insensitive to case" do
+        loader = Puppet::Resource::TypeCollection.new("env")
+        instance = Puppet::Resource::Type.new(data, "Bar")
 
-    it "should retrieve #{data} insensitive to case" do
-      loader = Puppet::Resource::TypeCollection.new("env")
-      instance = Puppet::Resource::Type.new(data, "Bar")
-      loader.add instance
-      loader.send(data, "bAr").should equal(instance)
-    end
+        loader.add instance
 
-    it "should return nil when asked for a #{data} that has not been added" do
-      Puppet::Resource::TypeCollection.new("env").send(data, "foo").should be_nil
-    end
+        loader.send(data, "bAr").should equal(instance)
+      end
 
-    it "should be able to retrieve all #{data}s" do
-      plurals = { "hostclass" => "hostclasses", "node" => "nodes", "definition" => "definitions" }
-      loader = Puppet::Resource::TypeCollection.new("env")
-      instance = Puppet::Resource::Type.new(data, "foo")
-      loader.add instance
-      loader.send(plurals[data]).should == { "foo" => instance }
+      it "should return nil when asked for a #{data} that has not been added" do
+        Puppet::Resource::TypeCollection.new("env").send(data, "foo").should be_nil
+      end
     end
   end
 
@@ -311,7 +297,7 @@ describe Puppet::Resource::TypeCollection do
       end
 
     end
-    
+
     it "should not look in the local scope for classes when the name is qualified" do
         @loader = Puppet::Resource::TypeCollection.new("env")
         @loader.add Puppet::Resource::Type.new(:hostclass, "foo::bar")
@@ -445,7 +431,5 @@ describe Puppet::Resource::TypeCollection do
 
       lambda { @code.version }.should raise_error(Puppet::ParseError)
     end
-
   end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppet
 version: !ruby/object:Gem::Version
-  version: 2.7.22
+  version: 2.7.23
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-18 00:00:00.000000000 Z
+date: 2013-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facter
@@ -46,7 +46,6 @@ files:
 - CHANGELOG
 - CONTRIBUTING.md
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - README_DEVELOPER.md
@@ -188,6 +187,8 @@ files:
 - lib/puppet/file_serving/mount/plugins.rb
 - lib/puppet/file_serving/terminus_helper.rb
 - lib/puppet/file_serving/terminus_selector.rb
+- lib/puppet/file_system.rb
+- lib/puppet/file_system/path_pattern.rb
 - lib/puppet/forge.rb
 - lib/puppet/forge/cache.rb
 - lib/puppet/forge/repository.rb
@@ -1041,6 +1042,7 @@ files:
 - ext/osx/prototype.plist.erb
 - ext/packaging/README-Solaris.md
 - ext/packaging/README.md
+- ext/packaging/packaging.rake
 - ext/packaging/spec/spec_helper.rb
 - ext/packaging/spec/tasks/00_utils_spec.rb
 - ext/packaging/spec/tasks/build_object_spec.rb
@@ -1058,15 +1060,14 @@ files:
 - ext/packaging/tasks/gem.rake
 - ext/packaging/tasks/ips.rake
 - ext/packaging/tasks/jenkins.rake
+- ext/packaging/tasks/jenkins_dynamic.rake
 - ext/packaging/tasks/mock.rake
 - ext/packaging/tasks/pe_deb.rake
 - ext/packaging/tasks/pe_remote.rake
 - ext/packaging/tasks/pe_rpm.rake
 - ext/packaging/tasks/pe_ship.rake
 - ext/packaging/tasks/pe_sign.rake
-- ext/packaging/tasks/pe_sles.rake
 - ext/packaging/tasks/pe_tar.rake
-- ext/packaging/tasks/pre_tasks.rake
 - ext/packaging/tasks/release.rake
 - ext/packaging/tasks/remote_build.rake
 - ext/packaging/tasks/retrieve.rake
@@ -1081,6 +1082,10 @@ files:
 - ext/packaging/tasks/vendor_gems.rake
 - ext/packaging/tasks/version.rake
 - ext/packaging/tasks/z_data_dump.rake
+- ext/packaging/templates/README
+- ext/packaging/templates/downstream.xml.erb
+- ext/packaging/templates/packaging.xml.erb
+- ext/packaging/templates/repo.xml.erb
 - ext/project_data.yaml
 - ext/puppet-load.rb
 - ext/puppet-test
@@ -1566,6 +1571,7 @@ files:
 - spec/unit/file_serving/mount_spec.rb
 - spec/unit/file_serving/terminus_helper_spec.rb
 - spec/unit/file_serving/terminus_selector_spec.rb
+- spec/unit/file_system/path_pattern_spec.rb
 - spec/unit/forge/repository_spec.rb
 - spec/unit/forge_spec.rb
 - spec/unit/indirector/active_record_spec.rb

data/Gemfile.lock

@@ -1,44 +0,0 @@
-PATH
-  remote: .
-  specs:
-    puppet (2.7.19)
-      facter (~> 1.5)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    diff-lcs (1.1.3)
-    facter (1.6.18)
-    metaclass (0.0.1)
-    mocha (0.10.5)
-      metaclass (~> 0.0.1)
-    rack (1.4.5)
-    rspec (2.10.0)
-      rspec-core (~> 2.10.0)
-      rspec-expectations (~> 2.10.0)
-      rspec-mocks (~> 2.10.0)
-    rspec-core (2.10.1)
-    rspec-expectations (2.10.0)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.10.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  facter (~> 1.6.4)
-  mocha (~> 0.10.5)
-  puppet!
-  rack (~> 1.4.1)
-  rspec (~> 2.10.0)
-  sys-admin (~> 1.5.6)
-  win32-api (~> 1.4.8)
-  win32-dir (~> 0.3.7)
-  win32-eventlog (~> 0.5.3)
-  win32-process (~> 0.6.5)
-  win32-security (~> 0.1.4)
-  win32-service (~> 0.7.2)
-  win32-taskscheduler (~> 0.2.2)
-  win32console (~> 1.3.2)
-  windows-api (~> 0.4.1)
-  windows-pr (~> 1.2.1)

data/ext/packaging/tasks/pe_sles.rake

@@ -1,101 +0,0 @@
-# tasks for sles building
-
-# take a tarball and stage it in a temp dir with appropriate
-# directories/files set up for building an rpm.
-# return the directory
-
-if @build.build_pe
-  def prep_sles_dir
-    temp = get_temp
-    check_file("pkg/#{@build.project}-#{@build.version}.tar.gz")
-    mkdir_pr temp, "#{temp}/SOURCES", "#{temp}/SPECS"
-    if @build.sign_tar
-      Rake::Task["pl:sign_tar"].invoke
-      cp_p "pkg/#{@build.project}-#{@build.version}.tar.gz.asc", "#{temp}/SOURCES"
-    end
-    cp_p "pkg/#{@build.project}-#{@build.version}.tar.gz", "#{temp}/SOURCES"
-    erb "ext/redhat/#{@build.project}.spec.erb", "#{temp}/SPECS/#{@build.project}.spec"
-    temp
-  end
-
-  namespace :pe do
-    # Temporary task to pull down pe dependencies until this is NFS-mounted
-    task :retrieve_sles_deps => 'pl:fetch' do
-      rm_rf FileList["#{ENV['HOME']}/package_repos/*"]
-      rsync_from("#{@build.sles_repo_path}/#{@build.pe_version}/repos/sles-*", @build.sles_repo_host, "#{ENV['HOME']}/package_repos/")
-      FileList["#{ENV['HOME']}/package_repos/*"].each do |f|
-        update_rpm_repo(f) if File.directory?(f)
-      end
-      cd "#{ENV['HOME']}/package_repos" do
-        unless File.symlink?('sles-11-i586')
-          if File.exist?('sles-11-i586')
-            rm_rf 'sles-11-i586'
-          end
-          File.symlink('sles-11-i386', 'sles-11-i586')
-        end
-      end
-    end
-
-    desc "Build a sles rpm from this repo"
-    task :local_sles => ['package:tar', 'pl:fetch', 'pe:retrieve_sles_deps'] do
-      check_tool('build')
-      check_tool('linux32')
-      check_tool('linux64')
-      build_dest_dir    = "usr/src/packages"
-      noarch            = FALSE
-      built_arch        = ''
-      @build.sles_arch_repos.each do |arch, deps_repo|
-        build_root        = get_temp
-        work_dir          = prep_sles_dir
-        build_source_dir  = "#{work_dir}/SOURCES"
-        build_spec_dir    = "#{work_dir}/SPECS"
-        build_spec        = "#{build_spec_dir}/#{@build.project}.spec"
-        if noarch == FALSE
-          bench = Benchmark.realtime do
-            linux_cmd = arch == 'i586' ? 'linux32' : 'linux64'
-            sh "yes | sudo #{linux_cmd} build \
-              --rpms        #{deps_repo}:#{ENV['HOME']}/package_repos/sles-11-#{arch} \
-              --root        #{build_root}/#{arch}                                     \
-              --rsync-src   #{build_source_dir}                                       \
-              --rsync-dest  /usr/src/packages/SOURCES                                 \
-              --no-checks   #{build_spec}                                             \
-              --arch        #{arch} || true"
-            rpms = FileList["#{build_root}/#{arch}/#{build_dest_dir}/RPMS/**/*.rpm"]
-            srpms = FileList["#{build_root}/#{arch}/#{build_dest_dir}/SRPMS/**/*.rpm"]
-            if rpms.empty?
-              STDERR.puts "No RPMS were built. Perhaps an error occurred?"
-              exit 1
-            end
-            built_arch = arch
-            %x{mkdir -p pkg/pe/rpm/sles-11-{srpms,#{arch}}}
-            cp(rpms, "pkg/pe/rpm/sles-11-#{arch}")
-            cp(srpms, "pkg/pe/rpm/sles-11-srpms")
-            noarch = rpms.exclude(/noarch/).empty?
-          end
-          # See 30_metrics.rake to see what this is doing
-          add_metrics({ :dist => 'sles', :bench => bench }) if @build.benchmark
-        else
-          arches_to_copy_to = @build.sles_arch_repos.keys - [ built_arch ]
-          arches_to_copy_to.each do |other_arch|
-            %x{mkdir -p pkg/pe/rpm/sles-11-#{other_arch}}
-            cp(FileList["pkg/pe/rpm/sles-11-#{built_arch}/*"], "pkg/pe/rpm/sles-11-#{other_arch}")
-          end
-        end
-        rm_rf build_root
-        rm_rf work_dir
-      end
-      post_metrics if @build.benchmark
-      cd 'pkg/pe/rpm' do
-        if File.exist?('sles-11-i586')
-          mkdir_p 'sles-11-i386'
-          cp FileList["sles-11-i586/*"], 'sles-11-i386'
-          rm_rf 'sles-11-i586'
-        end
-      end
-      if @build.team == 'release'
-        Rake::Task["pe:sign_rpms"].invoke
-      end
-    end
-  end
-end
-