dry-dock 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 488e56c2a6889532224d9d3badd1e03c696422e5
-  data.tar.gz: eb96040c6163b845684154856770d03afbaabce4
+  metadata.gz: 5de350e13158e99318eabbb68b7d507804cb0c9c
+  data.tar.gz: df476fedf7609cf0734aa92aaae0ab71235aa2df
 SHA512:
-  metadata.gz: 7ae957bf3ee4af5f6992d5810de25575e21d4a3f7b7bfbb0fbfdc568f72989e284f0d86a387968456bc9df84a2a8e4ee2f3ef65438408623c3bfb36f0ccb3790
-  data.tar.gz: a6531965d422e56a82a5c27feb550edc2d8aadd556547dcd9b97e8e649ac0b6a534f3c64de4bd73e279448a2049a715c3e77608697b7311c8587c99491385170
+  metadata.gz: 562e59af24727a8d9a23a2e8a677386b70a5bcadd48969af33a0c595c3c5592d68bd90cf72cc913a111bf4c27127ac03e051ce01aa114aa4d7db1e5189522183
+  data.tar.gz: f5807ebf5764c81c1fdef2e9c7650fc0e57f97608e305c586a18dcfe04fb46ef9a450d4c00085c1be94f181c1353df0da1719a4bf7f141d1f1e2bd23a4e64ba6

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/dry-dock.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: dry-dock 0.1.3 ruby lib
+# stub: dry-dock 0.1.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "dry-dock"
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Ripta Pasay"]
-  s.date = "2015-10-01"
+  s.date = "2015-10-02"
   s.description = "A Dockerfile-replacement DSL for building complex images"
   s.email = "github@r8y.org"
   s.executables = ["drydock", "json-test-consumer.rb", "json-test-producer.rb", "test-tar-writer-digest.rb"]

data/lib/drydock/errors.rb

@@ -3,4 +3,7 @@ module Drydock
   class OperationError < StandardError; end
 
   class InvalidInstructionError < OperationError; end
+
+  class ExecutionError < OperationError; end
+  class InvalidCommandExecutionError < ExecutionError; end
 end

data/lib/drydock/phase_chain.rb

@@ -55,11 +55,15 @@ module Drydock
       end
     end
 
+    # TODO(rpasay): Break this large method apart.
     def self.create_container(cfg, &blk)
       meta_options = cfg[:MetaOptions] || {}
       timeout = meta_options.fetch(:read_timeout, Excon.defaults[:read_timeout]) || 60
       
       Docker::Container.create(cfg).tap do |c|
+        # The call to Container.create merely creates a container, to be
+        # scheduled to run. Start a separate thread that attaches to the
+        # container's streams and mirror them to the logger.
         t = Thread.new do
           begin
             c.attach(stream: true, stdout: true, stderr: true) do |stream, chunk|
@@ -78,12 +82,44 @@ module Drydock
           end
         end
 
-        c.start
+        # TODO(rpasay): RACE CONDITION POSSIBLE - the thread above may be
+        # scheduled but not run before this block gets executed, which can
+        # cause a loss of log output. However, forcing `t` to be run once
+        # before this point seems to cause an endless wait (ruby 2.1.5).
+        # Need to dig deeper in the future.
+        # 
+        # TODO(rpasay): More useful `blk` handling here. This method only
+        # returns after the container terminates, which isn't useful when
+        # you want to do stuff to it, e.g., spawn a new exec container.
+        #
+        # The following block starts the container, and waits for it to finish.
+        # An error is raised if no exit code is returned or if the exit code
+        # is non-zero.
+        begin
+          c.start
+          blk.call(c) if blk
+          
+          results = c.wait(timeout)
+
+          unless results
+            raise InvalidCommandExecutionError, {container: c.id, message: "Container did not return anything (API BUG?)"}
+          end
 
-        blk.call(c) if blk
+          unless results.key?('StatusCode')
+            raise InvalidCommandExecutionError, {container: c.id, message: "Container did not return a status code (API BUG?)"}
+          end
 
-        c.wait(timeout)
-        t.join
+          unless results['StatusCode'] == 0
+            raise InvalidCommandExecutionError, {container: c.id, message: "Container exited with code #{results['StatusCode']}"}
+          end
+        rescue
+          # on error, kill the streaming logs and reraise the exception
+          t.kill
+          raise
+        ensure
+          # always rejoin the thread
+          t.join
+        end
       end
     end
 
@@ -210,8 +246,6 @@ module Drydock
           end
 
           commit_config = self.class.build_commit_opts(opts)
-          Drydock.logger.info(opts.inspect)
-          Drydock.logger.info(commit_config.inspect)
 
           result = container.commit(commit_config)
           Drydock.logger.info(message: "Committed image ID #{result.id.slice(0, 12)}")

data/spec/drydock/project_import_spec.rb

@@ -36,4 +36,14 @@ RSpec.describe Drydock::Project do
     expect(v2_output).to include("'/tmp/VERSION': No such file or directory")
   end
 
+  it 'succeeds running a real command' do
+    project.from('alpine')
+    expect { project.run('ls /') }.not_to raise_error
+  end
+
+  it 'fails running a non-existant command' do
+    project.from('alpine')
+    expect { project.run('whatever-gonna-error /') }.to raise_error(Drydock::InvalidCommandExecutionError)
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-dock
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Ripta Pasay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-01 00:00:00.000000000 Z
+date: 2015-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api