masamune 0.15.6 → 0.16.0

data/lib/masamune/transform/postgres/insert_reference_values.rb

@@ -1,6 +1,6 @@
 #  The MIT License (MIT)
 #
-#  Copyright (c) 2014-2015, VMware, Inc. All Rights Reserved.
+#  Copyright (c) 2014-2016, VMware, Inc. All Rights Reserved.
 #
 #  Permission is hereby granted, free of charge, to any person obtaining a copy
 #  of this software and associated documentation files (the "Software"), to deal

data/lib/masamune/transform/postgres/relabel_dimension.psql.erb

@@ -1,6 +1,6 @@
 --  The MIT License (MIT)
 --
---  Copyright (c) 2014-2015, VMware, Inc. All Rights Reserved.
+--  Copyright (c) 2014-2016, VMware, Inc. All Rights Reserved.
 --
 --  Permission is hereby granted, free of charge, to any person obtaining a copy
 --  of this software and associated documentation files (the "Software"), to deal

data/lib/masamune/transform/postgres/relabel_dimension.rb

@@ -1,6 +1,6 @@
 #  The MIT License (MIT)
 #
-#  Copyright (c) 2014-2015, VMware, Inc. All Rights Reserved.
+#  Copyright (c) 2014-2016, VMware, Inc. All Rights Reserved.
 #
 #  Permission is hereby granted, free of charge, to any person obtaining a copy
 #  of this software and associated documentation files (the "Software"), to deal

data/lib/masamune/transform/postgres/replace_table.psql.erb

@@ -1,6 +1,6 @@
 --  The MIT License (MIT)
 --
---  Copyright (c) 2014-2015, VMware, Inc. All Rights Reserved.
+--  Copyright (c) 2014-2016, VMware, Inc. All Rights Reserved.
 --
 --  Permission is hereby granted, free of charge, to any person obtaining a copy
 --  of this software and associated documentation files (the "Software"), to deal

data/lib/masamune/transform/postgres/rollup_fact.psql.erb

@@ -1,6 +1,6 @@
 --  The MIT License (MIT)
 --
---  Copyright (c) 2014-2015, VMware, Inc. All Rights Reserved.
+--  Copyright (c) 2014-2016, VMware, Inc. All Rights Reserved.
 --
 --  Permission is hereby granted, free of charge, to any person obtaining a copy
 --  of this software and associated documentation files (the "Software"), to deal

data/lib/masamune/transform/postgres/rollup_fact.rb

@@ -1,6 +1,6 @@
 #  The MIT License (MIT)
 #
-#  Copyright (c) 2014-2015, VMware, Inc. All Rights Reserved.
+#  Copyright (c) 2014-2016, VMware, Inc. All Rights Reserved.
 #
 #  Permission is hereby granted, free of charge, to any person obtaining a copy
 #  of this software and associated documentation files (the "Software"), to deal

data/lib/masamune/transform/postgres/snapshot_dimension.psql.erb

@@ -1,6 +1,6 @@
 --  The MIT License (MIT)
 --
---  Copyright (c) 2014-2015, VMware, Inc. All Rights Reserved.
+--  Copyright (c) 2014-2016, VMware, Inc. All Rights Reserved.
 --
 --  Permission is hereby granted, free of charge, to any person obtaining a copy
 --  of this software and associated documentation files (the "Software"), to deal

data/lib/masamune/transform/postgres/snapshot_dimension.rb

@@ -1,6 +1,6 @@
 #  The MIT License (MIT)
 #
-#  Copyright (c) 2014-2015, VMware, Inc. All Rights Reserved.
+#  Copyright (c) 2014-2016, VMware, Inc. All Rights Reserved.
 #
 #  Permission is hereby granted, free of charge, to any person obtaining a copy
 #  of this software and associated documentation files (the "Software"), to deal

data/lib/masamune/transform/postgres/stage_dimension.psql.erb

@@ -1,6 +1,6 @@
 --  The MIT License (MIT)
 --
---  Copyright (c) 2014-2015, VMware, Inc. All Rights Reserved.
+--  Copyright (c) 2014-2016, VMware, Inc. All Rights Reserved.
 --
 --  Permission is hereby granted, free of charge, to any person obtaining a copy
 --  of this software and associated documentation files (the "Software"), to deal

data/lib/masamune/transform/postgres/stage_dimension.rb

@@ -1,6 +1,6 @@
 #  The MIT License (MIT)
 #
-#  Copyright (c) 2014-2015, VMware, Inc. All Rights Reserved.
+#  Copyright (c) 2014-2016, VMware, Inc. All Rights Reserved.
 #
 #  Permission is hereby granted, free of charge, to any person obtaining a copy
 #  of this software and associated documentation files (the "Software"), to deal

data/lib/masamune/transform/postgres/stage_fact.psql.erb

@@ -1,6 +1,6 @@
 --  The MIT License (MIT)
 --
---  Copyright (c) 2014-2015, VMware, Inc. All Rights Reserved.
+--  Copyright (c) 2014-2016, VMware, Inc. All Rights Reserved.
 --
 --  Permission is hereby granted, free of charge, to any person obtaining a copy
 --  of this software and associated documentation files (the "Software"), to deal

data/lib/masamune/transform/postgres/stage_fact.rb

@@ -1,6 +1,6 @@
 #  The MIT License (MIT)
 #
-#  Copyright (c) 2014-2015, VMware, Inc. All Rights Reserved.
+#  Copyright (c) 2014-2016, VMware, Inc. All Rights Reserved.
 #
 #  Permission is hereby granted, free of charge, to any person obtaining a copy
 #  of this software and associated documentation files (the "Software"), to deal

data/lib/masamune/transform/relabel_dimension.rb

@@ -1,6 +1,6 @@
 #  The MIT License (MIT)
 #
-#  Copyright (c) 2014-2015, VMware, Inc. All Rights Reserved.
+#  Copyright (c) 2014-2016, VMware, Inc. All Rights Reserved.
 #
 #  Permission is hereby granted, free of charge, to any person obtaining a copy
 #  of this software and associated documentation files (the "Software"), to deal

data/lib/masamune/transform/rollup_fact.rb

@@ -1,6 +1,6 @@
 #  The MIT License (MIT)
 #
-#  Copyright (c) 2014-2015, VMware, Inc. All Rights Reserved.
+#  Copyright (c) 2014-2016, VMware, Inc. All Rights Reserved.
 #
 #  Permission is hereby granted, free of charge, to any person obtaining a copy
 #  of this software and associated documentation files (the "Software"), to deal

data/lib/masamune/transform/snapshot_dimension.rb

@@ -1,6 +1,6 @@
 #  The MIT License (MIT)
 #
-#  Copyright (c) 2014-2015, VMware, Inc. All Rights Reserved.
+#  Copyright (c) 2014-2016, VMware, Inc. All Rights Reserved.
 #
 #  Permission is hereby granted, free of charge, to any person obtaining a copy
 #  of this software and associated documentation files (the "Software"), to deal

data/lib/masamune/transform/stage_dimension.rb

@@ -1,6 +1,6 @@
 #  The MIT License (MIT)
 #
-#  Copyright (c) 2014-2015, VMware, Inc. All Rights Reserved.
+#  Copyright (c) 2014-2016, VMware, Inc. All Rights Reserved.
 #
 #  Permission is hereby granted, free of charge, to any person obtaining a copy
 #  of this software and associated documentation files (the "Software"), to deal

data/lib/masamune/transform/stage_fact.rb

@@ -1,6 +1,6 @@
 #  The MIT License (MIT)
 #
-#  Copyright (c) 2014-2015, VMware, Inc. All Rights Reserved.
+#  Copyright (c) 2014-2016, VMware, Inc. All Rights Reserved.
 #
 #  Permission is hereby granted, free of charge, to any person obtaining a copy
 #  of this software and associated documentation files (the "Software"), to deal

data/lib/masamune/version.rb

@@ -1,6 +1,6 @@
 #  The MIT License (MIT)
 #
-#  Copyright (c) 2014-2015, VMware, Inc. All Rights Reserved.
+#  Copyright (c) 2014-2016, VMware, Inc. All Rights Reserved.
 #
 #  Permission is hereby granted, free of charge, to any person obtaining a copy
 #  of this software and associated documentation files (the "Software"), to deal
@@ -21,5 +21,5 @@
 #  THE SOFTWARE.
 
 module Masamune
-  VERSION = '0.15.6'
+  VERSION = '0.16.0'
 end

data/spec/fixtures/aggregate.sql.erb

@@ -1,6 +1,6 @@
 --  The MIT License (MIT)
 --
---  Copyright (c) 2014-2015, VMware, Inc. All Rights Reserved.
+--  Copyright (c) 2014-2016, VMware, Inc. All Rights Reserved.
 --
 --  Permission is hereby granted, free of charge, to any person obtaining a copy
 --  of this software and associated documentation files (the "Software"), to deal

data/spec/fixtures/comment.sql.erb

@@ -1,6 +1,6 @@
 --  The MIT License (MIT)
 --
---  Copyright (c) 2014-2015, VMware, Inc. All Rights Reserved.
+--  Copyright (c) 2014-2016, VMware, Inc. All Rights Reserved.
 --
 --  Permission is hereby granted, free of charge, to any person obtaining a copy
 --  of this software and associated documentation files (the "Software"), to deal

data/spec/fixtures/invalid.sql.erb

@@ -1,6 +1,6 @@
 --  The MIT License (MIT)
 --
---  Copyright (c) 2014-2015, VMware, Inc. All Rights Reserved.
+--  Copyright (c) 2014-2016, VMware, Inc. All Rights Reserved.
 --
 --  Permission is hereby granted, free of charge, to any person obtaining a copy
 --  of this software and associated documentation files (the "Software"), to deal

data/spec/fixtures/relative.sql.erb

@@ -1,6 +1,6 @@
 --  The MIT License (MIT)
 --
---  Copyright (c) 2014-2015, VMware, Inc. All Rights Reserved.
+--  Copyright (c) 2014-2016, VMware, Inc. All Rights Reserved.
 --
 --  Permission is hereby granted, free of charge, to any person obtaining a copy
 --  of this software and associated documentation files (the "Software"), to deal

data/spec/fixtures/simple.sql.erb

@@ -1,6 +1,6 @@
 --  The MIT License (MIT)
 --
---  Copyright (c) 2014-2015, VMware, Inc. All Rights Reserved.
+--  Copyright (c) 2014-2016, VMware, Inc. All Rights Reserved.
 --
 --  Permission is hereby granted, free of charge, to any person obtaining a copy
 --  of this software and associated documentation files (the "Software"), to deal

data/spec/fixtures/whitespace.sql.erb

@@ -1,6 +1,6 @@
 --  The MIT License (MIT)
 --
---  Copyright (c) 2014-2015, VMware, Inc. All Rights Reserved.
+--  Copyright (c) 2014-2016, VMware, Inc. All Rights Reserved.
 --
 --  Permission is hereby granted, free of charge, to any person obtaining a copy
 --  of this software and associated documentation files (the "Software"), to deal

data/spec/masamune/actions/{elastic_mapreduce_spec.rb → aws_emr_spec.rb}

@@ -1,6 +1,6 @@
 #  The MIT License (MIT)
 #
-#  Copyright (c) 2014-2015, VMware, Inc. All Rights Reserved.
+#  Copyright (c) 2014-2016, VMware, Inc. All Rights Reserved.
 #
 #  Permission is hereby granted, free of charge, to any person obtaining a copy
 #  of this software and associated documentation files (the "Software"), to deal
@@ -20,36 +20,34 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-describe Masamune::Actions::ElasticMapreduce do
+describe Masamune::Actions::AwsEmr do
   let(:klass) do
     Class.new do
       include Masamune::HasEnvironment
       include Masamune::AfterInitializeCallbacks
-      include Masamune::Actions::ElasticMapreduce
+      include Masamune::Actions::AwsEmr
     end
   end
 
   let(:instance) { klass.new }
   let(:configuration) { {} }
-  let(:extra) { [] }
 
   before do
-    allow(instance).to receive_message_chain(:configuration, :elastic_mapreduce).and_return(configuration)
-    allow(instance).to receive(:extra).and_return(extra)
+    allow(instance).to receive_message_chain(:configuration, :aws_emr).and_return(configuration)
   end
 
-  describe '.elastic_mapreduce' do
+  describe '.aws_emr' do
     before do
-      mock_command(/\Aelastic-mapreduce/, mock_success)
+      mock_command(/\Aaws emr/, mock_success)
     end
 
-    subject { instance.elastic_mapreduce }
+    subject { instance.aws_emr }
 
     it { is_expected.to be_success }
 
     context 'with retries and backoff' do
       before do
-        allow(instance).to receive_message_chain(:configuration, :elastic_mapreduce).and_return(retries: 1, backoff: 10)
+        allow(instance).to receive_message_chain(:configuration, :aws_emr).and_return(retries: 1, backoff: 10)
         expect(Masamune::Commands::RetryWithBackoff).to receive(:new).with(anything, hash_including(retries: 1, backoff: 10)).once.and_call_original
       end
 
@@ -68,59 +66,41 @@ describe Masamune::Actions::ElasticMapreduce do
       it { expect { subject }.to_not raise_error }
     end
 
-    context 'when jobflow not required due to extra options' do
+    context 'when cluster_id is missing' do
       let(:configuration) { {enabled: true} }
-      let(:extra) { ['--create', '--name', 'zombo_cluster'] }
-      it { expect { subject }.to_not raise_error }
-    end
-
-    context 'when jobflow is missing' do
-      let(:configuration) { {enabled: true} }
-      it { expect { subject }.to raise_error Thor::RequiredArgumentMissingError, /No value provided for required options '--jobflow'/ }
+      it { expect { subject }.to raise_error Thor::RequiredArgumentMissingError, /No value provided for required options '--cluster-id'/ }
     end
 
-    context 'when jobflow is present without initialize' do
+    context 'when cluster_id is present without initialize' do
       let(:configuration) { {enabled: true} }
-      let(:options) { {jobflow: 'j-XYZ'} }
+      let(:options) { {cluster_id: 'j-XYZ'} }
       before do
-        expect(instance).to_not receive(:elastic_mapreduce)
+        expect(instance).to_not receive(:aws_emr)
       end
       it do
         expect { subject }.to_not raise_error
-        expect(instance.configuration.elastic_mapreduce[:jobflow]).to eq('j-XYZ')
+        expect(instance.configuration.aws_emr[:cluster_id]).to eq('j-XYZ')
       end
     end
 
-    context 'when jobflow does not exist' do
+    context 'when cluster_id does not exist' do
       let(:configuration) { {enabled: true} }
-      let(:options) { {initialize: true, jobflow: 'j-XYZ'} }
+      let(:options) { {initialize: true, cluster_id: 'j-XYZ'} }
       before do
-        mock_command(/\Aelastic-mapreduce/, mock_failure)
+        mock_command(/\Aaws emr/, mock_failure)
       end
-      it { expect { subject }.to raise_error Thor::RequiredArgumentMissingError, /Value 'j-XYZ' for '--jobflow' doesn't exist/ }
+      it { expect { subject }.to raise_error Thor::RequiredArgumentMissingError, /AWS EMR cluster 'j-XYZ' does not exist/ }
     end
 
-    context 'when jobflow exists' do
+    context 'when cluster_id exists' do
       let(:configuration) { {enabled: true} }
-      let(:options) { {initialize: true, jobflow: 'j-XYZ'} }
-      before do
-        mock_command(/\Aelastic-mapreduce/, mock_success)
-      end
-      it do
-        expect { subject }.to_not raise_error
-        expect(instance.configuration.elastic_mapreduce[:jobflow]).to eq('j-XYZ')
-      end
-    end
-
-    context 'when jobflow is symbolic' do
-      let(:configuration) { {enabled: true, jobflows: {'build' => 'j-XYZ'}} }
-      let(:options) { {initialize: true, jobflow: 'build', } }
+      let(:options) { {initialize: true, cluster_id: 'j-XYZ'} }
       before do
-        mock_command(/\Aelastic-mapreduce/, mock_success)
+        mock_command(/\Aaws emr/, mock_success)
       end
       it do
         expect { subject }.to_not raise_error
-        expect(instance.configuration.elastic_mapreduce[:jobflow]).to eq('j-XYZ')
+        expect(instance.configuration.aws_emr[:cluster_id]).to eq('j-XYZ')
       end
     end
   end

data/spec/masamune/actions/execute_spec.rb

@@ -1,6 +1,6 @@
 #  The MIT License (MIT)
 #
-#  Copyright (c) 2014-2015, VMware, Inc. All Rights Reserved.
+#  Copyright (c) 2014-2016, VMware, Inc. All Rights Reserved.
 #
 #  Permission is hereby granted, free of charge, to any person obtaining a copy
 #  of this software and associated documentation files (the "Software"), to deal

data/spec/masamune/actions/hadoop_filesystem_spec.rb

@@ -1,6 +1,6 @@
 #  The MIT License (MIT)
 #
-#  Copyright (c) 2014-2015, VMware, Inc. All Rights Reserved.
+#  Copyright (c) 2014-2016, VMware, Inc. All Rights Reserved.
 #
 #  Permission is hereby granted, free of charge, to any person obtaining a copy
 #  of this software and associated documentation files (the "Software"), to deal

data/spec/masamune/actions/hadoop_streaming_spec.rb

@@ -1,6 +1,6 @@
 #  The MIT License (MIT)
 #
-#  Copyright (c) 2014-2015, VMware, Inc. All Rights Reserved.
+#  Copyright (c) 2014-2016, VMware, Inc. All Rights Reserved.
 #
 #  Permission is hereby granted, free of charge, to any person obtaining a copy
 #  of this software and associated documentation files (the "Software"), to deal
@@ -38,7 +38,7 @@ describe Masamune::Actions::HadoopStreaming do
   describe '.hadoop_streaming' do
     before do
       allow(instance).to receive_message_chain(:configuration, :hadoop_streaming).and_return({})
-      allow(instance).to receive_message_chain(:configuration, :elastic_mapreduce).and_return({})
+      allow(instance).to receive_message_chain(:configuration, :aws_emr).and_return({})
       mock_command(/\Ahadoop/, mock_success)
     end
 
@@ -46,24 +46,24 @@ describe Masamune::Actions::HadoopStreaming do
 
     it { is_expected.to be_success }
 
-    context 'with jobflow' do
+    context 'with cluster_id' do
       before do
-        allow(instance).to receive_message_chain(:configuration, :elastic_mapreduce).and_return(jobflow: 'j-XYZ')
+        allow(instance).to receive_message_chain(:configuration, :aws_emr).and_return(cluster_id: 'j-XYZ')
         mock_command(/\Ahadoop/, mock_failure)
-        mock_command(/\Aelastic-mapreduce/, mock_success, StringIO.new('ssh fakehost exit'))
+        mock_command(/\Aaws emr/, mock_success, StringIO.new('ssh fakehost exit'))
         mock_command(/\Assh fakehost hadoop/, mock_success)
       end
 
       it { is_expected.to be_success }
     end
 
-    context 'with jobflow and extra' do
+    context 'with cluster_id and extra' do
       let(:extra) { ['-D', 'EXTRA'] }
 
       before do
-        allow(instance).to receive_message_chain(:configuration, :elastic_mapreduce).and_return(jobflow: 'j-XYZ')
+        allow(instance).to receive_message_chain(:configuration, :aws_emr).and_return(cluster_id: 'j-XYZ')
         mock_command(/\Ahadoop/, mock_failure)
-        mock_command(/\Aelastic-mapreduce/, mock_success, StringIO.new('ssh fakehost exit'))
+        mock_command(/\Aaws emr/, mock_success, StringIO.new('ssh fakehost exit'))
         mock_command(/\Assh fakehost -D EXTRA hadoop/, mock_failure)
         mock_command(/\Assh fakehost hadoop .*? -D EXTRA/, mock_success)
       end

data/spec/masamune/actions/hive_spec.rb

@@ -1,6 +1,6 @@
 #  The MIT License (MIT)
 #
-#  Copyright (c) 2014-2015, VMware, Inc. All Rights Reserved.
+#  Copyright (c) 2014-2016, VMware, Inc. All Rights Reserved.
 #
 #  Permission is hereby granted, free of charge, to any person obtaining a copy
 #  of this software and associated documentation files (the "Software"), to deal
@@ -36,8 +36,8 @@ describe Masamune::Actions::Hive do
   before do
     filesystem.add_path(:tmp_dir, File.join(Dir.tmpdir, SecureRandom.hex))
     allow(instance).to receive(:filesystem) { filesystem }
-    allow(instance).to receive_message_chain(:configuration, :elastic_mapreduce).and_return({})
     allow(instance).to receive_message_chain(:configuration, :hive).and_return(configuration)
+    allow(instance).to receive_message_chain(:configuration, :aws_emr).and_return({})
     allow(instance).to receive_message_chain(:define_schema, :to_file) { 'schema.hql' }
     allow_any_instance_of(Masamune::MockFilesystem).to receive(:copy_file_to_dir)
   end
@@ -51,11 +51,11 @@ describe Masamune::Actions::Hive do
 
     it { is_expected.to be_success }
 
-    context 'with jobflow' do
+    context 'with cluster_id' do
       before do
-        allow(instance).to receive_message_chain(:configuration, :elastic_mapreduce).and_return({jobflow: 'j-XYZ'})
+        allow(instance).to receive_message_chain(:configuration, :aws_emr).and_return({cluster_id: 'j-XYZ'})
         mock_command(/\Ahive/, mock_failure)
-        mock_command(/\Aelastic-mapreduce/, mock_success, StringIO.new('ssh fakehost exit'))
+        mock_command(/\Aaws emr/, mock_success, StringIO.new('ssh fakehost exit'))
         mock_command(/\Assh fakehost hive/, mock_success)
       end
 

data/spec/masamune/actions/invoke_parallel_spec.rb

@@ -1,6 +1,6 @@
 #  The MIT License (MIT)
 #
-#  Copyright (c) 2014-2015, VMware, Inc. All Rights Reserved.
+#  Copyright (c) 2014-2016, VMware, Inc. All Rights Reserved.
 #
 #  Permission is hereby granted, free of charge, to any person obtaining a copy
 #  of this software and associated documentation files (the "Software"), to deal