specinfra 2.67.0 → 2.67.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f21b316e6c4687959bdb8e9e344b981a5a5d1cd
-  data.tar.gz: f99ea92c64c15337c0e2c2d9d43142b94fb66395
+  metadata.gz: 7f1a7862cc881615ce10f40c8b4b8f05efd981c1
+  data.tar.gz: 65e53ff41e53463cde4558ba62ec66be6e085708
 SHA512:
-  metadata.gz: 85e43b80d970d78bccfb61e216895c43c6499b980958beaf7f0f21b248729442e22e53882902d9b2e889f430c5bb6b59b0b82cd67202f8ed649927ba9bf0140c
-  data.tar.gz: 4931fa261622ffeacaf7bbd3d7426b3b39169838d3ac409506ddbf88d2d939086a20f6d8c90baa75000aa99a003f72ec13f3572c0caf6d7ec32dc026b1fd2e96
+  metadata.gz: c044489735f08b4bc84a2ca490a10593817bff06f4398955bb33983ee1c5c839f91231508f34875cec4581a4a3873a96ab8c23081e1db2736b4b52cda563b2de
+  data.tar.gz: c23210434a283d203c454e1b3105d2581237bd665ff2c98abe2553b55b7b82d91027bf73672e9f26e432e35bfdae7f4c35bba205ae02cb45756b01f652305ba6

data/lib/specinfra/backend/docker.rb

@@ -27,18 +27,10 @@ module Specinfra
 
       def run_command(cmd, opts={})
         cmd = build_command(cmd)
-        cmd = add_pre_command(cmd)
+        run_pre_command(opts)
         docker_run!(cmd, opts)
       end
 
-      def build_command(cmd)
-        cmd
-      end
-
-      def add_pre_command(cmd)
-        cmd
-      end
-
       def send_file(from, to)
         if @base_image
           @images << commit_container if @container
@@ -95,7 +87,7 @@ module Specinfra
 
       def docker_run!(cmd, opts={})
         opts.merge!(get_config(:docker_container_exec_options) || {})
-        stdout, stderr, status = @container.exec(['/bin/sh', '-c', cmd], opts)
+        stdout, stderr, status = @container.exec(cmd.shellsplit, opts)
 
         CommandResult.new :stdout => stdout.join, :stderr => stderr.join,
         :exit_status => status
@@ -115,6 +107,13 @@ module Specinfra
           ::Docker::Image.create('fromImage' => name)
         end
       end
+
+      def run_pre_command(opts)
+        if get_config(:pre_command)
+          cmd = build_command(get_config(:pre_command))
+          docker_run!(cmd, opts)
+        end
+      end
     end
   end
 end

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.67.0"
+  VERSION = "2.67.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.67.0
+  version: 2.67.1
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-13 00:00:00.000000000 Z
+date: 2017-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-scp