vx-container_connector 0.2.9 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e82339895966cc9dcd2dca92e3c2111eb5ed2c7
-  data.tar.gz: bbbd8bb14d7bdeebb27fdd190e529ca20bdf8a99
+  metadata.gz: c84082fa207a3f63e5f75028ddc74136a95c4629
+  data.tar.gz: dc1ce66f51fac9b33871bc76fcdab207315b2a6c
 SHA512:
-  metadata.gz: 01723b6a46258b646d24217240a0c1b21eddb90f8e17969b73549e364e0210d7eae93b06c68c2d0c2c8046c9f529f57e975cac1b53a9f6b0c63398c096cb15bc
-  data.tar.gz: b23d9992e75b45fe30b98fe14eb463d4a185901e76d86e1b225c82c8f29306930af0398cc1747990134199f92fe2880300b64ff354afdd76bd270a03360ad467
+  metadata.gz: b760b4adf849aadb3bab434bbd74f686510073c05363df48ad3f09333f32f3691a18cc16b24dcdb8fbe47b2f97752ae6773fea35186b9490eb5a778fd08d742c
+  data.tar.gz: cc7278b8aa10f12bdff3faa504b5207ed97fb48fa1a01b1a1c30a279d70012b061814cc4f7cc2bd1f0d48e0084dca96718cd1ec74faa3f85dd6b876a62d5ec2c

data/lib/vx/container_connector/docker/default.rb

@@ -0,0 +1,52 @@
+module Vx
+  module ContainerConnector
+
+    class Docker
+
+      class Default
+
+        class << self
+
+          def ssh_host
+            if testing?
+              'localhost'
+            else
+              nil
+            end
+          end
+
+          def ssh_port
+            if testing?
+              2122
+            else
+              nil
+            end
+          end
+
+          def create_container_options
+            if testing?
+              { "ExposedPorts" => { "22/tcp" => {} } }
+            else
+              {}
+            end
+          end
+
+          def start_container_options
+            if testing?
+              { "PortBindings" => { "22/tcp" => [{ "HostPort" => "2022" }] } }
+            else
+              {}
+            end
+          end
+
+          def testing?
+            ENV['VX_ENV'] == 'test'
+          end
+
+        end
+
+      end
+
+    end
+  end
+end

data/lib/vx/container_connector/docker.rb

@@ -1,5 +1,4 @@
 require 'docker'
-require 'logger'
 require 'vx/common/spawn'
 require 'net/ssh'
 
@@ -9,31 +8,13 @@ module Vx
     class Docker
 
       autoload :Spawner, File.expand_path("../docker/spawner", __FILE__)
+      autoload :Default, File.expand_path("../docker/default", __FILE__)
 
       include Vx::Common::Spawn
       include ContainerConnector::Retriable
+      include Instrument
 
-      attr_reader :user, :password, :init, :image, :remote_dir, :logger
-
-      @@default_container_options = {}
-      @@default_ssh_port          = 22
-      @@host_to_connect_override  = nil
-
-      class << self
-        def default_container_options
-          @@default_container_options
-        end
-
-        def default_ssh_port(val = nil)
-          @@default_ssh_port = val if val
-          @@default_ssh_port
-        end
-
-        def host_to_connect_override(val = nil)
-          @@host_to_connect_override = val if val
-          @@host_to_connect_override
-        end
-      end
+      attr_reader :user, :password, :init, :image, :remote_dir
 
       def initialize(options = {})
         @user       = options[:user]       || "vexor"
@@ -41,7 +22,6 @@ module Vx
         @init       = options[:init]       || %w{ /sbin/init --startup-event dockerboot }
         @image      = options[:image]      || "dmexe/precise"
         @remote_dir = options[:remote_dir] || "/home/#{user}"
-        @logger     = options[:logger]     || ::Logger.new(STDOUT)
       end
 
       def start(&block)
@@ -50,51 +30,70 @@ module Vx
         end
       end
 
-      def container_options
-        self.class.default_container_options.merge(
-          'Cmd'       => init,
-          'Image'     => image,
+      def create_container_options
+        Default.create_container_options.merge(
+          'Cmd'   => init,
+          'Image' => image,
         )
       end
 
+      def start_container_options
+        Default.start_container_options
+      end
+
       private
 
         def open_ssh_session(container)
-          host = self.class.host_to_connect_override || container.json['NetworkSettings']['IPAddress']
+          host = Default.ssh_host || container.json['NetworkSettings']['IPAddress']
 
           ssh_options = {
             password:      password,
-            port:          self.class.default_ssh_port,
+            port:          Default.ssh_port,
             paranoid:      false,
             forward_agent: false
           }
-          logger.info "open ssh session to #{user}@#{host}"
+
+          instrumentation = {
+            container_type: "docker",
+            container:      container.json,
+            ssh_host:       host
+          }
+
           with_retries ::Net::SSH::AuthenticationFailed, limit: 3, sleep: 3 do
+            instrument("starting_ssh_session", instrumentation)
             open_ssh(host, user, ssh_options) do |ssh|
-              logger.info "ssh session opened"
               yield Spawner.new(container, ssh, remote_dir)
             end
           end
         end
 
         def start_container(&block)
-          container = ::Docker::Container.create container_options
+          container = instrument("create_container", container_type: "docker", container_options: create_container_options) do
+            ::Docker::Container.create create_container_options
+          end
+
+          instrumentation = {
+            container_type:    "docker",
+            container:         container.json,
+            container_options: start_container_options,
+          }
 
           with_retries ::Docker::Error::NotFoundError, limit: 3, sleep: 3 do
-            container.start
+            instrument("start_container", instrumentation) do
+              container.start start_container_options
+            end
           end
 
           begin
-            logger.info "start container #{container.id}"
             sleep 3
             yield container
           ensure
-            container.kill
-            logger.info "kill container #{container.id}"
+            instrument("kill_container", instrumentation) do
+              container.kill
+            end
           end
         end
 
-
     end
   end
 end

data/lib/vx/container_connector/local.rb

@@ -7,29 +7,32 @@ module Vx
 
     class Local
 
+      include Instrument
+
       autoload :Spawner, File.expand_path("../local/spawner", __FILE__)
 
-      attr_reader :work_dir, :logger
+      attr_reader :work_dir
 
       def initialize(options = {})
         @work_dir = options[:work_dir] || default_work_dir
         @work_dir = File.expand_path(@work_dir)
-        @logger   = options[:logger] || Logger.new(STDOUT)
       end
 
       def start(&block)
-        FileUtils.rm_rf(work_dir)
-        FileUtils.mkdir_p(work_dir)
+        instrument( "start_container", container_type: 'local', container: { work_dir: work_dir }) do
+          FileUtils.rm_rf(work_dir)
+          FileUtils.mkdir_p(work_dir)
+        end
 
         spawner = Spawner.new(work_dir)
-        logger.info "inside #{work_dir}"
+
         yield spawner
       end
 
       private
 
         def default_work_dir
-          "#{Dir.tmpdir}/.local_connector"
+          "#{Dir.tmpdir}/.vx_local_connector"
         end
 
     end

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

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

data/lib/vx/container_connector/mixin/retriable.rb

@@ -26,7 +26,6 @@ module Vx
         begin
           yield
         rescue *exceptions => e
-          $stderr.puts "got: #{inspect}, attempt #{retried}"
           if retried + 1 < options[:limit]
             retried += 1
             sleep options[:sleep]

data/lib/vx/container_connector/version.rb

@@ -1,5 +1,5 @@
 module Vx
   module ContainerConnector
-    VERSION = "0.2.9"
+    VERSION = "0.3.0"
   end
 end

data/lib/vx/container_connector.rb

@@ -4,13 +4,15 @@ require File.expand_path("../container_connector/errors",  __FILE__)
 module Vx
   module ContainerConnector
 
-    autoload :Local,     File.expand_path("../container_connector/local",  __FILE__)
-    autoload :Docker,    File.expand_path("../container_connector/docker", __FILE__)
-    autoload :Retriable, File.expand_path("../container_connector/mixin/retriable", __FILE__)
-
+    autoload :Local,      File.expand_path("../container_connector/local",            __FILE__)
+    autoload :Docker,     File.expand_path("../container_connector/docker",           __FILE__)
+    autoload :Retriable,  File.expand_path("../container_connector/mixin/retriable",  __FILE__)
+    autoload :Instrument, File.expand_path("../container_connector/mixin/instrument", __FILE__)
 
     extend self
 
+    attr_accessor :instrumenter
+
     def lookup(name, options = {})
       case name.to_sym
       when :docker

data/spec/lib/docker_spec.rb

@@ -5,14 +5,6 @@ describe Vx::ContainerConnector::Docker do
 
   it { should be }
 
-  its(:logger)   { should be }
-
-  context "container_options" do
-    subject { conn.container_options }
-    it { should eq("Cmd"       => ["/sbin/init", "--startup-event", "dockerboot"],
-                   "Image"     => "dmexe/precise") }
-  end
-
   context "user" do
     subject { conn.user }
 

data/spec/lib/local_spec.rb

@@ -8,7 +8,7 @@ describe Vx::ContainerConnector::Local do
 
   context "work_dir" do
     it "by default should be inside Dir.tmpdir" do
-      expect(conn.work_dir).to eq("#{Dir.tmpdir}/.local_connector")
+      expect(conn.work_dir).to eq("#{Dir.tmpdir}/.vx_local_connector")
     end
 
     it "when passed via options, should be" do
@@ -37,7 +37,7 @@ describe Vx::ContainerConnector::Local do
           end
         end
 
-        dir = "#{Dir.tmpdir}/.local_connector\n"
+        dir = "#{Dir.tmpdir}/.vx_local_connector\n"
         if RUBY_PLATFORM =~ /darwin/
           dir.gsub!(/^\/var/, '/private/var')
         end

data/spec/spec_helper.rb

@@ -1,20 +1,12 @@
-require File.expand_path '../../lib/vx/container_connector', __FILE__
-
 Bundler.require(:test)
+
+ENV['VX_ENV']     = 'test'
+ENV['DOCKER_URL'] = "tcp://localhost:4243"
+
+require File.expand_path '../../lib/vx/container_connector', __FILE__
 require 'rspec/autorun'
 
 Dir[File.expand_path("../..", __FILE__) + "/spec/support/**/*.rb"].each {|f| require f}
 
 RSpec.configure do |config|
-  config.mock_with :rr
-
-  config.before(:suite) do
-=begin
-    Vx::ContainerConnector::Docker.default_container_options.merge!(
-      'PortSpecs' => ['2022:22']
-    )
-    Vx::ContainerConnector::Docker.default_ssh_port 2223
-    Vx::ContainerConnector::Docker.host_to_connect_override 'localhost'
-=end
-  end
 end

data/vx-container_connector.gemspec

@@ -24,5 +24,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
-  spec.add_development_dependency "rr"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vx-container_connector
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.3.0
 platform: ruby
 authors:
 - Dmitry Galinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-03 00:00:00.000000000 Z
+date: 2014-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api
@@ -80,20 +80,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: ' description '
 email:
 - dima.exe@gmail.com
@@ -109,10 +95,12 @@ files:
 - Rakefile
 - lib/vx/container_connector.rb
 - lib/vx/container_connector/docker.rb
+- lib/vx/container_connector/docker/default.rb
 - lib/vx/container_connector/docker/spawner.rb
 - lib/vx/container_connector/errors.rb
 - lib/vx/container_connector/local.rb
 - lib/vx/container_connector/local/spawner.rb
+- lib/vx/container_connector/mixin/instrument.rb
 - lib/vx/container_connector/mixin/retriable.rb
 - lib/vx/container_connector/version.rb
 - spec/lib/container_connector_spec.rb