r10k 1.2.0 → 1.2.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzY2ZjkxNGNhY2MzYzliNTA3YzM2N2U5ODE4NzNhZDM1YmZhMDcxYg==
+    NzM2NDQyNzM1Y2I0Zjc5ZmUzNmEyZDA0MTJiMzZjM2E2MWNhNWJhMw==
   data.tar.gz: !binary |-
-    Yzc4NzYzOTI3NmQ4YWNlYWEyOThmOThjMzdmNGRjZjk4N2VmNDkyNw==
+    NmRkYWZiZDYxNGEyNTZiZDgzZDQwMjEzYjQ0MjA2MjgxNjE0MjRlMw==
 SHA512:
   metadata.gz: !binary |-
-    NjI2Yzk3YTk2YmY4MGYwYmQ2NmE4NzY1YWQ2ODY2MDgyN2IzM2Q5ZDlkNjBh
-    ODU0NDJhYmVmNmJiOTg1NGJhZjM3Zjg4NzBlZjc4YjVmYjc5ZDA4ZDY3MzY5
-    ZWQ1ZmU0MjRiN2QzYjNkZGFlMWExZDg3MDNiZjhmNzVhNmNhODE=
+    YWE2ZTg3ZDI1YzA4YTlkNTFlNjQ2MDIzZDU1YWNjZGExMjY3NTY5NGRhN2Fm
+    MTNhNDA4NzY1YTNkODM4ZjQ4NTI4ZmRiOTEwNDIwZWYwOWNiN2VhZWE3M2My
+    NDE4MGY0M2ZiZjcyOGI2Y2UyNWU5ZWRjNjlhZGJkZDc4ZjZlMGY=
   data.tar.gz: !binary |-
-    ZTBkMmIxMTdmZDdkMGY0ZTI2ZGE1YWJkMDViMzlhY2MwMWFlYzZlYzQ5YzI2
-    YjBmODUzODdkYTcwYWM5ZmI0YmJhNDQ4MGY3NWI3ZGI3MDg4YjdlYTA2YWY4
-    NGExZTk5ZGEyYzMwZjhmMDNjMzU1MGQ3NjQyN2E3MThkNWY4OWU=
+    NzM5YmU2ODRlNzg2NGEzMzQ3NjBmODIzYzE4MmUzM2NkYmRmYmExOTBhMWNk
+    NGNhMjI5Njc3MGEyNWVjYjg3NTNmMjJkOTY0ZTAzMDM3NzQ5YzhlYjlhZDI0
+    Yzg5MDQ0MDNlNmI5NjlhNGQwZTRiMGRhM2ZkNDI3MWM4Zjk2OGQ=

data/CHANGELOG

@@ -1,6 +1,25 @@
 CHANGELOG
 =========
 
+1.2.1
+-----
+
+2014/04/21
+
+### User Notes
+
+(GH-93) r10k deploy subcommands now respect the --help flag.
+
+(GH-100) The addition of a faster command execution library was POSIX centric,
+but there were a number of users that were running r10k on Windows, which brike
+their environments. Support for Windows has been re-added and Windows is now a
+supported platform for using the r10k puppetfile commands. Please note that
+r10k now requires Ruby 1.9.3 on Windows to function.
+
+### Thanks
+
+Thanks to Sam Kottler and Daniel Dreier for their their work on this release.
+
 1.2.0
 -----
 

data/README.markdown

@@ -18,15 +18,19 @@ implementation of Puppet [dynamic environments][workflow].
 Installation
 ------------
 
-r10k should be compatible with Ruby 1.8.7, 1.9.3, and 2.0.0. Any issue with
-those versions should be considered a bug.
+r10k supports the following Ruby versions:
+
+  - 1.8.7 (POSIX minimum version)
+  - 1.9.3 (Windows minimum version)
+  - 2.0.0
+  - 2.1.0
 
 ### Rubygems
 
 For general use, you should install r10k from Ruby gems:
 
     gem install r10k
-    r10k --help
+    r10k help
 
 ### Bundler
 
@@ -36,14 +40,14 @@ a git repository using Bundler for dependencies:
     git clone git://github.com/adrienthebo/r10k
     cd r10k
     bundle install
-    bundle exec r10k --help
+    bundle exec r10k help
 
 ### Puppet Enterprise
 
 Puppet Enterprise uses its own Ruby, so you need to use the correct version of gem when installing r10k.
 
     /opt/puppet/bin/gem install r10k
-    r10k --help
+    r10k help
 
 Common Commands
 ---------------

data/lib/r10k/cli.rb

@@ -46,3 +46,4 @@ require 'r10k/cli/module'
 require 'r10k/cli/synchronize'
 require 'r10k/cli/puppetfile'
 require 'r10k/cli/version'
+require 'r10k/cli/help'

data/lib/r10k/cli/deploy.rb

@@ -51,6 +51,10 @@ scheduled. On subsequent deployments, Puppetfile deployment will default to off.
           DESCRIPTION
 
           flag :p, :puppetfile, 'Deploy modules from a puppetfile'
+          flag :h, :help, 'Show help for this command' do |value, cmd|
+            puts cmd.help
+            exit 0
+          end
 
           run do |opts, args, cmd|
             deploy = R10K::Deployment.load_config(opts[:config])
@@ -86,6 +90,11 @@ It will load the Puppetfile configurations out of all environments, and will
 try to deploy the given module names in all environments.
           DESCRIPTION
 
+          flag :h, :help, 'Show help for this command' do |value, cmd|
+            puts cmd.help
+            exit 0
+          end
+
           run do |opts, args, cmd|
             deploy = R10K::Deployment.load_config(opts[:config])
 
@@ -111,6 +120,10 @@ try to deploy the given module names in all environments.
           summary 'Display environments and modules in the deployment'
 
           flag :p, :puppetfile, 'Display Puppetfile modules'
+          flag :h, :help, 'Show help for this command' do |value, cmd|
+            puts cmd.help
+            exit 0
+          end
 
           run do |opts, args, cmd|
             deploy = R10K::Deployment.load_config(opts[:config])

data/lib/r10k/cli/help.rb

@@ -0,0 +1,7 @@
+require 'r10k/cli'
+require 'cri'
+
+module R10K::CLI
+  help_cmd = Cri::Command.new_basic_help
+  self.command.add_command(help_cmd)
+end

data/lib/r10k/cli/puppetfile.rb

@@ -59,7 +59,7 @@ Puppetfile (http://bombasticmonkey.com/librarian-puppet/).
             puppetfile_root = Dir.getwd
             puppetfile_path = ENV['PUPPETFILE_DIR']
             puppetfile      = ENV['PUPPETFILE']
-            
+
             puppetfile = R10K::Puppetfile.new(puppetfile_root, puppetfile_path, puppetfile)
             begin
               puppetfile.load

data/lib/r10k/util/platform.rb

@@ -0,0 +1,19 @@
+require 'rbconfig'
+
+module R10K
+  module Util
+    module Platform
+      def self.platform
+        if self.windows?
+          :windows
+        else
+          :posix
+        end
+      end
+
+      def self.windows?
+        RbConfig::CONFIG['host_os'] =~ /mswin|win32|dos|mingw|cygwin/i
+      end
+    end
+  end
+end

data/lib/r10k/util/subprocess.rb

@@ -1,54 +1,81 @@
 require 'r10k/logging'
 require 'r10k/errors'
+require 'r10k/util/platform'
 
 module R10K
   module Util
 
-    # The subprocess namespace implements a subset of childprocess. It has
-    # three # main differences.
+    # The subprocess namespace implements an interface similar to childprocess.
+    # The interface has been simplified to make it easier to use and does not
+    # depend on native code.
     #
-    #   1. child processes invoke setsid()
-    #   2. there are no dependencies on C extensions (ffi)
-    #   3. it only support unixy systems.
+    # @api private
     class Subprocess
 
       require 'r10k/util/subprocess/runner'
       require 'r10k/util/subprocess/io'
       require 'r10k/util/subprocess/result'
 
+      require 'r10k/util/subprocess/posix'
+      require 'r10k/util/subprocess/windows'
+
+      # @return [Class < R10K::Util::Subprocess::Runner]
+      def self.runner
+        if R10K::Util::Platform.windows?
+          R10K::Util::Subprocess::Windows::Runner
+        else
+          R10K::Util::Subprocess::POSIX::Runner
+        end
+      end
+
       include R10K::Logging
 
+      # @!attribute [r] argv
+      #   @return [Array<String>] The command to be executed
+      attr_reader :argv
+
+      # @!attribute [rw] raise_on_fail
+      #   Determine whether #execute raises an error when the command exits
+      #   with a non-zero exit status.
+      #   @return [true, false]
       attr_accessor :raise_on_fail
+
+      # @!attribute [rw] cwd
+      #   @return [String] The directory to be used as the cwd when executing
+      #     the command.
       attr_accessor :cwd
 
+      # @!attribute [w] logger
+      #   Allow calling processes to take ownership of execution logs by passing
+      #   their own logger to the command being executed.
       attr_writer :logger
 
+      # Prepare the subprocess invocation.
+      #
+      # @param argv [Array<String>] The argument vector to execute
       def initialize(argv)
         @argv = argv
 
         @raise_on_fail = false
       end
 
+      # Execute the given command and return the result of evaluation.
+      #
+      # @api public
+      # @raise [R10K::Util::Subprocess::SubprocessError] if raise_on_fail is
+      #   true and the command exited with a non-zero status.
+      # @return [R10K::Util::Subprocess::Result]
       def execute
-        subprocess = R10K::Util::Subprocess::Runner.new(@argv)
-        subprocess.cwd = @cwd
-
-        stdout_r, stdout_w = attach_pipe(subprocess.io, :stdout, :reader)
-        stderr_r, stderr_w = attach_pipe(subprocess.io, :stderr, :reader)
+        subprocess = self.class.runner.new(@argv)
+        subprocess.cwd = @cwd if @cwd
 
         logmsg = "Execute: #{@argv.join(' ')}"
         logmsg << "(cwd: #{@cwd})" if @cwd
         logger.debug1 logmsg
 
-        subprocess.start
-        stdout_w.close
-        stderr_w.close
-        subprocess.wait
+        subprocess.run
 
-        stdout = stdout_r.read
-        stderr = stderr_r.read
-
-        result = Result.new(@argv, stdout, stderr, subprocess.exit_code)
+        result = subprocess.result
 
         logger.debug2 "[#{result.cmd}] STDOUT: #{result.stdout.chomp}" unless result.stdout.empty?
         logger.debug2 "[#{result.cmd}] STDERR: #{result.stderr.chomp}" unless result.stderr.empty?
@@ -60,33 +87,10 @@ module R10K
         result
       end
 
-      private
-
-      # Attach a pipe to the given process, and return the requested end of the
-      # pipe.
-      #
-      # @param subproc [Runner]
-      # @param name [Symbol] The name of the setter method on the subproc
-      # @param type [Symbol] One of (:reader, :writer) denoting the type to return
-      #
-      # @return [Array<IO>] The reader and writer endpoints of the pipe
-      def attach_pipe(subproc, name, type)
-        rd, wr = ::IO.pipe
-
-        case type
-        when :reader
-          other = wr
-        when :writer
-          other = rd
-        end
-
-        subproc.send("#{name}=", other)
-
-        [rd, wr]
-      end
-
       class SubprocessError < R10KError
 
+        # !@attribute [r] result
+        #   @return [R10K::Util::Subprocess::Result]
         attr_reader :result
 
         def initialize(mesg = nil, options = {})

data/lib/r10k/util/subprocess/io.rb

@@ -4,9 +4,4 @@ class R10K::Util::Subprocess::IO
 
   attr_accessor :stdout
   attr_accessor :stderr
-
-  def initialize
-    @stdout = '/dev/null'
-    @stderr = '/dev/null'
-  end
 end

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

@@ -0,0 +1,4 @@
+module R10K::Util::Subprocess::POSIX
+  require 'r10k/util/subprocess/posix/io'
+  require 'r10k/util/subprocess/posix/runner'
+end

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

@@ -0,0 +1,7 @@
+class R10K::Util::Subprocess::POSIX::IO < R10K::Util::Subprocess::IO
+
+  def initialize
+    @stdout = '/dev/null'
+    @stderr = '/dev/null'
+  end
+end

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

@@ -0,0 +1,113 @@
+require 'fcntl'
+
+# Implement a POSIX command runner by using fork/exec.
+#
+# This implementation is optimized to run commands in the background, and has
+# a few noteworthy implementation details.
+#
+# First off, when the child process is forked, it calls setsid() to detach from
+# the controlling TTY. This has two main ramifications: sending signals will
+# never be send to the forked process, and the forked process does not have
+# access to stdin.
+#
+# @api private
+class R10K::Util::Subprocess::POSIX::Runner < R10K::Util::Subprocess::Runner
+
+  def initialize(argv)
+    @argv = argv
+    @io = R10K::Util::Subprocess::POSIX::IO.new
+
+    attach_pipes
+  end
+
+  def start
+    exec_r, exec_w = status_pipe()
+
+
+    @pid = fork do
+      exec_r.close
+      execute_child(exec_w)
+    end
+
+    exec_w.close
+    execute_parent(exec_r)
+  end
+
+  def wait
+    if @pid
+      _, @status = Process.waitpid2(@pid)
+    end
+
+    stdout = @stdout_r.read
+    stderr = @stderr_r.read
+
+    @result = R10K::Util::Subprocess::Result.new(@argv, stdout, stderr, @status.exitstatus)
+  end
+
+  def run
+    start
+    wait
+    @result
+  end
+
+  def crashed?
+    exit_code != 0
+  end
+
+  def exit_code
+    @status.exitstatus
+  end
+
+  private
+
+  def execute_child(exec_w)
+    if @cwd
+      Dir.chdir @cwd
+    end
+
+    # Create a new session for the forked child. This prevents children from
+    # ever being the foreground process on a TTY, which is almost always what
+    # we want in r10k.
+    Process.setsid
+
+    # Reopen file descriptors
+    STDOUT.reopen(io.stdout)
+    STDERR.reopen(io.stderr)
+
+    executable = @argv.shift
+    exec([executable, executable], *@argv)
+  rescue SystemCallError => e
+    exec_w.write(e.message)
+  end
+
+  def execute_parent(exec_r)
+    @stdout_w.close
+    @stderr_w.close
+
+    if not exec_r.eof?
+      msg = exec_r.read || "exec() failed"
+      raise "Could not execute #{@argv.join(' ')}: #{msg}"
+    end
+  end
+
+  # Create a pipe so that the parent can verify that the child process
+  # successfully executed. The pipe will be closed on a successful exec(),
+  # and will contain an error message on failure.
+  #
+  # @return [IO, IO] The reader and writer for this pipe
+  def status_pipe
+    r_pipe, w_pipe = ::IO.pipe
+
+    w_pipe.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
+
+    [r_pipe, w_pipe]
+  end
+
+  def attach_pipes
+    @stdout_r, @stdout_w = ::IO.pipe
+    @stderr_r, @stderr_w = ::IO.pipe
+
+    @io.stdout = @stdout_w
+    @io.stderr = @stderr_w
+  end
+end

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

@@ -1,88 +1,50 @@
-require 'fcntl'
-
+# Define an abstract interface for external command runners.
+#
 # @api private
 class R10K::Util::Subprocess::Runner
 
+  # @!attribute [rw] cwd
+  #   @return [String] The directory to be used as the cwd when executing
+  #     the command.
   attr_accessor :cwd
 
   attr_reader :io
 
   attr_reader :pid
 
+  # @!attribute [r] status
+  #   @return [Process::Status]
   attr_reader :status
 
+  # @!attribute [r] result
+  #   @return [R10K::Util::Subprocess::Result]
+  attr_reader :result
+
   def initialize(argv)
-    @argv = argv
+    raise NotImplementedError
+  end
 
-    @io = R10K::Util::Subprocess::IO.new
+  def run
+    raise NotImplementedError
   end
 
+  # Start the process asynchronously and return. Not all runners will implement this.
   def start
-    exec_r, exec_w = status_pipe()
-
-    @pid = fork do
-      exec_r.close
-      execute_child(exec_w)
-    end
-
-    exec_w.close
-    execute_parent(exec_r)
+    raise NotImplementedError
   end
 
+  # Wait for the process to exit. Not all runners will implement this.
   def wait
-    if @pid
-      _, @status = Process.waitpid2(@pid)
-    end
+    raise NotImplementedError
   end
 
+  # Did the given process exit with a non-zero exit code?
   def crashed?
-    exit_code != 0
+    raise NotImplementedError
   end
 
+  # @return [Integer] The exit status of the given process.
   def exit_code
-    @status.exitstatus
-  end
-
-  private
-
-  def execute_child(exec_w)
-    if @cwd
-      Dir.chdir @cwd
-    end
-
-    # Create a new session for the forked child. This prevents children from
-    # ever being the foreground process on a TTY, which is almost always what
-    # we want in r10k.
-    Process.setsid
-
-    # Reopen file descriptors
-    STDOUT.reopen(io.stdout)
-    STDERR.reopen(io.stderr)
-
-    executable = @argv.shift
-    exec([executable, executable], *@argv)
-  rescue SystemCallError => e
-    exec_w.write(e.message)
-  end
-
-  def execute_parent(exec_r)
-
-    if not exec_r.eof?
-      msg = exec_r.read || "exec() failed"
-      raise "Could not execute #{@argv.join(' ')}: #{msg}"
-    end
-  end
-
-  # Create a pipe so that the parent can verify that the child process
-  # successfully executed. The pipe will be closed on a successful exec(),
-  # and will contain an error message on failure.
-  #
-  # @return [IO, IO] The reader and writer for this pipe
-  def status_pipe
-    r_pipe, w_pipe = ::IO.pipe
-
-    w_pipe.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
-
-    [r_pipe, w_pipe]
+    raise NotImplementedError
   end
 end

data/lib/r10k/util/subprocess/windows.rb

@@ -0,0 +1,4 @@
+module R10K::Util::Subprocess::Windows
+  require 'r10k/util/subprocess/windows/io'
+  require 'r10k/util/subprocess/windows/runner'
+end

data/lib/r10k/util/subprocess/windows/io.rb

@@ -0,0 +1,6 @@
+class R10K::Util::Subprocess::Windows::IO < R10K::Util::Subprocess::IO
+  def initialize
+    @stdout = 'NUL:'
+    @stderr = 'NUL:'
+  end
+end

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

@@ -0,0 +1,32 @@
+require 'open3'
+
+# Run processes on Windows.
+#
+# This implementation relies on Open3.capture3 to run commands and capture
+# results. In contrast to the POSIX runner this cannot be used in an
+# asynchronous manner as-is; implementing that will probably mean launching a
+# thread and invoking #capture3 in that thread.
+class R10K::Util::Subprocess::Windows::Runner < R10K::Util::Subprocess::Runner
+
+  def initialize(argv)
+    @argv = argv
+    @io = R10K::Util::Subprocess::Windows::IO.new
+  end
+
+  def run
+    cmd = @argv.join(' ')
+
+    stdout, stderr, status = Open3.capture3(cmd)
+
+    @status = status
+    @result = R10K::Util::Subprocess::Result.new(@argv, stdout, stderr, status.exitstatus)
+  end
+
+  def exit_code
+    @status.exitstatus
+  end
+
+  def crashed?
+    exit_code != 0
+  end
+end

data/lib/r10k/version.rb

@@ -1,3 +1,3 @@
 module R10K
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end

data/r10k.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.license  = 'Apache 2.0'
 
   s.add_dependency 'colored',   '>= 1.2'
-  s.add_dependency 'cri',       '~> 2.4.0'
+  s.add_dependency 'cri',       '~> 2.5.0'
 
   s.add_dependency 'systemu',   '~> 2.5.2'
 

data/spec/unit/util/subprocess_spec.rb

@@ -0,0 +1,65 @@
+require 'spec_helper'
+require 'r10k/util/subprocess'
+
+describe R10K::Util::Subprocess do
+
+  describe "selecting the runner implementation" do
+    it "uses the windows implementation on Windows platforms" do
+      expect(R10K::Util::Platform).to receive(:windows?).and_return true
+      expect(described_class.runner).to eq R10K::Util::Subprocess::Windows::Runner
+    end
+    it "uses the posix implementation when not on windows" do
+      expect(R10K::Util::Platform).to receive(:windows?).and_return true
+      expect(described_class.runner).to eq R10K::Util::Subprocess::Windows::Runner
+    end
+  end
+
+  describe "running commands" do
+    subject { described_class.new(['/bin/echo', 'hello', 'world']) }
+
+    let(:runner) do
+      double('R10K::Util::Subprocess::Runner').tap do |i|
+        allow(i).to receive(:run)
+        allow(i).to receive(:result).and_return(result)
+      end
+    end
+
+    let(:result) { double('R10K::Util::Subprocess::Result').as_null_object }
+
+    before do
+      allow(described_class).to receive(:runner).and_return(double(:new => runner))
+    end
+
+    it "copies the cwd to the runner if a cwd is given" do
+      expect(runner).to receive(:cwd=).with('/tmp')
+      subject.cwd = '/tmp'
+      subject.execute
+    end
+
+    it "returns the result from the execution" do
+      expect(subject.execute).to eq result
+    end
+
+    describe "when the command returned with a non-zero exit status" do
+      before do
+        allow(runner).to receive(:crashed?).and_return true
+      end
+
+      it "raises an exception if raise_on_fail is true" do
+        subject.raise_on_fail = true
+
+        allow(result).to receive(:exit_code).and_return(255)
+        allow(result).to receive(:stderr).and_return('Command not found')
+
+        expect {
+          subject.execute
+        }.to raise_error(R10K::Util::Subprocess::SubprocessError, /Command .* exited with 255: Command not found/)
+      end
+
+      it "doesn't raise an exception if raise_on_fail is false" do
+        subject.raise_on_fail = false
+        expect { subject.execute }.to_not raise_error
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r10k
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-07 00:00:00.000000000 Z
+date: 2014-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: systemu
   requirement: !ruby/object:Gem::Requirement
@@ -207,6 +207,7 @@ files:
 - lib/r10k/cli/environment/list.rb
 - lib/r10k/cli/environment/stale.rb
 - lib/r10k/cli/ext/logging.rb
+- lib/r10k/cli/help.rb
 - lib/r10k/cli/module.rb
 - lib/r10k/cli/module/deploy.rb
 - lib/r10k/cli/module/list.rb
@@ -253,11 +254,18 @@ files:
 - lib/r10k/task/module.rb
 - lib/r10k/task/puppetfile.rb
 - lib/r10k/task_runner.rb
+- lib/r10k/util/platform.rb
 - lib/r10k/util/purgeable.rb
 - lib/r10k/util/subprocess.rb
 - lib/r10k/util/subprocess/io.rb
+- lib/r10k/util/subprocess/posix.rb
+- lib/r10k/util/subprocess/posix/io.rb
+- lib/r10k/util/subprocess/posix/runner.rb
 - lib/r10k/util/subprocess/result.rb
 - lib/r10k/util/subprocess/runner.rb
+- lib/r10k/util/subprocess/windows.rb
+- lib/r10k/util/subprocess/windows/io.rb
+- lib/r10k/util/subprocess/windows/runner.rb
 - lib/r10k/version.rb
 - r10k.gemspec
 - r10k.yaml.example
@@ -299,6 +307,7 @@ files:
 - spec/unit/module_spec.rb
 - spec/unit/registry_spec.rb
 - spec/unit/settings/container_spec.rb
+- spec/unit/util/subprocess_spec.rb
 homepage: http://github.com/adrienthebo/r10k
 licenses:
 - Apache 2.0
@@ -375,6 +384,7 @@ test_files:
 - spec/unit/git/tag_spec.rb
 - spec/unit/deployment/environment_spec.rb
 - spec/unit/deployment/source_spec.rb
+- spec/unit/util/subprocess_spec.rb
 - spec/unit/settings/container_spec.rb
 - spec/unit/module/forge_spec.rb
 - spec/unit/module/svn_spec.rb