Make all puppetfile cli actions accept puppetfile name

puppetlabs · Dec 16, 2016 · 2678d55 · 2678d55
1 parent 49b8b06
commit 2678d55
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/lib/r10k/action/puppetfile/check.rb b/lib/r10k/action/puppetfile/check.rb
@@ -8,7 +8,7 @@ module Puppetfile
       class Check < R10K::Action::Base
 
         def call
-          pf = R10K::Puppetfile.new(@root, @moduledir, @path)
+          pf = R10K::Puppetfile.new(@root, @moduledir, @puppetfile)
           begin
             pf.load!
             $stderr.puts _("Syntax OK")

diff --git a/lib/r10k/action/puppetfile/purge.rb b/lib/r10k/action/puppetfile/purge.rb
@@ -8,7 +8,7 @@ module Puppetfile
       class Purge < R10K::Action::Base
 
         def call
-          pf = R10K::Puppetfile.new(@root, @moduledir, @path)
+          pf = R10K::Puppetfile.new(@root, @moduledir, @puppetfile)
           pf.load!
           pf.purge!
           true

diff --git a/lib/r10k/cli/puppetfile.rb b/lib/r10k/cli/puppetfile.rb
@@ -45,6 +45,8 @@ def self.command
           name  'check'
           usage 'check'
           summary 'Try and load the Puppetfile to verify the syntax is correct.'
+
+          required nil, :puppetfile, 'Path to puppetfile'
           runner R10K::Action::Puppetfile::CriRunner.wrap(R10K::Action::Puppetfile::Check)
         end
       end
@@ -57,6 +59,8 @@ def self.command
           usage 'purge'
           summary 'Purge unmanaged modules from a Puppetfile managed directory'
 
+          required nil, :moduledir, 'Path to install modules to'
+          required nil, :puppetfile, 'Path to puppetfile'
           runner R10K::Action::Puppetfile::CriRunner.wrap(R10K::Action::Puppetfile::Purge)
         end
       end