composer 0.0.5 → 0.0.6

data/.travis.yml

@@ -0,0 +1,4 @@
+rvm:
+  - 1.9.2
+  - 1.9.3
+script: "rake spec"

data/CHANGELOG

@@ -1,3 +1,7 @@
+## 0.0.6:
+
+* Added proxy support through https_proxy variable
+
 ## 0.0.5:
 
 * Fixed region logic in key pairs

data/README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://secure.travis-ci.org/intuit/composer.png)](http://travis-ci.org/intuit/composer)
+
 # Composer
 
 I help setup new projects on the Intuit Cloud Agility Platform

data/lib/composer/config.rb

@@ -9,9 +9,21 @@ module Composer
     end
 
     def configure_aws
-      ::AWS.config :access_key_id     => aws_access_key,
-                   :secret_access_key => aws_secret_key,
-                   :region            => region
+      options = { :access_key_id     => aws_access_key,
+                  :secret_access_key => aws_secret_key,
+                  :region            => region }
+
+      if https_proxy
+        options[:proxy_uri] = https_proxy
+      end
+
+      ::AWS.config options
+    end
+
+    private
+
+    def https_proxy
+      ENV['https_proxy']
     end
 
   end

data/lib/composer/version.rb

@@ -1,3 +1,3 @@
 module Composer
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/compose_spec.rb

@@ -60,6 +60,7 @@ describe Composer::Compose do
     @deploy_stack_mock.should_receive(:create).
                        with(:directory => '/tmp/dir',
                             :key       => 'key',
+                            :secret    => 'test1234',
                             :name      => 'name')
 
     @compose.run

data/spec/config_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe Composer::Config do
+
+  before do
+    @config = Composer::Config.new :log_level => 'info'
+    @config.aws_secret_key = 'secret'
+    @config.aws_access_key = 'key'
+    @config.region         = 'region'
+  end
+
+  context "testing proxy settings" do
+    before do
+      @options = { :access_key_id     => 'key',
+                   :secret_access_key => 'secret',
+                   :region            => 'region' }
+    end
+
+    it "should set the https_proxy if https_proxy env set" do
+      @config.stub :https_proxy => 'theproxy'
+      @options[:proxy_uri] = 'theproxy'
+      ::AWS.should_receive(:config).with @options
+      @config.configure_aws
+    end
+
+    it "should not set the https_proxy if https_proxy env not set" do
+      @config.stub :https_proxy => nil
+      ::AWS.should_receive(:config).with @options
+      @config.configure_aws
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: composer
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-18 00:00:00.000000000 Z
+date: 2012-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70135633813960 !ruby/object:Gem::Requirement
+  requirement: &70095561528160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70135633813960
+  version_requirements: *70095561528160
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70135633812960 !ruby/object:Gem::Requirement
+  requirement: &70095561527580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70135633812960
+  version_requirements: *70095561527580
 - !ruby/object:Gem::Dependency
   name: aws-sdk
-  requirement: &70135633812400 !ruby/object:Gem::Requirement
+  requirement: &70095561526320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,7 +43,7 @@ dependencies:
         version: 1.7.1
   type: :runtime
   prerelease: false
-  version_requirements: *70135633812400
+  version_requirements: *70095561526320
 description: I deploy and manage AWS resources.
 email:
 - brett@weav.net
@@ -54,6 +54,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rvmrc
+- .travis.yml
 - CHANGELOG
 - Gemfile
 - LICENSE.txt
@@ -85,6 +86,7 @@ files:
 - lib/composer/verify/secret.rb
 - lib/composer/version.rb
 - spec/compose_spec.rb
+- spec/config_spec.rb
 - spec/spec_helper.rb
 homepage: ''
 licenses: []
@@ -100,7 +102,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -926317595969483121
+      hash: 2440372189325897542
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -109,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -926317595969483121
+      hash: 2440372189325897542
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.16
@@ -118,4 +120,5 @@ specification_version: 3
 summary: I deploy and manage AWS resources.
 test_files:
 - spec/compose_spec.rb
+- spec/config_spec.rb
 - spec/spec_helper.rb