heirloom 0.12.0 → 0.12.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: d6d73c91dfef2a41499f55632e29e331c92cdcb3
+  data.tar.gz: 7e42b9a64be37441bca4a742d63cd34d0ea677f5
+SHA512:
+  metadata.gz: 85b6bb627ea3cf373d788bde7217d1b774eeb13aa1855a48fcf41d5e7d653ed1cb1f1b90e2df09b22a864fc779f5720525566a7790704d182bfc3059779b89a1
+  data.tar.gz: 1a07e220a9ed9a3ea9bc78e16bbc39b0f5c033abd6174dff3760246daea2961e5a24245b12d8bc4c87a7ce5cb30f32ac05bd4d8dc822ab77d9a9361efdcd6dff

data/.ruby-version

@@ -1 +1 @@
-1.9.3
+2.0.0

data/.travis.yml

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

data/CHANGELOG.md

@@ -1,4 +1,8 @@
-## HEAD: 
+## HEAD:
+
+## 0.12.1 (09/04/2013):
+
+* Upgraded to fog 1.15.0
 
 ## 0.12.0 (08/14/2013):
 

data/heirloom.gemspec

@@ -25,10 +25,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency "vcr", '= 2.4.0'
   s.add_development_dependency "watchr"
 
-  s.add_runtime_dependency 'excon', '= 0.16'
-  s.add_runtime_dependency 'fog', '= 1.10.0'
+  s.add_runtime_dependency 'fog', '= 1.15.0'
   s.add_runtime_dependency 'hashie', '= 2.0.5'
   s.add_runtime_dependency 'trollop', '= 2.0'
   s.add_runtime_dependency 'xml-simple', '~> 1.1.2'
-
 end

data/lib/heirloom/aws/simpledb.rb

@@ -6,7 +6,7 @@ module Heirloom
 
       def initialize(args)
         @config = args[:config]
-        
+
         fog_args = { :region => @config.metadata_region }
 
         if @config.use_iam_profile

data/lib/heirloom/cli/catalog.rb

@@ -23,12 +23,12 @@ module Heirloom
         ensure_catalog_domain_exists :config  => @config,
                                      :catalog => @catalog
       end
-      
+
       def all
         if @opts[:json]
           jj catalog_with_heirloom_prefix_removed
         else
-          formatter = Heirloom::CLI::Formatter::Catalog.new 
+          formatter = Heirloom::CLI::Formatter::Catalog.new
           puts formatter.format :catalog => catalog_with_heirloom_prefix_removed,
                                 :name    => @opts[:name]
         end

data/lib/heirloom/cli/shared.rb

@@ -10,6 +10,11 @@ module Heirloom
         config.secret_key = opts[:aws_secret_key] if opts[:aws_secret_key]
         config.metadata_region = opts[:metadata_region] if opts[:metadata_region]
         config.use_iam_profile = opts[:use_iam_profile] if opts[:use_iam_profile]
+        if config.proxy
+          logger.debug "Using proxy #{config.proxy} from https_proxy environment variable."
+        else
+          logger.debug "Proxy environment variable https_proxy not set."
+        end
         config
       end
 

data/lib/heirloom/config.rb

@@ -22,6 +22,10 @@ module Heirloom
                                      false
     end
 
+    def proxy
+      @proxy ||= env.load 'https_proxy'
+    end
+
     private
 
     def load_config_file

data/lib/heirloom/version.rb

@@ -1,3 +1,3 @@
 module Heirloom
-  VERSION = "0.12.0"
+  VERSION = "0.12.1"
 end

data/spec/aws/simpledb_spec.rb

@@ -2,14 +2,10 @@ require 'spec_helper'
 
 describe Heirloom::AWS::SimpleDB do
 
-  before do
-    @sdb = Heirloom::AWS::SimpleDB.new :config => mock_config
-  end
+  let(:sdb) { Heirloom::AWS::SimpleDB.new :config => mock_config }
 
   context "credential management" do
-
     it "should use the access and secret keys by default" do
-
       config = mock_config :aws_access_key_id => 'key',
                            :aws_secret_access_key => 'secret'
 
@@ -19,45 +15,42 @@ describe Heirloom::AWS::SimpleDB do
                               :region => 'us-west-1'
 
       s3 = Heirloom::AWS::SimpleDB.new :config => config
-
     end
 
     it "should use the iam role if asked to" do
-
       config = mock_config :use_iam_profile => true
-      
+
       Fog::AWS::SimpleDB.should_receive(:new).
                          with :use_iam_profile => true,
                               :region => 'us-west-1'
       s3 = Heirloom::AWS::SimpleDB.new :config => config
-
     end
 
   end
 
   # Data recorded with VCR after running ./spec/fixtures/create_test_data.sh
   context "select", :vcr => true do
-    
+    let(:sdb) { Heirloom::AWS::SimpleDB.new :config => integration_or_mock_config }
+
     before do
-      @sdb = Heirloom::AWS::SimpleDB.new :config => integration_or_mock_config
       @q = "select * from `heirloom_test_data` where built_at > '2000-01-01T00:00:00.000Z' order by built_at desc"
     end
 
     it "should get results" do
-      keys = @sdb.select(@q).keys
+      keys = sdb.select(@q).keys
       keys.size.should == 10
       keys.first.should == "v10"
     end
 
     it "should be able to offset results" do
-      keys = @sdb.select(@q, :offset => 2).keys
+      keys = sdb.select(@q, :offset => 2).keys
       keys.size.should == 8
       keys.first.should == "v8"
     end
 
     it "should yield when requested" do
       num_yields = 0
-      @sdb.select(@q, :offset => 2) do |k, v|
+      sdb.select(@q, :offset => 2) do |k, v|
         num_yields += 1
       end
       num_yields.should == 8
@@ -66,11 +59,9 @@ describe Heirloom::AWS::SimpleDB do
   end
 
   context "sdb operations" do
-
     before do
       @fog_mock = mock 'fog'
       Fog::AWS::SimpleDB.stub :new => @fog_mock
-      @sdb = Heirloom::AWS::SimpleDB.new :config => mock_config
     end
 
     it "should list the domains in simples db" do
@@ -79,35 +70,35 @@ describe Heirloom::AWS::SimpleDB do
                 and_return body_mock
       body_mock.should_receive(:body).
                 and_return 'Domains' => ['domain1']
-      @sdb.domains.should == ['domain1']
+      sdb.domains.should == ['domain1']
     end
 
     it "should create a new domain when it does not exist" do
-      @sdb.should_receive(:domains).and_return([])
+      sdb.should_receive(:domains).and_return([])
       @fog_mock.should_receive(:create_domain).with('new_domain')
-      @sdb.create_domain('new_domain')
+      sdb.create_domain('new_domain')
     end
 
     it "should destroy the specified domain" do
       @fog_mock.should_receive(:delete_domain).with('new_domain')
-      @sdb.delete_domain('new_domain')
+      sdb.delete_domain('new_domain')
     end
 
     it "should not create a new domain when already exists" do
-      @sdb.should_receive(:domains).and_return(['new_domain'])
+      sdb.should_receive(:domains).and_return(['new_domain'])
       @fog_mock.should_receive(:create_domain).exactly(0).times
-      @sdb.create_domain('new_domain')
+      sdb.create_domain('new_domain')
     end
 
     it "should update the attributes for an entry" do
       @fog_mock.should_receive(:put_attributes).
         with('domain', 'key', {'key' => 'value'}, { "option" => "123" })
-      @sdb.put_attributes('domain', 'key', {'key' => 'value'}, { "option" => "123" })
+      sdb.put_attributes('domain', 'key', {'key' => 'value'}, { "option" => "123" })
     end
 
     it "should delete the given entry from sdb" do
       @fog_mock.should_receive(:delete_attributes).with('domain', 'key')
-      @sdb.delete('domain', 'key')
+      sdb.delete('domain', 'key')
     end
 
     context "testing counts" do
@@ -121,7 +112,7 @@ describe Heirloom::AWS::SimpleDB do
                   with('SELECT count(*) FROM `heirloom_domain`').
                   and_return @body_stub
         @body_stub.stub :body => data
-        @sdb.count('heirloom_domain').should == 1
+        sdb.count('heirloom_domain').should == 1
       end
 
       it "should return true if no entries for the domain" do
@@ -130,7 +121,7 @@ describe Heirloom::AWS::SimpleDB do
                   with('SELECT count(*) FROM `heirloom_domain`').
                   and_return @body_stub
         @body_stub.stub :body => data
-        @sdb.domain_empty?('heirloom_domain').should be_true
+        sdb.domain_empty?('heirloom_domain').should be_true
       end
 
       it "should return false if entries exist for the domain" do
@@ -139,7 +130,7 @@ describe Heirloom::AWS::SimpleDB do
                   with('SELECT count(*) FROM `heirloom_domain`').
                   and_return @body_stub
         @body_stub.stub :body => data
-        @sdb.domain_empty?('heirloom_domain').should be_false
+        sdb.domain_empty?('heirloom_domain').should be_false
       end
 
       it "should return the count for a specific itemName within a domain" do
@@ -148,7 +139,7 @@ describe Heirloom::AWS::SimpleDB do
                   with("SELECT count(*) FROM `heirloom` WHERE itemName() = 'archive'").
                   and_return @body_stub
         @body_stub.stub :body => data
-        @sdb.item_count('heirloom', 'archive').should == 1
+        sdb.item_count('heirloom', 'archive').should == 1
       end
     end
   end

data/spec/cli/shared_spec.rb

@@ -67,34 +67,35 @@ describe Heirloom do
 
     before do
       @config_mock = mock 'config'
-      @logger_mock = mock 'logger'
+      @logger_stub = stub 'logger', :debug => true
       @object = Object.new
       @object.extend Heirloom::CLI::Shared
-      Heirloom::Config.should_receive(:new).with(:logger => @logger_mock, :environment => nil).
+      Heirloom::Config.should_receive(:new).with(:logger => @logger_stub, :environment => nil).
                        and_return @config_mock
+      @config_mock.stub :proxy => nil
     end
 
     it "should return the configuration" do
-      @object.load_config(:logger => @logger_mock,
+      @object.load_config(:logger => @logger_stub,
                           :opts => {}).should == @config_mock
     end
 
     it "should set the metadata region if specified" do
       opts = { :metadata_region => 'us-west-1' }
       @config_mock.should_receive(:metadata_region=).with 'us-west-1'
-      @object.load_config :logger => @logger_mock, :opts => opts
+      @object.load_config :logger => @logger_stub, :opts => opts
     end
 
     it "should set the access key if specified" do
       opts = { :aws_access_key => 'the_key' }
       @config_mock.should_receive(:access_key=).with 'the_key'
-      @object.load_config :logger => @logger_mock, :opts => opts
+      @object.load_config :logger => @logger_stub, :opts => opts
     end
 
     it "should set the secret key if specified" do
       opts = { :aws_secret_key => 'the_secret' }
       @config_mock.should_receive(:secret_key=).with 'the_secret'
-      @object.load_config :logger => @logger_mock, :opts => opts
+      @object.load_config :logger => @logger_stub, :opts => opts
     end
 
   end

data/spec/config_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Heirloom do
 
   before do
-    @config_file = { 'default' => 
+    @config_file = { 'default' =>
                      { 'access_key'      => 'key',
                        'secret_key'      => 'secret',
                        'metadata_region' => 'us-west-2'
@@ -17,7 +17,6 @@ describe Heirloom do
     @opts = { :aws_access_key  => 'optkey',
               :aws_secret_key  => 'optsec',
               :metadata_region => 'optmd' }
-                 
   end
 
   context "#test the config file" do
@@ -43,6 +42,18 @@ describe Heirloom do
     end
   end
 
+  context "#reading env variables" do
+    it "should return the proxy as set by https_proxy" do
+      env_mock = mock 'env'
+      env_mock.should_receive(:load).with('HEIRLOOM_CONFIG_FILE').and_return(nil)
+      env_mock.should_receive(:load).with('HOME').and_return('~')
+      env_mock.should_receive(:load).with('https_proxy').and_return('https://proxy.example.com:3128')
+      Heirloom::Env.stub(:new).and_return(env_mock)
+      config = Heirloom::Config.new :opts => @opts
+      expect(config.proxy).to eq('https://proxy.example.com:3128')
+    end
+  end
+
   context "#with config file set" do
     before do
       env_mock = mock 'env'
@@ -70,7 +81,7 @@ describe Heirloom do
       config.secret_key.should == @config_file['default']['secret_key']
       config.metadata_region.should == @config_file['default']['metadata_region']
     end
-    
+
     it "should override config settings in file from opts" do
       File.stub :exists? => true
       File.should_receive(:open).with("~/.heirloom.yml").and_return(@config_file.to_yaml)

data/spec/spec_helper.rb

@@ -30,6 +30,7 @@ module SpecHelpers
     args[:secret_key]      ||= 'secret'
     args[:metadata_region] ||= 'us-west-1'
     args[:use_iam_profile] ||= false
+    args[:proxy]           ||= nil
 
     Hashie::Mash.new args
   end

metadata

@@ -1,36 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: heirloom
 version: !ruby/object:Gem::Version
-  version: 0.12.0
-  prerelease: 
+  version: 0.12.1
 platform: ruby
 authors:
 - Brett Weaver
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-14 00:00:00.000000000 Z
+date: 2013-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,23 +41,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -78,55 +69,34 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: watchr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: excon
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: '0.16'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: '0.16'
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.15.0
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -134,7 +104,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -142,7 +111,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -150,7 +118,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -158,7 +125,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: xml-simple
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -166,7 +132,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -316,27 +281,26 @@ files:
 - watchr.rb
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: heirloom
-rubygems_version: 1.8.24
+rubygems_version: 2.0.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: I help with deploying code into the cloud
 test_files:
 - spec/acl/s3_spec.rb