heirloom 0.0.1 → 0.0.2

data/lib/heirloom/cli.rb

@@ -9,10 +9,13 @@ build and manage artifacts
 
 Usage:
 
-heirloom [options] build
 heirloom list
+heirloom build [options]
+heirloom delete [options]
+heirloom info [options]
 EOS
         opt :help, "Display Help"
+        opt :accounts, "CSV list of accounts to authorize", :type => :string
         opt :class, "Class of artifact.  This should match the SCM repo", :type => :string
         opt :dir, "Directory which contains git repo", :type => :string
         opt :prefix, "Bucket prefix", :type => :string
@@ -26,7 +29,8 @@ EOS
         raise 'Missing required args' unless @opts[:sha] && @opts[:class]
         h = Heirloom.new :heirloom_type => @opts[:class],
                          :source_dir => @opts[:dir] ||= ".",
-                         :prefix => @opts[:prefix]
+                         :prefix => @opts[:prefix],
+                         :accounts => @opts[:accounts].split(',')
 
         h.build_and_upload_to_s3(:sha => @opts[:sha])
       when 'list'

data/lib/heirloom/version.rb

@@ -1,3 +1,3 @@
 module Heirloom
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/heirloom.rb

@@ -40,15 +40,9 @@ module Heirloom
       sdb.delete args[:class], args[:sha]
     end
 
-    def self.connect_to_sdb
-      @access_key = ENV['AWS_ACCESS_KEY_ID']
-      @secret_key = ENV['AWS_SECRET_ACCESS_KEY']
-
-      AWS::SimpleDb.new(@access_key, @secret_key)
-    end
-
     def initialize(args)
       @sdb = self.class.connect_to_sdb
+      @accounts = args[:accounts]
 
       self.heirloom_type = args[:heirloom_type]
       self.source_dir = args[:source_dir]
@@ -57,6 +51,7 @@ module Heirloom
 
     def build_and_upload_to_s3(args)
       get_commit args[:sha]
+      create_sdb_domain 
       raise 'Artifact already uploaded to S3' if already_in_sdb?
       build_local_artifact
       create_sdb_record
@@ -89,7 +84,6 @@ module Heirloom
     end
 
     def create_sdb_record
-      create_sdb_domain 
       @sdb.put_attributes domain, sha, { 'built_by' => "#{user}@#{hostname}",
                                          'built_at' => Time.now.utc.iso8601,
                                          'tests' => 'pending',
@@ -111,6 +105,7 @@ module Heirloom
 
         # Connect to s3 in region of bucket
         region = options['region']
+        endpoint = options['endpoint']
         connection = Fog::Storage.new :provider                 => 'AWS',
                                       :aws_access_key_id        => ENV['AWS_ACCESS_KEY_ID'],
                                       :aws_secret_access_key    => ENV['AWS_SECRET_ACCESS_KEY'],
@@ -124,23 +119,50 @@ module Heirloom
                        :body   => File.open(artifact_path),
                        :public => false
                        
+        # Get the bucket owner name and ID
+        id = connection.get_bucket_acl(bucket).body['Owner']['ID']
+        name = connection.get_bucket_acl(bucket).body['Owner']['Name']
+
+        # Set the objects ACLs
+        connection.put_object_acl(bucket, "#{folder}/#{artifact}", build_bucket_grants(id, name))
+                       
         # Add the artifact location
         @sdb.put_attributes domain, sha, { "#{region}-s3-url" => "s3://#{bucket}/#{folder}/#{artifact}" }
 
         # Add the http url
-        @sdb.put_attributes domain, sha, { "#{region}-http-url" => "http://#{bucket}/#{folder}/#{artifact}" }
+        @sdb.put_attributes domain, sha, { "#{region}-http-url" => "http://#{endpoint}/#{folder}/#{artifact}" }
 
         # Add the https url
-        @sdb.put_attributes domain, sha, { "#{region}-https-url" => "https://#{bucket}/#{folder}/#{artifact}" }
+        @sdb.put_attributes domain, sha, { "#{region}-https-url" => "https://#{endpoint}/#{folder}/#{artifact}" }
       end
     end
 
     private
 
+    def build_bucket_grants(id, name)
+      # Creat the AccessControlList based on given accounts
+      a = Array.new
+      @accounts.each do |g|
+        a << {
+               'Grantee' => { 'EmailAddress' => g } ,
+               'Permission' => 'READ'
+             } 
+      end
+      
+      { 
+        'Owner' => { 
+          'DisplayName' => name,
+          'ID' => id
+        },
+        'AccessControlList' => a
+      }
+    end
+
     def buckets
       {
         "#{prefix}-us-west-1" => { 
-          'region' => 'us-west-1'
+          'region' => 'us-west-1',
+          'endpoint' => 's3-us-west-1.amazonaws.com'
         }
       }
     end
@@ -185,5 +207,12 @@ module Heirloom
       Socket.gethostname
     end
 
+    def self.connect_to_sdb
+      @access_key = ENV['AWS_ACCESS_KEY_ID']
+      @secret_key = ENV['AWS_SECRET_ACCESS_KEY']
+
+      AWS::SimpleDb.new(@access_key, @secret_key)
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heirloom
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-05 00:00:00.000000000 Z
+date: 2012-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70129331233340 !ruby/object:Gem::Requirement
+  requirement: &70259568822860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70129331233340
+  version_requirements: *70259568822860
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &70129331232880 !ruby/object:Gem::Requirement
+  requirement: &70259568822200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70129331232880
+  version_requirements: *70259568822200
 - !ruby/object:Gem::Dependency
   name: grit
-  requirement: &70129331228060 !ruby/object:Gem::Requirement
+  requirement: &70259568821600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70129331228060
+  version_requirements: *70259568821600
 - !ruby/object:Gem::Dependency
   name: logger
-  requirement: &70129331227600 !ruby/object:Gem::Requirement
+  requirement: &70259568820920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70129331227600
+  version_requirements: *70259568820920
 - !ruby/object:Gem::Dependency
   name: minitar
-  requirement: &70129331227180 !ruby/object:Gem::Requirement
+  requirement: &70259568820320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70129331227180
+  version_requirements: *70259568820320
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70129331226740 !ruby/object:Gem::Requirement
+  requirement: &70259568819700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70129331226740
+  version_requirements: *70259568819700
 description: I help build and manage artifacts
 email:
 - brett@weav.net
@@ -109,7 +109,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2848188182829183969
+      hash: -2437410671225482023
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -118,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2848188182829183969
+      hash: -2437410671225482023
 requirements: []
 rubyforge_project: heirloom
 rubygems_version: 1.8.16