masamune 0.17.15 → 0.18.0

data/spec/support/masamune/task_example_group.rb

@@ -20,38 +20,85 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
+require_relative 'shared_example_group'
+
 module Masamune::TaskExampleGroup
-  module TaskFixtureContent
-    shared_context 'task_fixture' do |context_options = {}|
-      include_context 'job_fixture', context_options
-      let!(:default_options) { configuration.as_options }
-
-      let(:stdout) { @stdout }
-      let(:stderr) { @stderr }
-
-      let(:command) { nil }
-      let(:options) { [] }
-
-      subject(:execute_command) do
-        n = context_options.fetch(:idempotent, false) ? 2 : 1
-        n = 1 if ENV['MASAMUNE_FASTER_SPEC']
-        capture(!default_options.include?('--debug')) do
-          n.times do
-            Array.wrap(command).each do |cmd|
-              described_class.start([cmd, *(default_options + options)].compact)
-            end
-          end
-        end
-      end
+  extend ActiveSupport::Concern
+
+  include Masamune::ExampleGroup
+  include Masamune::SharedExampleGroup
+  include Masamune::Actions::Filesystem
+  include Masamune::Actions::Hive
+  include Masamune::Transform::DenormalizeTable
+
+  shared_examples 'general usage' do
+    it 'exits with status code 0 and prints general usage' do
+      expect { execute_command }.to raise_error { |e|
+        expect(e).to be_a(SystemExit)
+        expect(e.status).to eq(0)
+      }
+      expect(stdout.string).to match(/^Commands:/)
+      expect(stderr.string).to be_blank
     end
   end
 
-  def self.included(base)
-    base.send(:include, Masamune::ExampleGroup)
-    base.send(:include, Masamune::Actions::Filesystem)
-    base.send(:include, Masamune::Actions::Hive)
-    base.send(:include, Masamune::Transform::DenormalizeTable)
-    base.send(:include, TaskFixtureContent)
+  shared_examples 'command usage' do
+    it 'exits with status code 0 and prints command usage' do
+      expect { execute_command }.to raise_error { |e|
+        expect(e).to be_a(SystemExit)
+        expect(e.status).to eq(0)
+      }
+      expect(stdout.string).to match(/^Usage:/)
+      expect(stdout.string).to match(/^Options:/)
+      expect(stderr.string).to be_blank
+    end
+  end
+
+  shared_examples 'executes with success' do
+    it 'exits with status code 0' do
+      expect { execute_command }.to raise_error { |e|
+        expect(e).to be_a(SystemExit)
+        expect(e.status).to eq(0)
+      }
+    end
+  end
+
+  shared_examples 'raises Thor::MalformattedArgumentError' do |message|
+    it { expect { execute_command }.to raise_error Thor::MalformattedArgumentError, message }
+  end
+
+  shared_examples 'raises Thor::RequiredArgumentMissingError' do |message|
+    it { expect { execute_command }.to raise_error Thor::RequiredArgumentMissingError, message }
+  end
+
+  shared_context 'task_fixture' do |context_options = {}|
+    include_context 'job_fixture', context_options
+
+    let(:execute_command_times) { !ENV['MASAMUNE_FASTER_SPEC'] && context_options.fetch(:idempotent, false) ? 2 : 1 }
+  end
+
+  included do
+    let!(:default_options) { configuration.as_options }
+
+    let(:thor_class) { described_class }
+    let(:command) { nil }
+    let(:options) { [] }
+    let!(:stdout) { StringIO.new }
+    let!(:stderr) { StringIO.new }
+
+    let(:execute_command_times) { 1 }
+
+    before do
+      thor_class.send(:include, Masamune::ThorMute)
+    end
+
+    subject(:execute_command) do
+      capture(stdout: stdout, stderr: stderr, enable: !default_options.include?('--debug')) do
+        execute_command_times.times do
+          thor_class.start([command, *(default_options + options)].compact)
+        end
+      end
+    end
   end
 end
 

data/spec/support/masamune/thor_mute.rb

@@ -22,8 +22,10 @@
 
 # Silence noisy and uninformative create_command method
 module Masamune::ThorMute
-  def self.included(base)
-    base.instance_eval do
+  extend ActiveSupport::Concern
+
+  included do
+    instance_eval do
       def create_command(*a)
         tmp_stdout = $stdout
         $stdout = StringIO.new

data/spec/support/rspec/example/action_example_group.rb

@@ -21,9 +21,11 @@
 #  THE SOFTWARE.
 
 module ActionExampleGroup
-  def self.included(base)
-    base.let(:run_dir) { Dir.mktmpdir('masamune') }
-    base.before do
+  extend ActiveSupport::Concern
+
+  included do
+    let(:run_dir) { Dir.mktmpdir('masamune') }
+    before do
       instance.environment = Masamune::ExampleGroup
       Masamune::ExampleGroup.filesystem.add_path(:run_dir, run_dir)
     end

data/spec/support/rspec/example/task_example_group.rb

@@ -21,78 +21,15 @@
 #  THE SOFTWARE.
 
 module TaskExampleGroup
-  def capture(stdout, stderr)
-    tmp_stdout = $stdout
-    $stdout = stdout
-    tmp_stderr = $stderr
-    $stderr = stderr
-    yield
-  ensure
-    $stdout = tmp_stdout
-    $stderr = tmp_stderr
-  end
-
-  shared_examples 'general usage' do
-    it 'exits with status code 0 and prints general usage' do
-      expect { cli_invocation }.to raise_error { |e|
-        expect(e).to be_a(SystemExit)
-        expect(e.status).to eq(0)
-      }
-      expect(stdout.string).to match(/^Commands:/)
-      expect(stderr.string).to be_blank
-    end
-  end
-
-  shared_examples 'command usage' do
-    it 'exits with status code 0 and prints command usage' do
-      expect { cli_invocation }.to raise_error { |e|
-        expect(e).to be_a(SystemExit)
-        expect(e.status).to eq(0)
-      }
-      expect(stdout.string).to match(/^Usage:/)
-      expect(stdout.string).to match(/^Options:/)
-      expect(stderr.string).to be_blank
-    end
-  end
-
-  shared_examples 'executes with success' do
-    it 'exits with status code 0' do
-      expect { cli_invocation }.to raise_error { |e|
-        expect(e).to be_a(SystemExit)
-        expect(e.status).to eq(0)
-      }
-    end
-  end
+  extend ActiveSupport::Concern
 
-  shared_examples 'raises Thor::MalformattedArgumentError' do |message|
-    it { expect { cli_invocation }.to raise_error Thor::MalformattedArgumentError, message }
-  end
+  include Masamune::TaskExampleGroup
 
-  shared_examples 'raises Thor::RequiredArgumentMissingError' do |message|
-    it { expect { cli_invocation }.to raise_error Thor::RequiredArgumentMissingError, message }
-  end
-
-  def self.included(base)
-    base.before :all do
+  included do
+    before :all do
       ENV['THOR_DEBUG'] = '1'
       Masamune::Actions::DataFlow.reset_module!
     end
-
-    base.let(:thor_class) { described_class }
-    base.let(:command) { nil }
-    base.let(:options) { {} }
-    base.let!(:stdout) { StringIO.new }
-    base.let!(:stderr) { StringIO.new }
-
-    base.before do
-      thor_class.send(:include, Masamune::ThorMute)
-    end
-
-    base.subject(:cli_invocation) do
-      capture(stdout, stderr) do
-        thor_class.start([command, *options].compact)
-      end
-    end
   end
 end
 

data/spec/support/rspec/example/transform_example_group.rb

@@ -21,11 +21,13 @@
 #  THE SOFTWARE.
 
 module TransformExampleGroup
-  def self.included(base)
-    base.let(:transform) { Object.new.extend(described_class) }
-    base.let(:environment) { double }
-    base.let(:catalog) { Masamune::Schema::Catalog.new(environment) }
-    base.after do
+  extend ActiveSupport::Concern
+
+  included do
+    let(:transform) { Object.new.extend(described_class) }
+    let(:environment) { double }
+    let(:catalog) { Masamune::Schema::Catalog.new(environment) }
+    after do
       catalog.clear!
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: masamune
 version: !ruby/object:Gem::Version
-  version: 0.17.15
+  version: 0.18.0
 platform: ruby
 authors:
 - Michael Andrews
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-11 00:00:00.000000000 Z
+date: 2016-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -136,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: hashie
+  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: rake
   requirement: !ruby/object:Gem::Requirement