baleen 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dea787c2508dcec0087aaf90800a907abc167953
-  data.tar.gz: 0ec3d68926b8f838f1cf83beb2d239b44beb2d70
+  metadata.gz: d482b118da5859fd3b1fb245b78a59d1082f36be
+  data.tar.gz: 4749f3562b29a41eab13e88db428d647616892cb
 SHA512:
-  metadata.gz: 610ab1e0ebdf2acdc7d610b864cd9398f6b09b967d48e6e5462b4c314fbc6ec7e09c1441e30c33f5a496415c994341c30189d5bc1b5a6d92b80f6801a38b8afe
-  data.tar.gz: f7f80725e98c6cc1feecc7fec29cdc13c24fd87dbf8bb80f7278d0d1042c10cc50bb3499bebe0c5e331299936c7720475f6cc5467dc150e71957cfd0c82eb542
+  metadata.gz: ffb1079d77d5c6a90d3471d4ddf09e5f28ba1b6b8ca0b80bda15eb5e00486fbcb334792a7fe501fc481ac38ffdef9aad32aa821cb36b6642899d0df07c333a23
+  data.tar.gz: 088b559d02e2afbc8afd176be5f0f2f9a2ac08df90dd29b64c331693d92279c40f32bf96dc216c91de17887bbdf32c1ae4890a61f5dcb2b647de9213d7e1ed3a

data/Gemfile

@@ -2,6 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in baleen.gemspec
 gemspec
-
-#gem 'docker-client', path: File.expand_path("/Users/kimh/git/docker-ruby", __FILE__)
-#gem 'baleen', path: File.expand_path("/Users/kimh/git/baleen", __FILE__)

data/baleen.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'celluloid'
   spec.add_runtime_dependency 'celluloid-io'
+  spec.add_runtime_dependency 'docker-api'
   spec.add_runtime_dependency 'colorize'
   spec.add_runtime_dependency 'thor'
 

data/lib/baleen/container.rb

@@ -4,27 +4,20 @@ module Baleen
     class DockerClient
       Result = Struct.new("Result", :status_code, :container_id, :log)
 
-      def initialize(containers)
-        @containers = containers
-      end
-
       def create_container(params)
-        @container = @containers.create([params.shell, params.opt, params.commands], params.image)
+        @container = Docker::Container.create('Cmd' => [params.shell, params.opt, params.commands], 'Image' => params.image)
       end
 
       def start_container
-        id = @container["Id"]
-
-        info "Start container #{id}"
-        @containers.start(id)
-        @containers.wait(id)
-        info "Finish container #{id}"
+        info "Start container #{@container.id}"
+        @container.start
+        @container.wait
+        info "Finish container #{@container.id}"
       end
 
       def result
-        id  = @container["Id"]
-        rst = @containers.show(id)
-        log = @containers.logs(id)
+        rst = @container.json
+        log = @container.attach(:stream => false, :stdout => true, :stderr => true, :logs => true)
 
         Result.new(
           rst["State"]["ExitCode"],
@@ -33,16 +26,6 @@ module Baleen
         )
       end
 
-      def kill_all
-        @containers.list.each do |container|
-          @containers.kill(container["Id"])
-        end
-      end
-
-      def status
-        info @containers.list
-      end
-
     end
 
   end

data/lib/baleen/message/request.rb

@@ -9,10 +9,6 @@ module Baleen
         def initialize(opt = {}); super() end
       end
 
-      class PingPong < Base
-        def initialize(opt = {}); super() end
-      end
-
       class Cucumber < Base
         def initialize(image: nil, work_dir: "./", files: "features", shell: "/bin/bash", opt: "-c", exe: "bundle exec cucumber", before_command: nil, command: nil)
           super()

data/lib/baleen/runner.rb

@@ -47,8 +47,7 @@ module Baleen
 
     CONCURRENCY=2
 
-    def initialize(containers, socket, msg)
-      @containers = containers
+    def initialize(socket, msg)
       @socket     = socket
       @queue      = []
       @results    = []
@@ -73,14 +72,14 @@ module Baleen
     def create_runners
       target_files.map {|file|
         @params.files = file
-        Runner.new(@containers, @params)
+        Runner.new(@params)
       }.each_slice(CONCURRENCY).map {|r| r}
     end
 
     def target_files
       params = @params.dup
       params.command = %{find #{params.files} | grep "\\.feature"}
-      runner = Runner.new(@containers, params)
+      runner = Runner.new(params)
       runner.run
       runner.status.log.split("\n")
     end
@@ -95,8 +94,8 @@ module Baleen
 
     attr_reader :status
 
-    def initialize(containers, params)
-      @docker_client = Container::DockerClient.new(containers)
+    def initialize(params)
+      @docker_client = Container::DockerClient.new
       @status = nil
       @params = params
     end
@@ -119,7 +118,7 @@ module Baleen
       begin
         @docker_client.create_container(@params)
         @docker_client.start_container
-      rescue Docker::Error::ContainerNotFound => e
+      rescue Excon::Errors::NotFound => e
         count += 1
         if count > max_retry
           raise Baleen::Error::StartContainerFail

data/lib/baleen/server.rb

@@ -11,12 +11,8 @@ module Baleen
     include Celluloid::IO
     finalizer :shutdown
 
-    attr_accessor :containers
-
     def initialize(docker_host: "127.0.0.1", docker_port: 4243, port: 5533)
-      @base_url = "http://#{docker_host}:#{docker_port}"
-      @docker = Docker::API.new(base_url: @base_url)
-      @containers = @docker.containers
+      Docker.url = "http://#{docker_host}:#{docker_port}"
       @server = TCPServer.new("0.0.0.0", port)
       async.run
     end
@@ -52,12 +48,10 @@ module Baleen
       msg = parse_request(message)
 
       case msg
-        when Message::Request::PingPong
-          socket.puts "pong"
         when Message::Request::ClientDisconnect
           socket.close
         when Message::Request::Cucumber
-          manager = RunnerManager.new(@containers, socket, msg)
+          manager = RunnerManager.new(socket, msg)
           manager.run
         else
           warn "Received unknown request"

data/lib/baleen/version.rb

@@ -1,3 +1,3 @@
 module Baleen
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: baleen
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Kim, Hirokuni
@@ -108,6 +108,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: docker-api
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement