specinfra 2.12.7 → 2.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 481871a1216b636632065d30fcf6b7596ba048aa
-  data.tar.gz: 8b831e0e5643609a50d0c66316b3cb1066f1a854
+  metadata.gz: 78b5cc48f8d10d0b2de74d1981f298837b3aa3c3
+  data.tar.gz: e424f7e527599710fe4a7ff10690d53123250c2f
 SHA512:
-  metadata.gz: 17573c8d4461b8cb06402f2ee75099f570b5a4cda08ff2f3e8217e2e2777558d9432241ea49d8e9a5bf17024701a1bf4adec5425e6c4b51cc8c1c6c9d6fe64db
-  data.tar.gz: 7b4e8b108300c812afe9188943c4f11d641c9ad4ec55c65498bbd412e36249641da62e297af04e217b3000ffe995c25a40631ce7a63f2c1c7af7a161008cba3c
+  metadata.gz: 12002f9e969a4e35926c91c8fb1f9eff7eca6bc72b597c8fad3f47345254b0ac35654fbd3fea00db8a87437fa652bfe2435dcccdff770730a0820ca759d468aa
+  data.tar.gz: 2eb541ec4489faddd13fa2b699862fe31c015f4b849bbf7a0dcecd35a1eeedd639c8e71ae8076b58a29f9992526bc1a53c4ce69556d765518836b39276606070

data/lib/specinfra/backend/docker.rb

@@ -7,9 +7,18 @@ module Specinfra::Backend
         fail "Docker client library is not available. Try installing `docker-api' gem."
       end
 
-      @images = []
       ::Docker.url = Specinfra.configuration.docker_url
-      @base_image = ::Docker::Image.get(Specinfra.configuration.docker_image)
+
+      if image = Specinfra.configuration.docker_image
+        @images = []
+        @base_image = ::Docker::Image.get(image)
+        create_and_start_container
+        ObjectSpace.define_finalizer(self, proc { cleanup_container })
+      elsif container = Specinfra.configuration.docker_container
+        @container = ::Docker::Container.get(container)
+      else
+        fail 'Please specify docker_image or docker_container.'
+      end
     end
 
     def run_command(cmd, opts={})
@@ -27,38 +36,44 @@ module Specinfra::Backend
     end
 
     def send_file(from, to)
+      if @base_image.nil?
+        fail 'Cannot call send_file without docker_image.'
+      end
+
       @images << current_image.insert_local('localPath' => from, 'outputPath' => to)
+      cleanup_container
+      create_and_start_container
     end
 
     private
 
+    def create_and_start_container
+      opts = { 'Image' => current_image.id }
+
+      if path = Specinfra.configuration.path
+        (opts['Env'] ||= {})['PATH'] = path
+      end
+
+      @container = ::Docker::Container.create(opts)
+      @container.start
+    end
+
+    def cleanup_container
+      @container.stop
+      @container.delete
+    end
+
     def current_image
       @images.last || @base_image
     end
 
     def docker_run!(cmd, opts={})
-      opts = {
-        'Image' => current_image.id,
-        'Cmd' => %W{/bin/sh -c #{cmd}},
-      }.merge(opts)
-
-      if path = Specinfra::configuration::path
-        (opts['Env'] ||= {})['PATH'] = path
-      end
-
-      container = ::Docker::Container.create(opts)
       begin
-        container.start
-        begin
-          stdout, stderr = container.attach(:logs => true)
-          result = container.wait
-          return CommandResult.new :stdout => stdout.join, :stderr => stderr.join,
-            :exit_status => result['StatusCode']
-        rescue
-          container.kill
-        end
-      ensure
-        container.delete
+        stdout, stderr, status = @container.exec(['/bin/sh', '-c', cmd])
+        return CommandResult.new :stdout => stdout, :stderr => stderr,
+        :exit_status => status
+      rescue
+        @container.kill
       end
     end
   end

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.12.7"
+  VERSION = "2.13.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.12.7
+  version: 2.13.0
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-12 00:00:00.000000000 Z
+date: 2015-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh