baleen 0.0.2 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc7921b0867d0a73836d50b562b35e7cf9692d7f
-  data.tar.gz: 43d2f2f70271efdd4407247e55e0341ffeb689ae
+  metadata.gz: abadaf7bacf699bd38b6bc8825b8decd083de9f5
+  data.tar.gz: 8bc97b2c0b3806f1288f736dcc7141fd6a7ce7e1
 SHA512:
-  metadata.gz: 2c9f0dab84c29a08f66fe481fa110c26ec6a8bf06b20826077c29cc2333696d7693209ea569d0a587a899144fa5bcefb42be29b4ff2824d4b06be2e68e6d8b78
-  data.tar.gz: 8ec1a88eac0e64c7402f9a2414c88bb9352a08fda0e68b8fdd3c0d90064e311a331c573f1bdfe4e3550d849f133fc5fe46a80949709e718e20c811e337b7c67a
+  metadata.gz: ae47b1bff4d6b98b5cfd3def67984d7aac351b680a807b195c24d1135be62b7e1e60551b90a2b9ab6a593c3a1b87615b4a60b4781880ac9d42eacdd106079f75
+  data.tar.gz: 3ead613980c270d3095ba89647391d7a9af188d2edaaebead15ed9c8de08d70f8fe238f41cddb8a662ae68a23ad8aa7e157b9606fdff1334af47ad6c974c2913

data/Gemfile

@@ -3,4 +3,5 @@ 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 'docker-client', path: File.expand_path("/Users/kimh/git/docker-ruby", __FILE__)
+#gem 'baleen', path: File.expand_path("/Users/kimh/git/baleen", __FILE__)

data/README.md

@@ -1,24 +1,64 @@
 # Baleen
+Baleen is a test runner powered by Docker and Celluloid::IO.
+Baleen allows you to run ruby standard tests such as Cucumber or Rspec in totally isolated environment and parallel.
 
-TODO: Write a gem description
+By using Baleen, you can run feature or spec in a dedicated linux container, so test will not affect the state of other tests.
+Also, Baleen will speed up your tests since multiple containers run their tests in parallel.
+
+## Requirement
+Linux machine with Docker installed
 
 ## Installation
 
-Add this line to your application's Gemfile:
+TODO
 
-    gem 'baleen'
+## Usage
 
-And then execute:
 
-    $ bundle
+Baleen is server-client model. You need to run baleen-server which talks Docker API to Docker and you can use baleen-client to put your request to the server like below.
 
-Or install it yourself as:
+    $ bundle exec baleen cucumber  --image kimh/baleen-poc --files features/ --work_dir /git/baleen/poc --before_command "source /etc/profile"
+    [Summary]
+    Result: Pass
+    Time: 0min 38sec
+    12 containers
 
-    $ gem install baleen
+    [Details]
+    Id: 5a836a088480f557bf79a00b0c6e34b36e8432f53ee8b5231b8983d902ae21d9
+    status code: 0
+    feature file: features/io_bound.feature
+    logs:
+    ------------------------------------
+    Rack::File headers parameter replaces cache_control after Rack 1.5.
+    Using the default profile...
+    Feature: Benchmark IO intensive feature
+
+      Scenario: Benchmark for IO bound operation # features/io_bound.feature:2
+        Then io intensive operation              # features/step_definitions/fake_test_steps.rb:20
+
+    1 scenario (1 passed)
+    1 step (1 passed)
+    0m1.556s
+
+    Id: 1e25993136553319379a07efd61fbc2b86094151fa25df4da0fc613f8c4fe87c
+    status code: 0
+    feature file: features/io_bound.feature
+    logs:
+    ------------------------------------
+    Rack::File headers parameter replaces cache_control after Rack 1.5.
+    Using the default profile...
+    Feature: Benchmark IO intensive feature
+
+      Scenario: Benchmark for IO bound operation # features/io_bound.feature:2
+        Then io intensive operation              # features/step_definitions/fake_test_steps.rb:20
+
+    1 scenario (1 passed)
+    1 step (1 passed)
+    0m1.518s
+
+    ....snip.....
 
-## Usage
 
-TODO: Write usage instructions here
 
 ## Contributing
 
@@ -27,3 +67,4 @@ TODO: Write usage instructions here
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+

data/baleen.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Kim, Hirokuni"]
   spec.email         = ["kimh@kvh.co.jp"]
   spec.description   = %q{Ballen allows you to run standard ruby tests in parallel and isolated environment}
-  spec.summary       = %q{Parallel and container-based test runner powered by Docker}
+  spec.summary       = %q{Container-based parallel test runner powered by Docker}
   spec.homepage      = ""
   spec.license       = "MIT"
 

data/bin/baleen

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
 require "thor"
+require "baleen"
 
 class BaleenCommand < Thor
 
@@ -9,8 +10,19 @@ class BaleenCommand < Thor
   option :work_dir, :default => "./"
   option :files, :default => "features"
   option :before_command, :default => nil
+  option :host, :default => "127.0.0.1"
+  option :port, :default => "5533"
   def cucumber
-    puts options[:image]
+    client  = Baleen::Client.new(options[:host], options[:port])
+    request = Baleen::Message::Request::Cucumber.new(
+                image: options[:image],
+                work_dir: options[:work_dir],
+                files: options[:files],
+                before_command: options[:before_command],
+              )
+
+    job     = Baleen::Job.new(client, request)
+    job.start
   end
 end
 

data/bin/baleen-server

@@ -0,0 +1,60 @@
+#!/usr/bin/env ruby
+
+require "thor"
+require "baleen"
+
+def pid
+  ### Use this when implement restart command
+  #pid = `ps ax | grep -E "baleen-server start|restart" | grep -v grep | awk '{print $1}'`
+  pid = `ps ax | grep -E "baleen-server start|restart" | grep -v grep | awk '{print $1}'`
+  pid.split("\n")
+end
+
+def running?
+  pid.size >= 1
+end
+
+class BaleenServerCli < Thor
+
+  desc "start", "Start Baleen server"
+  option :docker_host, :default => "127.0.0.1"
+  option :docker_port, :default => 4243
+  option :port,        :default => 5533
+  option :debug,       :type    => :boolean
+  def start
+    if pid.size > 1
+      warning "baleen-server is already running"
+      warning "Exiting..."
+      exit
+    end
+
+    docker_host = options[:docker_host]
+    docker_port = options[:docker_port]
+    port        = options[:port]
+    debug       = options[:debug]
+
+    info "Starting baleen-server..."
+    info "  Listening on: #{port}"
+    info "  Docker API: http://#{docker_host}:#{docker_port}"
+
+    Process.daemon(true, debug)
+    Baleen::Server.new(docker_host: docker_host, docker_port: docker_port, port: port)
+
+    # Prevent main thread from exiting for Celluloid actors to continue running
+    # See https://github.com/celluloid/celluloid/wiki/Frequently-Asked-Questions
+    sleep
+  end
+
+  desc "stop", "Stop Baleen server"
+  def stop
+    if running?
+      notice "Stopping Baleen server..."
+      `kill -9 #{pid.first}`
+    else
+      notice "baleen-server is not running"
+    end
+  end
+
+end
+
+BaleenServerCli.start

data/lib/baleen.rb

@@ -1,5 +1,14 @@
 require "baleen/version"
 
+require 'baleen/client'
+require 'baleen/message/message'
+require 'baleen/task'
+require 'baleen/job'
+
+require 'baleen/server'
+require 'baleen/container'
+require 'baleen/runner'
+
 module Baleen
   # Your code goes here...
 end

data/lib/baleen/client.rb

@@ -1,5 +1,6 @@
 require 'celluloid/io'
 require 'celluloid/autostart'
+require 'baleen/utils/colored_puts'
 
 module Baleen
   class Client
@@ -8,16 +9,18 @@ module Baleen
 
     def initialize(host, port=12345)
       @socket = TCPSocket.open(host, port)
-      @result = "running"
-      async.response
     end
 
     def request(request)
       @socket.puts(request.to_json)
     end
 
-    def response
-      loop { break if handle_response(@socket.gets) }
+    def wait_response
+      loop {
+        if response = handle_response(@socket.gets)
+          return response
+        end
+      }
     end
 
     def close
@@ -32,13 +35,7 @@ module Baleen
         raise RuntimeError, 'Connection closed by server'
       end
 
-      info "Got response"
-      @result = Baleen::Message::Decoder.new(response).decode
-      true
-    end
-
-    def result
-      @result
+      Baleen::Message::Decoder.new(response).decode
     end
 
   end

data/lib/baleen/error.rb

@@ -0,0 +1,5 @@
+module Baleen
+  module Error
+    class StartContainerFail < StandardError; end
+  end
+end

data/lib/baleen/job.rb

@@ -1,17 +1,28 @@
+require 'baleen/result_display'
+
 module Baleen
   class Job
 
     def initialize(client, msg)
       @client = client
       @msg = msg
+      @response = nil
     end
 
     def start
+      start_time = Time.now
       @client.request(@msg.params)
+      @response = @client.wait_response
+      end_time = Time.now
+      show_results(start_time, end_time)
     end
 
-    def result
-      @client.result
+    private
+
+    def show_results(s_time, e_time)
+      display = ResultDisplay.new(@response, start_time: s_time, end_time: e_time)
+      display.summary
+      display.detail
     end
 
   end

data/lib/baleen/{messages/messages.rb → message/base.rb}

@@ -3,7 +3,17 @@ require "json"
 module Baleen
   module Message
 
+    def symbolize_keys(hash)
+      hash.inject({}){|new_hash, key_value|
+        key, value = key_value
+        value = symbolize_keys(value) if value.is_a?(Hash)
+        new_hash[key.to_sym] = value
+        new_hash
+      }
+    end
+
     class Decoder
+      include Baleen::Message
 
       def initialize(json_string)
         @params = JSON.parse(json_string)
@@ -13,27 +23,24 @@ module Baleen
         klass = @params.delete "klass"
         Object.const_get(klass).new(symbolize_keys(@params))
       end
-
-      private
-
-      def symbolize_keys(hash)
-        hash.inject({}){|new_hash, key_value|
-          key, value = key_value
-          value = symbolize_keys(value) if value.is_a?(Hash)
-          new_hash[key.to_sym] = value
-          new_hash
-        }
-      end
     end
 
     class Base
-      attr_accessor :json_msg
 
       def initialize
         @params = {}
         @params[:klass] = self.class.to_s
       end
 
+      def method_missing(name, *args)
+        Base.class_eval{
+          define_method "#{name}" do
+            @params[name.to_sym]
+          end
+        }
+        send(name)
+      end
+
       def params
         @params
       end

data/lib/baleen/message/message.rb

@@ -0,0 +1,2 @@
+require "baleen/message/request"
+require "baleen/message/response"

data/lib/baleen/{messages → message}/request.rb

@@ -1,4 +1,5 @@
 require "json"
+require "baleen/message/base"
 
 module Baleen
   module Message
@@ -13,7 +14,7 @@ module Baleen
       end
 
       class Cucumber < Base
-        def initialize(image: "kimh/baleen-poc", work_dir: "./", files: "./features", shell: "/bin/bash", opt: "-c", exe: "bundle exec cucumber", before_command: nil, command: nil)
+        def initialize(image: nil, work_dir: "./", files: "features", shell: "/bin/bash", opt: "-c", exe: "bundle exec cucumber", before_command: nil, command: nil)
           super()
           @params[:image]          = image
           @params[:shell]          = shell

data/lib/baleen/{messages → message}/response.rb

@@ -1,27 +1,32 @@
+require 'json'
+
 module Baleen
   module Message
     module Response
 
-      class JobComplete < Base
+      class RunnerFinish < Base
+
         def initialize(opt = {})
           super()
           @params[:status_code]   = opt[:status_code]
           @params[:log ]          = opt[:log]
-          @params[:container_id ] = opt[:log]
+          @params[:container_id ] = opt[:container_id]
+          @params[:file]          = opt[:file]
         end
-
-        def status_code;  @params[:status_code] end
-        def log;          @params[:log] end
-        def container_id; @params[:container_id] end
       end
 
-      class RunnerFinish < Base
+      class JobComplete < Base
+        include Baleen::Message
+
         def initialize(opt = {})
           super()
-          @params[:status] = opt[:status]
+          @params[:status]  = opt[:status]
+          @params[:results] = opt[:results]
         end
 
-        def status;  @params[:status] end
+        def result
+          JSON.parse(@params[:results]).map {|r| symbolize_keys(r) }
+        end
       end
 
     end

data/lib/baleen/result_display.rb

@@ -0,0 +1,47 @@
+require "colorize"
+
+module Baleen
+  class ResultDisplay
+    def initialize(result, start_time: nil, end_time: nil)
+      @result     = result.result
+      @start_time = start_time
+      @end_time   = end_time
+    end
+
+    def summary
+      tests_result = pass_all? ? "Pass".green : "Fail".red
+      time = run_time
+
+      puts   ""
+      notice "[Summary]"
+      puts   "Result: ".yellow + tests_result
+      puts   "Time: ".yellow + time.green
+      puts   ""
+    end
+
+    def detail
+      notice "[Details]"
+      @result.each do |r|
+        puts "Id: ".yellow + "#{r[:container_id]}".green
+        puts "status code: ".yellow + "#{r[:status_code]}".green
+        puts "feature file: ".yellow + "#{r[:file]}".green
+        puts "logs:".yellow
+        puts "------------------------------------".yellow
+        puts "#{r[:log]}".green
+      end
+    end
+
+    private
+
+    def pass_all?
+      @result.all? {|r| r[:status_code] == 0}
+    end
+
+    def run_time
+      diff = @end_time - @start_time
+      min  = (diff / 60).floor
+      sec  = min != 0 ? (diff - (min * 60)).floor : diff.floor
+      "#{min}min #{sec}sec"
+    end
+  end
+end

data/lib/baleen/runner.rb

@@ -1,3 +1,5 @@
+require "baleen/error"
+
 module Baleen
 
   class DockerParam
@@ -49,6 +51,7 @@ module Baleen
       @containers = containers
       @socket     = socket
       @queue      = []
+      @results    = []
       @params     = DockerParam.new(msg.params)
     end
 
@@ -59,9 +62,9 @@ module Baleen
           runner.async.run
         end
         loop {break if monitor_runners}
+        @results += @queue.map {|runner| runner.status.params}
       end
-
-      msg = Message::Response::RunnerFinish.new(status: "done")
+      msg = Message::Response::JobComplete.new(status: "done", results: @results.to_json)
       @socket.puts(msg.to_json)
     end
 
@@ -100,18 +103,30 @@ module Baleen
 
     def run
       start_runner do |result|
-        @status = Message::Response::JobComplete.new(
+        @status = Message::Response::RunnerFinish.new(
            status_code: result.status_code,
            container_id: result.container_id,
-           log: result.log
+           log: result.log,
+           file: @params.files,
          )
       end
       sleep 0.1 # Stop a moment until RunnerManager checks the status
     end
 
     def start_runner
-      @docker_client.create_container(@params)
-      @docker_client.start_container
+      max_retry = 3; count = 0
+
+      begin
+        @docker_client.create_container(@params)
+        @docker_client.start_container
+      rescue Docker::Error::ContainerNotFound => e
+        count += 1
+        if count > max_retry
+          raise Baleen::Error::StartContainerFail
+        else
+          retry
+        end
+      end
       yield( @docker_client.result )
     end
 

data/lib/baleen/server.rb

@@ -13,11 +13,11 @@ module Baleen
 
     attr_accessor :containers
 
-    def initialize(host, port: 4243)
-      @base_url = "http://#{host}:#{port}"
+    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
-      @server = TCPServer.new("127.0.0.1", 12345)
+      @server = TCPServer.new("0.0.0.0", port)
       async.run
     end
 

data/lib/baleen/utils/colored_puts.rb

@@ -7,11 +7,11 @@ module Kernel
     puts msg.green
   end
 
-  def warn(msg)
+  def notice(msg)
     puts msg.yellow
   end
 
-  def error(msg)
+  def warning(msg)
     puts msg.red
   end
 end

data/lib/baleen/version.rb

@@ -1,3 +1,3 @@
 module Baleen
-  VERSION = "0.0.2"
+  VERSION = "0.0.9"
 end

data/poc/config/environments/development.rb

@@ -6,7 +6,7 @@ CiApp::Application.configure do
   # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
 
-  # Log error messages when you accidentally call methods on nil.
+  # Log error message when you accidentally call methods on nil.
   config.whiny_nils = true
 
   # Show full error reports and disable caching

data/poc/config/environments/test.rb

@@ -11,7 +11,7 @@ CiApp::Application.configure do
   config.serve_static_assets = true
   config.static_cache_control = "public, max-age=3600"
 
-  # Log error messages when you accidentally call methods on nil
+  # Log error message when you accidentally call methods on nil
   config.whiny_nils = true
 
   # Show full error reports and disable caching

data/poc/features/t1.feature

@@ -2,11 +2,11 @@ Feature: t1
   Scenario: Benchmark for IO bound operation
     Then io intensive operation
 
-  Scenario: Benchmark for CPU bound operation
-    Then cpu intensive operation
+  #Scenario: Benchmark for CPU bound operation
+  #  Then cpu intensive operation
 
-  Scenario: Benchmark for IO bound operation
-    Then io intensive operation
+  #Scenario: Benchmark for IO bound operation
+  #  Then io intensive operation
 
-  Scenario: Benchmark for CPU bound operation
-    Then cpu intensive operation
+  #Scenario: Benchmark for CPU bound operation
+  #  Then cpu intensive operation

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: baleen
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.9
 platform: ruby
 authors:
 - Kim, Hirokuni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-09 00:00:00.000000000 Z
+date: 2013-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -142,6 +142,7 @@ email:
 - kimh@kvh.co.jp
 executables:
 - baleen
+- baleen-server
 extensions: []
 extra_rdoc_files: []
 files:
@@ -152,13 +153,17 @@ files:
 - Rakefile
 - baleen.gemspec
 - bin/baleen
+- bin/baleen-server
 - lib/baleen.rb
 - lib/baleen/client.rb
 - lib/baleen/container.rb
+- lib/baleen/error.rb
 - lib/baleen/job.rb
-- lib/baleen/messages/messages.rb
-- lib/baleen/messages/request.rb
-- lib/baleen/messages/response.rb
+- lib/baleen/message/base.rb
+- lib/baleen/message/message.rb
+- lib/baleen/message/request.rb
+- lib/baleen/message/response.rb
+- lib/baleen/result_display.rb
 - lib/baleen/runner.rb
 - lib/baleen/server.rb
 - lib/baleen/task.rb
@@ -258,5 +263,5 @@ rubyforge_project:
 rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
-summary: Parallel and container-based test runner powered by Docker
+summary: Container-based parallel test runner powered by Docker
 test_files: []