masamune 0.15.2 → 0.15.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6b1e378ec9d528e71798e37eaf92a28e39ce275
-  data.tar.gz: a715c4524d5320cb579053f940419bfebd783036
+  metadata.gz: 104f7e365e635e684f6a1e955bcb5d86af5ffe3a
+  data.tar.gz: 5f4d61e0c5934fb9b9af59b1a72cad20c1fc1173
 SHA512:
-  metadata.gz: 5593ffbea50e048d74cf341afc34757a0e951df67528a7acdc5603a55fd2c4ed1c563ebebe3f396e41340af67d19ac9f9fcb5f3efb7ad03b902ea43a008bb602
-  data.tar.gz: 9b6cf17acce30109400902d6769ef72c90355542fa985e2b145e4a40aa9dd345f0054e17518f133d95ef950ba4e3e4f8975ce2eb0b0719a579eb1f9f6be95e92
+  metadata.gz: 55bac4af92f58e7af91d4d2aeae1a670e415287538e784f7ccbe0d1b2ec30e2fca9d907b938c507bd96265babb31bd643d418fb9434e598001d0343c8cf4723e
+  data.tar.gz: 508a833ca5711b4af150fb9f54e68ca91cf6e1faf69704a43e6e03288758b68365d9a69526c29f06a4d319f6338404412fa4543bfd4a4582a519ff080e38e65e

data/lib/masamune/commands/hive.rb

@@ -135,11 +135,8 @@ module Masamune::Commands
     end
 
     def load_setup_files
-      files = []
-      @setup_files.each do |path|
-        filesystem.glob_sort(path, order: :basename).each do |file|
-          files << file
-        end
+      files = @setup_files.map do |path|
+        filesystem.glob_sort(path, order: :basename)
       end
       files.flatten.compact.map { |file| {'-i' => file} }
     end

data/lib/masamune/configuration.rb

@@ -89,7 +89,7 @@ class Masamune::Configuration
 
   def load_catalog(paths = [])
     paths.each do |path|
-      filesystem.glob_sort(path, order: :basename).each do |file|
+      filesystem.glob_sort(path, order: :basename) do |file|
         configuration.with_quiet do
           catalog.load(file)
         end

data/lib/masamune/filesystem.rb

@@ -256,12 +256,16 @@ module Masamune
     end
 
     def glob_sort(pattern, options = {})
-      result = glob(pattern)
+      return to_enum(:glob_sort, pattern, options).to_a unless block_given?
       case options[:order]
       when :basename
-        result.sort { |x,y| File.basename(x) <=> File.basename(y) }
+        glob(pattern).sort { |x,y| File.basename(x) <=> File.basename(y) }.each do |result|
+          yield result
+        end
       else
-        result
+        glob(pattern) do |result|
+          yield result
+        end
       end
     end
 

data/lib/masamune/version.rb

@@ -21,5 +21,5 @@
 #  THE SOFTWARE.
 
 module Masamune
-  VERSION = '0.15.2'
+  VERSION = '0.15.3'
 end

data/spec/masamune/filesystem_spec.rb

@@ -737,6 +737,7 @@ shared_examples_for 'Filesystem' do
     end
 
     it { is_expected.to eq(%w(/tmp/c/00.txt /tmp/b/01.txt /tmp/a/02.txt)) }
+    it { expect { |b| instance.glob_sort('/tmp/*', order: :basename, &b) }.to yield_successive_args(*%w(/tmp/c/00.txt /tmp/b/01.txt /tmp/a/02.txt)) }
   end
 
   describe '#copy_file_to_file' do

data/spec/masamune/rspec/job_fixture_spec.rb

@@ -140,11 +140,13 @@ describe Masamune::JobFixture do
       }
     end
 
-    let(:other_data) { {} }
+    let(:reference_data) { {} }
+    let(:another_reference_data) { {} }
 
     before do
       described_class.new(path: fixture_path, name: 'basic', data: basic_data).save
-      described_class.new(path: fixture_path, name: 'other', data: other_data).save
+      described_class.new(path: fixture_path, name: 'reference', data: reference_data).save
+      described_class.new(path: fixture_path, name: 'another_reference', data: another_reference_data).save
     end
 
     context 'with basic fixture from path' do
@@ -178,7 +180,7 @@ describe Masamune::JobFixture do
     end
 
     context 'with reference fixture' do
-      let(:other_data) do
+      let(:reference_data) do
         {
           'inputs' => [
             {
@@ -200,17 +202,17 @@ describe Masamune::JobFixture do
         }
       end
 
-      subject(:instance) { described_class.load(path: fixture_path, name: 'other') }
+      subject(:instance) { described_class.load(path: fixture_path, name: 'reference') }
 
       it 'loads referenced fixture' do
-        expect(instance.inputs).to include(other_data['inputs'].first)
+        expect(instance.inputs).to include(reference_data['inputs'].first)
         expect(instance.inputs).to include(basic_data['outputs'].first)
-        expect(instance.outputs).to eq(other_data['outputs'])
+        expect(instance.outputs).to eq(reference_data['outputs'])
       end
     end
 
     context 'with reference fixture and path' do
-      let(:other_data) do
+      let(:reference_data) do
         {
           'inputs' => [
             {
@@ -233,17 +235,17 @@ describe Masamune::JobFixture do
         }
       end
 
-      subject(:instance) { described_class.load(path: fixture_path, name: 'other') }
+      subject(:instance) { described_class.load(path: fixture_path, name: 'reference') }
 
       it 'loads referenced fixture' do
-        expect(instance.inputs).to include(other_data['inputs'].first)
+        expect(instance.inputs).to include(reference_data['inputs'].first)
         expect(instance.inputs).to include(basic_data['outputs'].first)
-        expect(instance.outputs).to eq(other_data['outputs'])
+        expect(instance.outputs).to eq(reference_data['outputs'])
       end
     end
 
     context 'with reference fixture from file' do
-      let(:other_data) do
+      let(:reference_data) do
         {
           'inputs' => [
             {
@@ -265,18 +267,18 @@ describe Masamune::JobFixture do
         }
       end
 
-      subject(:instance) { described_class.load(path: fixture_path, name: 'other') }
+      subject(:instance) { described_class.load(path: fixture_path, name: 'reference') }
 
       it 'loads referenced fixture' do
-        expect(instance.inputs).to include(other_data['inputs'].first)
+        expect(instance.inputs).to include(reference_data['inputs'].first)
         expect(instance.inputs).to include(basic_data['outputs'].first)
-        expect(instance.outputs).to eq(other_data['outputs'])
+        expect(instance.outputs).to eq(reference_data['outputs'])
       end
     end
 
 
     context 'with reference fixture and section' do
-      let(:other_data) do
+      let(:reference_data) do
         {
           'inputs' => [
             {
@@ -299,17 +301,17 @@ describe Masamune::JobFixture do
         }
       end
 
-      subject(:instance) { described_class.load(path: fixture_path, name: 'other') }
+      subject(:instance) { described_class.load(path: fixture_path, name: 'reference') }
 
       it 'loads referenced fixture' do
-        expect(instance.inputs).to include(other_data['inputs'].first)
+        expect(instance.inputs).to include(reference_data['inputs'].first)
         expect(instance.inputs).to include(basic_data['inputs'].first)
-        expect(instance.outputs).to eq(other_data['outputs'])
+        expect(instance.outputs).to eq(reference_data['outputs'])
       end
     end
 
     context 'with reference fixture that does not exist' do
-      let(:other_data) do
+      let(:reference_data) do
         {
           'inputs' => [
             {
@@ -331,13 +333,13 @@ describe Masamune::JobFixture do
         }
       end
 
-      subject(:instance) { described_class.load(path: fixture_path, name: 'other') }
+      subject(:instance) { described_class.load(path: fixture_path, name: 'reference') }
 
       it { expect { instance.inputs }.to raise_error(ArgumentError) }
     end
 
     context 'with invalid reference fixture' do
-      let(:other_data) do
+      let(:reference_data) do
         {
           'inputs' => [
             {
@@ -357,9 +359,66 @@ describe Masamune::JobFixture do
         }
       end
 
-      subject(:instance) { described_class.load(path: fixture_path, name: 'other') }
+      subject(:instance) { described_class.load(path: fixture_path, name: 'reference') }
 
       it { expect { instance.inputs }.to raise_error(ArgumentError) }
     end
+
+    context 'with reference fixture that includes reference' do
+      let(:another_reference_data) do
+        {
+          'inputs' => [
+            {
+              'file' => 'another_input_file',
+              'data' => 'another_input_data'
+            },
+            {
+              'reference' => {
+                'fixture' => 'basic',
+                'section' => 'inputs'
+              }
+            }
+          ],
+          'outputs' => [
+            {
+              'file' => 'another_output_file',
+              'data' => 'another_output_data'
+            }
+          ]
+        }
+      end
+
+      let(:reference_data) do
+        {
+          'inputs' => [
+            {
+              'file' => 'other_input_file',
+              'data' => 'other_input_data'
+            },
+            {
+              'reference' => {
+                'fixture' => 'another_reference',
+                'section' => 'inputs'
+              }
+            }
+          ],
+          'outputs' => [
+            {
+              'file' => 'other_output_file',
+              'data' => 'other_output_data'
+            }
+          ]
+        }
+      end
+
+      subject(:instance) { described_class.load(path: fixture_path, name: 'reference') }
+
+      it 'loads both referenced fixtures' do
+        expect(instance.inputs).to include(reference_data['inputs'].first)
+        expect(instance.inputs).to include(basic_data['inputs'].first)
+        expect(instance.inputs).to include(another_reference_data['inputs'].first)
+        expect(instance.outputs).to eq(reference_data['outputs'])
+      end
+    end
   end
 end

data/spec/support/masamune/mock_filesystem.rb

@@ -49,7 +49,10 @@ class Masamune::MockFilesystem < Delegator
   end
 
   def glob_sort(pattern, options = {})
-    glob(pattern)
+    return to_enum(:glob_sort, pattern, options).to_a unless block_given?
+    glob(pattern) do |file|
+      yield file
+    end
   end
 
   def glob_stat(pattern)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: masamune
 version: !ruby/object:Gem::Version
-  version: 0.15.2
+  version: 0.15.3
 platform: ruby
 authors:
 - Michael Andrews
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-13 00:00:00.000000000 Z
+date: 2015-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -435,7 +435,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Hybrid Data & Work Flow