Merge branch 'pr/2715' into stable

* pr/2715:
  (maint) Test downloader behavior, not implementation
  (PUP-2705) Use source permissions for fact pluginsync

Author: joshcooper

lib/puppet/configurer/downloader.rb

@@ -25,8 +25,8 @@ def evaluate
     files
   end
 
-  def initialize(name, path, source, ignore = nil, environment = nil)
-    @name, @path, @source, @ignore, @environment = name, path, source, ignore, environment
+  def initialize(name, path, source, ignore = nil, environment = nil, source_permissions = :ignore)
+    @name, @path, @source, @ignore, @environment, @source_permissions = name, path, source, ignore, environment, source_permissions
   end
 
   def catalog
@@ -51,7 +51,7 @@ def default_arguments
       :path => path,
       :recurse => true,
       :source => source,
-      :source_permissions => :ignore,
+      :source_permissions => @source_permissions,
       :tag => name,
       :purge => true,
       :force => true,

lib/puppet/configurer/plugin_handler.rb

@@ -17,7 +17,8 @@ def download_plugins(environment)
           Puppet[:pluginfactdest],
           Puppet[:pluginfactsource],
           Puppet[:pluginsignore],
-          environment
+          environment,
+          :use
        )
        plugin_fact_downloader.evaluate
     end

spec/unit/configurer/downloader_spec.rb

@@ -6,6 +6,10 @@
 describe Puppet::Configurer::Downloader do
   require 'puppet_spec/files'
   include PuppetSpec::Files
+
+  let(:path)   { Puppet[:plugindest] }
+  let(:source) { 'puppet://puppet/plugins' }
+
   it "should require a name" do
     lambda { Puppet::Configurer::Downloader.new }.should raise_error(ArgumentError)
   end
@@ -21,87 +25,115 @@
     dler.source.should == "source"
   end
 
-  describe "when creating the file that does the downloading" do
-    before do
-      @dler = Puppet::Configurer::Downloader.new("foo", "path", "source")
-    end
+  def downloader(options = {})
+    options[:name] ||= "facts"
+    options[:path] ||= path
+    options[:source_permissions] ||= :ignore
+    Puppet::Configurer::Downloader.new(options[:name], options[:path], source, options[:ignore], options[:environment], options[:source_permissions])
+  end
 
+  def generate_file_resource(options = {})
+    dler = downloader(options)
+    dler.file
+  end
+
+  describe "when creating the file that does the downloading" do
     it "should create a file instance with the right path and source" do
-      Puppet::Type.type(:file).expects(:new).with { |opts| opts[:path] == "path" and opts[:source] == "source" }
-      @dler.file
+      file = generate_file_resource(:path => path, :source => source)
+
+      expect(file[:path]).to eq(path)
+      expect(file[:source]).to eq([source])
     end
 
     it "should tag the file with the downloader name" do
-      Puppet::Type.type(:file).expects(:new).with { |opts| opts[:tag] == "foo" }
-      @dler.file
+      name = "mydownloader"
+      file = generate_file_resource(:name => name)
+
+      expect(file[:tag]).to eq([name])
     end
 
     it "should always recurse" do
-      Puppet::Type.type(:file).expects(:new).with { |opts| opts[:recurse] == true }
-      @dler.file
+      file = generate_file_resource
+
+      expect(file[:recurse]).to be_true
     end
 
     it "should always purge" do
-      Puppet::Type.type(:file).expects(:new).with { |opts| opts[:purge] == true }
-      @dler.file
+      file = generate_file_resource
+
+      expect(file[:purge]).to be_true
     end
 
     it "should never be in noop" do
-      Puppet::Type.type(:file).expects(:new).with { |opts| opts[:noop] == false }
-      @dler.file
+      file = generate_file_resource
+
+      expect(file[:noop]).to be_false
     end
 
-    it "should set source_permissions to ignore" do
-      Puppet::Type.type(:file).expects(:new).with { |opts| opts[:source_permissions] == :ignore }
-      @dler.file
+    it "should set source_permissions to ignore by default" do
+      file = generate_file_resource
+
+      expect(file[:source_permissions]).to eq(:ignore)
+    end
+
+    it "should allow source_permissions to be overridden" do
+      file = generate_file_resource(:source_permissions => :use)
+
+      expect(file[:source_permissions]).to eq(:use)
     end
 
     describe "on POSIX", :as_platform => :posix do
       it "should always set the owner to the current UID" do
         Process.expects(:uid).returns 51
-        Puppet::Type.type(:file).expects(:new).with { |opts| opts[:owner] == 51 }
-        @dler.file
+
+        file = generate_file_resource(:path => '/path')
+        expect(file[:owner]).to eq(51)
       end
 
       it "should always set the group to the current GID" do
         Process.expects(:gid).returns 61
-        Puppet::Type.type(:file).expects(:new).with { |opts| opts[:group] == 61 }
-        @dler.file
+
+        file = generate_file_resource(:path => '/path')
+        expect(file[:group]).to eq(61)
       end
     end
 
     describe "on Windows", :as_platform => :windows do
       it "should omit the owner" do
-        Puppet::Type.type(:file).expects(:new).with { |opts| opts[:owner] == nil }
-        @dler.file
+        file = generate_file_resource(:path => 'C:/path')
+
+        expect(file[:owner]).to be_nil
       end
 
       it "should omit the group" do
-        Puppet::Type.type(:file).expects(:new).with { |opts| opts[:group] == nil }
-        @dler.file
+        file = generate_file_resource(:path => 'C:/path')
+
+        expect(file[:group]).to be_nil
       end
     end
 
     it "should always force the download" do
-      Puppet::Type.type(:file).expects(:new).with { |opts| opts[:force] == true }
-      @dler.file
+      file = generate_file_resource
+
+      expect(file[:force]).to be_true
     end
 
     it "should never back up when downloading" do
-      Puppet::Type.type(:file).expects(:new).with { |opts| opts[:backup] == false }
-      @dler.file
+      file = generate_file_resource
+
+      expect(file[:backup]).to be_false
     end
 
     it "should support providing an 'ignore' parameter" do
-      Puppet::Type.type(:file).expects(:new).with { |opts| opts[:ignore] == [".svn"] }
-      @dler = Puppet::Configurer::Downloader.new("foo", "path", "source", ".svn")
-      @dler.file
+      file = generate_file_resource(:ignore => '.svn')
+
+      expect(file[:ignore]).to eq(['.svn'])
     end
 
     it "should split the 'ignore' parameter on whitespace" do
-      Puppet::Type.type(:file).expects(:new).with { |opts| opts[:ignore] == %w{.svn CVS} }
-      @dler = Puppet::Configurer::Downloader.new("foo", "path", "source", ".svn CVS")
-      @dler.file
+      file = generate_file_resource(:ignore => '.svn CVS')
+
+      expect(file[:ignore]).to eq(['.svn', 'CVS'])
     end
   end
 

spec/unit/configurer/plugin_handler_spec.rb

@@ -28,7 +28,7 @@ class PluginHandlerTester
     Puppet[:pluginfactdest] = plugindest
 
     downloader = mock 'downloader'
-    Puppet::Configurer::Downloader.expects(:new).with("pluginfacts", plugindest, "psource", "pignore", environment).returns downloader
+    Puppet::Configurer::Downloader.expects(:new).with("pluginfacts", plugindest, "psource", "pignore", environment, :use).returns downloader
     Puppet::Configurer::Downloader.expects(:new).with("plugin", plugindest, "psource", "pignore", environment).returns downloader
 
     downloader.stubs(:evaluate).returns([])