masamune 0.15.6 → 0.16.0

data/spec/spec_helper.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/support/masamune/example_group.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/support/masamune/job_example_group.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/support/masamune/job_fixture.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/support/masamune/mock_command.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/support/masamune/mock_delegate.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/support/masamune/mock_filesystem.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/support/masamune/shared_example_group.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/support/masamune/step_example_group.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/support/masamune/step_fixture.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/support/masamune/task_example_group.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/support/masamune/thor_mute.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/support/rspec/example/action_example_group.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/support/rspec/example/task_example_group.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/support/rspec/example/transform_example_group.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/support/shared_examples/postgres_common_examples.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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: masamune
 version: !ruby/object:Gem::Version
-  version: 0.15.6
+  version: 0.16.0
 platform: ruby
 authors:
 - Michael Andrews
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-08 00:00:00.000000000 Z
+date: 2016-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -198,7 +198,7 @@ email:
 executables:
 - masamune-shell
 - masamune-hive
-- masamune-elastic-mapreduce
+- masamune-aws-emr
 - masamune-psql
 - masamune-dump
 extensions: []
@@ -207,16 +207,16 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/masamune-aws-emr
 - bin/masamune-dump
-- bin/masamune-elastic-mapreduce
 - bin/masamune-hive
 - bin/masamune-psql
 - bin/masamune-shell
 - lib/masamune.rb
 - lib/masamune/actions.rb
+- lib/masamune/actions/aws_emr.rb
 - lib/masamune/actions/data_flow.rb
 - lib/masamune/actions/date_parse.rb
-- lib/masamune/actions/elastic_mapreduce.rb
 - lib/masamune/actions/execute.rb
 - lib/masamune/actions/filesystem.rb
 - lib/masamune/actions/hadoop_filesystem.rb
@@ -230,11 +230,10 @@ files:
 - lib/masamune/after_initialize_callbacks.rb
 - lib/masamune/cached_filesystem.rb
 - lib/masamune/commands.rb
-- lib/masamune/commands/elastic_mapreduce.rb
+- lib/masamune/commands/aws_emr.rb
 - lib/masamune/commands/hadoop_filesystem.rb
 - lib/masamune/commands/hadoop_streaming.rb
 - lib/masamune/commands/hive.rb
-- lib/masamune/commands/interactive.rb
 - lib/masamune/commands/postgres.rb
 - lib/masamune/commands/postgres_admin.rb
 - lib/masamune/commands/postgres_common.rb
@@ -269,8 +268,8 @@ files:
 - lib/masamune/schema/table_reference.rb
 - lib/masamune/spec_helper.rb
 - lib/masamune/string_format.rb
+- lib/masamune/tasks/aws_emr_thor.rb
 - lib/masamune/tasks/dump_thor.rb
-- lib/masamune/tasks/elastic_mapreduce_thor.rb
 - lib/masamune/tasks/hive_thor.rb
 - lib/masamune/tasks/postgres_thor.rb
 - lib/masamune/tasks/shell_thor.rb
@@ -335,7 +334,7 @@ files:
 - spec/fixtures/relative.sql.erb
 - spec/fixtures/simple.sql.erb
 - spec/fixtures/whitespace.sql.erb
-- spec/masamune/actions/elastic_mapreduce_spec.rb
+- spec/masamune/actions/aws_emr_spec.rb
 - spec/masamune/actions/execute_spec.rb
 - spec/masamune/actions/hadoop_filesystem_spec.rb
 - spec/masamune/actions/hadoop_streaming_spec.rb
@@ -347,6 +346,7 @@ files:
 - spec/masamune/actions/transform_spec.rb
 - spec/masamune/after_initialization_callbacks_spec.rb
 - spec/masamune/cached_filesystem_spec.rb
+- spec/masamune/commands/aws_emr_spec.rb
 - spec/masamune/commands/hadoop_filesystem_spec.rb
 - spec/masamune/commands/hadoop_streaming_spec.rb
 - spec/masamune/commands/hive_spec.rb
@@ -376,8 +376,8 @@ files:
 - spec/masamune/schema/store_spec.rb
 - spec/masamune/schema/table_spec.rb
 - spec/masamune/string_format_spec.rb
+- spec/masamune/tasks/aws_emr_thor_spec.rb
 - spec/masamune/tasks/dump_thor_spec.rb
-- spec/masamune/tasks/elastic_mapreduce_thor_spec.rb
 - spec/masamune/tasks/hive_thor_spec.rb
 - spec/masamune/tasks/postgres_thor_spec.rb
 - spec/masamune/tasks/shell_thor_spec.rb
@@ -436,7 +436,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Hybrid Data & Work Flow
@@ -447,7 +447,7 @@ test_files:
 - spec/fixtures/relative.sql.erb
 - spec/fixtures/simple.sql.erb
 - spec/fixtures/whitespace.sql.erb
-- spec/masamune/actions/elastic_mapreduce_spec.rb
+- spec/masamune/actions/aws_emr_spec.rb
 - spec/masamune/actions/execute_spec.rb
 - spec/masamune/actions/hadoop_filesystem_spec.rb
 - spec/masamune/actions/hadoop_streaming_spec.rb
@@ -459,6 +459,7 @@ test_files:
 - spec/masamune/actions/transform_spec.rb
 - spec/masamune/after_initialization_callbacks_spec.rb
 - spec/masamune/cached_filesystem_spec.rb
+- spec/masamune/commands/aws_emr_spec.rb
 - spec/masamune/commands/hadoop_filesystem_spec.rb
 - spec/masamune/commands/hadoop_streaming_spec.rb
 - spec/masamune/commands/hive_spec.rb
@@ -488,8 +489,8 @@ test_files:
 - spec/masamune/schema/store_spec.rb
 - spec/masamune/schema/table_spec.rb
 - spec/masamune/string_format_spec.rb
+- spec/masamune/tasks/aws_emr_thor_spec.rb
 - spec/masamune/tasks/dump_thor_spec.rb
-- spec/masamune/tasks/elastic_mapreduce_thor_spec.rb
 - spec/masamune/tasks/hive_thor_spec.rb
 - spec/masamune/tasks/postgres_thor_spec.rb
 - spec/masamune/tasks/shell_thor_spec.rb

data/lib/masamune/commands/interactive.rb

@@ -1,37 +0,0 @@
-#  The MIT License (MIT)
-#
-#  Copyright (c) 2014-2015, 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
-#  in the Software without restriction, including without limitation the rights
-#  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-#  copies of the Software, and to permit persons to whom the Software is
-#  furnished to do so, subject to the following conditions:
-#
-#  The above copyright notice and this permission notice shall be included in
-#  all copies or substantial portions of the Software.
-#
-#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-#  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-#  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-#  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-#  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-#  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-#  THE SOFTWARE.
-
-require 'delegate'
-
-module Masamune::Commands
-  class Interactive < SimpleDelegator
-
-    def initialize(delegate, attrs = {})
-      super delegate
-      @interactive = attrs.fetch(:interactive, false)
-    end
-
-    def interactive?
-      @interactive
-    end
-  end
-end

data/lib/masamune/tasks/elastic_mapreduce_thor.rb

@@ -1,61 +0,0 @@
-#  The MIT License (MIT)
-#
-#  Copyright (c) 2014-2015, 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
-#  in the Software without restriction, including without limitation the rights
-#  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-#  copies of the Software, and to permit persons to whom the Software is
-#  furnished to do so, subject to the following conditions:
-#
-#  The above copyright notice and this permission notice shall be included in
-#  all copies or substantial portions of the Software.
-#
-#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-#  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-#  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-#  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-#  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-#  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-#  THE SOFTWARE.
-
-require 'masamune'
-require 'thor'
-
-module Masamune::Tasks
-  class ElasticMapreduceThor < Thor
-    include Masamune::Thor
-    include Masamune::Actions::ElasticMapreduce
-
-    # FIXME need to add an unnecessary namespace until this issue is fixed:
-    # https://github.com/wycats/thor/pull/247
-    namespace :elastic_mapreduce
-    skip_lock!
-
-    desc 'elastic_mapreduce', 'Launch an ElasticMapReduce ssh session'
-    class_option :template, :type => :string, :aliases => '-t', :desc => 'Execute named template command'
-    class_option :params, :type => :hash, :aliases => '-p', :desc => 'Bind params to named template command', :default => {}
-    def elastic_mapreduce_exec
-      elastic_mapreduce_options = options.dup.with_indifferent_access
-      elastic_mapreduce_options.merge!(interactive: true)
-      elastic_mapreduce_options.merge!(extra: extra_or_ssh)
-      elastic_mapreduce(elastic_mapreduce_options)
-    end
-    default_task :elastic_mapreduce_exec
-
-    no_tasks do
-      after_initialize(:first) do |thor, options|
-        begin
-          thor.extra += thor.configuration.bind_template(:elastic_mapreduce, options[:template], options[:params]) if options[:template]
-        rescue ArgumentError => e
-          raise ::Thor::MalformattedArgumentError, e.to_s
-        end
-      end
-
-      def extra_or_ssh
-        self.extra.any? ? self.extra : ['--ssh']
-      end
-    end
-  end
-end

data/spec/masamune/tasks/elastic_mapreduce_thor_spec.rb

@@ -1,54 +0,0 @@
-#  The MIT License (MIT)
-#
-#  Copyright (c) 2014-2015, 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
-#  in the Software without restriction, including without limitation the rights
-#  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-#  copies of the Software, and to permit persons to whom the Software is
-#  furnished to do so, subject to the following conditions:
-#
-#  The above copyright notice and this permission notice shall be included in
-#  all copies or substantial portions of the Software.
-#
-#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-#  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-#  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-#  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-#  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-#  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-#  THE SOFTWARE.
-
-require 'masamune/tasks/elastic_mapreduce_thor'
-
-describe Masamune::Tasks::ElasticMapreduceThor do
-  context 'with help command ' do
-    let(:command) { 'help' }
-    it_behaves_like 'command usage'
-  end
-
-  context 'with -j' do
-    let(:options) { ['-j', 'j-XYZ'] }
-    it do
-      expect_any_instance_of(described_class).to receive(:elastic_mapreduce).with(hash_including(jobflow: 'j-XYZ', extra: ['--ssh'])).once.and_return(mock_success)
-      cli_invocation
-    end
-  end
-
-  context 'with --jobflow' do
-    let(:options) { ['--jobflow=j-XYZ'] }
-    it do
-      expect_any_instance_of(described_class).to receive(:elastic_mapreduce).with(hash_including(jobflow: 'j-XYZ', extra: ['--ssh'])).once.and_return(mock_success)
-      cli_invocation
-    end
-  end
-
-  context 'with -- --list' do
-    let(:options) { ['--', '--list'] }
-    it do
-      expect_any_instance_of(described_class).to receive(:elastic_mapreduce).with(hash_including(extra: ['--list'])).once.and_return(mock_success)
-      cli_invocation
-    end
-  end
-end