elasticity 2.5 → 2.5.1

data/.rvmrc

@@ -1 +1 @@
-rvm use ruby-1.9.3-p194@elasticity --create
+rvm use ruby-1.9.3-p327@elasticity --create

data/HISTORY.md

@@ -1,3 +1,8 @@
+## 2.5.1 - November 28, 2012
+
++ When ```JobFlow#placement``` is specified, instances are created in that availability zone.  Previously, this setting was only used to derive the EMR API endpoint to connect to (i.e. the region).
++ Updated development depdencies.
+
 ## 2.5 - September 29, 2012
 
 + ```SyncToS3``` supports S3 region specification.

data/README.md

@@ -1,3 +1,5 @@
+(2012-11-23) Hey all, I'm still out here.  Elasticity remains part of our daily workflow at [Sharethrough](http://www.sharethrough.com/) and after a year of work, our usage patterns have stabilized.  Submit an issue if you have suggestions!
+
 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) REE, 1.8.7, 1.9.2, 1.9.3
@@ -339,13 +341,13 @@ Unfortunately, the documentation is sometimes incorrect and sometimes missing.
 
 * AWS signing was used from [RightScale's](http://www.rightscale.com/) amazing [right_aws gem](https://github.com/rightscale/right_aws) which works extraordinarily well!  If you need access to any AWS service (EC2, S3, etc.), have a look.
 * <code>camelize</code> was used from ActiveSupport to assist in converting parmeters to AWS request format.
-* Thanks to the following people who have contributed patches or helpful suggestions: [Ryan Weald](https://github.com/rweald), [Aram Price](https://github.com/aramprice/), [Wouter Broekhof](https://github.com/wouter/) and [Menno van der Sman](https://github.com/menno)
+* Thanks to the following people who have contributed patches or helpful suggestions: [Ryan Weald](https://github.com/rweald), [Aram Price](https://github.com/aramprice/), [Wouter Broekhof](https://github.com/wouter/), [Menno van der Sman](https://github.com/menno), [Michael Tibben](https://github.com/mtibben) and [Alexander Dean](https://github.com/alexanderdean).
 
 
 # License
 
 ```
-  Copyright 2011-2012 Robert Slifka
+  Copyright 2011-2013 Robert Slifka
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

data/elasticity.gemspec

@@ -16,8 +16,8 @@ Gem::Specification.new do |s|
   s.add_dependency('fog')
 
   s.add_development_dependency('rake', '~> 0.9')
-  s.add_development_dependency('rspec', '~> 2.11.0')
-  s.add_development_dependency('timecop')
+  s.add_development_dependency('rspec', '~> 2.12.0')
+  s.add_development_dependency('timecop', '~> 0.5')
   s.add_development_dependency('fakefs', '~> 0.4')
 
   s.files         = `git ls-files`.split("\n")

data/lib/elasticity/hive_step.rb

@@ -41,14 +41,7 @@ module Elasticity
         :action_on_failure => 'TERMINATE_JOB_FLOW',
         :hadoop_jar_step => {
           :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'
-          ],
+          :args => %w(s3://elasticmapreduce/libs/hive/hive-script --base-path s3://elasticmapreduce/libs/hive/ --install-hive --hive-versions latest)
         },
         :name => 'Elasticity - Install Hive'
       }

data/lib/elasticity/job_flow.rb

@@ -157,7 +157,10 @@ module Elasticity
         :instances => {
           :keep_job_flow_alive_when_no_steps => @keep_job_flow_alive_when_no_steps,
           :hadoop_version => @hadoop_version,
-          :instance_groups => jobflow_instance_groups
+          :instance_groups => jobflow_instance_groups,
+          :placement => {
+            :availability_zone => @placement
+          }
         }
       }
       preamble.merge!(:ec2_subnet_id => @ec2_subnet_id) if @ec2_subnet_id

data/lib/elasticity/version.rb

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

data/spec/lib/elasticity/job_flow_integration_spec.rb

@@ -17,7 +17,7 @@ describe 'Elasticity::JobFlow Integration Examples' do
 
     let(:hive_jobflow) do
       Elasticity::JobFlow.new('access', 'secret').tap do |jf|
-        jf.placement = 'us-west-1b'
+        jf.placement = 'us-west-1a'
         jf.log_uri = 's3n://slif-test/output/logs'
         jf.add_step(hive_step)
       end
@@ -45,6 +45,9 @@ describe 'Elasticity::JobFlow Integration Examples' do
                 :market => 'ON_DEMAND'
               },
           ],
+          :placement => {
+            :availability_zone => 'us-west-1a'
+          },
         },
         :steps => [
           {
@@ -99,7 +102,7 @@ describe 'Elasticity::JobFlow Integration Examples' do
 
     let(:pig_jobflow) do
       Elasticity::JobFlow.new('access', 'secret').tap do |jf|
-        jf.placement = 'us-west-1b'
+        jf.placement = 'us-west-1c'
         jf.instance_count = 8
         jf.slave_instance_type = 'm1.xlarge'
         jf.log_uri = 's3n://slif-test/output/logs'
@@ -128,8 +131,12 @@ describe 'Elasticity::JobFlow Integration Examples' do
                 :instance_type => 'm1.xlarge',
                 :market => 'ON_DEMAND'
               },
-          ]
+          ],
+          :placement => {
+            :availability_zone => 'us-west-1c'
+          },
         },
+
         :steps => [
           {
             :action_on_failure => 'TERMINATE_JOB_FLOW',
@@ -210,7 +217,10 @@ describe 'Elasticity::JobFlow Integration Examples' do
                 :instance_type => 'm1.small',
                 :market => 'ON_DEMAND'
               },
-          ]
+          ],
+          :placement => {
+            :availability_zone => 'us-west-1b'
+          },
         },
         :steps => [
           {

data/spec/lib/elasticity/job_flow_spec.rb

@@ -356,7 +356,10 @@ describe Elasticity::JobFlow do
         :instances => {
           :keep_job_flow_alive_when_no_steps => false,
           :hadoop_version => '1.0.3',
-          :instance_groups => ['INSTANCE_GROUP_CONFIGURATION']
+          :instance_groups => ['INSTANCE_GROUP_CONFIGURATION'],
+          :placement => {
+            :availability_zone => 'us-east-1a'
+          }
         }
       }
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elasticity
 version: !ruby/object:Gem::Version
-  version: '2.5'
+  version: 2.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-29 00:00:00.000000000 Z
+date: 2012-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: 2.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,23 +90,23 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: 2.12.0
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
@@ -187,18 +187,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4541363325950914992
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4541363325950914992
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24