heirloom 0.12.1 → 0.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6d73c91dfef2a41499f55632e29e331c92cdcb3
-  data.tar.gz: 7e42b9a64be37441bca4a742d63cd34d0ea677f5
+  metadata.gz: decae42c86e0f9136bccc91e721bc442e9bb7370
+  data.tar.gz: 66989f1a4f9018f4e39383c1fd28c230d69566c2
 SHA512:
-  metadata.gz: 85b6bb627ea3cf373d788bde7217d1b774eeb13aa1855a48fcf41d5e7d653ed1cb1f1b90e2df09b22a864fc779f5720525566a7790704d182bfc3059779b89a1
-  data.tar.gz: 1a07e220a9ed9a3ea9bc78e16bbc39b0f5c033abd6174dff3760246daea2961e5a24245b12d8bc4c87a7ce5cb30f32ac05bd4d8dc822ab77d9a9361efdcd6dff
+  metadata.gz: 38a972e23a71f7f797959acac530987d9b3e6199aaf44bf6b56d174a344178ac4e00886e86decaf2f3105855b088ddd02e4a3e7339b2f05f523f4fc4241d8a9e
+  data.tar.gz: 499f01de342b1d059156336495f172a302a5d9fe824123643b78d4e4f6216917c98d2af69a1b0455a16e1f0de5f0f7c402d1259911ddfb8e24c9eaf3d787659c

data/.ruby-version

@@ -1 +1 @@
-2.0.0
+2.1.0

data/.travis.yml

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

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## HEAD:
 
+## 0.12.2 (03/26/2014):
+
+* Upgrade to fog 1.21.0
+* Remove VCR
+* Update specs to use double
+
 ## 0.12.1 (09/04/2013):
 
 * Upgraded to fog 1.15.0

data/README.md

@@ -1,5 +1,5 @@
 [![Build Status](https://secure.travis-ci.org/intuit/heirloom.png)](http://travis-ci.org/intuit/heirloom)
-
+[![Code Climate](https://codeclimate.com/github/intuit/heirloom.png)](https://codeclimate.com/github/intuit/heirloom)
 Heirloom
 ========
 
@@ -26,18 +26,24 @@ To get started, copy the sample below to ~/.heirloom.yml and update the specifie
 
 ```
 # default environment
+
 default:
   access_key: UPDATE_ME
   secret_key: UPDATE_ME
   metadata_region: us-west-1
-  
+
 # multiple environments can be defined and 
 # selected via cli with -e or --environment
 
-# prod:
-#   access_key: UPDATE_ME
-#   secret_key: UPDATE_ME
-#   metadata_region: us-west-1
+prod:
+  access_key: UPDATE_ME
+  secret_key: UPDATE_ME
+  metadata_region: us-west-1
+
+preprod:
+  access_key: UPDATE_ME
+  secret_key: UPDATE_ME
+  metadata_region: us-west-1
 ```
 
 You can specify an alternate config file by setting "HEIRLOOM_CONFIG_FILE" 

data/heirloom.gemspec

@@ -20,13 +20,11 @@ Gem::Specification.new do |s|
 
   # specify any dependencies here; for example:
   s.add_development_dependency "rake"
-  s.add_development_dependency "rspec", '~> 2.11.0'
+  s.add_development_dependency "rspec", '~> 2.14.1'
   s.add_development_dependency "simplecov"
-  s.add_development_dependency "vcr", '= 2.4.0'
-  s.add_development_dependency "watchr"
 
-  s.add_runtime_dependency 'fog', '= 1.15.0'
+  s.add_runtime_dependency 'fog', '= 1.21.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'
+  s.add_runtime_dependency 'xml-simple', '~> 1.1.3'
 end

data/lib/heirloom/catalog/verify.rb

@@ -10,10 +10,10 @@ module Heirloom
 
       def catalog_domain_exists?
         if sdb.domain_exists? 'heirloom'
-          @logger.debug "Catalog exists in #{@region}."
+          @logger.debug "Catalog of Heirlooms exists in #{@region}."
           true
         else
-          @logger.debug "Catalog does not exist in #{@region}."
+          @logger.debug "Catalog of Heirlooms does not exist in #{@region}."
           false
         end
       end

data/lib/heirloom/cli/authorize.rb

@@ -57,8 +57,7 @@ EOS
           opt :id, "ID of the Heirloom to authorize.", :type => :string
           opt :level, "Log level [debug|info|warn|error].", :type    => :string,
                                                             :default => 'info'
-          opt :metadata_region, "AWS region to store Heirloom metadata.", :type    => :string,   
-                                                                          :default => 'us-west-1'
+          opt :metadata_region, "AWS region to store Heirloom metadata.", :type => :string
           opt :name, "Name of Heirloom.", :type => :string
           opt :aws_access_key, "AWS Access Key ID", :type => :string, 
                                                     :short => :none

data/lib/heirloom/cli/catalog.rb

@@ -17,27 +17,71 @@ module Heirloom
         ensure_valid_options :provided => @opts,
                              :required => [],
                              :config   => @config
-        ensure_valid_region :region => @opts[:metadata_region],
-                            :config => @config
-        @catalog = Heirloom::Catalog.new :config  => @config
-        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
-          puts formatter.format :catalog => catalog_with_heirloom_prefix_removed,
-                                :name    => @opts[:name]
+        detected_regions.each do |region|
+          @config.metadata_region = region
+
+          ensure_valid_region :region => region,
+                              :config => @config
+
+          next unless catalog_domain_exists?
+
+          @catalog_list = Hash[@catalog.all]
+
+          unless @opts[:name]
+            heirloom_summary region
+            @heirloom_found = true
+            next
+          end
+
+          if heirloom_exists_in_catalog? @opts[:name]
+            @logger.debug "Heirloom \'#{@opts[:name]}\' found in catalog for #{region}."
+            heirloom_details region, @opts[:name]
+            @heirloom_found = true
+          else
+            @logger.debug "Heirloom \'#{@opts[:name]}\' not found in catalog for #{region}."
+          end
         end
+
+        @logger.info "Heirloom \'#{@opts[:name]}\' not found in any regions." unless @heirloom_found
       end
 
       private
 
-      def catalog_with_heirloom_prefix_removed
-        Hash[@catalog.all.sort.map { |k, v| [k.sub(/heirloom_/, ''), v] }]
+      def heirloom_summary(region)
+        puts formatter.summary_format :region  => region
+      end
+
+      def heirloom_details(region,name)
+        puts formatter.detailed_format :region  => region,
+                                       :name    => name
+      end
+
+      def catalog_domain_exists?
+        @catalog = Heirloom::Catalog.new :config  => @config
+        ensure_catalog_domain_exists :config  => @config,
+                                     :catalog => @catalog,
+                                     :continue_on_error => true
+      end
+
+
+      def default_regions
+        %w(us-east-1 us-west-1 us-west-2)
+      end
+
+      def detected_regions
+        return default_regions if @opts[:all_regions]
+        Array(@opts[:metadata_region] || @config.metadata_region || default_regions)
+      end
+
+      def formatter
+        @formatter = Heirloom::CLI::Formatter::Catalog.new  :catalog => @catalog_list
+      end
+
+      def heirloom_exists_in_catalog?(name)
+        @catalog_list.include? "heirloom_#{name}"
       end
 
       def read_options
@@ -51,17 +95,16 @@ Usage:
 
 heirloom catalog
 
-EOS
+          EOS
           opt :help, "Display Help"
           opt :level, "Log level [debug|info|warn|error].", :type    => :string,
                                                             :default => 'info'
-          opt :json, "Dump full catalog as raw JSON."
           opt :name, "Name of Heirloom to show full details.", :type => :string
-          opt :metadata_region, "AWS region to store Heirloom metadata.", :type    => :string,   
-                                                                          :default => 'us-west-1'
-          opt :aws_access_key, "AWS Access Key ID", :type => :string, 
+          opt :metadata_region, "AWS region to store Heirloom metadata.", :type => :string
+          opt :all_regions, "Return catalog of all regions."
+          opt :aws_access_key, "AWS Access Key ID", :type  => :string,
                                                     :short => :none
-          opt :aws_secret_key, "AWS Secret Access Key", :type => :string, 
+          opt :aws_secret_key, "AWS Secret Access Key", :type  => :string,
                                                         :short => :none
           opt :use_iam_profile, "Use IAM EC2 Profile", :short => :none
           opt :environment, "Environment (defined in ~/.heirloom.yml)", :type => :string

data/lib/heirloom/cli/cleanup.rb

@@ -57,8 +57,7 @@ EOS
           opt :help, "Display Help"
           opt :log_level, "Log level [debug|info|warn|error].", :type    => :string,
                                                                 :default => 'info'
-          opt :metadata_region, "AWS region to store Heirloom metadata.", :type    => :string,   
-                                                                          :default => 'us-west-1'
+          opt :metadata_region, "AWS region to store Heirloom metadata.", :type => :string
           opt :name, "Name of Heirloom.", :type => :string
           opt :keep, "Number of unpreserved heirlooms to keep.", :default => 100
 

data/lib/heirloom/cli/destroy.rb

@@ -52,8 +52,7 @@ EOS
           opt :id, "ID of the Heirloom to display.", :type => :string
           opt :level, "Log level [debug|info|warn|error].", :type    => :string,
                                                             :default => 'info'
-          opt :metadata_region, "AWS region to store Heirloom metadata.", :type    => :string,   
-                                                                          :default => 'us-west-1'
+          opt :metadata_region, "AWS region to store Heirloom metadata.", :type => :string
           opt :name, "Name of Heirloom.", :type => :string
           opt :aws_access_key, "AWS Access Key ID", :type => :string, 
                                                     :short => :none

data/lib/heirloom/cli/download.rb

@@ -77,13 +77,12 @@ EOS
           opt :id, "ID of the Heirloom to download.", :type => :string
           opt :level, "Log level [debug|info|warn|error].", :type    => :string,
                                                             :default => 'info'
-          opt :metadata_region, "AWS region to store Heirloom metadata.", :type    => :string,
-                                                                          :default => 'us-west-1'
+          opt :metadata_region, "AWS region to store Heirloom metadata.", :type => :string
           opt :name, "Name of Heirloom.", :type => :string
           opt :output, "Path to output downloaded Heirloom. Must be existing directory.", :type => :string
           opt :region, "Region to download Heirloom.", :type    => :string,
                                                        :default => 'us-west-1'
-          opt :secret, "Secret for ecrypted Heirloom.", :type => :string
+          opt :secret, "Secret for encrypted Heirloom.", :type => :string
           opt :secret_file, "Read secret from file.", :type  => :string,
                                                       :short => :none
           opt :aws_access_key, "AWS Access Key ID", :type => :string, 

data/lib/heirloom/cli/formatter/catalog.rb

@@ -2,41 +2,55 @@ module Heirloom
   module CLI
     module Formatter
       class Catalog
-        def format(args)
-          @catalog = args[:catalog]
-          @name    = args[:name]
 
-          return summary unless @name
+        def initialize(args)
+          @catalog = args[:catalog]
+        end
 
-          return "Heirloom #{@name} not found in catalog." unless name_exists?
+        def detailed_format(args)
+          @name    = args[:name]
+          @region  = args[:region]
 
           filter_by_name
           details
+         end
+
+        def summary_format(args)
+          @region  = args[:region]
+
+          summary
         end
 
         private
 
-        def name_exists?
-          @catalog.include? @name
+        def remove_heirloom_prefix
+          Hash[@catalog.sort.map { |k, v| [k.sub(/heirloom_/, ''), v] }]
+        end
+
+        def add_indent_prefix
+          Hash[remove_heirloom_prefix.sort.map { |k, v| [k.sub(/^/, '  '), v] }]
         end
 
         def filter_by_name
-          @catalog.select! {|k| @name == k }
+          @catalog.select! {|k| "heirloom_#{@name}" == k }
         end
 
         def summary
-          @catalog.keys.join "\n"
+          s = @region + "\n"
+          s << add_indent_prefix.keys.join("\n")
         end
 
         def details
+          @catalog = remove_heirloom_prefix
           data = @catalog.each_pair.map do |k,v|
-            urls = v["regions"].map do |region|
+            urls = v["regions"].sort.map do |region|
               bucket_prefix = v["bucket_prefix"].first
               "  #{region}-s3-url : s3://#{bucket_prefix}-#{region}/#{k}"
             end
 
             d = k + "\n"
-            d << "  regions          : " + @catalog[k]["regions"].join(", ") + "\n"
+            d << "  metadata_region  : #{@region}\n"
+            d << "  regions          : " + @catalog[k]["regions"].sort.join(", ") + "\n"
             d << "  bucket_prefix    : " + @catalog[k]["bucket_prefix"].first + "\n"
             d << urls.join("\n")
           end

data/lib/heirloom/cli/list.rb

@@ -52,11 +52,9 @@ EOS
           opt :count, "Number of IDs to return.", :type    => :integer,
                                                   :default => 10
           opt :help, "Display Help"
-          opt :json, "Display output as raw JSON."
           opt :level, "Log level [debug|info|warn|error].", :type    => :string,
                                                             :default => 'info'
-          opt :metadata_region, "AWS region to store Heirloom metadata.", :type    => :string,   
-                                                                          :default => 'us-west-1'
+          opt :metadata_region, "AWS region to store Heirloom metadata.", :type => :string
           opt :name, "Name of Heirloom.", :type => :string
           opt :aws_access_key, "AWS Access Key ID", :type => :string, 
                                                     :short => :none

data/lib/heirloom/cli/rotate.rb

@@ -66,8 +66,7 @@ EOS
           opt :id, "ID of the Heirloom to rotate.", :type => :string
           opt :level, "Log level [debug|info|warn|error].", :type    => :string,
                                                             :default => 'info'
-          opt :metadata_region, "AWS region to store Heirloom metadata.", :type    => :string,
-                                                                          :default => 'us-west-1'
+          opt :metadata_region, "AWS region to store Heirloom metadata.", :type    => :string
           opt :name, "Name of Heirloom.", :type => :string
           opt :region, "Region to download Heirloom.", :type    => :string,
                                                        :default => 'us-west-1'

data/lib/heirloom/cli/setup.rb

@@ -81,8 +81,7 @@ us-east-1' will create bucket test-us-west-1 in us-west-1 and test-us-east-1 in
           opt :help, "Display Help"
           opt :level, "Log level [debug|info|warn|error].", :type    => :string,
                                                             :default => 'info'
-          opt :metadata_region, "AWS region to store Heirloom metadata.", :type    => :string,
-                                                                          :default => 'us-west-1'
+          opt :metadata_region, "AWS region to store Heirloom metadata.", :type    => :string
           opt :name, "Name of Heirloom.", :type => :string
           opt :region, "AWS Region(s) to upload Heirloom. \
 Can be specified multiple times.", :type  => :string, 

data/lib/heirloom/cli/shared.rb

@@ -167,13 +167,16 @@ module Heirloom
       def ensure_catalog_domain_exists(args)
         config  = args[:config]
         catalog = args[:catalog]
+        continue_on_error = args[:continue_on_error]
         logger  = config.logger
         region  = config.metadata_region
 
         unless catalog.catalog_domain_exists?
+          return false if continue_on_error
           logger.error "Catalog does not exist in #{region}."
           exit 1
         end
+        true
       end
 
       def ensure_entry_exists_in_catalog(args)

data/lib/heirloom/cli/show.rb

@@ -63,11 +63,9 @@ EOS
           opt :help, "Display Help"
           opt :all, "Display all attributes (includes internal heirloom settings)."
           opt :id, "ID of the Heirloom to display.", :type => :string
-          opt :json, "Display output as raw JSON."
           opt :level, "Log level [debug|info|warn|error].", :type    => :string,
                                                             :default => 'info'
-          opt :metadata_region, "AWS region to store Heirloom metadata.", :type    => :string,   
-                                                                          :default => 'us-west-1'
+          opt :metadata_region, "AWS region to store Heirloom metadata.", :type => :string
           opt :name, "Name of Heirloom.", :type => :string
           opt :aws_access_key, "AWS Access Key ID", :type => :string, 
                                                     :short => :none

data/lib/heirloom/cli/tag.rb

@@ -56,8 +56,7 @@ EOS
           opt :id, "ID of the Heirloom to tag.", :type => :string
           opt :level, "Log level [debug|info|warn|error].", :type    => :string,
                                                             :default => 'info'
-          opt :metadata_region, "AWS region to store Heirloom metadata.", :type    => :string,   
-                                                                          :default => 'us-west-1'
+          opt :metadata_region, "AWS region to store Heirloom metadata.", :type    => :string
           opt :name, "Name of Heirloom.", :type => :string
           opt :value, "Value of attribute.", :type  => :string,
                                              :short => 'u'

data/lib/heirloom/cli/teardown.rb

@@ -73,8 +73,7 @@ EOS
           opt :help, "Display Help"
           opt :level, "Log level [debug|info|warn|error].", :type    => :string,
                                                             :default => 'info'
-          opt :metadata_region, "AWS region to store Heirloom metadata.", :type    => :string,
-                                                                          :default => 'us-west-1'
+          opt :metadata_region, "AWS region to store Heirloom metadata.", :type    => :string
           opt :name, "Name of Heirloom.", :type => :string
           opt :force, "Forces recursive deletion of existing archives."
           opt :keep_buckets, "Do not delete S3 buckets."

data/lib/heirloom/cli/upload.rb

@@ -93,8 +93,7 @@ Can be specified multiple times.", :type  => :string, :multi => true, :short =>
           opt :id, "ID for Heirloom.", :type => :string
           opt :level, "Log level [debug|info|warn|error].", :type    => :string,
                                                             :default => 'info'
-          opt :metadata_region, "AWS region to store Heirloom metadata.", :type    => :string,
-                                                                          :default => 'us-west-1'
+          opt :metadata_region, "AWS region to store Heirloom metadata.", :type    => :string
           opt :name, "Name of Heirloom.", :type => :string
           opt :public, "Set this Heirloom as public readable?"
           opt :secret, "Encrypt the Heirloom with given secret.", :type => :string

data/lib/heirloom/version.rb

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

data/spec/acl/s3_spec.rb

@@ -2,11 +2,11 @@ require 'spec_helper'
 
 describe Heirloom do
   before do
-    @config_mock = double 'config'
-    @logger_stub = stub 'logger', :info => true, :debug => true
-    @config_mock.stub :logger => @logger_stub
+    @config_double = double 'config'
+    @logger_double = double 'logger', :info => true, :debug => true
+    @config_double.stub :logger => @logger_double
 
-    @s3 = Heirloom::ACL::S3.new :config  => @config_mock,
+    @s3 = Heirloom::ACL::S3.new :config  => @config_double,
                                 :region  => 'us-west-1'
   end
 
@@ -17,17 +17,17 @@ describe Heirloom do
                'ID' => '123'
               }
            }
-    s3_mock = mock 's3'
+    s3_double = double 's3'
 
     @s3.should_receive(:s3).exactly(2).times.
-                            and_return(s3_mock)
+                            and_return(s3_double)
 
-    s3_mock.should_receive(:get_object_acl).
-            with(:bucket => 'bucket', :object_name => 'key-folder/key.tar.gz').
-            and_return acls
+    s3_double.should_receive(:get_object_acl).
+              with(:bucket => 'bucket', :object_name => 'key-folder/key.tar.gz').
+              and_return acls
 
-    s3_mock.should_receive(:put_object_acl).
-            with("bucket", "key-folder/key.tar.gz", {"Owner"=>{"DisplayName"=>"Brett", "ID"=>"123"}, "AccessControlList"=>[{"Grantee"=>{"EmailAddress"=>"acct1@test.com"}, "Permission"=>"READ"}, {"Grantee"=>{"EmailAddress"=>"acct2@test.com"}, "Permission"=>"READ"}, {"Grantee"=>{"DisplayName"=>"Brett", "ID"=>"123"}, "Permission"=>"FULL_CONTROL"}]})
+    s3_double.should_receive(:put_object_acl).
+              with("bucket", "key-folder/key.tar.gz", {"Owner"=>{"DisplayName"=>"Brett", "ID"=>"123"}, "AccessControlList"=>[{"Grantee"=>{"EmailAddress"=>"acct1@test.com"}, "Permission"=>"READ"}, {"Grantee"=>{"EmailAddress"=>"acct2@test.com"}, "Permission"=>"READ"}, {"Grantee"=>{"DisplayName"=>"Brett", "ID"=>"123"}, "Permission"=>"FULL_CONTROL"}]})
 
     @s3.allow_read_access_from_accounts :bucket     => 'bucket', 
                                         :key_name   => 'key.tar.gz',