heirloom 0.0.2 → 0.0.3

data/lib/heirloom/cli.rb

@@ -19,6 +19,7 @@ EOS
         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
+        opt :open, "Is this artifact open to public read?"
         opt :sha, "Git Sha", :type => :string
       end
 
@@ -27,10 +28,14 @@ EOS
       case cmd
       when 'build'
         raise 'Missing required args' unless @opts[:sha] && @opts[:class]
+        
+        accounts = @opts[:accounts].nil? ? [] : @opts[:accounts].split(',')
+
         h = Heirloom.new :heirloom_type => @opts[:class],
                          :source_dir => @opts[:dir] ||= ".",
                          :prefix => @opts[:prefix],
-                         :accounts => @opts[:accounts].split(',')
+                         :open => @opts[:open],
+                         :accounts => accounts
 
         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.2"
+  VERSION = "0.0.3"
 end

data/lib/heirloom.rb

@@ -43,6 +43,7 @@ module Heirloom
     def initialize(args)
       @sdb = self.class.connect_to_sdb
       @accounts = args[:accounts]
+      @open = args[:open] ||= false
 
       self.heirloom_type = args[:heirloom_type]
       self.source_dir = args[:source_dir]
@@ -117,14 +118,17 @@ module Heirloom
         # Upload the artifact
         b.files.create :key    => "#{folder}/#{artifact}",
                        :body   => File.open(artifact_path),
-                       :public => false
+                       :public => open?
                        
         # 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))
+        # Only set them if ACLs exist
+        if @accounts.any?
+          connection.put_object_acl(bucket, "#{folder}/#{artifact}", build_bucket_grants(id, name))
+        end
                        
         # Add the artifact location
         @sdb.put_attributes domain, sha, { "#{region}-s3-url" => "s3://#{bucket}/#{folder}/#{artifact}" }
@@ -203,6 +207,10 @@ module Heirloom
       ENV['USER']
     end
 
+    def open?
+      @open
+    end
+
     def hostname
       Socket.gethostname
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heirloom
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70259568822860 !ruby/object:Gem::Requirement
+  requirement: &70356561112560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70259568822860
+  version_requirements: *70356561112560
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &70259568822200 !ruby/object:Gem::Requirement
+  requirement: &70356561112100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70259568822200
+  version_requirements: *70356561112100
 - !ruby/object:Gem::Dependency
   name: grit
-  requirement: &70259568821600 !ruby/object:Gem::Requirement
+  requirement: &70356561111680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70259568821600
+  version_requirements: *70356561111680
 - !ruby/object:Gem::Dependency
   name: logger
-  requirement: &70259568820920 !ruby/object:Gem::Requirement
+  requirement: &70356561111260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70259568820920
+  version_requirements: *70356561111260
 - !ruby/object:Gem::Dependency
   name: minitar
-  requirement: &70259568820320 !ruby/object:Gem::Requirement
+  requirement: &70356561110820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70259568820320
+  version_requirements: *70356561110820
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70259568819700 !ruby/object:Gem::Requirement
+  requirement: &70356561110380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70259568819700
+  version_requirements: *70356561110380
 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: -2437410671225482023
+      hash: 2587255120957144358
 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: -2437410671225482023
+      hash: 2587255120957144358
 requirements: []
 rubyforge_project: heirloom
 rubygems_version: 1.8.16