specinfra 2.21.0 → 2.21.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbebb2af7385aecbd1b5d1205e703c75768974fa
-  data.tar.gz: 1b3f85640b685b3748c3b1ac206fe3a43b8e0da6
+  metadata.gz: 4e796a0b83f9bde7cfa6fc07448f33a4515af371
+  data.tar.gz: 8851a409215866f9ea12b1be34432ad7a055871d
 SHA512:
-  metadata.gz: a04dcb00a7e89deaa8eacb21b2510cbca3d1997c0f23954e21fc533123b237e87cd4f4f1efad4ed14804a48ee8d432fa93f9450c5b22e6f3889ae54690b061e7
-  data.tar.gz: 102bf6a1b015038809081a877198b97d46eed6df465d611556c7a798b0541179c26e87fa592cbf2920770b8974669fb94625dd15fc628df3fb3a5d957460ce6c
+  metadata.gz: 6e4b443bb4083979729929b28093e5f8a50d7acf7879ba025b34851935dd2ae1097a0448b80f5a47cb7e209e76ae238737e2032f8b8e6176d057f922190f5634
+  data.tar.gz: 48ac0a3b80d41cb7d658d68e44d500c81abd55735b28413b30602a538b9c3fe143abec40858b6e678c94ed8ddac198d086039bb3d1b6bf5d7da27af19e803f83

data/lib/specinfra/backend/docker.rb

@@ -11,7 +11,7 @@ module Specinfra::Backend
 
       if image = Specinfra.configuration.docker_image
         @images = []
-        @base_image = ::Docker::Image.get(image)
+        @base_image = get_or_pull_image(image)
 
         create_and_start_container
         ObjectSpace.define_finalizer(self, proc { cleanup_container })
@@ -46,15 +46,21 @@ module Specinfra::Backend
       create_and_start_container
     end
 
+    def commit_container
+      @container.commit
+    end
+
     private
 
     def create_and_start_container
       opts = { 'Image' => current_image.id }
 
       if current_image.json["Config"]["Cmd"].nil?
-        opts.merge!({'Cmd' => ['/bin/sh'], 'OpenStdin' => true})
+        opts.merge!({'Cmd' => ['/bin/sh']})
       end
 
+      opts.merge!({'OpenStdin' => true})
+
       if path = Specinfra.configuration.path
         (opts['Env'] ||= []) << "PATH=#{path}"
       end
@@ -90,5 +96,13 @@ module Specinfra::Backend
       CommandResult.new :stdout => [stdout].join, :stderr => err.join,
       :exit_status => (status || 1)
     end
+
+    def get_or_pull_image(name)
+      begin
+        ::Docker::Image.get(name)
+      rescue ::Docker::Error::NotFoundError
+        ::Docker::Image.create('fromImage' => name)
+      end
+    end
   end
 end

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.21.0"
+  VERSION = "2.21.1"
 end

data/wercker.yml

@@ -3,8 +3,7 @@ build:
   steps:
     - script:
         name: Run walter
-        code: ./walter
-        cwd: $WORKING_DIR
+        code: ./$WORKING_DIR/walter -c ./$WORKING_DIR/pipeline.yml
 
   after-steps:
     - 1syo/idobata-notify@0.1.1:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.21.0
+  version: 2.21.1
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-21 00:00:00.000000000 Z
+date: 2015-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh