heirloom 0.12.3 → 0.12.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7b6780177f9642c797541d6730045defd34ad39
-  data.tar.gz: eaa96e012726570ab11c0c93d70fb77dfd26fc18
+  metadata.gz: 387329119518755b3986e46b25f5bf67213cbff2
+  data.tar.gz: ebfd043ec1a6bb70acbb49cf76532b4dbb2ca8e7
 SHA512:
-  metadata.gz: 346534a56c069eb25fc47b6b0a221d34948f3a90fe1397c2970f65ddd9a297709aea57a5b5567aeb034bac248bec4b9ba2399a7f183d685f0c04c6750f7e81d9
-  data.tar.gz: 32f7530a706b86cccb63400cea21692df5342760e5880eb88cc6a4f5cefcbb9e2f0661bbcceef0be74e6d9435ac0b19b73da746b5952889ce14a5b9147893246
+  metadata.gz: b37e92d8b09bef36e6cf1acf078383e62d6c2cd7812e5a18a3d3a9751a36b57d18076ce089dc08cb9271bcbc6b46e74f94c50e55c0fb14adae04929588dc2697
+  data.tar.gz: 0e2084f9ed3d225aae3989bac5bc6b181454a806a18a96fd68fa1d3d427070ad71cad3164cb5590c63cfe5a6e17551f691a8b9d507bfdf9e9f45d4e1fc663a4c

data/CHANGELOG.md

@@ -1,4 +1,10 @@
-## HEAD:
+## 0.12.4: (04/02/2014):
+
+* Bug fix in setup to properly read metadata region from config
+* Update to CLI environment message
+* Added SimpleDB debug query logging
+* Bug fix in catalog to return proper errors when catalog not found
+* Removed unused JSON output from CLI
 
 ## 0.12.3 (03/26/2014):
 

data/README.md

@@ -32,8 +32,8 @@ default:
   secret_key: UPDATE_ME
   metadata_region: us-west-1
 
-# multiple environments can be defined and 
-# selected via cli with -e or --environment
+# multiple environments can be defined in heirloom.yml and selected
+# via the cli with the -e or --environment option
 
 prod:
   access_key: UPDATE_ME
@@ -46,7 +46,11 @@ preprod:
   metadata_region: us-west-1
 ```
 
-You can specify an alternate config file by setting "HEIRLOOM_CONFIG_FILE" 
+By default, heirloom will load **.heirloom.yml** from your home directory.
+
+You can specify an alternate config file by setting the HEIRLOOM_CONFIG_FILE
+environment variable
+
 ```
 export HEIRLOOM_CONFIG_FILE="~/special_config.yml"
 ```

data/lib/heirloom/archive/downloader.rb

@@ -24,7 +24,7 @@ module Heirloom
 
       raw_archive = s3_downloader.download_file :bucket => bucket,
                                                 :key    => key
-      
+
       return false unless raw_archive
 
       archive = cipher_data.decrypt_data :data   => raw_archive,

data/lib/heirloom/archive/lister.rb

@@ -4,7 +4,7 @@ module Heirloom
 
     def initialize(args)
       @config = args[:config]
-      @name = args[:name]
+      @name   = args[:name]
       @domain = "heirloom_#{@name}"
     end
 

data/lib/heirloom/aws/simpledb.rb

@@ -6,6 +6,7 @@ module Heirloom
 
       def initialize(args)
         @config = args[:config]
+        @logger = @config.logger
 
         fog_args = { :region => @config.metadata_region }
 
@@ -44,26 +45,34 @@ module Heirloom
       end
 
       def select(query, opts = {})
-        has_more = true
+        has_more   = true
         next_token = nil
-        results = {}
+        results    = {}
+
+        logger.debug "Executing simpledb query '#{query}'."
 
         if opts[:offset] && opts[:offset] > 0
           limit = @sdb.select("#{query} limit #{opts[:offset]}").body
           if limit['NextToken']
+            logger.debug "Next token found. Retrieving results."
             next_token = limit['NextToken']
           else
+            logger.debug "No more results. Query complete."
             has_more = false
           end
         end
+
         while has_more
+          logger.debug "Retrieving results from next token '#{next_token}'." if next_token
           more = @sdb.select(query, 'NextToken' => next_token).body
           more['Items'].each do |k, v|
             block_given? ? yield(k, v) : results[k] = v
           end
           if more['NextToken']
+            logger.debug "Next token found. Retrieving results."
             next_token = more['NextToken']
           else
+            logger.debug "No more results. Query complete."
             has_more = false
           end
         end
@@ -84,6 +93,10 @@ module Heirloom
         @sdb.select(query).body['Items']['Domain']['Count'].first.to_i
       end
 
+      def logger
+        @logger
+      end
+
     end
   end
 

data/lib/heirloom/cli/authorize.rb

@@ -17,9 +17,8 @@ module Heirloom
         ensure_valid_options :provided => @opts,
                              :required => [:accounts, :name, :id],
                              :config   => @config
-        ensure_valid_region :region => @opts[:metadata_region],
-                            :config => @config
-        ensure_domain_exists :name => @opts[:name], 
+        ensure_valid_metadata_region @config
+        ensure_domain_exists :name => @opts[:name],
                              :config => @config
         @archive = Archive.new :name   => @opts[:name],
                                :id     => @opts[:id],
@@ -64,7 +63,7 @@ EOS
           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
+          opt :environment, "Environment (defined in heirloom config file)", :type => :string
         end
       end
 

data/lib/heirloom/cli/catalog.rb

@@ -20,13 +20,17 @@ module Heirloom
       end
 
       def all
-        detected_regions.each do |region|
+        regions = detected_regions
+        @logger.info "Querying regions #{regions.join(', ')} for Heirloom catalogs."
+        regions.each do |region|
           @config.metadata_region = region
 
-          ensure_valid_region :region => region,
-                              :config => @config
+          ensure_valid_metadata_region @config
 
-          next unless catalog_domain_exists?
+          unless catalog_domain_exists?
+            @logger.info "No heirloom catalog in '#{region}'."
+            next
+          end
 
           @catalog_list = Hash[@catalog.all]
 
@@ -37,15 +41,21 @@ module Heirloom
           end
 
           if heirloom_exists_in_catalog? @opts[:name]
-            @logger.debug "Heirloom \'#{@opts[:name]}\' found in catalog for #{region}."
+            @logger.info "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}."
+            @logger.info "Heirloom \'#{@opts[:name]}\' not found in catalog for #{region}."
           end
         end
 
-        @logger.info "Heirloom \'#{@opts[:name]}\' not found in any regions." unless @heirloom_found
+        unless @heirloom_found
+          if @opts[:name]
+            @logger.info "Heirloom \'#{@opts[:name]}\' not found in any regions."
+          else
+            @logger.info "Heirloom catalog not found in any regions."
+          end
+        end
       end
 
       private
@@ -107,7 +117,7 @@ heirloom catalog
           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
+          opt :environment, "Environment (defined in heirloom config file)", :type => :string
         end
       end
 

data/lib/heirloom/cli/cleanup.rb

@@ -14,24 +14,16 @@ module Heirloom
 
         Heirloom.log.level = @opts[:log_level]
 
-        ensure_valid_options(
-          :provided => @opts,
-          :required => [:name],
-          :config   => @config
-        )
+        ensure_valid_options :provided => @opts,
+                             :required => [:name],
+                             :config   => @config
 
-        ensure_valid_region(
-          :region => @opts[:metadata_region],
-          :config => @config
-        )
-
-        ensure_domain_exists(
-          :name   => @opts[:name],
-          :config => @config
-        )
+        ensure_valid_metadata_region @config
 
+        ensure_domain_exists :name   => @opts[:name],
+                             :config => @config
       end
-      
+
       def cleanup
         cat = Heirloom::Catalog.new :name => @opts[:name], :config => @config
         cat.cleanup :num_to_keep => @opts[:keep]
@@ -65,7 +57,7 @@ EOS
                                                     :short => :none
           opt :aws_secret_key, "AWS Secret Access Key", :type  => :string, 
                                                         :short => :none
-          opt :environment, "Environment (defined in ~/.heirloom.yml)", :type => :string
+          opt :environment, "Environment (defined in heirloom config file)", :type => :string
         end
       end
     end

data/lib/heirloom/cli/destroy.rb

@@ -17,8 +17,7 @@ module Heirloom
         ensure_valid_options :provided => @opts,
                              :required => [:name, :id],
                              :config   => @config
-        ensure_valid_region :region => @opts[:metadata_region],
-                            :config => @config
+        ensure_valid_metadata_region @config
         ensure_domain_exists :name => @opts[:name], :config => @config
 
         @name = @opts[:name]
@@ -59,7 +58,7 @@ EOS
           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
+          opt :environment, "Environment (defined in heirloom config file)", :type => :string
         end
       end
     end

data/lib/heirloom/cli/download.rb

@@ -22,7 +22,7 @@ module Heirloom
                                          :config  => @config
 
         # Can't use fetch as Trollop sets :id to nil
-        id = @opts[:id] ||( latest_id :name   => @opts[:name],                                              
+        id = @opts[:id] ||( latest_id :name   => @opts[:name],
                                       :config => @config)
 
         @archive = Archive.new :name   => @opts[:name],
@@ -39,7 +39,7 @@ module Heirloom
         @region = @opts[:region] || @catalog.regions.first
         @bucket_prefix = @opts[:bucket_prefix] || @catalog.bucket_prefix
       end
-      
+
       def download
         ensure_path_is_directory     :path => @opts[:output], :config => @config
         ensure_directory_is_writable :path => @opts[:output], :config => @config
@@ -90,7 +90,7 @@ EOS
           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
+          opt :environment, "Environment (defined in heirloom config file)", :type => :string
         end
       end
     end

data/lib/heirloom/cli/list.rb

@@ -17,22 +17,17 @@ module Heirloom
         ensure_valid_options :provided => @opts,
                              :required => [:name],
                              :config   => @config
-        ensure_valid_region :region => @opts[:metadata_region],
-                            :config => @config
+        ensure_valid_metadata_region @config
         ensure_domain_exists :name => @opts[:name], :config => @config
 
         @archive = Archive.new :name   => @opts[:name],
                                :config => @config
       end
-      
+
       def list(count = @opts[:count])
         @logger.debug "#{@archive.count} IDs found."
         list = @archive.list count
-        if @opts[:json]
-          jj list
-        else
-          puts list.join "\n"
-        end
+        puts list.join "\n"
       end
 
       private
@@ -61,7 +56,7 @@ EOS
           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
+          opt :environment, "Environment (defined in heirloom config file)", :type => :string
         end
       end
 

data/lib/heirloom/cli/rotate.rb

@@ -35,7 +35,7 @@ module Heirloom
         @opts[:region]        ||= @catalog.regions.first
         @opts[:bucket_prefix] ||= @catalog.bucket_prefix
       end
-      
+
       def rotate
         @archive.rotate @opts
       rescue Heirloom::Exceptions::RotateFailed => e
@@ -78,6 +78,7 @@ EOS
                                                     :short => :none
           opt :aws_secret_key, "AWS Secret Access Key", :type => :string, 
                                                         :short => :none
+          opt :environment, "Environment (defined in heirloom config)", :type => :string
         end
       end
     end

data/lib/heirloom/cli/setup.rb

@@ -14,9 +14,8 @@ module Heirloom
         @config = load_config :logger => @logger,
                               :opts   => @opts
 
-        ensure_valid_options :provided => @opts, 
-                             :required => [:metadata_region, 
-                                           :bucket_prefix,
+        ensure_valid_options :provided => @opts,
+                             :required => [:bucket_prefix,
                                            :region, :name],
                              :config   => @config
 
@@ -27,13 +26,12 @@ module Heirloom
       end
 
       def setup
-        ensure_valid_region :region => @opts[:metadata_region],
-                            :config => @config
+        ensure_valid_metadata_region @config
 
         ensure_valid_regions :regions => @opts[:region],
                              :config  => @config
 
-        ensure_metadata_in_upload_region :config  => @config, 
+        ensure_metadata_in_upload_region :config  => @config,
                                          :regions => @opts[:region]
 
         ensure_valid_name :config => @config,
@@ -92,7 +90,7 @@ Can be specified multiple times.", :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
+          opt :environment, "Environment (defined in heirloom config file)", :type => :string
         end
       end
 

data/lib/heirloom/cli/shared.rb

@@ -76,6 +76,11 @@ module Heirloom
         end
       end
 
+      def ensure_valid_metadata_region(config)
+        ensure_valid_region :region => config.metadata_region,
+                            :config => config
+      end
+
       def ensure_metadata_in_upload_region(args)
         config  = args[:config]
         regions = args[:regions]

data/lib/heirloom/cli/show.rb

@@ -17,9 +17,8 @@ module Heirloom
         ensure_valid_options :provided => @opts,
                              :required => [:name],
                              :config   => @config
-        ensure_valid_region :region => @opts[:metadata_region],
-                            :config => @config
-        ensure_domain_exists :name   => @opts[:name], 
+        ensure_valid_metadata_region @config
+        ensure_domain_exists :name   => @opts[:name],
                              :config => @config
 
         # Can't use fetch as Trollop sets :id to nil
@@ -32,16 +31,12 @@ module Heirloom
         ensure_archive_exists :archive => @archive,
                               :config  => @config
       end
-      
+
       def show
         data = @archive.show
-        if @opts[:json]
-          jj data
-        else
-          formatter = Heirloom::CLI::Formatter::Show.new
-          puts formatter.format :attributes => data,
-                                :all        => @opts[:all]
-        end
+        formatter = Heirloom::CLI::Formatter::Show.new
+        puts formatter.format :attributes => data,
+                              :all        => @opts[:all]
       end
 
       private
@@ -72,7 +67,7 @@ EOS
           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
+          opt :environment, "Environment (defined in heirloom config file)", :type => :string
         end
       end
 

data/lib/heirloom/cli/tag.rb

@@ -17,8 +17,7 @@ module Heirloom
         ensure_valid_options :provided => @opts,
                              :required => [:name, :id, :attribute, :value],
                              :config   => @config
-        ensure_valid_region :region => @opts[:metadata_region],
-                            :config => @config
+        ensure_valid_metadata_region @config
         ensure_domain_exists :name => @opts[:name], :config => @config
 
         @archive = Archive.new :name   => @opts[:name],
@@ -27,7 +26,7 @@ module Heirloom
         ensure_archive_exists :archive => @archive,
                               :config => @config
       end
-      
+
       def tag
         unless @archive.exists?
           @logger.error "Archive does not exist"
@@ -65,7 +64,7 @@ EOS
           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
+          opt :environment, "Environment (defined in heirloom config file)", :type => :string
         end
       end
     end

data/lib/heirloom/cli/teardown.rb

@@ -14,7 +14,8 @@ module Heirloom
         @config = load_config :logger => @logger,
                               :opts   => @opts
 
-        ensure_valid_options :provided => @opts, 
+        ensure_valid_metadata_region @config
+        ensure_valid_options :provided => @opts,
                              :required => [:name],
                              :config   => @config
 
@@ -82,7 +83,7 @@ EOS
           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
+          opt :environment, "Environment (defined in heirloom config file)", :type => :string
         end
       end
 

data/lib/heirloom/cli/upload.rb

@@ -33,8 +33,7 @@ module Heirloom
       end
 
       def upload
-        ensure_valid_region :region => @opts[:metadata_region],
-                            :config => @config
+        ensure_valid_metadata_region @config
         ensure_domain_exists :name   => @opts[:name],
                              :config => @config
         ensure_buckets_exist :bucket_prefix => @bucket_prefix,
@@ -104,7 +103,7 @@ Can be specified multiple times.", :type  => :string, :multi => true, :short =>
           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
+          opt :environment, "Environment (defined in heirloom config file)", :type => :string
         end
       end
 

data/lib/heirloom/config.rb

@@ -12,11 +12,11 @@ module Heirloom
     end
 
     def load_config
-      @access_key      = @opts.fetch :aws_access_key, 
+      @access_key      = @opts.fetch :aws_access_key,
                                      @config['access_key']
-      @secret_key      = @opts.fetch :aws_secret_key, 
+      @secret_key      = @opts.fetch :aws_secret_key,
                                      @config['secret_key']
-      @metadata_region = @opts.fetch :metadata_region, 
+      @metadata_region = @opts.fetch :metadata_region,
                                      @config['metadata_region']
       @use_iam_profile = @opts.fetch :use_iam_profile,
                                      false
@@ -31,7 +31,7 @@ module Heirloom
     def load_config_file
       if File.exists? config_file
         data = YAML::load File.open(config_file)
-        if data.has_key? @environment
+        if data && data.has_key?(@environment)
           return data[@environment]
         else
           @logger.warn "Environment '#{@environment}' not found in config file."

data/lib/heirloom/version.rb

@@ -1,3 +1,3 @@
 module Heirloom
-  VERSION = "0.12.3"
+  VERSION = "0.12.4"
 end

data/spec/cli/catalog_spec.rb

@@ -11,6 +11,7 @@ describe Heirloom do
                 { 'regions'       => ['us-west-1'],
                   'bucket_prefix' => ['bp'] } }
     @logger_double = double :debug => true
+    @logger_double.stub :info => true
     @config_double = double_config :logger => @logger_double
     @catalog_double = double 'catalog'
     @catalog_double.stub :catalog_domain_exists? => true

data/spec/cli/list_spec.rb

@@ -29,20 +29,6 @@ describe Heirloom do
     @archive_double.should_receive(:count)
   end
 
-  context "as json" do
-    before do
-      @options[:json] = true
-      Trollop.stub :options => @options
-    end
-
-    it "should list ids for given archive" do
-      @cli_list = Heirloom::CLI::List.new
-      @archive_double.should_receive(:list).with(100).and_return(['1','2'])
-      @cli_list.should_receive(:jj).with ['1','2']
-      @cli_list.list
-    end
-  end
-
   context "as human readable" do
     before do
       @options[:json] = nil

data/spec/cli/show_spec.rb

@@ -36,20 +36,6 @@ describe Heirloom do
       @attributes = { 'id' => '1.0.0' }
     end
 
-    context "as json" do
-      before do
-        @options[:json] = true
-        Trollop.stub(:options).and_return @options
-      end
-
-      it "should show a given id as json" do
-        @cli_show = Heirloom::CLI::Show.new
-        @archive_double.stub :show => @attributes
-        @cli_show.should_receive(:jj).with @attributes
-        @cli_show.show
-      end
-    end
-
     context "as human readable" do
       before do
         @options[:json] = false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: heirloom
 version: !ruby/object:Gem::Version
-  version: 0.12.3
+  version: 0.12.4
 platform: ruby
 authors:
 - Brett Weaver
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-26 00:00:00.000000000 Z
+date: 2014-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake