heirloom 0.1.2 → 0.1.3

data/lib/heirloom/acl/s3.rb

@@ -39,6 +39,7 @@ module Heirloom
 
         a = Array.new
 
+        # Add each account email as read access
         @accounts.each do |g|
           a << {
                  'Grantee' => { 'EmailAddress' => g } ,
@@ -46,6 +47,11 @@ module Heirloom
                }
         end
 
+        # Grand owner full access
+        a << { 'Grantee' => { 'DisplayName' => name, 'ID' => id },
+               'Permission' => 'FULL_CONTROL'
+             }
+
         {
           'Owner' => {
             'DisplayName' => name,

data/lib/heirloom/artifact.rb

@@ -26,6 +26,7 @@ module Heirloom
 
       artifact_uploader.upload :id              => args[:id],
                                :name            => args[:name],
+                               :bucket_prefix   => args[:bucket_prefix],
                                :public_readable => args[:public],
                                :file            => file
 

data/lib/heirloom/artifact/artifact_authorizer.rb

@@ -16,8 +16,9 @@ module Heirloom
         @logger.info "Authorizing access to artifact."
 
         @config.regions.each do |region|
-          bucket = "#{@config.bucket_prefix}-#{region}"
-
+          bucket = artifact_reader.get_bucket :region => region,
+                                              :name   => name,
+                                              :id     => id
           s3_acl = ACL::S3.new :config => @config,
                                :logger => @logger,
                                :region => region
@@ -29,5 +30,11 @@ module Heirloom
       end
     end
 
+    private
+
+    def artifact_reader
+      @artifact_reader ||= ArtifactReader.new :config => @config
+    end
+
   end
 end

data/lib/heirloom/artifact/artifact_destroyer.rb

@@ -14,7 +14,10 @@ module Heirloom
       @logger.info "Destroying #{args[:name]} - #{args[:id]}"
 
       @config.regions.each do |region|
-        bucket = "#{@config.bucket_prefix}-#{region}"
+        puts "#{region}, #{name}, #{id}"
+        bucket = artifact_reader.get_bucket :region => region,
+                                            :name   => name,
+                                            :id     => id
         key = "#{id}.tar.gz"
 
         @logger.info "Deleting s3://#{bucket}/#{name}/#{key}"
@@ -26,8 +29,8 @@ module Heirloom
                                   :key_folder => name,
                                   :bucket => bucket
 
-        sdb.delete name, id
       end
+      sdb.delete name, id
     end
 
     private
@@ -36,5 +39,9 @@ module Heirloom
       @sdb ||= AWS::SimpleDB.new :config => @config
     end
 
+    def artifact_reader
+      @artifact_reader ||= ArtifactReader.new :config => @config
+    end
+
   end
 end

data/lib/heirloom/artifact/artifact_downloader.rb

@@ -17,10 +17,18 @@ module Heirloom
                                          :logger => @logger,
                                          :region => @region
 
-      @logger.info "Downloading s3://#{get_bucket}/#{get_key} from #{@region}."
+      bucket = artifact_reader.get_bucket :region => @region,
+                                          :name   => @name,
+                                          :id     => @id
 
-      file = s3_downloader.download_file :bucket => get_bucket,
-                                         :key    => get_key
+      key = artifact_reader.get_key :region => @region,
+                                    :name   => @name,
+                                    :id     => @id
+
+      @logger.info "Downloading s3://#{bucket}/#{key} from #{@region}."
+
+      file = s3_downloader.download_file :bucket => bucket,
+                                         :key    => key
 
       @logger.info "Writing file to #{@output}."
 

data/lib/heirloom/artifact/artifact_reader.rb

@@ -17,6 +17,26 @@ module Heirloom
       show(args) != nil
     end
 
+    def get_bucket(args)
+      artifact = show :name => args[:name],
+                      :id   => args[:id]
+
+      url = artifact["#{args[:region]}-s3-url"].first
+
+      bucket = url.gsub('s3://', '').split('/').first
+    end
+
+    def get_key(args)
+      artifact = show :name => args[:name],
+                      :id   => args[:id]
+
+      url = artifact["#{args[:region]}-s3-url"].first
+
+      bucket = url.gsub('s3://', '').gsub(get_bucket(args), '')
+      bucket.slice!(0)
+      bucket
+    end
+
     private
 
     def sdb

data/lib/heirloom/artifact/artifact_uploader.rb

@@ -13,10 +13,11 @@ module Heirloom
       key_folder = args[:name]
       key_name = "#{id}.tar.gz"
       name = args[:name]
+      bucket_prefix = args[:bucket_prefix]
       public_readable = args[:public_readable]
 
       @config.regions.each do |region|
-        bucket = "#{@config.bucket_prefix}-#{region}"
+        bucket = "#{bucket_prefix}-#{region}"
 
         s3_uploader = Uploader::S3.new :config => @config,
                                        :logger => @logger,

data/lib/heirloom/cli.rb

@@ -13,7 +13,7 @@ Usage:
 heirloom names
 heirloom list -n NAME
 heirloom show -n NAME -i ID
-heirloom build -n NAME -i ID [-d DIRECTORY] [-p] [-g]
+heirloom build -n NAME -i ID -b BUCKET_PREFIX [-d DIRECTORY] [-p] [-g]
 heirloom download -n NAME -i ID -r REGION -o OUTPUT_FILE
 heirloom update -n NAME -i ID -a ATTRIBUTE -u UPDATE
 heirloom destroy -n NAME -i ID
@@ -21,6 +21,7 @@ heirloom destroy -n NAME -i ID
 EOS
         opt :help, "Display Help"
         opt :attribute, "Attribute to update.", :type => :string
+        opt :bucket_prefix, "Bucket prefix which will be combined with region.", :type => :string
         opt :directory, "Source directory of build.", :type    => :string, 
                                                       :default => '.'
         opt :exclude, "Comma spereate list of files or directories to exclude.", :type => :string,
@@ -52,13 +53,14 @@ EOS
         puts a.show(:name => @opts[:name],
                     :id   => @opts[:id]).to_yaml
       when 'build'
-        a.build :name      => @opts[:name],
-                :id        => @opts[:id],
-                :accounts  => @opts[:accounts],
-                :directory => @opts[:directory],
-                :exclude   => @opts[:exclude].split(','),
-                :public    => @opts[:public],
-                :git       => @opts[:git]
+        a.build :name           => @opts[:name],
+                :id             => @opts[:id],
+                :accounts       => @opts[:accounts],
+                :bucket_prefix  => @opts[:bucket_prefix],
+                :directory      => @opts[:directory],
+                :exclude        => @opts[:exclude].split(','),
+                :public         => @opts[:public],
+                :git            => @opts[:git]
       when 'update'
         a.update :name      => @opts[:name],
                  :id        => @opts[:id],

data/lib/heirloom/version.rb

@@ -1,3 +1,3 @@
 module Heirloom
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/artifact_spec.rb

@@ -6,7 +6,7 @@ describe Heirloom do
                 'secret_key'              => 'secret',
                 'regions'                 => ['us-west-1', 'us-west-2'],
                 'bucket_prefix'           => 'prefix',
-                'authorized_aws_accounts' => [ 'test1 @acct.com', 'test2@acct.com'] }
+                'authorized_aws_accounts' => [ 'test1 @acct.com', 'test2@acct.com' ] }
     @logger = 'logger'
   end
 
@@ -17,7 +17,8 @@ describe Heirloom do
                                       :logger => 'logger'
   end
 
-  it "should build the artifact" 
+  it "should build the artifact"
+
   it "should update the artifact"
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heirloom
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70233621052940 !ruby/object:Gem::Requirement
+  requirement: &70276834500700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70233621052940
+  version_requirements: *70276834500700
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &70233621051920 !ruby/object:Gem::Requirement
+  requirement: &70276834499760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70233621051920
+  version_requirements: *70276834499760
 - !ruby/object:Gem::Dependency
   name: grit
-  requirement: &70233621006260 !ruby/object:Gem::Requirement
+  requirement: &70276834499000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70233621006260
+  version_requirements: *70276834499000
 - !ruby/object:Gem::Dependency
   name: logger
-  requirement: &70233621004160 !ruby/object:Gem::Requirement
+  requirement: &70276834496380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70233621004160
+  version_requirements: *70276834496380
 - !ruby/object:Gem::Dependency
   name: minitar
-  requirement: &70233621002400 !ruby/object:Gem::Requirement
+  requirement: &70276834494800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70233621002400
+  version_requirements: *70276834494800
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70233621000920 !ruby/object:Gem::Requirement
+  requirement: &70276834509460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70233621000920
+  version_requirements: *70276834509460
 description: I help build and manage artifacts
 email:
 - brett@weav.net
@@ -139,7 +139,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -188177513496697606
+      hash: 2277153022604360161
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -148,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -188177513496697606
+      hash: 2277153022604360161
 requirements: []
 rubyforge_project: heirloom
 rubygems_version: 1.8.16