henk 0.1.0 → 0.2.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    Y2Y3ZDhjZjRkZDUxMDI0ZDdkNTkxMGQwNDdkMzlmMGY1NjE0ZDk0Nw==
-  data.tar.gz: !binary |-
-    MWY4ZTQ3MDZlOGU4MTJjZjY5NTlkYjViMDc1MTk2ZjkxODlmZTUwNQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    Nzk0OGFkOWIyYzRhY2ZkN2Q5YTQ4MzhlMjI3YmUyMmI1NTNkYTRlMWI0NWEz
-    NDg1ZjQ4YWE1NTQzNzhmZjFmMzAzMzRmMjk5ZGNhNDU3OGY2MTM4NWFkMjIz
-    OTE1M2I1N2IyNmU5Mzc4MjZkZGM4ZDIxNDRhNWY3OGIyYmUxMTE=
-  data.tar.gz: !binary |-
-    NDgzZjQyMTZiYTRmNWQ2M2YwNDhkMTM2ZTVjZjcxYzA4MGU1MTFmNWI5N2Zm
-    MGMzZjI0ZTI4N2YyMGI3ZmYyYmYzZWM0ZWFkZWI3YjZlMmI3NTNkYzIzMjA2
-    OGFhOThlYzIyNzdkY2YyMTZiODRiY2QwMmY0ZDI5MWJiZDZlMTQ=
+SHA1:
+  metadata.gz: 676f2827414421809ad632dfced0f94c1fc1b665
+  data.tar.gz: 22513230d990a8a07736055dc66292b441fb1791
+SHA512:
+  metadata.gz: 6305f1d4bd9c27dc93af5dbd60e414d236e2570845c258f6e28a1017077c713c94775249e32a0868d0f1e128a14fac99918d7c74d5b440f973131215bd85ec98
+  data.tar.gz: ad8340b7e82509dae6172cea3a4ea977451e7a2ab9fde7b0ddd34cddf9bb574fb45abd9417017198b17e9b1bfda3aff720553bfb70d5781b7feac1f65528f48d

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in henk.gemspec
 gemspec
+
+gem 'rake'

data/lib/henk/commands.rb

@@ -12,7 +12,6 @@ module Henk
       lines = lines.map { |line| line.split(/ +/) }
 
       raise "'docker images' output not as expected" unless
-        lines.first.length == 5 &&
         lines.first[0..1] == %w(REPOSITORY TAG)
 
       line = lines.find { |l| l[0..1].join(':') == name}
@@ -44,5 +43,9 @@ module Henk
 
       execute 'docker', 'tag', *command_options, image, repository, *tag
     end
+
+    def kill(*containers)
+      execute('docker', 'kill', *containers)
+    end
   end
 end

data/lib/henk/instance.rb

@@ -6,6 +6,14 @@ module Henk
   class Instance
     include Commands
 
+    def initialize
+      @running_containers = []
+    end
+
+    def running_containers
+      @running_containers.to_enum
+    end
+
     # Block is passed exit status object
     def on_subshell_error(&block)
       @subshell_error_block = block
@@ -63,5 +71,14 @@ module Henk
       sheller_result = execute(*arguments)
       sheller_result.stdout.chomp.split("\n") if sheller_result.exit_status.success?
     end
+
+    private
+
+    def while_container_running(container)
+      @running_containers << container
+      yield
+    ensure
+      @running_containers.delete(container)
+    end
   end
 end

data/lib/henk/step.rb

@@ -21,7 +21,9 @@ module Henk
       container = @henk.execute_for_word(*@arguments)
       return unless container
 
-      container_exit = @henk.wait(container)
+      container_exit = @henk.send(:while_container_running, container) do
+        @henk.wait(container)
+      end
 
       @after_wait_block.call(container, container_exit) if @after_wait_block
 

data/lib/henk/version.rb

@@ -1,3 +1,3 @@
 module Henk
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: henk
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Thomas Stratmann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-27 00:00:00.000000000 Z
+date: 2013-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: sheller
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  name: sheller
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Henk is a ruby wrapper around the docker CLI
@@ -40,7 +40,6 @@ files:
 - lib/henk.rb
 - lib/henk/commands.rb
 - lib/henk/instance.rb
-- lib/henk/old.rb
 - lib/henk/sequence.rb
 - lib/henk/step.rb
 - lib/henk/version.rb
@@ -53,19 +52,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: a ruby wrapper around the docker CLI
 test_files: []
-has_rdoc: 

data/lib/henk/old.rb

@@ -1,96 +0,0 @@
-require 'sheller'
-
-module Henk
-  extend self
-
-  def spawn(*arguments, &block)
-    block ||= method(:default_error_handler)
-
-    result = Sheller.execute(*arguments)
-
-    block.call(arguments, result) unless result.exit_status.success?
-
-    result
-  end
-
-  def spawn_for_id(*arguments, &block)
-    sheller_result = spawn(*arguments, &block)
-
-    sheller_result.stdout.chomp if sheller_result.exit_status.success?
-  end
-
-  def default_error_handler(sheller_arguments, sheller_result)
-    raise "Subshell invocation #{sheller_arguments.join ' '} failed, exit status #{sheller_result.exit_status}"
-  end
-
-  def pull(name, &block)
-    spawn('docker', 'pull', name, &block)
-  end
-
-  # can we make good use of this in Sequence?
-  def wait(container, &block)
-    exit_code_string = spawn_for_id('docker', 'wait', container, &block)
-
-    yield exit_code_string if block_given? && exit_code_string != '0'
-
-    exit_code_string
-  end
-
-  def commit(container, &block)
-    spawn_for_id('docker', 'commit', container, &block)
-  end
-
-  class Sequence
-    include Henk
-
-    attr_reader :image
-
-    def log_spawn(&block)
-      @log_spawn_block = block
-    end
-
-    def on_error(&block)
-      @error_block = block
-    end
-
-    def on_bad_exit(&block)
-      @bad_exit_block = block
-    end
-
-    def after_wait(&block)
-      @after_wait_block = block
-    end
-
-    def spawn(*arguments, &block)
-      @log_spawn_block.call(Sheller.command(*arguments)) if @log_spawn_block
-      super
-    end
-
-    def step(*arguments)
-      @image = nil
-
-      container = spawn_for_id(*arguments, &@error_block)
-      return unless container
-
-      wait_result = spawn('docker', 'wait', container)
-      return unless wait_result.exit_status.success?
-
-      exit_code_string = wait_result.stdout.chomp
-
-      @after_wait_block.call(container, exit_code_string) if @after_wait_block
-
-      unless exit_code_string == '0'
-        bad_exit_block.call(exit_code_string)
-        return
-      end
-
-      @image = commit(container, &@error_block)
-    end
-
-    def bad_exit_block
-      @bad_exit_block ||= Proc.new do |exit_code_string|
-        raise "Container exited with code #{exit_code_string}"
-      end
-    end
-  end
-end