vx-lib-container 0.5.11 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 594a66b891b11810ba46b7855a8819beec140105
-  data.tar.gz: c1841c4ed5ba9b62cf4b4a4253b971572061e190
+  metadata.gz: 2aa9c3e92022ed99759a8493f55ca3bda44459a6
+  data.tar.gz: 711b942d04d5e771cebc2883be205ef9f499be15
 SHA512:
-  metadata.gz: 86acd9f9bd64dbf9d982534b21e0c25dd726e50cc8509bde650e83286a2b36fb20bf29d26106957d48364feeec58010a4d4902db45ba4c13f1db3d26b778a125
-  data.tar.gz: 53ee3f5467ba0cc3ac8bfd6d22585df3117ca6e03801fc072a36f9f28eb3f1d4bdb09df9924dda8097e9956043abf3144215c8a21fb5f8f03575187cdaeca38a
+  metadata.gz: da843df18fa69d2e606f2b8f604ede2f276656e37675799a248221bd67617d2e488f9dd5a7c1ee53cd40e3efd4f497e9635694caac5c47b43c413eb1598a3aab
+  data.tar.gz: b2664f01f405660715fd9c8dd93f7bfb9d936146fbc62fd4fef8d464bee8285b9ebef7d3ec9c061ea0bc71413b55b9c09c832b92b872ab8e662bc62a16d5f503

data/lib/vx/lib/container.rb

@@ -8,13 +8,10 @@ module Vx
       autoload :Local,      File.expand_path("../container/local",            __FILE__)
       autoload :Docker,     File.expand_path("../container/docker",           __FILE__)
       autoload :Retriable,  File.expand_path("../container/mixin/retriable",  __FILE__)
-      autoload :Instrument, File.expand_path("../container/mixin/instrument", __FILE__)
       autoload :Upload,     File.expand_path("../container/mixin/upload",     __FILE__)
 
       extend self
 
-      attr_accessor :instrumenter
-
       def lookup(name, options = {})
         case name.to_sym
         when :docker

data/lib/vx/lib/container/docker.rb

@@ -14,7 +14,6 @@ module Vx
 
         include Lib::Shell
         include Lib::Container::Retriable
-        include Lib::Container::Instrument
 
         attr_reader :user, :password, :init, :image, :remote_dir, :memory, :memory_swap
 
@@ -55,16 +54,8 @@ module Vx
               timeout:       3,
             }
 
-            instrumentation = {
-              container_type: "docker",
-              container:      container.json,
-              ssh_options:    ssh_options.merge(host: host, user: user)
-            }
-
             ssh = with_retries ::Net::SSH::AuthenticationFailed, ::Errno::ECONNREFUSED, ::Errno::ETIMEDOUT, ::Timeout::Error, limit: 5, sleep: 3 do
-              instrument("start_ssh_session", instrumentation) do
-                ::Net::SSH.start host, user, ssh_options
-              end
+              ::Net::SSH.start host, user, ssh_options
             end
 
             re = yield Spawner.new(container, ssh)
@@ -75,27 +66,16 @@ module Vx
           def start_container(&block)
             container =
               with_retries ::Docker::Error::TimeoutError, limit: 5, sleep: 3 do
-                instrument("create", container_type: "docker", container_options: create_container_options) do
-                  ::Docker::Container.create create_container_options
-                end
+                ::Docker::Container.create create_container_options
               end
 
-            instrumentation = {
-              container_type: "docker",
-              container:      container.json
-            }
-
-            instrument("start", instrumentation) do
-              container.start
-            end
+            container.start
 
             begin
               yield container
             ensure
-              instrument("kill", instrumentation) do
-                container.kill
-                container.remove
-              end
+              container.kill
+              container.remove
             end
           end
 

data/lib/vx/lib/container/docker/spawner.rb

@@ -22,6 +22,10 @@ module Vx ; module Lib ; module Container ;
         container.id
       end
 
+      def properties
+        container.json
+      end
+
     end
   end
 

data/lib/vx/lib/container/local.rb

@@ -17,18 +17,14 @@ module Vx ; module Lib ; module Container ;
     end
 
     def start(&block)
-      instrument( "create", container_type: 'local', container: { work_dir: work_dir }) do
-        FileUtils.rm_rf(work_dir)
-        FileUtils.mkdir_p(work_dir)
-      end
+      FileUtils.rm_rf(work_dir)
+      FileUtils.mkdir_p(work_dir)
 
       begin
         spawner = Spawner.new(work_dir)
         yield spawner
       ensure
-        instrument( "kill", container_type: 'local', container: { work_dir: work_dir }) do
-          FileUtils.mkdir_p(work_dir)
-        end
+        FileUtils.mkdir_p(work_dir)
       end
     end
 

data/lib/vx/lib/container/local/spawner.rb

@@ -21,6 +21,10 @@ module Vx
             work_dir
           end
 
+          def properties
+            {}
+          end
+
         end
       end
     end

data/lib/vx/lib/container/version.rb

@@ -1,7 +1,7 @@
 module Vx
   module Lib
     module Container
-      VERSION = "0.5.11"
+      VERSION = "0.6.0"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vx-lib-container
 version: !ruby/object:Gem::Version
-  version: 0.5.11
+  version: 0.6.0
 platform: ruby
 authors:
 - Dmitry Galinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-08 00:00:00.000000000 Z
+date: 2014-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api
@@ -100,7 +100,6 @@ files:
 - lib/vx/lib/container/errors.rb
 - lib/vx/lib/container/local.rb
 - lib/vx/lib/container/local/spawner.rb
-- lib/vx/lib/container/mixin/instrument.rb
 - lib/vx/lib/container/mixin/retriable.rb
 - lib/vx/lib/container/mixin/upload.rb
 - lib/vx/lib/container/version.rb

data/lib/vx/lib/container/mixin/instrument.rb

@@ -1,23 +0,0 @@
-module Vx
-  module Lib
-    module Container
-      module Instrument
-
-        def instrument(name, payload, &block)
-          name = "#{name}.container.lib.vx"
-
-          if ENV['DEBUG']
-            $stdout.puts " --> #{name}: #{payload}"
-          end
-
-          if inst = Container.instrumenter
-            inst.instrument(name, payload, &block)
-          else
-            yield if block_given?
-          end
-        end
-      end
-
-    end
-  end
-end