maestro_plugin 0.0.15 → 0.0.16

data/.ruby-version

@@ -1 +1 @@
-jruby-1.7.4
+jruby-1.6.8

data/lib/maestro_plugin/logging.rb

@@ -3,12 +3,15 @@ require 'logging'
 
 module Maestro
 
-  module Logging
+  unless Maestro.const_defined?('Logging')
 
-    def log
-      ::Logging::Logger.new(STDOUT)
-    end
+    module Logging
+
+      def log
+        ::Logging::Logger.new(STDOUT)
+      end
 
+    end
   end
 
   class << self

data/lib/maestro_plugin/maestro_worker.rb

@@ -202,7 +202,12 @@ module Maestro
     end
 
     def output
-      workitem[OUTPUT_META]
+      if MaestroWorker.mock?
+        workitem[OUTPUT_META]
+      else
+        Maestro.log.warn "Output is only accessible when mock is enabled in tests. Otherwise is directly sent to Maestro"
+        nil
+      end
     end
 
     def error

data/lib/maestro_plugin/version.rb

@@ -1,5 +1,5 @@
 module Maestro
   module Plugin
-    VERSION = '0.0.15'
+    VERSION = '0.0.16'
   end
 end

data/spec/maestro_worker_spec.rb

@@ -2,168 +2,149 @@ require 'spec_helper'
 
 describe Maestro::MaestroWorker do
 
-  describe 'Mock' do
-
-    before :each do
-      Maestro::MaestroWorker.mock!
-    end
+  let(:workitem) {{'fields' => {}}}
+  before { subject.workitem = workitem }
 
-    after :each do
-      Maestro::MaestroWorker.unmock!
-    end
+  describe 'Mock' do
+    before { Maestro::MaestroWorker.mock! }
+    after { Maestro::MaestroWorker.unmock! }
 
     it 'should mock send_workitem_message calls' do
-      @workitem = {'fields' => {}}
-
-      @worker = Maestro::MaestroWorker.new
-      @worker.stub(:workitem => @workitem)
-      @worker.should_not_receive(:ruote_participant)
-
-      @worker.write_output('Some test string')
-
+      subject.should_not_receive(:ruote_participant)
+      subject.write_output('Some test string')
+    end
+    context 'when accessing output' do
+      before { subject.write_output("xxx") }
+      its(:output) { should eq("xxx") }
     end
-
   end
 
   describe 'Messaging' do
-    before :each do
-      @workitem = {'fields' => {}}
-      @ruote_participants = double("ruote_participants")
-      @ruote_participants.should_receive(:send_workitem_message).at_least(:once).with(@workitem)
-
-      @worker = Maestro::MaestroWorker.new
-      @worker.stub(:ruote_participants => @ruote_participants)
-      @worker.stub(:workitem => @workitem)
-      @worker.should_receive(:send_workitem_message).at_least(:once).and_call_original
+    let(:ruote_participants) { double("ruote_participants") }
 
+    before :each do
+      ruote_participants.should_receive(:send_workitem_message).at_least(:once).with(workitem)
+      subject.stub(:ruote_participants => ruote_participants)
+      subject.should_receive(:send_workitem_message).at_least(:once).and_call_original
     end
 
-    it 'should send a write_output message' do
-      @worker.write_output('Some Silly String')
-      @worker.workitem['__output__'].should eql('Some Silly String')
-      @worker.workitem['__streaming__'].should be_nil
+    context 'when sending a write_output message' do
+      before { subject.write_output('Some Silly String') }
+      it { subject.workitem['__output__'].should eql('Some Silly String') }
+      it { subject.workitem['__streaming__'].should be_nil }
+      it("output should not be accesible without mock!") { expect(subject.output).to be_nil }
     end
 
     it 'should aggregate output' do
-      @worker.write_output('Some Silly String')
-      @worker.workitem['__output__'].should eql('Some Silly String')
-      @worker.workitem['__streaming__'].should be_nil
+      subject.write_output('Some Silly String')
+      subject.workitem['__output__'].should eql('Some Silly String')
+      subject.workitem['__streaming__'].should be_nil
 
-      @worker.write_output("1", :buffer => true)
-      @worker.workitem['__output__'].should eql('Some Silly String')
-      @worker.workitem['__streaming__'].should be_nil
-      @worker.write_output("22", :buffer => true)
-      @worker.workitem['__output__'].should eql('Some Silly String')
-      @worker.workitem['__streaming__'].should be_nil
+      subject.write_output("1", :buffer => true)
+      subject.workitem['__output__'].should eql('Some Silly String')
+      subject.workitem['__streaming__'].should be_nil
+      subject.write_output("22", :buffer => true)
+      subject.workitem['__output__'].should eql('Some Silly String')
+      subject.workitem['__streaming__'].should be_nil
 
       # Should auto-send after 2 second delay
       sleep 3
-      @worker.write_output("333", :buffer => true)
-      @worker.workitem['__output__'].should eql('122333')
-      @worker.workitem['__streaming__'].should be_nil
-      @worker.write_output("4444", :buffer => true)
-      @worker.workitem['__output__'].should eql('122333')
-      @worker.workitem['__streaming__'].should be_nil
+      subject.write_output("333", :buffer => true)
+      subject.workitem['__output__'].should eql('122333')
+      subject.workitem['__streaming__'].should be_nil
+      subject.write_output("4444", :buffer => true)
+      subject.workitem['__output__'].should eql('122333')
+      subject.workitem['__streaming__'].should be_nil
 
       # When called without aggregate, should purge
-      @worker.write_output("5555")
-      @worker.workitem['__output__'].should eql('44445555')
-      @worker.workitem['__streaming__'].should be_nil
+      subject.write_output("5555")
+      subject.workitem['__output__'].should eql('44445555')
+      subject.workitem['__streaming__'].should be_nil
     end
 
     it 'should send a not needed message' do
-      @worker.not_needed
-      @worker.workitem['__not_needed__'].should be_nil
+      subject.not_needed
+      subject.workitem['__not_needed__'].should be_nil
     end
 
     it 'should send a cancel message' do
-      @worker.cancel
-      @worker.workitem['__cancel__'].should be_nil
+      subject.cancel
+      subject.workitem['__cancel__'].should be_nil
     end
 
     it 'should send a set_waiting message' do
       # expects already in before :each block, so putting it here too causes test fail
-#      @ruote_participants.should_receive(:send_workitem_message).with(@workitem)
-      @worker.set_waiting(true)
-      @worker.workitem['__waiting__'].should be_true
+#      ruote_participants.should_receive(:send_workitem_message).with(@workitem)
+      subject.set_waiting(true)
+      subject.workitem['__waiting__'].should be_true
 
-      @worker.set_waiting(false)
-      @worker.workitem['__waiting__'].should be_nil
+      subject.set_waiting(false)
+      subject.workitem['__waiting__'].should be_nil
     end
 
     it 'should send a create record message' do
-      @worker.create_record_with_fields('cars', ['manu', 'date', 'name'], ['ferrari', '1964', '250 GTO'])
+      subject.create_record_with_fields('cars', ['manu', 'date', 'name'], ['ferrari', '1964', '250 GTO'])
 
-      @worker.workitem['__model__'].should eql('cars')
-      @worker.workitem['__record_fields__'].should eql('manu,date,name')
-      @worker.workitem['__record_values__'].should eql('ferrari,1964,250 GTO')
+      subject.workitem['__model__'].should eql('cars')
+      subject.workitem['__record_fields__'].should eql('manu,date,name')
+      subject.workitem['__record_values__'].should eql('ferrari,1964,250 GTO')
     end
 
     it 'should send a create record message with a hash' do
       fields = {'manu' => 'ferrari', 'date' => '1964', 'name' => 'GTO'}
-      @worker.create_record_with_fields('cars', fields)
-      @worker.workitem['__model__'].should eql('cars')
-      @worker.workitem['__record_fields__'].should eql(fields)
+      subject.create_record_with_fields('cars', fields)
+      subject.workitem['__model__'].should eql('cars')
+      subject.workitem['__record_fields__'].should eql(fields)
     end
 
     it 'should send an update record-field message' do
-      @worker.update_fields_in_record('animal', 'donkey', 'name', 'e-or')
+      subject.update_fields_in_record('animal', 'donkey', 'name', 'e-or')
 
-      @worker.workitem['__model__'].should eql('animal')
-      @worker.workitem['__record_id__'].should eql('donkey')
-      @worker.workitem['__record_field__'].should eql('name')
-      @worker.workitem['__record_value__'].should eql('e-or')
+      subject.workitem['__model__'].should eql('animal')
+      subject.workitem['__record_id__'].should eql('donkey')
+      subject.workitem['__record_field__'].should eql('name')
+      subject.workitem['__record_value__'].should eql('e-or')
     end
 
     it 'should send a delete record message' do
-      @worker.delete_record('animal', 1)
-      @worker.workitem['__model__'].should eql('animal')
-      @worker.workitem['__name__'].should eql('1')
-      @worker.workitem['__filter__'].should be_nil
+      subject.delete_record('animal', 1)
+      subject.workitem['__model__'].should eql('animal')
+      subject.workitem['__name__'].should eql('1')
+      subject.workitem['__filter__'].should be_nil
     end
 
     it 'should send a delete record message with a filter' do
       filter = {'type' => 1}
-      @worker.delete_record('animal', filter)
-      @worker.workitem['__model__'].should eql('animal')
-      @worker.workitem['__filter__'].should eql(filter)
-      @worker.workitem['__name__'].should be_nil
+      subject.delete_record('animal', filter)
+      subject.workitem['__model__'].should eql('animal')
+      subject.workitem['__filter__'].should eql(filter)
+      subject.workitem['__name__'].should be_nil
     end
   end
 
   describe 'Field handling' do
-    before :each do
-      @worker = Maestro::MaestroWorker.new
-      @worker.workitem = {'fields' => {}}
-    end
+    let(:workitem) {{'fields' => {'a' => 'a'}}}
 
     it 'should set and get errors' do
-      @worker.workitem['__error__'].should be_nil
-      @worker.error?.should be_false
-      @worker.set_error 'myerror'
-      @worker.error?.should be_true
-      @worker.workitem['fields']['__error__'].should eq('myerror')
+      subject.workitem['__error__'].should be_nil
+      subject.error?.should be_false
+      subject.set_error 'myerror'
+      subject.error?.should be_true
+      subject.workitem['fields']['__error__'].should eq('myerror')
     end
 
     it 'should set fields' do
-      @worker.workitem = {'fields' => {'a' => 'a'}}
-      @worker.fields['a'].should eq('a')
-      @worker.fields['b'] = 'b'
-      @worker.fields['b'].should eq('b')
+      subject.fields['a'].should eq('a')
+      subject.fields['b'] = 'b'
+      subject.fields['b'].should eq('b')
     end
   end
 
   describe 'Helpers' do
-    before :each do
-      @worker = Maestro::MaestroWorker.new
-      @worker.workitem = {'fields' => {}}
-    end
-
     it 'should validate JSON data contained in strings' do
-      @worker.is_json?('{"key": "a string"}').should be_true
-      @worker.is_json?('a string').should be_false
+      subject.is_json?('{"key": "a string"}').should be_true
+      subject.is_json?('a string').should be_false
     end
-
   end
 
   describe 'Errors' do
@@ -181,30 +162,22 @@ describe Maestro::MaestroWorker do
       end
     end
 
-    before :each do
-      @worker = ErrorTestWorker.new
-    end
+    subject { ErrorTestWorker.new }
 
     it 'should handle a ConfigError for bad config' do
-      workitem = {'fields' => {}}
-
-      @worker.perform(:configerror_test, workitem)
+      subject.perform(:configerror_test, workitem)
       workitem['fields']['__error__'].should include('Bad Config')
       workitem['__output__'].should be_nil
     end
 
     it 'should handle a PluginError' do
-      workitem = {'fields' => {}}
-
-      @worker.perform(:pluginerror_test, workitem)
+      subject.perform(:pluginerror_test, workitem)
       workitem['fields']['__error__'].should include('PluginError - I had a problem')
       workitem['__output__'].should be_nil
     end
 
     it 'should handle an unexpected Error' do
-      workitem = {'fields' => {}}
-
-      @worker.perform(:error_test, workitem)
+      subject.perform(:error_test, workitem)
       workitem['fields']['__error__'].should include('Unexpected error executing task: Exception noooo')
       workitem['__output__'].should be_nil
     end

metadata

@@ -1,157 +1,144 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: maestro_plugin
-version: !ruby/object:Gem::Version
-  version: 0.0.15
+version: !ruby/object:Gem::Version 
+  prerelease: 
+  version: 0.0.16
 platform: ruby
-authors:
-- Etienne Pelletier
-autorequire:
+authors: 
+  - Etienne Pelletier
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-06 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: logging
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.8.0
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.8.0
-  prerelease: false
-  type: :runtime
-- !ruby/object:Gem::Dependency
-  name: rubyzip
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.9.8
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.9.8
-  prerelease: false
-  type: :runtime
-- !ruby/object:Gem::Dependency
-  name: json
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.4.6
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.4.6
-  prerelease: false
-  type: :runtime
-- !ruby/object:Gem::Dependency
-  name: bundler
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  prerelease: false
-  type: :development
-- !ruby/object:Gem::Dependency
-  name: rake
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  prerelease: false
-  type: :development
-- !ruby/object:Gem::Dependency
-  name: jruby-openssl
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  prerelease: false
-  type: :development
-- !ruby/object:Gem::Dependency
-  name: rspec
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.13.0
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.13.0
-  prerelease: false
-  type: :development
+
+date: 2013-08-11 00:00:00 Z
+dependencies: 
+  - !ruby/object:Gem::Dependency 
+    name: logging
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - "="
+          - !ruby/object:Gem::Version 
+            version: 1.8.0
+    type: :runtime
+    version_requirements: *id001
+  - !ruby/object:Gem::Dependency 
+    name: rubyzip
+    prerelease: false
+    requirement: &id002 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - "="
+          - !ruby/object:Gem::Version 
+            version: 0.9.8
+    type: :runtime
+    version_requirements: *id002
+  - !ruby/object:Gem::Dependency 
+    name: json
+    prerelease: false
+    requirement: &id003 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 1.4.6
+    type: :runtime
+    version_requirements: *id003
+  - !ruby/object:Gem::Dependency 
+    name: bundler
+    prerelease: false
+    requirement: &id004 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: "1.3"
+    type: :development
+    version_requirements: *id004
+  - !ruby/object:Gem::Dependency 
+    name: rake
+    prerelease: false
+    requirement: &id005 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    type: :development
+    version_requirements: *id005
+  - !ruby/object:Gem::Dependency 
+    name: jruby-openssl
+    prerelease: false
+    requirement: &id006 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    type: :development
+    version_requirements: *id006
+  - !ruby/object:Gem::Dependency 
+    name: rspec
+    prerelease: false
+    requirement: &id007 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: 2.13.0
+    type: :development
+    version_requirements: *id007
 description: A ruby library to help with the creation of Maestro plugins
-email:
-- epelletier@maestrodev.com
+email: 
+  - epelletier@maestrodev.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
-- .gitignore
-- .ruby-version
-- Gemfile
-- LICENSE.txt
-- README.md
-- Rakefile
-- lib/maestro_plugin.rb
-- lib/maestro_plugin/logging.rb
-- lib/maestro_plugin/maestro_worker.rb
-- lib/maestro_plugin/version.rb
-- maestro_plugin.gemspec
-- spec/maestro_worker_spec.rb
-- spec/spec_helper.rb
+
+files: 
+  - .gitignore
+  - .ruby-version
+  - Gemfile
+  - LICENSE.txt
+  - README.md
+  - Rakefile
+  - lib/maestro_plugin.rb
+  - lib/maestro_plugin/logging.rb
+  - lib/maestro_plugin/maestro_worker.rb
+  - lib/maestro_plugin/version.rb
+  - maestro_plugin.gemspec
+  - spec/maestro_worker_spec.rb
+  - spec/spec_helper.rb
 homepage: https://github.com/maestrodev/maestro-ruby-plugin
-licenses:
-- Apache 2.0
-metadata: {}
-post_install_message:
+licenses: 
+  - Apache 2.0
+post_install_message: 
 rdoc_options: []
-require_paths:
-- lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+
+require_paths: 
+  - lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 requirements: []
-rubyforge_project:
-rubygems_version: 2.0.3
-signing_key:
-specification_version: 4
+
+rubyforge_project: 
+rubygems_version: 1.8.24
+signing_key: 
+specification_version: 3
 summary: Maestro ruby plugin
-test_files:
-- spec/maestro_worker_spec.rb
-- spec/spec_helper.rb
+test_files: 
+  - spec/maestro_worker_spec.rb
+  - spec/spec_helper.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: e11866b367ab7fa42da98d6b51d1ecd4c23f988e
-  data.tar.gz: a4ad35e37e462e1659ae1e1fa72852af5ababe28
-SHA512:
-  metadata.gz: b40fdcdec594bb9d6b56445322788dff8eb697b512cc1b2372bfe030eb242b3ca16424692099534f857b070e712a960e58a1e54400e9fd832e5606c397c6b7bc
-  data.tar.gz: e9adec57b9053b60c76badc0b6aa1a240d28188a0cedaa8f0addf48cdcdcd8f6dce7aef67eda8ca80657a72915506e2107bcd89566be43130c266a24d3c9a4f8