heirloom 0.11.0 → 0.11.1

data/.gitignore

@@ -3,3 +3,4 @@
 Gemfile.lock
 pkg/*
 .idea/
+coverage

data/.ruby-gemset

@@ -0,0 +1 @@
+heirloom

data/.ruby-version

@@ -0,0 +1 @@
+1.9.3

data/CHANGELOG.md

@@ -1,4 +1,7 @@
-## HEAD:
+## 0.11.1 (06/18/2013):
+
+* Fixes bug #139 by using get_object_acl instead of removed get_bucket_acl.
+* Move to .ruby-version and .ruby-gemset instead of .rvmrc
 
 ## 0.11.0 (04/26/2013):
 

data/README.md

@@ -44,3 +44,12 @@ Documentation
 -------------
 
 For more information, please view the [Heirloom Wiki](https://github.com/intuit/heirloom/wiki).
+
+Contributing
+-------------
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request

data/heirloom.gemspec

@@ -19,10 +19,16 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # specify any dependencies here; for example:
-  s.add_development_dependency "rspec", '~> 2.11.0'
+  s.add_development_dependency "hashie"
   s.add_development_dependency "rake"
+  s.add_development_dependency "rspec", '~> 2.11.0'
+  s.add_development_dependency "simplecov"
+  s.add_development_dependency "vcr", '= 2.4.0'
+  s.add_development_dependency "watchr"
 
-  s.add_runtime_dependency 'fog', '~> 1.10.0'
+  s.add_runtime_dependency 'excon', '= 0.16'
+  s.add_runtime_dependency 'fog', '= 1.10.0'
   s.add_runtime_dependency 'trollop', '= 2.0'
   s.add_runtime_dependency 'xml-simple', '~> 1.1.2'
+
 end

data/lib/heirloom.rb

@@ -13,3 +13,12 @@ require "heirloom/exceptions"
 require "heirloom/logger"
 require "heirloom/uploader"
 require "heirloom/version"
+
+module Heirloom
+  
+  def self.log
+    @logger ||= HeirloomLogger.new
+  end
+  
+end
+

data/lib/heirloom/acl/s3.rb

@@ -19,7 +19,7 @@ module Heirloom
 
         key          = "#{key_folder}/#{key_name}"
 
-        current_acls = s3.get_bucket_acl bucket
+        current_acls = s3.get_object_acl :bucket => bucket, :object_name => key
         name         = current_acls['Owner']['Name']
         id           = current_acls['Owner']['ID']
 

data/lib/heirloom/aws/simpledb.rb

@@ -43,8 +43,31 @@ module Heirloom
         @sdb.put_attributes domain, key, attributes, options
       end
 
-      def select(query)
-        @sdb.select(query).body['Items']
+      def select(query, opts = {})
+        has_more = true
+        next_token = nil
+        results = {}
+
+        if opts[:offset] && opts[:offset] > 0
+          limit = @sdb.select("#{query} limit #{opts[:offset]}").body
+          if limit['NextToken']
+            next_token = limit['NextToken']
+          else
+            has_more = false
+          end
+        end
+        while has_more
+          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']
+            next_token = more['NextToken']
+          else
+            has_more = false
+          end
+        end
+        results unless block_given?
       end
 
       def delete(domain, key)

data/lib/heirloom/catalog.rb

@@ -13,6 +13,31 @@ module Heirloom
       @name    = args[:name]
     end
 
+    def cleanup(opts = {})
+      opts[:num_to_keep]      ||= 100
+      opts[:remove_preserved] ||= false
+
+      num_cleaned = 0
+
+      q = "select * from `#{domain}` where built_at > '2000-01-01T00:00:00.000Z' order by built_at desc"
+
+      sdb.select(q, :offset => opts[:num_to_keep]) do |key, item|
+        unless opts[:remove_preserved]
+          next if preserved?(item)
+        end
+
+        archive = Archive.new :config => @config, :name => @name, :id => key
+        archive.destroy
+        num_cleaned += 1
+      end
+
+      if num_cleaned == 0
+        Heirloom.log.info "No archives to delete."
+      else
+        Heirloom.log.info "#{num_cleaned} archive#{'s' unless num_cleaned == 1} deleted."
+      end
+    end
+
     def create_catalog_domain
       setup.create_catalog_domain
     end
@@ -47,6 +72,14 @@ module Heirloom
 
     private
 
+    def preserved?(item)
+      item['preserve'] && item['preserve'].include?('true')
+    end
+
+    def sdb
+      @sdb ||= Heirloom::AWS::SimpleDB.new :config => @config
+    end
+
     def add
       @add ||= Catalog::Add.new :config => @config,
                                 :name   => @name
@@ -74,5 +107,9 @@ module Heirloom
       @verify ||= Catalog::Verify.new :config => @config
     end
 
+    def domain
+      "heirloom_#{@name}"
+    end
+
   end
 end

data/lib/heirloom/cli.rb

@@ -1,3 +1,4 @@
+require 'hashie'
 require 'json'
 require 'trollop'
 
@@ -6,6 +7,7 @@ require 'heirloom/cli/shared'
 
 require 'heirloom/cli/authorize'
 require 'heirloom/cli/catalog'
+require 'heirloom/cli/cleanup'
 require 'heirloom/cli/destroy'
 require 'heirloom/cli/download'
 require 'heirloom/cli/list'
@@ -26,6 +28,8 @@ module Heirloom
         CLI::Authorize.new.authorize
       when 'catalog'
         CLI::Catalog.new.all
+      when 'cleanup'
+        CLI::Cleanup.new.cleanup
       when 'destroy', 'delete'
         CLI::Destroy.new.destroy
       when 'download'
@@ -47,10 +51,39 @@ module Heirloom
       when '-v'
         puts Heirloom::VERSION
       else
-        puts "Unkown command: '#{cmd}'." unless cmd == '-h'
-        puts "heirloom [authorize|catalog|destroy|download|list|setup|show|tag|teardown|upload] OPTIONS"
-        puts "Append -h for help on specific command."
+        puts "Unknown command: '#{cmd}'." unless cmd == '-h'
+        usage
       end
     end
+
+    def self.usage
+      puts ''
+      puts 'Usage: heirloom command [options]'
+      puts ''
+      puts 'Append -h for help on specific command.'
+      puts ''
+      puts 'Commands:'
+      commands.each do |cmd|
+        $stdout.printf "    %-#{length_of_longest_command}s      %s\n",
+                       cmd.command_name,
+                       cmd.command_summary
+      end
+    end
+
+    def self.commands
+      return @commands if @commands
+      klasses = Heirloom::CLI.constants.reject { |c| [:Shared, :Formatter].include?(c) }
+      @commands = klasses.map do |klass|
+        Hashie::Mash.new.tap do |h|
+          h[:command_name]    = klass.downcase
+          h[:command_summary] = Heirloom::CLI.const_get(klass).command_summary
+        end
+      end
+    end
+
+    def self.length_of_longest_command
+      @length ||= commands.map { |c| c.command_name.length }.max
+    end
+
   end
 end

data/lib/heirloom/cli/authorize.rb

@@ -4,6 +4,10 @@ module Heirloom
 
       include Heirloom::CLI::Shared
 
+      def self.command_summary
+        'Authorize access from another AWS account to an Heirloom'
+      end
+
       def initialize
         @opts = read_options
         @logger = HeirloomLogger.new :log_level => @opts[:level]
@@ -37,7 +41,7 @@ module Heirloom
           version Heirloom::VERSION
           banner <<-EOS
 
-Authorize access from another AWS account to an Heirloom.
+#{Authorize.command_summary}.
 
 Usage:
 

data/lib/heirloom/cli/catalog.rb

@@ -4,6 +4,10 @@ module Heirloom
 
       include Heirloom::CLI::Shared
 
+      def self.command_summary
+        'Show catalog of Heirlooms'
+      end
+
       def initialize
         @opts = read_options
         @logger = HeirloomLogger.new :log_level => @opts[:level]
@@ -41,7 +45,7 @@ module Heirloom
           version Heirloom::VERSION
           banner <<-EOS
 
-Show catalog of Heirlooms.
+#{Catalog.command_summary}.
 
 Usage:
 

data/lib/heirloom/cli/cleanup.rb

@@ -0,0 +1,74 @@
+module Heirloom
+  module CLI
+    class Cleanup
+
+      include Heirloom::CLI::Shared
+
+      def self.command_summary
+        "Delete old heirlooms not tagged with 'preserve': true"
+      end
+
+      def initialize
+        @opts   = read_options
+        @config = load_config :opts => @opts, :logger => Heirloom.log
+
+        Heirloom.log.level = @opts[:log_level]
+
+        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
+        )
+
+      end
+      
+      def cleanup
+        cat = Heirloom::Catalog.new :name => @opts[:name], :config => @config
+        cat.cleanup :num_to_keep => @opts[:keep]
+      rescue Heirloom::Exceptions::CleanupFailed => e
+        Heirloom.log.error e.message
+        exit 1
+      end
+
+      private
+
+      def read_options
+        Trollop::options do
+          version Heirloom::VERSION
+          banner <<-EOS
+
+#{Cleanup.command_summary}.
+
+Usage:
+
+heirloom cleanup -n NAME -k 10
+
+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 :name, "Name of Heirloom.", :type => :string
+          opt :keep, "Number of unpreserved heirlooms to keep.", :default => 100
+
+          opt :aws_access_key, "AWS Access Key ID", :type  => :string, 
+                                                    :short => :none
+          opt :aws_secret_key, "AWS Secret Access Key", :type  => :string, 
+                                                        :short => :none
+          opt :environment, "Environment (defined in ~/.heirloom.yml)", :type => :string
+        end
+      end
+    end
+  end
+end

data/lib/heirloom/cli/destroy.rb

@@ -4,6 +4,10 @@ module Heirloom
 
       include Heirloom::CLI::Shared
 
+      def self.command_summary
+        'Destroy an Heirloom'
+      end
+
       def initialize
         @opts = read_options
         @logger = HeirloomLogger.new :log_level => @opts[:level]
@@ -37,7 +41,7 @@ module Heirloom
           version Heirloom::VERSION
           banner <<-EOS
 
-Destroy an Heirloom.
+#{Destroy.command_summary}.
 
 Usage:
 

data/lib/heirloom/cli/download.rb

@@ -4,6 +4,10 @@ module Heirloom
 
       include Heirloom::CLI::Shared
 
+      def self.command_summary
+        'Download Heirloom'
+      end
+
       def initialize
         @opts = read_options
         @logger = HeirloomLogger.new :log_level => @opts[:level]
@@ -56,7 +60,7 @@ module Heirloom
           version Heirloom::VERSION
           banner <<-EOS
 
-Download Heirloom.
+#{Download.command_summary}.
 
 Usage:
 

data/lib/heirloom/cli/list.rb

@@ -4,6 +4,10 @@ module Heirloom
 
       include Heirloom::CLI::Shared
 
+      def self.command_summary
+        'List Heirloom IDs'
+      end
+
       def initialize
         @opts = read_options
         @logger = HeirloomLogger.new :log_level => @opts[:level]
@@ -38,7 +42,7 @@ module Heirloom
           version Heirloom::VERSION
           banner <<-EOS
 
-List Heirloom IDs.
+#{List.command_summary}.
 
 Usage:
 

data/lib/heirloom/cli/rotate.rb

@@ -4,6 +4,10 @@ module Heirloom
 
       include Heirloom::CLI::Shared
 
+      def self.command_summary
+        'Rotate keys for an Heirloom'
+      end
+
       def initialize
         @opts = read_options
         @logger = HeirloomLogger.new :log_level => @opts[:level]
@@ -46,7 +50,7 @@ module Heirloom
           version Heirloom::VERSION
           banner <<-EOS
 
-Rotate keys for an Heirloom.  
+#{Rotate.command_summary}.  
 
 Will download the heirloom to temp directory, decrypt, encrypt, and upload, replacing original.
 

data/lib/heirloom/cli/setup.rb

@@ -4,6 +4,10 @@ module Heirloom
 
       include Heirloom::CLI::Shared
 
+      def self.command_summary
+        'Setup S3 and SimpleDB in the given regions'
+      end
+
       def initialize
         @opts = read_options
         @logger = HeirloomLogger.new :log_level => @opts[:level]
@@ -63,7 +67,7 @@ module Heirloom
           version Heirloom::VERSION
           banner <<-EOS
 
-Setup S3 and SimpleDB in the given regions.
+#{Setup.command_summary}.
 
 Usage: