r10k 2.6.9 → 3.0.0

data/lib/r10k/environment/svn.rb

@@ -43,7 +43,7 @@ class R10K::Environment::SVN < R10K::Environment::Base
   def initialize(name, basedir, dirname, options = {})
     super
 
-    setopts(options, {:remote => :self, :username => :self, :password => :self})
+    setopts(options, {:remote => :self, :username => :self, :password => :self, :puppetfile_name => :self })
 
     @working_dir = R10K::SVN::WorkingDir.new(Pathname.new(@full_path), :username => @username, :password => @password)
   end

data/lib/r10k/forge/module_release.rb

@@ -181,14 +181,14 @@ module R10K
       # Remove the temporary directory used for unpacking the module.
       def cleanup_unpack_path
         if unpack_path.exist?
-          unpack_path.rmtree
+          unpack_path.parent.rmtree
         end
       end
 
       # Remove the downloaded module release.
       def cleanup_download_path
         if download_path.exist?
-          download_path.delete
+          download_path.parent.rmtree
         end
       end
 

data/lib/r10k/git/rugged/base_repository.rb

@@ -34,10 +34,13 @@ class R10K::Git::Rugged::BaseRepository
 
   # @return [Symbol] The type of the given ref, one of :branch, :tag, :commit, or :unknown
   def ref_type(pattern)
-    if branches.include? pattern
-      :branch
-    elsif tags.include? pattern
+    # Try to match and resolve SHA refs as quickly as possible.
+    if pattern =~ /^[0-9a-f]{5,40}$/i && @_rugged_repo.include?(pattern)
+      :commit
+    elsif @_rugged_repo.tags[pattern]
       :tag
+    elsif @_rugged_repo.branches[pattern]
+      :branch
     elsif resolve(pattern)
       :commit
     else

data/lib/r10k/git/rugged/working_repository.rb

@@ -118,7 +118,16 @@ class R10K::Git::Rugged::WorkingRepository < R10K::Git::Rugged::BaseRepository
   end
 
   def dirty?
-    with_repo { |repo| repo.diff_workdir('HEAD').size > 0 }
+    with_repo do |repo|
+      diff = repo.diff_workdir('HEAD')
+
+      diff.each_patch do |p|
+        logger.debug(_("Found local modifications in %{file_path}" % {file_path: File.join(@path, p.delta.old_file[:path])}))
+        logger.debug1(p.to_s)
+      end
+
+      return diff.size > 0
+    end
   end
 
   private

data/lib/r10k/git/shellgit/base_repository.rb

@@ -30,21 +30,40 @@ class R10K::Git::ShellGit::BaseRepository
     for_each_ref('refs/heads')
   end
 
+  def is_branch?(pattern)
+    result = git ['rev-parse', '-q', '--verify', "refs/heads/#{pattern}"], :git_dir => git_dir.to_s, :raise_on_fail => false
+
+    result.success?
+  end
+
   # @return [Array<String>] All tags in this repository
   def tags
     for_each_ref('refs/tags')
   end
 
+  def is_tag?(pattern)
+    result = git ['rev-parse', '-q', '--verify', "refs/tags/#{pattern}"], :git_dir => git_dir.to_s, :raise_on_fail => false
+
+    result.success?
+  end
+
   # @return [Symbol] The type of the given ref, one of :branch, :tag, :commit, or :unknown
   def ref_type(pattern)
-    if branches.include? pattern
-      :branch
-    elsif tags.include? pattern
-      :tag
-    elsif resolve(pattern)
-      :commit
-    else
-      :unknown
+    @_ref_type_cache ||= {}
+
+    @_ref_type_cache[pattern] ||= begin
+      # Try to match and resolve SHA refs as quickly as possible.
+      if pattern =~ /^[0-9a-f]{5,40}$/i && resolve(pattern)
+        :commit
+      elsif is_tag? pattern
+        :tag
+      elsif is_branch? pattern
+        :branch
+      elsif resolve(pattern)
+        :commit
+      else
+        :unknown
+      end
     end
   end
 

data/lib/r10k/git/shellgit/working_repository.rb

@@ -49,14 +49,14 @@ class R10K::Git::ShellGit::WorkingRepository < R10K::Git::ShellGit::BaseReposito
   # @param ref [String] The git reference to check out
   # @param opts [Hash] Optional hash of additional options.
   def checkout(ref, opts = {})
+    argv = ['checkout', ref]
+
     # :force defaults to true
     if !opts.has_key?(:force) || opts[:force]
-      force_opt = '--force'
-    else
-      force_opt = ''
+      argv << '--force'
     end
 
-    git ['checkout', ref, force_opt], :path => @path.to_s
+    git argv, :path => @path.to_s
   end
 
   def fetch(remote_name='origin')
@@ -91,7 +91,21 @@ class R10K::Git::ShellGit::WorkingRepository < R10K::Git::ShellGit::BaseReposito
 
   # does the working tree have local modifications to tracked files?
   def dirty?
-    result = git(['diff-index', '--quiet','HEAD', '--'], :path => @path.to_s, :raise_on_fail => false)
-    result.exit_code != 0
+    result = git(['diff-index', '--exit-code', '--name-only', 'HEAD'], :path => @path.to_s, :raise_on_fail => false)
+
+    if result.exit_code != 0
+      dirty_files = result.stdout.split('\n')
+
+      dirty_files.each do |file|
+        logger.debug(_("Found local modifications in %{file_path}" % {file_path: File.join(@path, file)}))
+
+        # Do this in a block so that the extra subprocess only gets invoked when needed.
+        logger.debug1 { git(['diff-index', '-p', 'HEAD', file], :path => @path.to_s, :raise_on_fail => false).stdout }
+      end
+
+      return true
+    else
+      return false
+    end
   end
 end

data/lib/r10k/git/stateful_repository.rb

@@ -89,7 +89,6 @@ class R10K::Git::StatefulRepository
   # @api private
   def sync_cache?(ref)
     return true if !@cache.exist?
-    return true if !@cache.resolve(ref)
     return true if !([:commit, :tag].include? @cache.ref_type(ref))
     return false
   end

data/lib/r10k/module/git.rb

@@ -23,11 +23,6 @@ class R10K::Module::Git < R10K::Module::Base
   #   @return [String]
   attr_reader :desired_ref
 
-  # @!attribute [r] default_ref
-  #   @api private
-  #   @return [String]
-  attr_reader :default_ref
-
   def initialize(title, dirname, args, environment=nil)
     super
 

data/lib/r10k/puppetfile.rb

@@ -46,7 +46,10 @@ class Puppetfile
     @basedir         = basedir
     @force           = force || false
     @moduledir       = moduledir  || File.join(basedir, 'modules')
-    @puppetfile_path = puppetfile_path || File.join(basedir, 'Puppetfile')
+    @puppetfile_name = puppetfile_name || 'Puppetfile'
+    @puppetfile_path = puppetfile_path || File.join(basedir, @puppetfile_name)
+
+    logger.info _("Using Puppetfile '%{puppetfile}'") % {puppetfile: @puppetfile_path}
 
     @modules = []
     @managed_content = {}
@@ -55,42 +58,42 @@ class Puppetfile
     @loaded = false
   end
 
-  def load(default_branch_override = nil)
+  def load
     if File.readable? @puppetfile_path
-      self.load!(default_branch_override)
+      self.load!
     else
       logger.debug _("Puppetfile %{path} missing or unreadable") % {path: @puppetfile_path.inspect}
     end
   end
 
-  def load!(default_branch_override = nil)
-    @default_branch_override = default_branch_override
-
+  def load!
     dsl = R10K::Puppetfile::DSL.new(self)
     dsl.instance_eval(puppetfile_contents, @puppetfile_path)
-    
     validate_no_duplicate_names(@modules)
     @loaded = true
-  rescue SyntaxError, LoadError, ArgumentError => e
+  rescue SyntaxError, LoadError, ArgumentError, NameError => e
     raise R10K::Error.wrap(e, _("Failed to evaluate %{path}") % {path: @puppetfile_path})
   end
 
-  # @param [String] forge
-  def set_forge(forge)
-    @forge = forge
-  end
-
   # @param [Array<String>] modules
   def validate_no_duplicate_names(modules)
     dupes = modules
             .group_by { |mod| mod.name }
-            .select { |_, v| v.size > 1 }.map(&:first)
+            .select { |_, v| v.size > 1 }
+            .map(&:first)
     unless dupes.empty?
-      logger.warn _('Puppetfiles should not contain duplicate module names and will result in an error in r10k v3.x.')
-      logger.warn _("Remove the duplicates of the following modules: %{dupes}" % {dupes: dupes.join(" ")})
+      msg = _('Puppetfiles cannot contain duplicate module names.')
+      msg += ' '
+      msg += _("Remove the duplicates of the following modules: %{dupes}" % { dupes: dupes.join(' ') })
+      raise R10K::Error.new(msg)
     end
   end
 
+  # @param [String] forge
+  def set_forge(forge)
+    @forge = forge
+  end
+
   # @param [String] moduledir
   def set_moduledir(moduledir)
     @moduledir = if Pathname.new(moduledir).absolute?
@@ -110,10 +113,6 @@ class Puppetfile
       install_path = @moduledir
     end
 
-    if args.is_a?(Hash) && @default_branch_override != nil
-      args[:default_branch] = @default_branch_override
-    end
-
     # Keep track of all the content this Puppetfile is managing to enable purging.
     @managed_content[install_path] = Array.new unless @managed_content.has_key?(install_path)
 
@@ -128,9 +127,7 @@ class Puppetfile
   def managed_directories
     self.load unless @loaded
 
-    dirs = @managed_content.keys
-    dirs.delete(real_basedir)
-    dirs
+    @managed_content.keys
   end
 
   # Returns an array of the full paths to all the content being managed.
@@ -182,6 +179,8 @@ class Puppetfile
   end
 
   def validate_install_path(path, modname)
+    real_basedir = Pathname.new(basedir).cleanpath.to_s
+
     unless /^#{Regexp.escape(real_basedir)}.*/ =~ path
       raise R10K::Error.new("Puppetfile cannot manage content '#{modname}' outside of containing environment: #{path} is not within #{real_basedir}")
     end
@@ -189,10 +188,6 @@ class Puppetfile
     true
   end
 
-  def real_basedir
-    Pathname.new(basedir).cleanpath.to_s
-  end
-
   class DSL
     # A barebones implementation of the Puppetfile DSL
     #

data/lib/r10k/source/base.rb

@@ -16,6 +16,11 @@ class R10K::Source::Base
   #     Defaults to nil.
   attr_reader :prefix
 
+  # @!attribute [r] puppetfile_name
+  #   @return [String, nil] The Name of the puppetfile
+  #     Defaults to nil.
+  attr_reader :puppetfile_name
+
   # Initialize the given source.
   #
   # @param name [String] The identifier for this source.
@@ -30,6 +35,7 @@ class R10K::Source::Base
     @name    = name
     @basedir = Pathname.new(basedir).cleanpath.to_s
     @prefix  = options.delete(:prefix)
+    @puppetfile_name = options.delete(:puppetfile_name)
     @options = options
   end
 

data/lib/r10k/source/git.rb

@@ -95,11 +95,11 @@ class R10K::Source::Git < R10K::Source::Base
     branch_names.each do |bn|
       if bn.valid?
         envs << R10K::Environment::Git.new(bn.name, @basedir, bn.dirname,
-                                       {:remote => remote, :ref => bn.name})
+                                       {:remote => remote, :ref => bn.name, :puppetfile_name => puppetfile_name })
       elsif bn.correct?
        logger.warn _("Environment %{env_name} contained non-word characters, correcting name to %{corrected_env_name}") % {env_name: bn.name.inspect, corrected_env_name: bn.dirname}
         envs << R10K::Environment::Git.new(bn.name, @basedir, bn.dirname,
-                                       {:remote => remote, :ref => bn.name})
+                                       {:remote => remote, :ref => bn.name, :puppetfile_name => puppetfile_name})
       elsif bn.validate?
        logger.error _("Environment %{env_name} contained non-word characters, ignoring it.") % {env_name: bn.name.inspect}
       end

data/lib/r10k/source/svn.rb

@@ -55,10 +55,11 @@ class R10K::Source::SVN < R10K::Source::Base
   # @option options [String] :remote The URL to the base directory of the SVN repository
   # @option options [String] :username The SVN username
   # @option options [String] :password The SVN password
+  # @option options [String] :puppetfile_name The puppetfile name
   def initialize(name, basedir, options = {})
     super
 
-    setopts(options, {:remote => :self, :username => :self, :password => :self})
+    setopts(options, {:remote => :self, :username => :self, :password => :self, :puppetfile_name => :self })
     @environments = []
     @svn_remote = R10K::SVN::Remote.new(@remote, :username => @username, :password => @password)
     @ignore_branch_prefixes = options[:ignore_branch_prefixes]
@@ -88,7 +89,8 @@ class R10K::Source::SVN < R10K::Source::Base
       options = {
         :remote   => path,
         :username => @username,
-        :password => @password
+        :password => @password,
+        :puppetfile_name => puppetfile_name
       }
       R10K::Environment::SVN.new(branch.name, @basedir, branch.dirname, options)
     end

data/lib/r10k/util/purgeable.rb

@@ -45,10 +45,12 @@ module R10K
 
       # @return [Array<String>] Directory contents that are present but not expected
       def stale_contents(recurse, exclusions, whitelist)
+        fn_match_opts = File::FNM_PATHNAME | File::FNM_DOTMATCH
+
         (current_contents(recurse) - desired_contents).reject do |item|
-          if exclusion_match = exclusions.find { |ex_item| File.fnmatch?(ex_item, item, File::FNM_PATHNAME | File::FNM_DOTMATCH) }
+          if exclusion_match = exclusions.find { |ex_item| (ex_item == item) || File.fnmatch?(ex_item, item, fn_match_opts) }
             logger.debug2 _("Not purging %{item} due to internal exclusion match: %{exclusion_match}") % {item: item, exclusion_match: exclusion_match}
-          elsif whitelist_match = whitelist.find { |wl_item| File.fnmatch?(wl_item, item, File::FNM_PATHNAME | File::FNM_DOTMATCH) }
+          elsif whitelist_match = whitelist.find { |wl_item| (wl_item == item) || File.fnmatch?(wl_item, item, fn_match_opts) }
             logger.debug _("Not purging %{item} due to whitelist match: %{whitelist_match}") % {item: item, whitelist_match: whitelist_match}
           end
 

data/lib/r10k/util/subprocess/runner/posix.rb

@@ -28,15 +28,15 @@ class R10K::Util::Subprocess::Runner::POSIX < R10K::Util::Subprocess::Runner
 
     @stdout_pump = R10K::Util::Subprocess::Runner::Pump.new(@stdout_r)
     @stderr_pump = R10K::Util::Subprocess::Runner::Pump.new(@stderr_r)
+    @stdout_pump.start
+    @stderr_pump.start
+
     pid = fork do
       exec_r.close
       execute_child(exec_w)
     end
 
     exec_w.close
-    @stdout_pump.start
-    @stderr_pump.start
-
     execute_parent(exec_r, pid)
 
     @result

data/lib/r10k/version.rb

@@ -1,6 +1,3 @@
 module R10K
-  # When updating to a new major (X) or minor (Y) version, include `#major` or
-  # `#minor` (respectively) in your commit message to trigger the appropriate
-  # release. Otherwise, a new patch (Z) version will be released.
-  VERSION = '2.6.9'
+  VERSION = '3.0.0'
 end

data/locales/r10k.pot

@@ -6,11 +6,11 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: r10k 2.6.5-10-g5854775\n"
+"Project-Id-Version: r10k 2.6.3-141-gc7f57d5\n"
 "\n"
 "Report-Msgid-Bugs-To: docs@puppetlabs.com\n"
-"POT-Creation-Date: 2018-11-29 09:11-0800\n"
-"PO-Revision-Date: 2018-11-29 09:11-0800\n"
+"POT-Creation-Date: 2018-08-02 19:06+0000\n"
+"PO-Revision-Date: 2018-08-02 19:06+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -75,10 +75,6 @@ msgstr ""
 msgid "Syntax OK"
 msgstr ""
 
-#: ../lib/r10k/action/puppetfile/cri_runner.rb:19
-msgid "The use of the PUPPETFILE and PUPPETFILE_DIR environment variables is deprecated."
-msgstr ""
-
 #: ../lib/r10k/action/puppetfile/install.rb:30
 msgid "Updating module %{mod_path}"
 msgstr ""
@@ -107,7 +103,7 @@ msgstr ""
 msgid "Unable to load sources; the supplied configuration does not define the 'sources' key"
 msgstr ""
 
-#: ../lib/r10k/environment/base.rb:53 ../lib/r10k/environment/base.rb:69 ../lib/r10k/environment/base.rb:78 ../lib/r10k/source/base.rb:58
+#: ../lib/r10k/environment/base.rb:59 ../lib/r10k/environment/base.rb:75 ../lib/r10k/environment/base.rb:84 ../lib/r10k/source/base.rb:64
 msgid "%{class} has not implemented method %{method}"
 msgstr ""
 
@@ -247,6 +243,10 @@ msgstr ""
 msgid "Fetching remote '%{remote}' at %{path}"
 msgstr ""
 
+#: ../lib/r10k/git/rugged/working_repository.rb:125 ../lib/r10k/git/shellgit/working_repository.rb:100
+msgid "Found local modifications in %{file_path}"
+msgstr ""
+
 #: ../lib/r10k/git/stateful_repository.rb:40
 msgid "Unable to sync repo to unresolvable ref '%{ref}'"
 msgstr ""
@@ -319,23 +319,27 @@ msgstr ""
 msgid "Could not read metadata.json"
 msgstr ""
 
-#: ../lib/r10k/puppetfile.rb:62
+#: ../lib/r10k/puppetfile.rb:52
+msgid "Using Puppetfile '%{puppetfile}'"
+msgstr ""
+
+#: ../lib/r10k/puppetfile.rb:65
 msgid "Puppetfile %{path} missing or unreadable"
 msgstr ""
 
-#: ../lib/r10k/puppetfile.rb:72
+#: ../lib/r10k/puppetfile.rb:75
 msgid "Failed to evaluate %{path}"
 msgstr ""
 
-#: ../lib/r10k/puppetfile.rb:86
-msgid "Puppetfiles should not contain duplicate module names and will result in an error in r10k v3.x."
+#: ../lib/r10k/puppetfile.rb:85
+msgid "Puppetfiles cannot contain duplicate module names."
 msgstr ""
 
 #: ../lib/r10k/puppetfile.rb:87
 msgid "Remove the duplicates of the following modules: %{dupes}"
 msgstr ""
 
-#: ../lib/r10k/puppetfile.rb:207
+#: ../lib/r10k/puppetfile.rb:213
 msgid "unrecognized declaration '%{method}'"
 msgstr ""
 
@@ -415,7 +419,7 @@ msgstr ""
 msgid "Environment %{env_name} contained non-word characters, ignoring it."
 msgstr ""
 
-#: ../lib/r10k/source/git.rb:123 ../lib/r10k/source/svn.rb:111
+#: ../lib/r10k/source/git.rb:123 ../lib/r10k/source/svn.rb:113
 msgid "Branch %{branch} filtered out by ignore_branch_prefixes %{ibp}"
 msgstr ""
 
@@ -443,23 +447,23 @@ msgstr ""
 msgid "pe_license feature is not available, PE only Puppet modules will not be downloadable."
 msgstr ""
 
-#: ../lib/r10k/util/purgeable.rb:50
+#: ../lib/r10k/util/purgeable.rb:52
 msgid "Not purging %{item} due to internal exclusion match: %{exclusion_match}"
 msgstr ""
 
-#: ../lib/r10k/util/purgeable.rb:52
+#: ../lib/r10k/util/purgeable.rb:54
 msgid "Not purging %{item} due to whitelist match: %{whitelist_match}"
 msgstr ""
 
-#: ../lib/r10k/util/purgeable.rb:69
+#: ../lib/r10k/util/purgeable.rb:71
 msgid "No unmanaged contents in %{managed_dirs}, nothing to purge"
 msgstr ""
 
-#: ../lib/r10k/util/purgeable.rb:74
+#: ../lib/r10k/util/purgeable.rb:76
 msgid "Removing unmanaged path %{path}"
 msgstr ""
 
-#: ../lib/r10k/util/purgeable.rb:79
+#: ../lib/r10k/util/purgeable.rb:81
 msgid "Unable to remove unmanaged path: %{path}"
 msgstr ""