elasticity 2.4 → 2.5

data/HISTORY.md

@@ -1,3 +1,8 @@
+## 2.5 - September 29, 2012
+
++ ```SyncToS3``` supports S3 region specification.
++ ```SyncToS3#sync``` supports being called with both files and directories.
+
 ## 2.4 - September 1, 2012
 
 + ```SyncToS3``` added to enable one-way asset synchronization.

data/README.md

@@ -16,7 +16,7 @@ gem install elasticity
 or in your Gemfile
 
 ```
-gem 'elasticity', '~> 2.0'
+gem 'elasticity', '~> 2.5'
 ```
 
 This will ensure that you protect yourself from API changes, which will only be made in major revisions.
@@ -273,20 +273,27 @@ jobflow.add_step(jar_step)
 
 ## 6 - Upload Assets (optional)
 
-This isn't part of ```JobFlow```; more of an aside :)  Elasticity provides a very basic means of uploading assets to S3 so that your EMR job has access to them.  For example, a TSV file with a range of valid values, join tables, etc.
+This isn't part of ```JobFlow```; more of an aside.  Elasticity provides a very basic means of uploading assets to S3 so that your EMR job has access to them.  Most commonly this will be a set of resources to run the job (e.g. JAR files, streaming scripts, etc.) and a set of resources used by the job itself (e.g. a TSV file with a range of valid values, join tables, etc.).
 
 ```ruby
-# Specify the bucket and AWS credentials
-s3 = Elasticity::SyncToS3('my-bucket', 'access', 'secret')
+# Specify the bucket name, AWS credentials and region
+s3 = Elasticity::SyncToS3('my-bucket', 'access', 'secret', 'region')
 
-# Use the standard environment variables (AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY)
+# Alternatively, specify nothing :)
+# - Use the standard environment variables (AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY)
+# - Use the 'us-east-1' region by default
 # s3 = Elasticity::SyncToS3('my-bucket')
 
-# Recursively sync the contents of '/some/parent/dir' under the remote location 'remote-dir/this-job/assets'
-s3.sync('/some/parent/dir', 'remote-dir/this-job/assets')
+# Recursively sync the contents of '/foo' under the remote location 'remote-dir/this-job'
+s3.sync('/foo', 'remote-dir/this-job')
+
+# Sync a single file to a remote directory
+s3.sync('/foo/this-job/tables/join.tsv', 'remote-dir/this-job/tables')
 ```
 
-If the files already exist, there is an MD5 checksum check.  If the checksums are the same, the file will be skipped.  Now you can use something like ```s3n://my-bucket/remote-dir/this-job/assets/join.tsv``` in your EMR jobs.
+If the bucket doesn't exist, it will be created.
+
+If a file already exists, there is an MD5 checksum evaluation.  If the checksums are the same, the file will be skipped.  Now you can use something like ```s3n://my-bucket/remote-dir/this-job/tables/join.tsv``` in your EMR jobs.
 
 ## 7 - Run the Job Flow
 

data/elasticity.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.add_dependency('nokogiri')
   s.add_dependency('fog')
 
-  s.add_development_dependency('rake')
+  s.add_development_dependency('rake', '~> 0.9')
   s.add_development_dependency('rspec', '~> 2.11.0')
   s.add_development_dependency('timecop')
   s.add_development_dependency('fakefs', '~> 0.4')

data/lib/elasticity.rb

@@ -5,8 +5,6 @@ require 'rest_client'
 require 'nokogiri'
 require 'fog'
 
-require 'elasticity/support/conditional_raise'
-
 require 'elasticity/aws_request'
 require 'elasticity/emr'
 

data/lib/elasticity/aws_request.rb

@@ -50,7 +50,7 @@ module Elasticity
     def get_secret_key(secret)
       return secret if secret
       return ENV['AWS_SECRET_ACCESS_KEY'] if ENV['AWS_SECRET_ACCESS_KEY']
-      raise MissingKeyError, 'Please provide a secret key or set AWS_ACCESS_KEY_ID.'
+      raise MissingKeyError, 'Please provide a secret key or set AWS_SECRET_ACCESS_KEY.'
     end
 
     # (Used from RightScale's right_aws gem.)

data/lib/elasticity/hive_step.rb

@@ -17,7 +17,7 @@ module Elasticity
     end
 
     def to_aws_step(job_flow)
-      args = %w(s3://elasticmapreduce/libs/hive/hive-script --run-hive-script --args)
+      args = %w(s3://elasticmapreduce/libs/hive/hive-script --base-path s3://elasticmapreduce/libs/hive/ --hive-versions latest --run-hive-script --args)
       args.concat(['-f', @script])
       @variables.keys.sort.each do |name|
         args.concat(['-d', "#{name}=#{@variables[name]}"])
@@ -43,11 +43,11 @@ module Elasticity
           :jar => 's3://elasticmapreduce/libs/script-runner/script-runner.jar',
           :args => [
             's3://elasticmapreduce/libs/hive/hive-script',
-              '--base-path',
-              's3://elasticmapreduce/libs/hive/',
-              '--install-hive',
-              '--hive-versions',
-              'latest'
+            '--base-path',
+            's3://elasticmapreduce/libs/hive/',
+            '--install-hive',
+            '--hive-versions',
+            'latest'
           ],
         },
         :name => 'Elasticity - Install Hive'

data/lib/elasticity/instance_group.rb

@@ -19,19 +19,27 @@ module Elasticity
     end
 
     def count=(instance_count)
-      raise_if instance_count <= 0, ArgumentError, "Instance groups require at least 1 instance (#{instance_count} requested)"
-      raise_if @role == 'MASTER' && instance_count != 1, ArgumentError, "MASTER instance groups can only have 1 instance (#{instance_count} requested)"
+      if instance_count <= 0
+        raise ArgumentError, "Instance groups require at least 1 instance (#{instance_count} requested)"
+      end
+      if @role == 'MASTER' && instance_count != 1
+        raise ArgumentError, "MASTER instance groups can only have 1 instance (#{instance_count} requested)"
+      end
       @count = instance_count
     end
 
     def role=(group_role)
-      raise_unless ROLES.include?(group_role), ArgumentError, "Role must be one of MASTER, CORE or TASK (#{group_role} was requested)"
+      if !ROLES.include?(group_role)
+        raise ArgumentError, "Role must be one of MASTER, CORE or TASK (#{group_role} was requested)"
+      end
       @count = 1 if group_role == 'MASTER'
       @role = group_role
     end
 
     def set_spot_instances(bid_price)
-      raise_unless bid_price > 0, ArgumentError, "The bid price for spot instances should be greater than 0 (#{bid_price} requested)"
+      if bid_price < 0
+        raise ArgumentError, "The bid price for spot instances should be greater than 0 (#{bid_price} requested)"
+      end
       @bid_price = bid_price
       @market = 'SPOT'
     end

data/lib/elasticity/job_flow.rb

@@ -21,7 +21,7 @@ module Elasticity
 
     attr_reader :access_key
     attr_reader :secret_key
-    
+
     def initialize(access=nil, secret=nil)
       @action_on_failure = 'TERMINATE_JOB_FLOW'
       @hadoop_version = '1.0.3'
@@ -73,7 +73,9 @@ module Elasticity
     end
 
     def add_bootstrap_action(bootstrap_action)
-      raise_if is_jobflow_running?, JobFlowRunningError, 'To modify bootstrap actions, please create a new job flow.'
+      if is_jobflow_running?
+        raise JobFlowRunningError, 'To modify bootstrap actions, please create a new job flow.'
+      end
       @bootstrap_actions << bootstrap_action
     end
 
@@ -106,18 +108,26 @@ module Elasticity
     end
 
     def run
-      raise_if @jobflow_steps.empty?, JobFlowMissingStepsError, 'Cannot run a job flow without adding steps.  Please use #add_step.'
-      raise_if is_jobflow_running?, JobFlowRunningError, 'Cannot run a job flow multiple times.  To do more with this job flow, please use #add_step.'
+      if @jobflow_steps.empty?
+        raise JobFlowMissingStepsError, 'Cannot run a job flow without adding steps.  Please use #add_step.'
+      end
+      if is_jobflow_running?
+        raise JobFlowRunningError, 'Cannot run a job flow multiple times.  To do more with this job flow, please use #add_step.'
+      end
       @jobflow_id = emr.run_job_flow(jobflow_config)
     end
 
     def shutdown
-      raise_unless is_jobflow_running?, JobFlowNotStartedError, 'Cannot #shutdown a job flow that has not yet been #run.'
+      if !is_jobflow_running?
+        raise JobFlowNotStartedError, 'Cannot #shutdown a job flow that has not yet been #run.'
+      end
       emr.terminate_jobflows(@jobflow_id)
     end
 
     def status
-      raise_unless is_jobflow_running?, JobFlowNotStartedError, 'Please #run this job flow before attempting to retrieve status.'
+      if !is_jobflow_running?
+        raise JobFlowNotStartedError, 'Please #run this job flow before attempting to retrieve status.'
+      end
       emr.describe_jobflow(@jobflow_id)
     end
 

data/lib/elasticity/sync_to_s3.rb

@@ -2,38 +2,45 @@ module Elasticity
 
   class NoBucketError < StandardError; end
   class NoDirectoryError < StandardError; end
+  class NoFileError < StandardError; end
 
   class SyncToS3
 
     attr_reader :access_key
     attr_reader :secret_key
     attr_reader :bucket_name
+    attr_reader :region
 
-    def initialize(bucket, access=nil, secret=nil)
+    def initialize(bucket, access=nil, secret=nil, region=nil)
       @access_key = get_access_key(access)
       @secret_key = get_secret_key(secret)
       @bucket_name = bucket
+      @region = region ||= 'us-east-1'
     end
 
     def sync(local, remote)
-      raise_unless bucket, NoBucketError, "Bucket '#@bucket_name' does not exist"
-      raise_unless File.directory?(local), NoDirectoryError, "Directory '#{local}' does not exist or is not a directory"
-      sync_dir(local, remote)
+      if File.directory?(local)
+        sync_dir(local, remote)
+      else
+        sync_file(local, remote)
+      end
     end
 
     private
 
-    def sync_dir(local, remote)
-      Dir.glob(File.join([local, '*'])).each do |entry|
+    def sync_dir(dir_name, remote_dir)
+      raise NoDirectoryError, "Directory '#{dir_name}' does not exist or is not a directory" unless File.directory?(dir_name)
+      Dir.glob(File.join([dir_name, '*'])).each do |entry|
         if File.directory?(entry)
-          sync_dir(entry, [remote, File.basename(entry)].join('/'))
+          sync_dir(entry, [remote_dir, File.basename(entry)].join('/'))
         else
-          sync_file(entry, remote)
+          sync_file(entry, remote_dir)
         end
       end
     end
 
     def sync_file(file_name, remote_dir)
+      raise NoFileError, "File '#{file_name}' does not exist" unless File.exists?(file_name)
       remote_dir = remote_dir.gsub(/^(\/)/, '')
       remote_path = (remote_dir.empty?) ? (File.basename(file_name)) : [remote_dir, File.basename(file_name)].join('/')
       metadata = bucket.files.head(remote_path)
@@ -46,14 +53,17 @@ module Elasticity
       })
     end
 
+    private
+
     def bucket
-      index = s3.directories.index { |d| d.key == @bucket_name }
-      @bucket ||= index ? s3.directories[index] : nil
+      @bucket ||= s3.directories.find { |d| d.key == @bucket_name }
+      @bucket ||= s3.directories.create(:key => @bucket_name)
     end
 
     def s3
       @connection ||= Fog::Storage.new({
         :provider => 'AWS',
+        :region => @region,
         :aws_access_key_id => @access_key,
         :aws_secret_access_key => @secret_key
       })

data/lib/elasticity/version.rb

@@ -1,3 +1,3 @@
 module Elasticity
-  VERSION = '2.4'
+  VERSION = '2.5'
 end

data/spec/lib/elasticity/aws_request_spec.rb

@@ -68,7 +68,7 @@ describe Elasticity::AwsRequest do
           it 'should raise an error' do
             expect {
               missing_something.access_key
-            }.to raise_error(Elasticity::MissingKeyError, 'Please provide a secret key or set AWS_ACCESS_KEY_ID.')
+            }.to raise_error(Elasticity::MissingKeyError, 'Please provide a secret key or set AWS_SECRET_ACCESS_KEY.')
           end
         end
       end

data/spec/lib/elasticity/hive_step_spec.rb

@@ -20,10 +20,14 @@ describe Elasticity::HiveStep do
       step[:hadoop_jar_step][:jar].should == 's3://elasticmapreduce/libs/script-runner/script-runner.jar'
       step[:hadoop_jar_step][:args].should start_with([
         's3://elasticmapreduce/libs/hive/hive-script',
-          '--run-hive-script',
-          '--args',
-          '-f',
-          'script.hql'
+        '--base-path',
+        's3://elasticmapreduce/libs/hive/',
+        '--hive-versions',
+        'latest',
+        '--run-hive-script',
+        '--args',
+        '-f',
+        'script.hql'
       ])
     end
 
@@ -39,7 +43,7 @@ describe Elasticity::HiveStep do
 
       it 'should convert to aws step format' do
         step = hs_with_variables.to_aws_step(Elasticity::JobFlow.new('access', 'secret'))
-        step[:hadoop_jar_step][:args][5..9].should == %w(-d VAR1=VALUE1 -d VAR2=VALUE2)
+        step[:hadoop_jar_step][:args][9..13].should == %w(-d VAR1=VALUE1 -d VAR2=VALUE2)
       end
     end
 
@@ -60,11 +64,11 @@ describe Elasticity::HiveStep do
           :jar => 's3://elasticmapreduce/libs/script-runner/script-runner.jar',
           :args => [
             's3://elasticmapreduce/libs/hive/hive-script',
-              '--base-path',
-              's3://elasticmapreduce/libs/hive/',
-              '--install-hive',
-              '--hive-versions',
-              'latest'
+            '--base-path',
+            's3://elasticmapreduce/libs/hive/',
+            '--install-hive',
+            '--hive-versions',
+            'latest'
           ],
         },
         :name => 'Elasticity - Install Hive'

data/spec/lib/elasticity/job_flow_integration_spec.rb

@@ -68,7 +68,11 @@ describe 'Elasticity::JobFlow Integration Examples' do
                 :jar => 's3://elasticmapreduce/libs/script-runner/script-runner.jar',
                 :args => [
                   's3://elasticmapreduce/libs/hive/hive-script',
-                    '--run-hive-script',
+                  '--base-path',
+                  's3://elasticmapreduce/libs/hive/',
+                  '--hive-versions',
+                  'latest',
+                  '--run-hive-script',
                     '--args',
                     '-f', 's3n://slif-hive/test.q',
                     '-d', 'OUTPUT=s3n://slif-test/output'

data/spec/lib/elasticity/sync_to_s3_spec.rb

@@ -17,18 +17,19 @@ describe Elasticity::SyncToS3 do
     describe 'basic assignment' do
 
       it 'should set the proper values' do
-        sync = Elasticity::SyncToS3.new('bucket', 'access', 'secret')
+        sync = Elasticity::SyncToS3.new('bucket', 'access', 'secret', 'region')
         sync.access_key.should == 'access'
         sync.secret_key.should == 'secret'
         sync.bucket_name.should == 'bucket'
+        sync.region.should == 'region'
       end
 
     end
 
-    context 'when access and secret keys are nil' do
+    context 'when parameters are missing' do
 
-      let(:both_keys_nil) { Elasticity::SyncToS3.new('_', nil, nil) }
-      let(:both_keys_missing) { Elasticity::SyncToS3.new('_') }
+      let(:optional_params_nil) { Elasticity::SyncToS3.new('_', nil, nil, nil) }
+      let(:optional_params_missing) { Elasticity::SyncToS3.new('_') }
 
       before do
         ENV.stub(:[]).with('AWS_ACCESS_KEY_ID').and_return(access_key)
@@ -38,13 +39,21 @@ describe Elasticity::SyncToS3 do
       context 'when environment variables are present' do
         let(:access_key) { 'ENV_ACCESS' }
         let(:secret_key) { 'ENV_SECRET' }
-        it 'should assign them to the keys' do
-          both_keys_nil.access_key.should == 'ENV_ACCESS'
-          both_keys_nil.secret_key.should == 'ENV_SECRET'
 
-          both_keys_missing.access_key.should == 'ENV_ACCESS'
-          both_keys_missing.secret_key.should == 'ENV_SECRET'
+        it 'should assign environment variables to the keys' do
+          optional_params_nil.access_key.should == 'ENV_ACCESS'
+          optional_params_nil.secret_key.should == 'ENV_SECRET'
+          optional_params_missing.access_key.should == 'ENV_ACCESS'
+          optional_params_missing.secret_key.should == 'ENV_SECRET'
         end
+
+        it 'should set the region to us-east-1' do
+          optional_params_nil.region.should == 'us-east-1'
+          optional_params_nil.region.should == 'us-east-1'
+          optional_params_missing.region.should == 'us-east-1'
+          optional_params_missing.region.should == 'us-east-1'
+        end
+
       end
 
       context 'when environment variables are not present' do
@@ -54,7 +63,7 @@ describe Elasticity::SyncToS3 do
           let(:secret_key) { '_' }
           it 'should raise an error' do
             expect {
-              both_keys_nil # Trigger instantiation
+              optional_params_nil # Trigger instantiation
             }.to raise_error(Elasticity::MissingKeyError, 'Please provide an access key or set AWS_ACCESS_KEY_ID.')
           end
         end
@@ -64,7 +73,7 @@ describe Elasticity::SyncToS3 do
           let(:secret_key) { nil }
           it 'should raise an error' do
             expect {
-              both_keys_nil # Trigger instantiation
+              optional_params_nil # Trigger instantiation
             }.to raise_error(Elasticity::MissingKeyError, 'Please provide a secret key or set AWS_SECRET_ACCESS_KEY.')
           end
         end
@@ -77,50 +86,23 @@ describe Elasticity::SyncToS3 do
 
   describe '#sync' do
 
-    context 'when the bucket exists' do
-
-      before do
-        s3.directories.create(:key => bucket_name)
-      end
-
-      context 'when the local directory exists' do
-        before do
-          FileUtils.mkdir('GOOD_DIR')
-        end
-        it 'should sync that directory' do
-          sync_to_s3.should_receive(:sync_dir).with('GOOD_DIR', 'REMOTE_DIR')
-          sync_to_s3.sync('GOOD_DIR', 'REMOTE_DIR')
-        end
-      end
-
-      context 'when the local directory does not exist' do
-        it 'should raise an error' do
-          expect {
-            sync_to_s3.sync('BAD_DIR', '_')
-          }.to raise_error(Elasticity::NoDirectoryError, "Directory 'BAD_DIR' does not exist or is not a directory")
-        end
-      end
-
-      context 'when the local directory is not a directory' do
-        before do
-          FileUtils.touch('NOT_A_DIR')
-        end
-        it 'should raise an error' do
-          expect {
-            sync_to_s3.sync('NOT_A_DIR', '_')
-          }.to raise_error(Elasticity::NoDirectoryError, "Directory 'NOT_A_DIR' does not exist or is not a directory")
-        end
-      end
+    let(:dir_name) { 'GOOD_DIR' }
+    let(:file_name) { File.join(%w(GOOD_DIR file_1)) }
+    let(:remote_dir) { 'REMOTE_DIR' }
 
+    before do
+      FileUtils.mkdir(dir_name)
+      FileUtils.touch(file_name)
+    end
+    
+    it 'should sync directories' do
+      sync_to_s3.should_receive(:sync_dir).with(dir_name, remote_dir)
+      sync_to_s3.sync(dir_name, remote_dir)
     end
 
-    context 'when the bucket does not exist' do
-      let(:bucket_name) { 'BAD_BUCKET' }
-      it 'should raise an error' do
-        expect {
-          sync_to_s3.sync('_', '_')
-        }.to raise_error(Elasticity::NoBucketError, "Bucket 'BAD_BUCKET' does not exist")
-      end
+    it 'should sync files' do
+      sync_to_s3.should_receive(:sync_file).with(file_name, remote_dir)
+      sync_to_s3.sync(file_name, remote_dir)
     end
 
   end
@@ -156,6 +138,14 @@ describe Elasticity::SyncToS3 do
       end
     end
 
+    context 'when the directory does not exist or is not a directory' do
+      it 'should raise an error' do
+        expect {
+          sync_to_s3.send(:sync_dir, 'NOT_A_DIR', '_')
+        }.to raise_error(Elasticity::NoDirectoryError, "Directory 'NOT_A_DIR' does not exist or is not a directory")
+      end
+    end
+
   end
 
   describe '#sync_file' do
@@ -164,13 +154,13 @@ describe Elasticity::SyncToS3 do
     let(:file_name) { 'test.out' }
     let(:full_path) { File.join([local_dir, file_name]) }
     let(:remote_dir) { 'job/assets' }
-    let(:remote_path) { "#{remote_dir}/#{file_name}"}
+    let(:remote_path) { "#{remote_dir}/#{file_name}" }
     let(:file_data) { 'Some test content' }
 
     before do
       s3.directories.create(:key => bucket_name)
       FileUtils.makedirs(local_dir)
-      File.open(full_path, 'w') {|f| f.write(file_data) }
+      File.open(full_path, 'w') { |f| f.write(file_data) }
     end
 
     it 'should write the specified file into the remote directory' do
@@ -202,34 +192,56 @@ describe Elasticity::SyncToS3 do
       end
 
       context 'when remote dir is empty' do
-        let(:remote_dir) {''}
+        let(:remote_dir) { '' }
         it 'should place files in the root without a bunk empty folder name' do
           s3.directories[0].files.head(file_name).should_not be_nil
         end
       end
 
       context 'when remote dir is /' do
-        let(:remote_dir) {'/'}
+        let(:remote_dir) { '/' }
         it 'should place files in the root without a bunk empty folder name' do
           s3.directories[0].files.head(file_name).should_not be_nil
         end
       end
 
       context 'when remote dir starts with a /' do
-        let(:remote_dir) {'/starts_with_slash'}
+        let(:remote_dir) { '/starts_with_slash' }
         it 'should place files in the root without a bunk empty folder name' do
           s3.directories[0].files.head('starts_with_slash/test.out').should_not be_nil
         end
       end
     end
 
+    context 'when the file does not exist' do
+      it 'should raise an error' do
+        expect {
+          sync_to_s3.send(:sync_file, 'NO_FILE', '_')
+        }.to raise_error(Elasticity::NoFileError, "File 'NO_FILE' does not exist")
+      end
+    end
+
+    context 'when the bucket does not exist' do
+      let(:no_bucket_sync) { Elasticity::SyncToS3.new('NEW_BUCKET', '_', '_') }
+      before do
+        no_bucket_sync.stub(:s3).and_return(s3)
+        FileUtils.mkdir('GOOD_DIR')
+        FileUtils.touch(File.join(%w(GOOD_DIR file_1)))
+      end
+      it 'should create the bucket in s3' do
+        no_bucket_sync.sync('GOOD_DIR', '_')
+        s3.directories.find { |d| d.key == 'NEW_BUCKET' }.should_not be_nil
+      end
+    end
+
   end
 
   describe '#s3' do
-    let(:connection_test) { Elasticity::SyncToS3.new('_', 'access', 'secret') }
+    let(:connection_test) { Elasticity::SyncToS3.new('_', 'access', 'secret', 'region') }
     it 'should connect to S3 using the specified credentials' do
       Fog::Storage.should_receive(:new).with({
         :provider => 'AWS',
+        :region => 'region',
         :aws_access_key_id => 'access',
         :aws_secret_access_key => 'secret'
       }).and_return('GOOD_CONNECTION')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elasticity
 version: !ruby/object:Gem::Version
-  version: '2.4'
+  version: '2.5'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-02 00:00:00.000000000 Z
+date: 2012-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -64,17 +64,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -155,7 +155,6 @@ files:
 - lib/elasticity/job_flow_step.rb
 - lib/elasticity/pig_step.rb
 - lib/elasticity/streaming_step.rb
-- lib/elasticity/support/conditional_raise.rb
 - lib/elasticity/sync_to_s3.rb
 - lib/elasticity/version.rb
 - spec/lib/elasticity/aws_request_spec.rb
@@ -173,7 +172,6 @@ files:
 - spec/lib/elasticity/job_flow_step_spec.rb
 - spec/lib/elasticity/pig_step_spec.rb
 - spec/lib/elasticity/streaming_step_spec.rb
-- spec/lib/elasticity/support/conditional_raise_spec.rb
 - spec/lib/elasticity/sync_to_s3_spec.rb
 - spec/spec_helper.rb
 - spec/support/be_a_hash_including_matcher.rb
@@ -191,7 +189,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2552375759855937320
+      hash: -4541363325950914992
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -200,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2552375759855937320
+      hash: -4541363325950914992
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -223,7 +221,6 @@ test_files:
 - spec/lib/elasticity/job_flow_step_spec.rb
 - spec/lib/elasticity/pig_step_spec.rb
 - spec/lib/elasticity/streaming_step_spec.rb
-- spec/lib/elasticity/support/conditional_raise_spec.rb
 - spec/lib/elasticity/sync_to_s3_spec.rb
 - spec/spec_helper.rb
 - spec/support/be_a_hash_including_matcher.rb

data/lib/elasticity/support/conditional_raise.rb

@@ -1,23 +0,0 @@
-module Elasticity
-
-  module ConditionalRaising
-
-    def raise_if(conditional, error_class, message)
-      raise error_class, message if conditional
-    end
-
-    def raise_unless(conditional, error_class, message)
-      raise error_class, message unless conditional
-    end
-
-  end
-
-end
-
-module Kernel
-  include Elasticity::ConditionalRaising
-end
-
-class Object
-  include Kernel
-end

data/spec/lib/elasticity/support/conditional_raise_spec.rb

@@ -1,35 +0,0 @@
-describe 'Conditional Raising' do
-
-  describe '#raise_if' do
-
-    it 'should raise the specified error if the condition is true' do
-      expect {
-        raise_if true, RuntimeError, 'MESSAGE'
-      }.to raise_error(RuntimeError, 'MESSAGE')
-    end
-
-    it 'should not raise the specified error if the condition is false' do
-      expect {
-        raise_if false, RuntimeError, 'MESSAGE'
-      }.to_not raise_error(RuntimeError, 'MESSAGE')
-    end
-
-  end
-
-  describe '#raise_unless' do
-
-    it 'should not raise the specified error unless the condition is true' do
-      expect {
-        raise_unless true, RuntimeError, 'MESSAGE'
-      }.to_not raise_error(RuntimeError, 'MESSAGE')
-    end
-
-    it 'should raise the specified error unless the condition is false' do
-      expect {
-        raise_unless false, RuntimeError, 'MESSAGE'
-      }.to raise_error(RuntimeError, 'MESSAGE')
-    end
-
-  end
-
-end