aruba 0.12.0 → 0.13.0

data/lib/aruba/runtime.rb

@@ -2,7 +2,7 @@ require 'aruba/config'
 require 'aruba/aruba_path'
 require 'aruba/config_wrapper'
 require 'aruba/events'
-require 'event/bus'
+require 'aruba/event_bus'
 
 module Aruba
   # Runtime of aruba
@@ -40,7 +40,7 @@ module Aruba
     attr_accessor :config, :environment, :logger, :command_monitor, :announcer, :event_bus
 
     def initialize(opts = {})
-      @event_bus       = ::Event::Bus.new(::Event::NameResolver.new(Aruba::Events))
+      @event_bus       = EventBus.new(EventBus::NameResolver.new(Aruba::Events))
       @announcer       = opts.fetch(:announcer, Aruba.platform.announcer.new)
       @config          = opts.fetch(:config, ConfigWrapper.new(Aruba.config.make_copy, @event_bus))
       @environment     = opts.fetch(:environment, Aruba.platform.environment_variables.new)

data/lib/aruba/setup.rb

@@ -37,6 +37,7 @@ module Aruba
           runtime.announcer.announce :command, event.entity.commandline
           runtime.announcer.announce :timeout, 'exit', event.entity.exit_timeout
           runtime.announcer.announce :timeout, 'io wait', event.entity.io_wait_timeout
+          runtime.announcer.announce :wait_time, 'startup wait time', event.entity.startup_wait_time
           runtime.announcer.announce :full_environment, event.entity.environment
         end
       )
@@ -52,8 +53,10 @@ module Aruba
       runtime.event_bus.register(
         :command_stopped,
         proc do |event|
-          runtime.announcer.announce :stdout, event.entity.stdout
-          runtime.announcer.announce :stderr, event.entity.stderr
+          runtime.announcer.announce(:stdout) { event.entity.stdout }
+          runtime.announcer.announce(:stderr) { event.entity.stderr }
+          runtime.announcer.announce(:command_content) { event.entity.content }
+          runtime.announcer.announce(:command_filesystem_status) { event.entity.filesystem_status }
         end
       )
 

data/lib/aruba/version.rb

@@ -1,3 +1,3 @@
 module Aruba
-  VERSION = '0.12.0'
+  VERSION = '0.13.0'
 end

data/script/bootstrap

@@ -13,6 +13,14 @@ echo -ne "$info_msg Checking if ruby installed? "
 which 'ruby' >/dev/null 2>error.log || ( echo -e "$error_msg\n\nCould not find \`ruby\`. Please install ruby or add it to PATH"; output_error_log; exit 1 )
 echo OK
 
+echo -ne "$info_msg Checking if bash installed? "
+which 'bash' >/dev/null 2>error.log || ( echo -e "$error_msg\n\nCould not find \`bash\`. Please install bash or add it to PATH"; output_error_log; exit 1 )
+echo OK
+
+echo -ne "$info_msg Checking if zsh installed? "
+which 'zsh' >/dev/null 2>error.log || ( echo -e "$error_msg\n\nCould not find \`zsh\`. Please install zsh or add it to PATH"; output_error_log; exit 1 )
+echo OK
+
 echo -e "$info_msg rubygem \"bundler\" "
 gem install bundler
 

data/spec/aruba/api_spec.rb

@@ -1081,7 +1081,7 @@ describe Aruba::Api  do
       context 'enabled' do
         before :each do
           @aruba.aruba.announcer = instance_double 'Aruba::Platforms::Announcer'
-          expect(@aruba.aruba.announcer).to receive(:announce).with(:stdout, "hello world\n")
+          expect(@aruba.aruba.announcer).to receive(:announce).with(:stdout) { "hello world\n" }
           allow(@aruba.aruba.announcer).to receive(:announce)
         end
 

data/spec/aruba/platform/simple_table_spec.rb

@@ -11,13 +11,13 @@ RSpec.describe '.simple_table' do
     end
     let(:rows) { ['# key1 => value', '# key2 => value'] }
 
-    it { expect(Aruba.platform.simple_table(hash)).to eq rows }
+    it { expect(Aruba.platform.simple_table(hash).to_s).to eq rows.join("\n") }
   end
 
   context 'when empty hash' do
     let(:hash) { {} }
     let(:rows) { [] }
 
-    it { expect(Aruba.platform.simple_table(hash)).to eq rows }
+    it { expect(Aruba.platform.simple_table(hash).to_s).to eq rows.join("\n") }
   end
 end

data/spec/event_bus/name_resolver_spec.rb

@@ -0,0 +1,68 @@
+require 'aruba/event_bus/name_resolver'
+
+describe Aruba::EventBus::NameResolver do
+  subject(:resolver) { described_class.new(default_name_space) }
+  let(:default_name_space) { 'Events' }
+  let(:resolved_name) { resolver.transform(original_name) }
+
+  before :each do
+    stub_const('Events::MyEvent', Class.new)
+    stub_const('Events::MyEvent', Class.new)
+  end
+
+  describe '#transform' do
+    context 'when name is string' do
+      context 'when simple' do
+        let(:original_name) { 'Events::MyEvent' }
+        it { expect(resolved_name).to eq Events::MyEvent }
+      end
+
+      context 'when prefixed' do
+        let(:original_name) { '::Events::MyEvent' }
+        it { expect(resolved_name).to eq Events::MyEvent }
+      end
+    end
+
+    context 'when name is class' do
+      context 'when simple' do
+        let(:original_name) { Events::MyEvent }
+        it { expect(resolved_name).to eq Events::MyEvent }
+      end
+
+      context 'when prefixed' do
+        let(:original_name) { ::Events::MyEvent }
+        it { expect(resolved_name).to eq Events::MyEvent }
+      end
+    end
+
+    context 'when name is symbol' do
+      let(:original_name) { :my_event }
+      it { expect(resolved_name).to eq Events::MyEvent }
+    end
+
+    context 'when namespace ...' do
+      before :each do
+        stub_const('MyLib::Events::MyEvent', Class.new)
+      end
+
+      context 'when is string' do
+        let!(:default_name_space) { 'MyLib::Events' }
+        let!(:original_name) { :my_event }
+
+        it { expect(resolved_name).to eq MyLib::Events::MyEvent }
+      end
+
+      context 'when is module' do
+        let!(:default_name_space) { MyLib::Events }
+        let!(:original_name) { :my_event }
+
+        it { expect(resolved_name).to eq MyLib::Events::MyEvent }
+      end
+    end
+
+    context 'when invalid' do
+      let(:original_name) { 1 }
+      it { expect { resolved_name }.to raise_error Aruba::EventNameResolveError, /Transforming "1"/ }
+    end
+  end
+end

data/spec/event_bus_spec.rb

@@ -0,0 +1,160 @@
+require 'aruba/event_bus'
+
+# rubocop:disable Style/Documentation
+module Events
+  class TestEvent; end
+  class AnotherTestEvent; end
+  module MalformedTestEvent; end
+end
+
+class MyHandler
+  def call(*); end
+end
+
+class MyMalformedHandler; end
+# rubocop:enable Style/Documentation
+
+describe Aruba::EventBus do
+  subject(:bus) { described_class.new(name_resolver) }
+
+  let(:name_resolver) { instance_double('Events::NameResolver') }
+
+  let!(:event_klass) { Events::TestEvent }
+  let!(:event_name) { event_klass }
+  let!(:event_instance) { Events::TestEvent.new }
+
+  let!(:another_event_klass) { Events::AnotherTestEvent }
+  let!(:another_event_name) { another_event_klass }
+  let!(:another_event_instance) { Events::AnotherTestEvent.new }
+
+  describe '#notify' do
+    before(:each) do
+      allow(name_resolver).to receive(:transform).with(event_name).and_return(event_klass)
+    end
+
+    context 'when subscriber to event, the block is called and get\'s an instance of the event passed as payload' do
+      before :each do
+        bus.register(event_klass) do |event|
+          @received_payload = event
+        end
+
+        bus.notify event_instance
+      end
+
+      it { expect(@received_payload).to eq(event_instance) }
+    end
+
+    context 'when not subscriber to event' do
+      before :each do
+        @received_payload = false
+        bus.register(event_klass) { @received_payload = true }
+        bus.notify another_event_instance
+      end
+
+      it { expect(@received_payload).to eq(false) }
+    end
+
+    context 'when event is not an instance of event class' do
+      let!(:event_name) { :test_event }
+      let(:received_payload) { [] }
+
+      before :each do
+        bus.register(event_name, proc {})
+      end
+
+      it { expect { bus.notify event_klass }.to raise_error Aruba::NoEventError }
+    end
+  end
+
+  describe '#register' do
+    before(:each) do
+      allow(name_resolver).to receive(:transform).with(event_name).and_return(event_klass)
+    end
+
+    context 'when valid subscriber' do
+      context 'when multiple instances are given' do
+        let(:received_events) { [] }
+
+        before :each do
+          bus.register(Events::TestEvent) do |event|
+            received_events << event
+          end
+          bus.register(Events::TestEvent) do |event|
+            received_events << event
+          end
+
+          bus.notify event_instance
+        end
+
+        it { expect(received_events.length).to eq 2 }
+        it { expect(received_events).to all eq event_instance }
+      end
+
+      context 'when is string' do
+        let!(:event_name) { event_klass.to_s }
+        let(:received_payload) { [] }
+
+        before :each do
+          bus.register(event_klass.to_s) do |event|
+            received_payload << event
+          end
+
+          bus.notify event_instance
+        end
+
+        it { expect(received_payload).to include event_instance }
+      end
+
+      context 'when is symbol and event is defined in the default namespace given to NameResolver.new' do
+        let!(:event_name) { :test_event }
+        let(:received_payload) { [] }
+
+        before :each do
+          bus.register(event_name) do |event|
+            received_payload << event
+          end
+
+          bus.notify event_instance
+        end
+
+        it { expect(received_payload).to include event_instance }
+      end
+    end
+
+    context 'when valid custom handler' do
+      context 'when single event class' do
+        before(:each) do
+          allow(name_resolver).to receive(:transform).with(event_name).and_return(event_klass)
+        end
+
+        before :each do
+          bus.register(event_klass, MyHandler.new)
+        end
+
+        it { expect { bus.notify event_instance }.not_to raise_error }
+      end
+
+      context 'when list of event classes' do
+        before(:each) do
+          allow(name_resolver).to receive(:transform).with(event_name).and_return(event_klass)
+          allow(name_resolver).to receive(:transform).with(another_event_name).and_return(another_event_klass)
+        end
+
+        before :each do
+          bus.register([event_klass, another_event_klass], MyHandler.new)
+        end
+
+        it { expect { bus.notify event_instance }.not_to raise_error }
+        it { expect { bus.notify another_event_instance }.not_to raise_error }
+      end
+    end
+
+    context 'when malformed custom handler' do
+      it { expect { bus.register(event_klass, MyMalformedHandler.new) }.to raise_error ArgumentError }
+    end
+
+    context 'when no handler is given' do
+      it { expect { bus.register(event_klass) }.to raise_error ArgumentError }
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -10,9 +10,6 @@ SimpleCov.start
 require 'bundler'
 Bundler.require
 
-# Activate RSpec Integration
-require 'aruba/rspec'
-
 # Loading support files
 if RUBY_VERSION < '1.9'
   Dir.glob(::File.expand_path('../support/*.rb', __FILE__)).each { |f| require File.join(File.dirname(f), File.basename(f, '.rb')) }

data/spec/support/configs/aruba.rb

@@ -0,0 +1,5 @@
+require 'aruba/rspec'
+
+Aruba.configure do |config|
+  config.activate_announcer_on_command_failure = [:stderr, :stdout, :command]
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aruba
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Aslak Hellesøy
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-03 00:00:00.000000000 Z
+date: 2016-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -99,20 +99,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.19'
-- !ruby/object:Gem::Dependency
-  name: event-bus
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -162,6 +148,8 @@ files:
 - features/api/command/run.feature
 - features/api/command/run_simple.feature
 - features/api/command/send_signal.feature
+- features/api/command/stderr.feature
+- features/api/command/stdout.feature
 - features/api/command/stop.feature
 - features/api/command/stop_all_commands.feature
 - features/api/command/terminate_all_commands.feature
@@ -187,6 +175,7 @@ files:
 - features/api/text/unescape_text.feature
 - features/cli/console.feature
 - features/cli/init.feature
+- features/configuration/activate_announcer_on_command_failure.feature
 - features/configuration/command_runtime_environment.feature
 - features/configuration/console_history_file.feature
 - features/configuration/exit_timeout.feature
@@ -233,6 +222,7 @@ files:
 - features/steps/command/output.feature
 - features/steps/command/run.feature
 - features/steps/command/send_signal.feature
+- features/steps/command/shell.feature
 - features/steps/command/stderr.feature
 - features/steps/command/stdout.feature
 - features/steps/command/stop.feature
@@ -302,6 +292,7 @@ files:
 - lib/aruba/basic_configuration.rb
 - lib/aruba/basic_configuration/option.rb
 - lib/aruba/cli.rb
+- lib/aruba/colorizer.rb
 - lib/aruba/command.rb
 - lib/aruba/config.rb
 - lib/aruba/config/jruby.rb
@@ -321,9 +312,12 @@ files:
 - lib/aruba/cucumber/rvm.rb
 - lib/aruba/cucumber/testing_frameworks.rb
 - lib/aruba/errors.rb
+- lib/aruba/event_bus.rb
+- lib/aruba/event_bus/name_resolver.rb
 - lib/aruba/events.rb
 - lib/aruba/extensions/string/strip.rb
 - lib/aruba/file_size.rb
+- lib/aruba/generators/script_file.rb
 - lib/aruba/hooks.rb
 - lib/aruba/in_config_wrapper.rb
 - lib/aruba/in_process.rb
@@ -373,6 +367,7 @@ files:
 - lib/aruba/platforms/determine_disk_usage.rb
 - lib/aruba/platforms/determine_file_size.rb
 - lib/aruba/platforms/disk_usage_calculator.rb
+- lib/aruba/platforms/filesystem_status.rb
 - lib/aruba/platforms/local_environment.rb
 - lib/aruba/platforms/simple_table.rb
 - lib/aruba/platforms/unix_command_string.rb
@@ -417,8 +412,11 @@ files:
 - spec/aruba/rspec_spec.rb
 - spec/aruba/runtime_spec.rb
 - spec/aruba/spawn_process_spec.rb
+- spec/event_bus/name_resolver_spec.rb
+- spec/event_bus_spec.rb
 - spec/spec_helper.rb
 - spec/support/configs/.keep
+- spec/support/configs/aruba.rb
 - spec/support/configs/pry.rb
 - spec/support/configs/rspec.rb
 - spec/support/helpers/.keep
@@ -475,7 +473,7 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: aruba-0.12.0
+summary: aruba-0.13.0
 test_files:
 - features/api/command/find_command.feature
 - features/api/command/last_command_started.feature
@@ -483,6 +481,8 @@ test_files:
 - features/api/command/run.feature
 - features/api/command/run_simple.feature
 - features/api/command/send_signal.feature
+- features/api/command/stderr.feature
+- features/api/command/stdout.feature
 - features/api/command/stop.feature
 - features/api/command/stop_all_commands.feature
 - features/api/command/terminate_all_commands.feature
@@ -508,6 +508,7 @@ test_files:
 - features/api/text/unescape_text.feature
 - features/cli/console.feature
 - features/cli/init.feature
+- features/configuration/activate_announcer_on_command_failure.feature
 - features/configuration/command_runtime_environment.feature
 - features/configuration/console_history_file.feature
 - features/configuration/exit_timeout.feature
@@ -554,6 +555,7 @@ test_files:
 - features/steps/command/output.feature
 - features/steps/command/run.feature
 - features/steps/command/send_signal.feature
+- features/steps/command/shell.feature
 - features/steps/command/stderr.feature
 - features/steps/command/stdout.feature
 - features/steps/command/stop.feature
@@ -605,8 +607,11 @@ test_files:
 - spec/aruba/rspec_spec.rb
 - spec/aruba/runtime_spec.rb
 - spec/aruba/spawn_process_spec.rb
+- spec/event_bus/name_resolver_spec.rb
+- spec/event_bus_spec.rb
 - spec/spec_helper.rb
 - spec/support/configs/.keep
+- spec/support/configs/aruba.rb
 - spec/support/configs/pry.rb
 - spec/support/configs/rspec.rb
 - spec/support/helpers/.keep