baleen 0.2.3 → 0.2.4

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    OGY2MjEyY2M5YTgyY2FiMzBiZTE1ODI4NjkxNTE3M2NiMjVlMDU2Mg==
-  data.tar.gz: !binary |-
-    ZTFhNWQ0M2NjYzk5MDgxMDIxNzNmYjEyNzZhMjU1OWQyOWQyNjZiZQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    ZjM1MzFjMzJkZjU0ZThmNDNlMmQxMWM3OTc3ZTRkM2I5YzRlZDNmMTgzN2Ux
-    MGYwZDdkMDAzNmYxZWFhODYwNjc4MGVmNjhiMDc2YjBiN2U0NGQyY2M1NDY4
-    YjM3ODdmY2VhZWMyYzE3ZDJhYWFhMWM3NTliMDUxMTA0NDlhMjA=
-  data.tar.gz: !binary |-
-    M2M1ZGM4YzcxZjViYzMwOWI1NjE2ZDBiZTc5MzlkMzIyYTIxOWU1OTIwZTlk
-    MjYwZDEzNDhiNDk4MDA4OTczNmQ5MzBiMTU1ZmYxNWNlYTYzMGYxODEzMjVj
-    YTRkYWVmNjE0ZjM1OWMzN2JmMjdkZTAxNjg2ODUyYTcwYWU1OTc=
+SHA1:
+  metadata.gz: 9df0bfc4b8a205c46c3e13fbf2906087e6c1a033
+  data.tar.gz: f197d4b4e8e14d113d0f41c4daf3e747b34898c5
+SHA512:
+  metadata.gz: 26902b9e10a2489d82c769a873fcab7a5214eef1d8ad707d46a8c7245d11d58209bdf21e0b3e590455db66ae5fda608b051f42ec6521871849c710747524ad7c
+  data.tar.gz: ebfec9d50b6b5ba7c249d50a00fc8390fcdb5b73876f802f849b85aff3f9a66c159103718f476bbad850de15d600ff742141a40846a44c879369331ba3e27ecb

data/lib/baleen.rb

@@ -6,7 +6,6 @@ require 'baleen/utils/logger'
 require 'baleen/serializable'
 require 'baleen/client'
 require 'baleen/task/task'
-require 'baleen/task'
 require 'baleen/job'
 require 'baleen/server'
 require 'baleen/runner'

data/lib/baleen/job.rb

@@ -23,7 +23,7 @@ module Baleen
     private
 
     def show_results(s_time, e_time)
-      display = ResultDisplay.new(@response.results, s_time, e_time, STDOUT)
+      display = ResultDisplay.new(@response.results, s_time, e_time)
       display.report_result
     end
 

data/lib/baleen/project.rb

@@ -113,6 +113,7 @@ module Baleen
         Baleen::Task::Cucumber.new(
           image: @config[:runner][:image],
           work_dir: @config[:runner][:work_dir],
+          options: @config[:framework][:options],
           files: @config[:framework][:files],
           before_command: @config[:runner][:before_command],
           concurrency: @config[:runner][:concurrency].to_i,

data/lib/baleen/result_display.rb

@@ -2,7 +2,7 @@ require "colorize"
 
 module Baleen
   class ResultDisplay
-    def initialize(result, start_time, end_time, output)
+    def initialize(result, start_time, end_time, output=$stdout)
       @result     = result
       @start_time = start_time
       @end_time   = end_time

data/lib/baleen/runner.rb

@@ -44,7 +44,7 @@ module Baleen
     def_delegator :@connection, :notify_info
 
     def initialize(task, connection=nil)
-      @container = Docker::Container.create('Cmd' => [task.shell, task.opt, task.commands], 'Image' => task.image)
+      @container  = Docker::Container.create('Cmd' => ["bash", "-c", task.commands], 'Image' => task.image)
       @connection = connection ? connection : Connection.new
       @task = task
     end

data/lib/baleen/task/base.rb

@@ -6,11 +6,10 @@ module Baleen
       def initialize
         @params = {}
         @params[:klass]          = self.class.to_s
-        @params[:shell]          = nil
-        @params[:opt]            = nil
         @params[:work_dir]       = nil
         @params[:files]          = nil
-        @params[:exe]            = nil
+        @params[:bin]            = nil
+        @params[:options]        = nil
         @params[:concurrency]    = nil
         @params[:image]          = nil
         @params[:before_command] = nil
@@ -29,7 +28,7 @@ module Baleen
       end
 
       def command
-        @params[:command] ||= %{#{@params[:exe]} #{@params[:files]}}
+        @params[:command] ||= %{#{@params[:bin]} #{@params[:options]} #{@params[:files]}}
       end
 
       def command=(c)

data/lib/baleen/task/cucumber.rb

@@ -11,9 +11,8 @@ module Baleen
 
       def initialize(opt)
         super()
-        @params[:shell]          = opt[:shell]          || "/bin/bash"
-        @params[:opt]            = opt[:opt]            || "-c"
-        @params[:exe]            = opt[:exe]            || "bundle exec cucumber"
+        @params[:bin]            = opt[:bin]            || "bundle exec cucumber"
+        @params[:options]        = opt[:options]
         @params[:work_dir]       = opt[:work_dir]       || default_work_dir
         @params[:files]          = opt[:files]          || default_features
         @params[:concurrency]    = opt[:concurrency]    || default_concurrency
@@ -27,8 +26,6 @@ module Baleen
 
       def prepare
         task = Generic.new(
-          shell:    shell,
-          opt:      opt,
           work_dir: work_dir,
           image:    image,
           command:  %{find #{files} | grep "\\.feature"}

data/lib/baleen/task/generic.rb

@@ -6,8 +6,6 @@ module Baleen
 
       def initialize(opt)
         super()
-        @params[:shell]          = opt[:shell]       ||="/bin/bash"
-        @params[:opt]            = opt[:opt]         ||="-c"
         @params[:work_dir]       = opt[:work_dir]    ||="./"
         @params[:image]          = opt[:image]
         @params[:command]        = opt[:command]

data/lib/baleen/task/image_update.rb

@@ -8,8 +8,6 @@ module Baleen
 
       def initialize(opt)
         super()
-        @params[:shell]          = opt[:shell]       ||="/bin/bash"
-        @params[:opt]            = opt[:opt]         ||="-c"
         @params[:image]          = opt[:image]       ||="kimh/baleen-poc"
         @params[:command]        = opt[:command]
         @params[:work_dir]       = opt[:work_dir]

data/lib/baleen/validator.rb

@@ -84,6 +84,7 @@ module Baleen
       def optional_attributes
         [
           target_files,
+          :options,
         ]
       end
 

data/lib/baleen/version.rb

@@ -1,3 +1,3 @@
 module Baleen
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/spec/lib/baleen/spec_result_display.rb

@@ -3,45 +3,74 @@ require_relative '../../spec_helper'
 describe Baleen::ResultDisplay do
   describe "#summary" do
     context "when all test passes" do
-      it "should display Pass" do
-        result = [
-          {
-            "status_code" => 0,
-            "container_id" => "aaaaaa",
-            "log" => "brabrabra",
-            "file" => "feature/t1.feature"
-          },
-          {
-            "status_code" => 0,
-            "container_id" => "bbbbbb",
-            "log" => "brabrabra",
-            "file" => "feature/t2.feature"
-          }
-        ]
-        displayer = Baleen::ResultDisplay.new(result, Time.now, Time.now+10)
-        capture(:stdout) { displayer.summary }.should include 'Pass'
+      result = [
+        {
+          "status_code" => 0,
+          "container_id" => "aaaaaa",
+          "log" => "brabrabra",
+          "file" => "feature/t1.feature"
+        },
+        {
+          "status_code" => 0,
+          "container_id" => "bbbbbb",
+          "log" => "brabrabra",
+          "file" => "feature/t2.feature"
+        }
+      ]
+
+      context "when output is STDOUT" do
+        it "should display Pass" do
+          displayer = Baleen::ResultDisplay.new(result, Time.now, Time.now+10, Kernel)
+          capture(:stdout) { displayer.summary }.should include 'Pass'
+        end
+      end
+
+      context "when output is logger" do
+        it "should contain Pass" do
+          logger = Baleen::BL.instance
+          log_file = File.join(Baleen::Configuration.instance.dir, "log", "baleen.log")
+
+          Baleen::ResultDisplay.new(result, Time.now, Time.now+10, logger).summary
+          expect(File.open(log_file).read).to include 'Pass'
+        end
       end
+
     end
 
     context "when some test fails" do
-      it "should display Fail" do
-         result = [
-          {
-            "status_code" => 0,
-            "container_id" => "aaaaaa",
-            "log" => "brabrabra",
-            "file" => "feature/t1.feature"
-          },
-          {
-            "status_code" => 1,
-            "container_id" => "bbbbbb",
-            "log" => "brabrabra",
-            "file" => "feature/t2.feature"
-          }
-        ]
-        displayer = Baleen::ResultDisplay.new(result, Time.now, Time.now+10)
-        capture(:stdout) { displayer.summary }.should include 'Fail'
+      result = [
+         {
+           "status_code" => 0,
+           "container_id" => "aaaaaa",
+           "log" => "brabrabra",
+           "file" => "feature/t1.feature"
+         },
+         {
+           "status_code" => 1,
+           "container_id" => "bbbbbb",
+           "log" => "brabrabra",
+           "file" => "feature/t2.feature"
+         }
+      ]
+
+      context "when output is STDOUT" do
+        it "should display Fail" do
+          displayer = Baleen::ResultDisplay.new(result, Time.now, Time.now+10, Kernel)
+          capture(:stdout) { displayer.summary }.should include 'Fail'
+        end
       end
+
+      context "when output is logger" do
+        it "should contain Pass" do
+          logger = Baleen::BL.instance
+          log_file = File.join(Baleen::Configuration.instance.dir, "log", "baleen.log")
+
+          Baleen::ResultDisplay.new(result, Time.now, Time.now+10, logger).summary
+          expect(File.open(log_file).read).to include 'Fail'
+        end
+      end
+
     end
+
   end
 end

data/spec/lib/baleen/spec_task.rb

@@ -13,7 +13,7 @@ describe Baleen::Task do
       )
       runner = Baleen::Runner.new(task)
       result = runner.run
-      expect(result[:log]).to include string
+      expect(result[:stdout].join("\n")).to include string
     end
   end
 
@@ -28,7 +28,7 @@ describe Baleen::Task do
       )
       runner = Baleen::Runner.new(task)
       result = runner.run
-      expect(result[:log]).to include "Scenario"
+      expect(result[:stdout].join("\n")).to include "Scenario"
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: baleen
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Kim, Hirokuni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-04 00:00:00.000000000 Z
+date: 2013-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,154 +28,154 @@ dependencies:
   name: rake
   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'
 - !ruby/object:Gem::Dependency
   name: pry
   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'
 - !ruby/object:Gem::Dependency
   name: awesome_print
   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'
 - !ruby/object:Gem::Dependency
   name: interactive_editor
   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'
 - !ruby/object:Gem::Dependency
   name: rspec
   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'
 - !ruby/object:Gem::Dependency
   name: celluloid
   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: celluloid-io
   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: 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
     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: thor
   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: sinatra
   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'
 description: Ballen allows you to run standard ruby tests in parallel and isolated
@@ -217,7 +217,6 @@ files:
 - lib/baleen/runner.rb
 - lib/baleen/serializable.rb
 - lib/baleen/server.rb
-- lib/baleen/task.rb
 - lib/baleen/task/base.rb
 - lib/baleen/task/cucumber.rb
 - lib/baleen/task/generic.rb
@@ -243,12 +242,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -263,4 +262,3 @@ test_files:
 - spec/lib/baleen/spec_task.rb
 - spec/lib/baleen/spec_validator.rb
 - spec/spec_helper.rb
-has_rdoc: 

data/lib/baleen/task.rb

@@ -1,44 +0,0 @@
-module Baleen
-  module Task
-
-    class Command
-      def initialize(work_dir, files, bundler)
-        @work_dir = work_dir
-        @files = files
-        @bundler = bundler
-        @before = []
-        build_default_arg
-      end
-
-      def before(commands=nil)
-        commands = sanitize_and_tokenize(commands) if commands
-        commands ? @before = commands : @before
-      end
-
-      def commands
-        @before ? @before + @args : @args
-      end
-
-      def <<(arg)
-        @args << arg
-      end
-
-      private
-
-      def build_default_arg
-        exe = @bundler ? "bundle exec cucumber" : "cucumber"
-        @args = ["cd #{@work_dir}", "#{exe} #{@files}"]
-      end
-
-      def sanitize_and_tokenize(arg)
-        # sanitize
-        arg = arg.strip.gsub(/^ */, '').gsub(/\n+/, "\n")
-        # tokenize
-        arg = arg.gsub(";", "\n")
-        arg.split("\n")
-      end
-    end
-
-  end
-end
-