flock-sandbox 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3de9da61d626a83aaa24178f54488223ecb7d119
-  data.tar.gz: 7c31c7b0d67b953ee53072879b67fae9f2a2f8eb
+  metadata.gz: 02562d9d82cdcc051d9c3074d7e71bfc9d57cc89
+  data.tar.gz: f89140d1379185138d646b7f201c5d3620092e61
 SHA512:
-  metadata.gz: 999b1985a5c72b11af0a349239cf1d3455cc27542b1e57bfce463f7a2899882fe53b5f056a2fdf61dd4f96f3a366311c66c913ee0dda33ce2ea6f4131009c8ed
-  data.tar.gz: 0c788ba6b893f811b7a5d8ee739d4caf741effd239b2ffaeb693e5e0edb03ec897a3677a1a3a6b2f53826a0a7af9cc715069e0fe112a90e41e22a6944ce24f02
+  metadata.gz: 7b9d427fe15bc727fba261206363f2ba5c027d9dc0fc63ebf0fc190e1f65c7cc6c6ab58ee85b28ea9fdd9cbe38043f0c2700e349e0476c55127b959ae1864eb0
+  data.tar.gz: 1f5c2fb865d4d9159ee83349873a081e18178c135780e3fe0019ca22b95ce46d46b89b8365b78cd678eb7f9b54ae8335f3f2689e2e26d8cad1c87b3a48853a53

data/lib/flock/sandbox.rb

@@ -25,6 +25,8 @@ module Flock
           Docker.new(definition).run
         when "vagrant"
           Vagrant.new(definition).run
+        when "docker-stop"
+          DockerStop.new(definition).run
         end
       end
 
@@ -74,42 +76,72 @@ module Flock
       def run
         containers = []
         begin
-          @definition.containers.each do |c|
-            puts "Start container #{c[:name]} (#{c[:image]})"
-            ::Docker::Image.create('fromImage' => c[:image])
-            container = ::Docker::Container.create('Image' => c[:image],
-                                                   'name' => c[:name],
-                                                   'Env' => c[:envs],
-                                                   'HostConfig' => {'Links' => c[:links]})
-            containers << container
-            container.start
+          unless ENV['ONLY_SCRIPTS']
+            @definition.containers.each do |c|
+              puts "Start container #{c[:name]} (#{c[:image]})"
+              ::Docker::Image.create('fromImage' => c[:image])
+              container = ::Docker::Container.create('Image' => c[:image],
+                                                     'name' => c[:name],
+                                                     'Env' => c[:envs],
+                                                     'HostConfig' => {'Links' => c[:links]})
+              containers << container
+              container.start
+            end
           end
-          @definition.scripts.each do |c|
-            puts "Run script #{c[:name]} (#{c[:image]} #{c[:cmd].inspect})"
-            ::Docker::Image.create('fromImage' => c[:image])
-            container = ::Docker::Container.create('Cmd' => c[:cmd],
-                                                   'Image' => c[:image],
-                                                   'Env' => c[:envs],
-                                                   'HostConfig' => {'Links' => c[:links]})
-            containers << container
-            container.start
-            res = container.wait
-            logs = container.logs(stdout: true, stderr: true)
-            puts logs
-            if res['StatusCode'] != 0
-              puts "Error in script #{c[:name]}: error code #{res['StatusCode']}"
-              exit res['StatusCode']
+          if ENV['MANUAL_SCRIPTS']
+            @definition.scripts.each do |c|
+              puts "docker run #{(c[:links] || []).map { |v| "--link #{v}" } * " " } #{(c[:envs] || []).map { |e| "-e #{e}" } * " " } #{c[:image]} #{c[:cmd] * ' '}"
+            end
+          else
+            @definition.scripts.each do |c|
+              puts "Run script #{c[:name]} (#{c[:image]} #{c[:cmd].inspect})"
+              ::Docker::Image.create('fromImage' => c[:image])
+              container = ::Docker::Container.create('Cmd' => c[:cmd],
+                                                     'Image' => c[:image],
+                                                     'Env' => c[:envs],
+                                                     'HostConfig' => {'Links' => c[:links]})
+              containers << container
+              container.start
+              res = container.wait(1200)
+              logs = container.logs(stdout: true, stderr: true)
+              puts logs
+              if res['StatusCode'] != 0
+                puts "Error in script #{c[:name]}: error code #{res['StatusCode']}"
+                exit res['StatusCode']
+              end
             end
           end
         ensure
-          containers.each do |c|
-            c.kill
-            c.delete
+          unless ENV['MANUAL_SCRIPTS']
+            containers.each do |c|
+              c.kill
+              c.delete
+            end
           end
         end
       end
     end
 
+    class DockerStop
+
+      def initialize(definition)
+        @definition = definition
+      end
+
+      def run
+        @definition.containers.each do |c|
+          cont = begin
+                   ::Docker::Container.get(c[:name])
+                 rescue ::Docker::Error::NotFoundError
+                 end
+          next unless c
+          puts "Stop #{c[:name]}"
+          cont.kill
+          cont.delete
+        end
+      end
+    end
+
     class Vagrant
       def initialize(definition)
         @definition = definition

data/lib/flock/sandbox/version.rb

@@ -1,5 +1,5 @@
 module Flock
   module Sandbox
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flock-sandbox
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Andrew Rudenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-27 00:00:00.000000000 Z
+date: 2015-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api