elasticity 6.0.8 → 6.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3cd50c2b68572e1a5e546d3ff07e49e040b60a92
-  data.tar.gz: cfda4f23570cb4206835b9e4e6366807d7ab2f4c
+  metadata.gz: b5a420f1b650e0fa6585fd2920421cfd6b486644
+  data.tar.gz: 1154a380992793fe9df9547595563066f8c0b6e7
 SHA512:
-  metadata.gz: c61bae14a944d248c96cf45bb522de9bf611bcad24599d158fed27003f2d1c164afb58451fba87c62e55b68fc10f05ab0dc28df49b1b9fc0ca9b6433aaedb231
-  data.tar.gz: 25c6be356bf71593510bca93f8f327c8f5162ade323d15bf4fca7e68c5ef9a2017050de7307add76a930808e4f8c3706b9327a267356029df4d5aaa21b54d978
+  metadata.gz: 81cb07a81d797dee5892a142d09ae459d4cefd0796407f0b509787db1b3aa0174bdd9290d329780659f0cdf41c7e8d732076640cd628a86d9e44b9c14671ae40
+  data.tar.gz: 81c09d734cea32f997f68932d0e36aa1fb0d11ee62b1ae46560334392dccc4e433094930de311d6f29fa1bb6ec920e801b1b62bdd95ee8c9570a3f26dcdd6a8a

data/.travis.yml

@@ -1,7 +1,5 @@
 language: ruby
 rvm:
-  - 2.0
-  - 2.1
   - 2.2
   - 2.3.0
 before_install:

data/HISTORY.md

@@ -1,3 +1,8 @@
+## 6.0.9 - December 20, 2016
+
+- Including PR [#130](https://github.com/rslifka/elasticity/pull/130) - "AAdd support for EBS".  Thank you [@jbeemster](https://github.com/jbeemster)!
+- Including PR [#131](https://github.com/rslifka/elasticity/pull/131) - "Deprecated Support for Ruby <= 2.2".
+
 ## 6.0.8 - February 22, 2016
 
 - Including PR [#126](https://github.com/rslifka/elasticity/pull/126) - "Add support for additional security groups".  Thank you [@alistair](https://github.com/alistair)!

data/README.md

@@ -2,7 +2,7 @@
 
 Elasticity provides programmatic access to Amazon's Elastic Map Reduce service.  The aim is to conveniently abstract away the complex EMR REST API and make working with job flows more productive and more enjoyable.
 
-[![Build Status](https://secure.travis-ci.org/rslifka/elasticity.png)](http://travis-ci.org/rslifka/elasticity) 2.0.x, 2.1.x, 2.2.x, 2.3.x
+[![Build Status](https://secure.travis-ci.org/rslifka/elasticity.png)](http://travis-ci.org/rslifka/elasticity) 2.2.x, 2.3.x
 
 Elasticity provides two ways to access EMR:
 
@@ -10,6 +10,7 @@ Elasticity provides two ways to access EMR:
 * **Directly through access to the EMR REST API**. The less-discussed hidden darkside... I use this to enable the Elasticity API.  RubyDoc can be found at the RubyGems [auto-generated documentation site](http://rubydoc.info/gems/elasticity/frames).  Be forewarned: Making the calls directly requires that you understand how to structure EMR requests at the Amazon API level and from experience I can tell you there are more fun things you could be doing :)  Scroll to the end for more information on the Amazon API.
 
 # Installation
+You must be running a ruby >= 2.2
 
 ```
 gem install elasticity

data/elasticity.gemspec

@@ -3,13 +3,14 @@ $:.push File.expand_path('../lib', __FILE__)
 require 'elasticity/version'
 
 Gem::Specification.new do |s|
-  s.name        = 'elasticity'
-  s.version     = Elasticity::VERSION
-  s.platform    = Gem::Platform::RUBY
-  s.authors     = ['Robert Slifka']
-  s.homepage    = 'http://www.github.com/rslifka/elasticity'
-  s.summary     = %q{Streamlined, programmatic access to Amazon's Elastic Map Reduce service.}
-  s.description = %q{Streamlined, programmatic access to Amazon's Elastic Map Reduce service, driven by the Sharethrough team's requirements for belting out EMR jobs.}
+  s.name                  = 'elasticity'
+  s.version               = Elasticity::VERSION
+  s.required_ruby_version = '>= 2.2'
+  s.platform              = Gem::Platform::RUBY
+  s.authors               = ['Robert Slifka']
+  s.homepage              = 'http://www.github.com/rslifka/elasticity'
+  s.summary               = %q{Streamlined, programmatic access to Amazon's Elastic Map Reduce service.}
+  s.description           = %q{Streamlined, programmatic access to Amazon's Elastic Map Reduce service, driven by the Sharethrough team's requirements for belting out EMR jobs.}
 
   s.add_dependency('rest-client', '~> 1.0')
   s.add_dependency('fog', '~> 1.0')

data/lib/elasticity/instance_group.rb

@@ -8,6 +8,7 @@ module Elasticity
     attr_accessor :type
     attr_accessor :role
 
+    attr_reader :ebs_configuration
     attr_reader :bid_price
     attr_reader :market
 
@@ -49,6 +50,12 @@ module Elasticity
       @market = 'ON_DEMAND'
     end
 
+    def set_ebs_configuration(ebs_configuration)
+      if ebs_configuration.is_a?(Elasticity::EbsConfiguration)
+        @ebs_configuration = ebs_configuration
+      end
+    end
+
     def to_aws_instance_config
       {
         :market => @market,
@@ -57,9 +64,64 @@ module Elasticity
         :instance_role => @role,
       }.tap do |config|
         config.merge!(:bid_price => @bid_price) if @market == 'SPOT'
+        config.merge!(:ebs_configuration => @ebs_configuration.to_aws_ebs_config) if @ebs_configuration != nil
       end
     end
 
   end
 
+  class EbsConfiguration
+
+    attr_accessor :ebs_optimized
+
+    attr_reader :ebs_block_device_configs
+
+    def initialize
+      @ebs_optimized = false
+      @ebs_block_device_configs = Array.new
+    end
+
+    def add_ebs_block_device_config(ebs_block_device_config)
+      if ebs_block_device_config.is_a?(Elasticity::EbsBlockDeviceConfig)
+        @ebs_block_device_configs.push(ebs_block_device_config)
+      end
+    end
+
+    def to_aws_ebs_config
+      {
+        :ebs_optimized => @ebs_optimized,
+        :ebs_block_device_configs => @ebs_block_device_configs.map {
+          |i| i.to_aws_ebs_block_device_config
+        }
+      }
+    end
+  end
+
+  class EbsBlockDeviceConfig
+
+    attr_accessor :volume_type
+    attr_accessor :iops
+    attr_accessor :size_in_gb
+    attr_accessor :volumes_per_instance
+
+    def initialize
+      @volume_type = "gp2"
+      @iops = 1
+      @size_in_gb = 1
+      @volumes_per_instance = 1
+    end
+
+    def to_aws_ebs_block_device_config
+      {
+        :volume_specification => {
+          :volume_type => @volume_type,
+          :size_in_gb => @size_in_gb,
+        }.tap do |spec|
+          spec.merge!(:iops => @iops) if @volume_type == "io1"
+        end,
+        :volumes_per_instance => @volumes_per_instance
+      }
+    end
+  end
+
 end

data/lib/elasticity/job_flow.rb

@@ -133,6 +133,18 @@ module Elasticity
       @instance_groups[:task] = instance_group
     end
 
+    def set_master_ebs_configuration(ebs_configuration)
+      @instance_groups[:master].set_ebs_configuration(ebs_configuration)
+    end
+
+    def set_core_ebs_configuration(ebs_configuration)
+      @instance_groups[:core].set_ebs_configuration(ebs_configuration)
+    end
+
+    def set_task_ebs_configuration(ebs_configuration)
+      @instance_groups[:task].set_ebs_configuration(ebs_configuration)
+    end
+
     def add_step(jobflow_step)
       if is_jobflow_running?
         jobflow_steps = []

data/lib/elasticity/version.rb

@@ -1,3 +1,3 @@
 module Elasticity
-  VERSION = '6.0.8'
+  VERSION = '6.0.9'
 end

data/spec/lib/elasticity/aws_request_v4_spec.rb

@@ -123,7 +123,7 @@ describe Elasticity::AwsRequestV4 do
 
   describe '.aws_v4_signature' do
     it 'should create the proper signature' do
-      subject.send(:aws_v4_signature).should == '8cd99127235ec8f7c9304ad55d1ef702c556d1d5169dd2d224e6cf86fe179f1e'
+      subject.send(:aws_v4_signature).should == 'aee8cb25939b4262213612d3410b3033107f97134beadc91563b532c54cf3ab3'
     end
   end
 

data/spec/lib/elasticity/instance_group_spec.rb

@@ -7,6 +7,7 @@ describe Elasticity::InstanceGroup do
       expect(subject.type).to eql('m1.small')
       expect(subject.market).to eql('ON_DEMAND')
       expect(subject.role).to eql('CORE')
+      expect(subject.ebs_configuration).to eql(nil)
     end
   end
 
@@ -98,6 +99,20 @@ describe Elasticity::InstanceGroup do
 
   end
 
+  describe '#set_ebs_configuration' do
+
+    it 'should not change if the type is incorrect' do
+      subject.set_ebs_configuration("ebs_configuration")
+      subject.ebs_configuration.should == nil
+    end
+
+    it 'should change if the type is correct' do
+      subject.set_ebs_configuration(Elasticity::EbsConfiguration.new)
+      subject.ebs_configuration.should_not == nil
+    end
+
+  end
+
   describe '#to_aws_instance_config' do
 
     context 'when an ON_DEMAND group' do
@@ -139,6 +154,58 @@ describe Elasticity::InstanceGroup do
       end
     end
 
+    context 'when a EBS configuration' do
+      let(:on_demand_instance_group) do
+        Elasticity::InstanceGroup.new.tap do |i|
+          i.count = 5
+          i.type = 'c1.medium'
+          i.role = 'CORE'
+          i.set_ebs_configuration(
+            Elasticity::EbsConfiguration.new.tap do |ebs|
+              ebs.add_ebs_block_device_config(Elasticity::EbsBlockDeviceConfig.new)
+              ebs.add_ebs_block_device_config(
+                Elasticity::EbsBlockDeviceConfig.new.tap do |ebsc|
+                  ebsc.size_in_gb = 10000
+                  ebsc.volumes_per_instance = 10
+                  ebsc.iops = 9999
+                  ebsc.volume_type = "io1"
+                end
+              )
+            end
+          )
+        end
+      end
+      it 'should generate an AWS config' do
+        on_demand_instance_group.ebs_configuration.ebs_block_device_configs.length.should == 2
+        on_demand_instance_group.to_aws_instance_config.should == {
+          :market => 'ON_DEMAND',
+          :instance_count => 5,
+          :instance_type => 'c1.medium',
+          :instance_role => 'CORE',
+          :ebs_configuration => {
+            :ebs_block_device_configs => [
+              {
+                :volume_specification => {
+                  :volume_type => "gp2",
+                  :size_in_gb => 1,
+                },
+                :volumes_per_instance => 1
+              },
+              {
+                :volume_specification => {
+                  :volume_type => "io1",
+                  :iops => 9999,
+                  :size_in_gb => 10000,
+                },
+                :volumes_per_instance => 10
+              },
+            ],
+            :ebs_optimized => false,
+          },
+        }
+      end
+    end
+
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticity
 version: !ruby/object:Gem::Version
-  version: 6.0.8
+  version: 6.0.9
 platform: ruby
 authors:
 - Robert Slifka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-21 00:00:00.000000000 Z
+date: 2016-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -206,7 +206,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="