r10k 3.11.0 → 3.14.0

data/lib/r10k/util/downloader.rb

@@ -0,0 +1,134 @@
+require 'digest'
+require 'net/http'
+
+module R10K
+  module Util
+
+    # Utility mixin for classes that need to download files
+    module Downloader
+
+      # Downloader objects need to checksum downloaded or saved content. The
+      # algorithm used to perform this checksumming (and therefore the kinds of
+      # checksums returned by various methods) is reported by this method.
+      #
+      # @return [Symbol] The checksum algorithm the downloader uses
+      def checksum_algorithm
+        @checksum_algorithm ||= :SHA256
+      end
+
+      private
+
+      # Set the checksum algorithm the downloader should use. It should be a
+      # symbol, and a valid Ruby 'digest' library algorithm. The default is
+      # :SHA256.
+      #
+      # @param algorithm [Symbol] The checksum algorithm the downloader should use
+      def checksum_algorithm=(algorithm)
+        @checksum_algorithm = algorithm
+      end
+
+      CHUNK_SIZE = 64 * 1024 # 64 kb
+
+      # @param src_uri [URI] The URI to download from
+      # @param dst_file [String] The file or path to save to
+      # @return [String] The downloaded file's hex digest
+      def download(src_uri, dst_file)
+        digest = Digest(checksum_algorithm).new
+        http_get(src_uri) do |resp|
+          File.open(dst_file, 'wb') do |output_stream|
+            resp.read_body do |chunk|
+              output_stream.write(chunk)
+              digest.update(chunk)
+            end
+          end
+        end
+
+        digest.hexdigest
+      end
+
+      # @param src_file The file or path to copy from
+      # @param dst_file The file or path to copy to
+      # @return [String] The copied file's sha256 hex digest
+      def copy(src_file, dst_file)
+        digest = Digest(checksum_algorithm).new
+        File.open(src_file, 'rb') do |input_stream|
+          File.open(dst_file, 'wb') do |output_stream|
+            until input_stream.eof?
+              chunk = input_stream.read(CHUNK_SIZE)
+              output_stream.write(chunk)
+              digest.update(chunk)
+            end
+          end
+        end
+
+        digest.hexdigest
+      end
+
+      # Start a Net::HTTP::Get connection, then yield the Net::HTTPSuccess object
+      # to the caller's block. Follow redirects if Net::HTTPRedirection responses
+      # are encountered, and use a proxy if directed.
+      #
+      # @param uri [URI] The URI to download the file from
+      # @param redirect_limit [Integer] How many redirects to permit before failing
+      # @param proxy [URI, String] The URI to use as a proxy
+      def http_get(uri, redirect_limit: 10, proxy: nil, &block)
+        raise "HTTP redirect too deep" if redirect_limit.zero?
+
+        session = Net::HTTP.new(uri.host, uri.port, *proxy_to_array(proxy))
+        session.use_ssl = true if uri.scheme == 'https'
+        session.start
+
+        begin
+          session.request_get(uri) do |response|
+            case response
+            when Net::HTTPRedirection
+              redirect = response['location']
+              session.finish
+              return http_get(URI.parse(redirect), redirect_limit: redirect_limit - 1, proxy: proxy, &block)
+            when Net::HTTPSuccess
+              yield response
+            else
+              raise "Unexpected response code #{response.code}: #{response}"
+            end
+          end
+        ensure
+          session.finish if session.active?
+        end
+      end
+
+      # Helper method to translate a proxy URI to array arguments for
+      # Net::HTTP#new. A nil argument returns nil array elements.
+      def proxy_to_array(proxy_uri)
+        if proxy_uri
+          px = proxy_uri.is_a?(URI) ? proxy_uri : URI.parse(proxy_uri)
+          [px.host, px.port, px.user, px.password]
+        else
+          [nil, nil, nil, nil]
+        end
+      end
+
+      # Return the sha256 digest of the file at the given path
+      #
+      # @param path [String] The path to the file
+      # @return [String] The file's sha256 hex digest
+      def file_digest(path)
+        File.open(path) do |file|
+          reader_digest(file)
+        end
+      end
+
+      # Return the sha256 digest of the readable data
+      #
+      # @param reader [String] An object that responds to #read
+      # @return [String] The read data's sha256 hex digest
+      def reader_digest(reader)
+        digest = Digest(checksum_algorithm).new
+        while chunk = reader.read(CHUNK_SIZE)
+          digest.update(chunk)
+        end
+
+        digest.hexdigest
+      end
+    end
+  end
+end

data/lib/r10k/util/purgeable.rb

@@ -1,3 +1,5 @@
+require 'r10k/logging'
+
 require 'fileutils'
 
 module R10K
@@ -9,6 +11,8 @@ module R10K
     #   {#desired_contents}
     module Purgeable
 
+      include R10K::Logging
+
       HIDDEN_FILE = /\.[^.]+/
 
       FN_MATCH_OPTS = File::FNM_PATHNAME | File::FNM_DOTMATCH
@@ -95,8 +99,8 @@ module R10K
         end
 
         children.flat_map do |child|
-          if File.directory?(child) && recurse
-            potentially_purgeable(child, exclusion_globs, allowed_globs, desireds_not_to_recurse_into, recurse)
+          if File.directory?(child) && !File.symlink?(child) && recurse
+            potentially_purgeable(child, exclusion_globs, allowed_globs, desireds_not_to_recurse_into, recurse) << child.to_s
           else
             child.to_s
           end

data/lib/r10k/util/setopts.rb

@@ -1,3 +1,5 @@
+require 'r10k/logging'
+
 module R10K
   module Util
 

data/lib/r10k/util/subprocess.rb

@@ -1,3 +1,4 @@
+require 'r10k/logging'
 require 'r10k/util/platform'
 
 module R10K

data/lib/r10k/version.rb

@@ -2,5 +2,5 @@ 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 = '3.11.0'
+  VERSION = '3.14.0'
 end

data/locales/r10k.pot

@@ -6,11 +6,11 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: r10k 3.9.3-75-ge9bdb69\n"
+"Project-Id-Version: r10k 3.9.3-170-g8cb36435\n"
 "\n"
 "Report-Msgid-Bugs-To: docs@puppetlabs.com\n"
-"POT-Creation-Date: 2021-08-13 23:48+0000\n"
-"PO-Revision-Date: 2021-08-13 23:48+0000\n"
+"POT-Creation-Date: 2021-11-16 21:43+0000\n"
+"PO-Revision-Date: 2021-11-16 21:43+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -19,71 +19,83 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ../lib/r10k/action/deploy/deploy_helpers.rb:12 ../lib/r10k/settings/loader.rb:63
+#: ../lib/r10k/action/deploy/deploy_helpers.rb:16 ../lib/r10k/settings/loader.rb:63
 msgid "No configuration file given, no config file found in current directory, and no global config present"
 msgstr ""
 
-#: ../lib/r10k/action/deploy/deploy_helpers.rb:26
+#: ../lib/r10k/action/deploy/deploy_helpers.rb:30
 msgid "Making changes to deployed environments has been administratively disabled."
 msgstr ""
 
-#: ../lib/r10k/action/deploy/deploy_helpers.rb:27
+#: ../lib/r10k/action/deploy/deploy_helpers.rb:31
 msgid "Reason: %{write_lock}"
 msgstr ""
 
-#: ../lib/r10k/action/deploy/environment.rb:113
+#: ../lib/r10k/action/deploy/environment.rb:116
 msgid "Environment(s) \\'%{environments}\\' cannot be found in any source and will not be deployed."
 msgstr ""
 
-#: ../lib/r10k/action/deploy/environment.rb:146
+#: ../lib/r10k/action/deploy/environment.rb:136
+msgid "Executing postrun command."
+msgstr ""
+
+#: ../lib/r10k/action/deploy/environment.rb:150
 msgid "Environment %{env_dir} does not match environment name filter, skipping"
 msgstr ""
 
-#: ../lib/r10k/action/deploy/environment.rb:154
+#: ../lib/r10k/action/deploy/environment.rb:158
 msgid "Deploying environment %{env_path}"
 msgstr ""
 
-#: ../lib/r10k/action/deploy/environment.rb:157
+#: ../lib/r10k/action/deploy/environment.rb:161
 msgid "Environment %{env_dir} is now at %{env_signature}"
 msgstr ""
 
-#: ../lib/r10k/action/deploy/environment.rb:161
+#: ../lib/r10k/action/deploy/environment.rb:165
 msgid "Environment %{env_dir} is new, updating all modules"
 msgstr ""
 
-#: ../lib/r10k/action/deploy/module.rb:98
+#: ../lib/r10k/action/deploy/module.rb:81
+msgid "Running postrun command for environments: %{envs_to_run}."
+msgstr ""
+
+#: ../lib/r10k/action/deploy/module.rb:91
+msgid "No environments were modified, not executing postrun command."
+msgstr ""
+
+#: ../lib/r10k/action/deploy/module.rb:103
 msgid "Only updating modules in environment(s) %{opt_env} skipping environment %{env_path}"
 msgstr ""
 
-#: ../lib/r10k/action/deploy/module.rb:100
+#: ../lib/r10k/action/deploy/module.rb:105
 msgid "Updating modules %{modules} in environment %{env_path}"
 msgstr ""
 
-#: ../lib/r10k/action/puppetfile/check.rb:16
+#: ../lib/r10k/action/puppetfile/check.rb:18
 msgid "Syntax OK"
 msgstr ""
 
-#: ../lib/r10k/action/runner.rb:57 ../lib/r10k/deployment/config.rb:42
+#: ../lib/r10k/action/runner.rb:63 ../lib/r10k/deployment/config.rb:42
 msgid "Overriding config file setting '%{key}': '%{old_val}' -> '%{new_val}'"
 msgstr ""
 
-#: ../lib/r10k/action/runner.rb:99
+#: ../lib/r10k/action/runner.rb:105
 msgid "Reading configuration from %{config_path}"
 msgstr ""
 
-#: ../lib/r10k/action/runner.rb:102
+#: ../lib/r10k/action/runner.rb:108
 msgid "No config file explicitly given and no default config file could be found, default settings will be used."
 msgstr ""
 
-#: ../lib/r10k/content_synchronizer.rb:27
+#: ../lib/r10k/content_synchronizer.rb:33
 msgid "Updating modules with %{pool_size} threads"
 msgstr ""
 
-#: ../lib/r10k/content_synchronizer.rb:37
+#: ../lib/r10k/content_synchronizer.rb:46
 msgid "Error during concurrent deploy of a module: %{message}"
 msgstr ""
 
-#: ../lib/r10k/content_synchronizer.rb:75
+#: ../lib/r10k/content_synchronizer.rb:87
 msgid "Module thread %{id} exiting: %{message}"
 msgstr ""
 
@@ -95,7 +107,11 @@ msgstr ""
 msgid "Unable to load sources; the supplied configuration does not define the 'sources' key"
 msgstr ""
 
-#: ../lib/r10k/environment/base.rb:68 ../lib/r10k/environment/base.rb:84 ../lib/r10k/environment/base.rb:93 ../lib/r10k/source/base.rb:83
+#: ../lib/r10k/environment/bare.rb:6
+msgid "\"bare\" environment type is deprecated; please use \"plain\" instead (environment: %{name})"
+msgstr ""
+
+#: ../lib/r10k/environment/base.rb:89 ../lib/r10k/environment/base.rb:105 ../lib/r10k/environment/base.rb:114 ../lib/r10k/source/base.rb:83
 msgid "%{class} has not implemented method %{method}"
 msgstr ""
 
@@ -103,15 +119,15 @@ msgstr ""
 msgid "Improper configuration value given for strip_component setting in %{src} source. Value must be a string, a /regex/, false, or omitted. Got \"%{val}\" (%{type})"
 msgstr ""
 
-#: ../lib/r10k/environment/with_modules.rb:57
+#: ../lib/r10k/environment/with_modules.rb:60
 msgid "Environment and %{src} both define the \"%{name}\" module"
 msgstr ""
 
-#: ../lib/r10k/environment/with_modules.rb:58
+#: ../lib/r10k/environment/with_modules.rb:61
 msgid "#{msg_error}. The %{src} definition will be ignored"
 msgstr ""
 
-#: ../lib/r10k/environment/with_modules.rb:68
+#: ../lib/r10k/environment/with_modules.rb:71
 msgid "Unexpected value for `module_conflicts` setting in %{env} environment: %{val}"
 msgstr ""
 
@@ -139,19 +155,19 @@ msgstr ""
 msgid "Proc %{block} for feature %{name} returned %{output}"
 msgstr ""
 
-#: ../lib/r10k/forge/module_release.rb:196
+#: ../lib/r10k/forge/module_release.rb:197
 msgid "Unpacking %{tarball_cache_path} to %{target_dir} (with tmpdir %{tmp_path})"
 msgstr ""
 
-#: ../lib/r10k/forge/module_release.rb:198
+#: ../lib/r10k/forge/module_release.rb:199
 msgid "Valid files unpacked: %{valid_files}"
 msgstr ""
 
-#: ../lib/r10k/forge/module_release.rb:200
+#: ../lib/r10k/forge/module_release.rb:201
 msgid "These files existed in the module's tar file, but are invalid filetypes and were not unpacked: %{invalid_files}"
 msgstr ""
 
-#: ../lib/r10k/forge/module_release.rb:203
+#: ../lib/r10k/forge/module_release.rb:204
 msgid "Symlinks are unsupported and were not unpacked from the module tarball. %{release_slug} contained these ignored symlinks: %{symlinks}"
 msgstr ""
 
@@ -187,11 +203,11 @@ msgstr ""
 msgid "Cannot write %{file}; parent directory does not exist"
 msgstr ""
 
-#: ../lib/r10k/git/cache.rb:65
+#: ../lib/r10k/git/cache.rb:57
 msgid "%{class}#path is deprecated; use #git_dir"
 msgstr ""
 
-#: ../lib/r10k/git/cache.rb:94
+#: ../lib/r10k/git/cache.rb:86
 msgid "Creating new git cache for %{remote}"
 msgstr ""
 
@@ -207,6 +223,14 @@ msgstr ""
 msgid "Rugged versions prior to 0.24.0 do not support pruning stale branches during fetch, please upgrade your \\'rugged\\' gem. (Current version is: %{version})"
 msgstr ""
 
+#: ../lib/r10k/git/rugged/base_repository.rb:24
+msgid "Unable to resolve %{pattern}: %{e} "
+msgstr ""
+
+#: ../lib/r10k/git/rugged/base_repository.rb:69
+msgid "Remote URL is different from cache, updating %{orig} to %{update}"
+msgstr ""
+
 #: ../lib/r10k/git/rugged/credentials.rb:28
 msgid "Authentication failed for Git remote %{url}."
 msgstr ""
@@ -323,35 +347,35 @@ msgstr ""
 msgid "Found local modifications in %{file_path}"
 msgstr ""
 
-#: ../lib/r10k/git/stateful_repository.rb:44
+#: ../lib/r10k/git/stateful_repository.rb:45
 msgid "Unable to sync repo to unresolvable ref '%{ref}'"
 msgstr ""
 
-#: ../lib/r10k/git/stateful_repository.rb:51
+#: ../lib/r10k/git/stateful_repository.rb:53
 msgid "Cloning %{repo_path} and checking out %{ref}"
 msgstr ""
 
-#: ../lib/r10k/git/stateful_repository.rb:54
+#: ../lib/r10k/git/stateful_repository.rb:56
 msgid "Replacing %{repo_path} and checking out %{ref}"
 msgstr ""
 
-#: ../lib/r10k/git/stateful_repository.rb:58 ../lib/r10k/git/stateful_repository.rb:63
+#: ../lib/r10k/git/stateful_repository.rb:60 ../lib/r10k/git/stateful_repository.rb:65
 msgid "Updating %{repo_path} to %{ref}"
 msgstr ""
 
-#: ../lib/r10k/git/stateful_repository.rb:62
+#: ../lib/r10k/git/stateful_repository.rb:64
 msgid "Overwriting local modifications to %{repo_path}"
 msgstr ""
 
-#: ../lib/r10k/git/stateful_repository.rb:66
+#: ../lib/r10k/git/stateful_repository.rb:68
 msgid "Skipping %{repo_path} due to local modifications"
 msgstr ""
 
-#: ../lib/r10k/git/stateful_repository.rb:69
+#: ../lib/r10k/git/stateful_repository.rb:72
 msgid "%{repo_path} is already at Git ref %{ref}"
 msgstr ""
 
-#: ../lib/r10k/initializers.rb:30
+#: ../lib/r10k/initializers.rb:31
 msgid "the purgedirs key in r10k.yaml is deprecated. it is currently ignored."
 msgstr ""
 
@@ -363,55 +387,59 @@ msgstr ""
 msgid "No class registered for %{key}"
 msgstr ""
 
-#: ../lib/r10k/logging.rb:60
+#: ../lib/r10k/logging.rb:73 ../lib/r10k/logging.rb:100 ../lib/r10k/logging.rb:109
 msgid "Invalid log level '%{val}'. Valid levels are %{log_levels}"
 msgstr ""
 
-#: ../lib/r10k/module.rb:29
+#: ../lib/r10k/module.rb:45
 msgid "Module %{name} with args %{args} doesn't have an implementation. (Are you using the right arguments?)"
 msgstr ""
 
-#: ../lib/r10k/module/base.rb:80
+#: ../lib/r10k/module/base.rb:83
 msgid "Spec dir for #{@title} will not be deleted because it is not in the moduledir"
 msgstr ""
 
-#: ../lib/r10k/module/base.rb:92
+#: ../lib/r10k/module/base.rb:95
 msgid "Deleting spec data at #{spec_path}"
 msgstr ""
 
-#: ../lib/r10k/module/base.rb:100
+#: ../lib/r10k/module/base.rb:103
 msgid "No spec dir detected at #{spec_path}, skipping deletion"
 msgstr ""
 
-#: ../lib/r10k/module/base.rb:112
+#: ../lib/r10k/module/base.rb:116
 msgid "Deploying module to %{path}"
 msgstr ""
 
-#: ../lib/r10k/module/base.rb:115
+#: ../lib/r10k/module/base.rb:119
 msgid "Only updating modules %{modules}, skipping module %{name}"
 msgstr ""
 
-#: ../lib/r10k/module/base.rb:171
+#: ../lib/r10k/module/base.rb:175
 msgid "Module name (%{title}) must match either 'modulename' or 'owner/modulename'"
 msgstr ""
 
-#: ../lib/r10k/module/forge.rb:90
+#: ../lib/r10k/module/definition.rb:28
+msgid "Not updating module %{name}, assuming content unchanged"
+msgstr ""
+
+#: ../lib/r10k/module/forge.rb:98
 msgid "The module %{title} does not appear to have any published releases, cannot determine latest version."
 msgstr ""
 
-#: ../lib/r10k/module/forge.rb:93 ../lib/r10k/module/forge.rb:122
+#: ../lib/r10k/module/forge.rb:101 ../lib/r10k/module/forge.rb:130
 msgid "The module %{title} does not exist on %{url}."
 msgstr ""
 
-#: ../lib/r10k/module/forge.rb:197
+#: ../lib/r10k/module/forge.rb:205
 msgid "Forge module names must match 'owner/modulename', instead got #{title}"
 msgstr ""
 
-#: ../lib/r10k/module/git.rb:66
+#: ../lib/r10k/module/git.rb:81
 msgid "Cannot track control repo branch for content '%{name}' when not part of a git-backed environment, will use default if available."
 msgstr ""
 
-#: ../lib/r10k/module/local.rb:35
+#: ../lib/r10k/module/local.rb:37
 msgid "Module %{title} is a local module, always indicating synced."
 msgstr ""
 
@@ -419,34 +447,50 @@ msgstr ""
 msgid "Could not read metadata.json"
 msgstr ""
 
-#: ../lib/r10k/module_loader/puppetfile.rb:49
+#: ../lib/r10k/module_loader/puppetfile.rb:64
 msgid "Using Puppetfile '%{puppetfile}'"
 msgstr ""
 
-#: ../lib/r10k/module_loader/puppetfile.rb:50
+#: ../lib/r10k/module_loader/puppetfile.rb:65
 msgid "Using moduledir '%{moduledir}'"
 msgstr ""
 
-#: ../lib/r10k/module_loader/puppetfile.rb:74
+#: ../lib/r10k/module_loader/puppetfile.rb:86
 msgid "Failed to evaluate %{path}"
 msgstr ""
 
-#: ../lib/r10k/module_loader/puppetfile.rb:149
-msgid "Puppetfiles cannot contain duplicate module names."
+#: ../lib/r10k/module_loader/puppetfile.rb:103
+msgid "Unable to preload Puppetfile because of %{msg}"
 msgstr ""
 
-#: ../lib/r10k/module_loader/puppetfile.rb:151
-msgid "Remove the duplicates of the following modules: %{dupes}"
+#: ../lib/r10k/module_loader/puppetfile.rb:121
+msgid "Using Forge from Puppetfile: %{forge}"
 msgstr ""
 
-#: ../lib/r10k/module_loader/puppetfile/dsl.rb:32
-msgid "unrecognized declaration '%{method}'"
+#: ../lib/r10k/module_loader/puppetfile.rb:124
+msgid "Ignoring Forge declaration in Puppetfile, using value from settings: %{forge}."
+msgstr ""
+
+#: ../lib/r10k/module_loader/puppetfile.rb:173
+msgid "\"basedir\" is deprecated. Please use \"environment_name\" instead. \"basedir\" will be removed in a future version."
 msgstr ""
 
-#: ../lib/r10k/puppetfile.rb:105
+#: ../lib/r10k/module_loader/puppetfile.rb:192 ../lib/r10k/puppetfile.rb:104
 msgid "Puppetfile %{path} missing or unreadable"
 msgstr ""
 
+#: ../lib/r10k/module_loader/puppetfile.rb:228
+msgid "Puppetfiles cannot contain duplicate module names."
+msgstr ""
+
+#: ../lib/r10k/module_loader/puppetfile.rb:230
+msgid "Remove the duplicates of the following modules: %{dupes}"
+msgstr ""
+
+#: ../lib/r10k/module_loader/puppetfile/dsl.rb:37
+msgid "unrecognized declaration '%{method}'"
+msgstr ""
+
 #: ../lib/r10k/settings/collection.rb:77
 msgid "Validation failed for '%{name}' settings group"
 msgstr ""
@@ -570,6 +614,10 @@ msgstr ""
 msgid "Both username and password must be specified"
 msgstr ""
 
+#: ../lib/r10k/tarball.rb:167
+msgid "Cache not present at %{path}"
+msgstr ""
+
 #: ../lib/r10k/util/basedir.rb:34
 msgid "Expected Array<#desired_contents>, got R10K::Deployment"
 msgstr ""
@@ -590,45 +638,45 @@ msgstr ""
 msgid "pe_license feature is not available, PE only Puppet modules will not be downloadable."
 msgstr ""
 
-#: ../lib/r10k/util/purgeable.rb:87
+#: ../lib/r10k/util/purgeable.rb:91
 msgid "Not purging %{path} due to internal exclusion match: %{exclusion_match}"
 msgstr ""
 
-#: ../lib/r10k/util/purgeable.rb:89
+#: ../lib/r10k/util/purgeable.rb:93
 msgid "Not purging %{path} due to whitelist match: %{allowlist_match}"
 msgstr ""
 
-#: ../lib/r10k/util/purgeable.rb:133
+#: ../lib/r10k/util/purgeable.rb:137
 msgid "No unmanaged contents in %{managed_dirs}, nothing to purge"
 msgstr ""
 
-#: ../lib/r10k/util/purgeable.rb:138
+#: ../lib/r10k/util/purgeable.rb:142
 msgid "Removing unmanaged path %{path}"
 msgstr ""
 
-#: ../lib/r10k/util/purgeable.rb:143
+#: ../lib/r10k/util/purgeable.rb:147
 msgid "Unable to remove unmanaged path: %{path}"
 msgstr ""
 
-#: ../lib/r10k/util/setopts.rb:58
+#: ../lib/r10k/util/setopts.rb:60
 msgid "%{class_name} parameters '%{a}' and '%{b}' conflict. Specify one or the other, but not both"
 msgstr ""
 
-#: ../lib/r10k/util/setopts.rb:65
+#: ../lib/r10k/util/setopts.rb:67
 msgid "%{class_name} cannot handle option '%{key}'"
 msgstr ""
 
-#: ../lib/r10k/util/subprocess.rb:69
+#: ../lib/r10k/util/subprocess.rb:70
 msgid "Starting process: %{args}"
 msgstr ""
 
-#: ../lib/r10k/util/subprocess.rb:74
+#: ../lib/r10k/util/subprocess.rb:75
 msgid ""
 "Finished process:\n"
 "%{result}"
 msgstr ""
 
-#: ../lib/r10k/util/subprocess.rb:77
+#: ../lib/r10k/util/subprocess.rb:78
 msgid "Command exited with non-zero exit code"
 msgstr ""
 

data/r10k.gemspec

@@ -32,18 +32,18 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'gettext-setup', '~>0.24'
   # These two pins narrow what is allowed by gettext-setup,
-  # to preserver compatability with Ruby 2.4
+  # to preserve compatability with Ruby 2.4
   s.add_dependency 'fast_gettext', '~> 1.1.0'
   s.add_dependency 'gettext', ['>= 3.0.2', '< 3.3.0']
 
   s.add_dependency 'jwt', '~> 2.2.3'
+  s.add_dependency 'minitar', '~> 0.9.0'
 
   s.add_development_dependency 'rspec', '~> 3.1'
 
   s.add_development_dependency 'rake'
 
   s.add_development_dependency 'yard', '~> 0.9.11'
-  s.add_development_dependency 'minitar', '~> 0.9.0'
 
   s.files        = %x[git ls-files].split($/)
   s.require_path = 'lib'