Merge pull request #3 from intuit/bug_fix

renamed to acl_public since (public reserved)
intuit-archive · Mar 20, 2013 · ea8dbfd · ea8dbfd
2 parents 1482bd9 + e205edc
commit ea8dbfd
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -41,7 +41,7 @@ Uploads a file to s3
       action :upload
       bucket "BUCKET_TO_DOWNLOAD_FROM"
       object_name "OBJECT_TO_DOWNLOAD"
-      public true
+      acl_public true
       force true
     end
 

diff --git a/providers/file.rb b/providers/file.rb
@@ -24,7 +24,7 @@
   file_name   = new_resource.file_name
   bucket      = new_resource.bucket
   object_name = new_resource.object_name
-  acl_public  = new_resource.public ? '--acl-public' : ''
+  acl_public  = new_resource.acl_public ? '--acl-public' : ''
   force       = new_resource.force ? '--force' : ''
 
   execute "Uploading #{file_name} to s3://#{bucket}/#{object_name}" do

diff --git a/resources/file.rb b/resources/file.rb
@@ -7,4 +7,4 @@
 attribute :group, :kind_of => String, :default => 'root'
 attribute :mode, :kind_of => String, :default => '0600'
 attribute :force, :kind_of => [ TrueClass, FalseClass ], :default => true
-attribute :public, :kind_of => [ TrueClass, FalseClass ], :default => false
+attribute :acl_public, :kind_of => [ TrueClass, FalseClass ], :default => false