dandelion 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00110ac83b39564910efe70d62413f0131965c7a
-  data.tar.gz: 08d3488e8bc26fe5ef82c5a4e01257b22de7eeb6
+  metadata.gz: 5520acb69585608fbf7087b4bb2ca2d37a7ba767
+  data.tar.gz: bcfa8fae2c7324ee5dfebf64d54f6f3aa38b1504
 SHA512:
-  metadata.gz: ef0da54d71427e9307dbe9139cd642ce025e8ba23f09aba5bee3b383e8364847fa7497b6e33210a4cd1e653151e871a44ad935a30264d0372e42bb247e68d8f7
-  data.tar.gz: 2e049e82a8a9c756dbd0f2012b27561d2e254fa48f8261b97b5ddada5972662a8d971882deb862a7e32a91f4742f665714de1deaa0df0f5fe4f7ff80d5d22ed8
+  metadata.gz: 0b0b3e1773552af905d074664285fc30f271d2c1dfbceb8fea159bc753cedeb124c0b2462bbc3bbb077c6d600ffc1f2d72acb3df5e0ae313149f710cc2af5b4a
+  data.tar.gz: 2f9e4b05a622d0a1a61bbdc99a7d23785d3e755b54f751364dedf896476ba0a377cbe073b794096ecf0bbe232321f004c1771a4aa719127a08d60ae48bb5e718

data/README.md

@@ -83,7 +83,7 @@ Required:
 Optional:
 
  * `port` (defaults to 21)
- * `passive` (defaults to true)
+ * `passive` (defaults to false)
 
 **Amazon S3**: `adapter: s3`
 
@@ -96,6 +96,7 @@ Required:
 Optional:
 
  * `host` (defaults to s3.amazonaws.com)
+ * `preserve_permissions` (defaults to true)
 
 Usage
 -----

data/lib/dandelion/adapter/s3.rb

@@ -7,49 +7,55 @@ module Dandelion
       def initialize(config)
         require 'aws/s3'
         
-        @access_key_id = config[:access_key_id]
-        @secret_access_key = config[:secret_access_key]
-        @bucket_name = config[:bucket_name]
-        @host = config[:host]
-        @path = config[:path]
+        @config = config
+        @config.defaults(preserve_permissions: true)
       end
 
       def read(file)
-        s3connect!
-        return nil unless AWS::S3::S3Object.exists?(path(file), @bucket_name)
-        AWS::S3::S3Object.value(path(file), @bucket_name)
+        connect!
+        return nil unless AWS::S3::S3Object.exists?(path(file), bucket_name)
+        AWS::S3::S3Object.value(path(file), bucket_name)
       end
 
       def write(file, data)
-        s3connect!
-        AWS::S3::S3Object.store(path(file), data, @bucket_name)
+        connect!
+
+        key = path(file)
+        policy = AWS::S3::S3Object.acl(key, bucket_name) if @config[:preserve_permissions]
+
+        AWS::S3::S3Object.store(path(file), data, bucket_name)
+        AWS::S3::S3Object.acl(key, bucket_name, policy) unless policy.nil?
       end
 
       def delete(file)
-        s3connect!
-        AWS::S3::S3Object.delete(path(file), @bucket_name)
+        connect!
+        AWS::S3::S3Object.delete(path(file), bucket_name)
       end
       
       def to_s
-        "s3://#{@access_key_id}@#{@bucket_name}/#{@path}"
+        "s3://#{@config[:access_key_id]}@#{bucket_name}/#{@config[:path]}"
       end
 
       protected
       
-      def s3connect!
+      def connect!
         options = {
-          access_key_id: @access_key_id,
-          secret_access_key: @secret_access_key,
+          access_key_id: @config[:access_key_id],
+          secret_access_key: @config[:secret_access_key],
           use_ssl: true
         }
 
-        options[:server] = @host if @host
+        options[:server] = @config[:host] if @config[:host]
         AWS::S3::Base.establish_connection!(options) unless AWS::S3::Base.connected?
       end
+
+      def bucket_name
+        @config[:bucket_name]
+      end
             
       def path(file)
-        if @path and !@path.empty?
-          "#{@path}/#{file}"
+        if @config[:path] and !@config[:path].empty?
+          "#{@config[:path]}/#{file}"
         else
           file
         end

data/lib/dandelion/cli.rb

@@ -6,6 +6,8 @@ module Dandelion
       @args = args
       @options = {}
       @parser = Command::Base.parser(@options)
+
+      @options[:help] = true if @args.length == 0
     end
 
     def config

data/lib/dandelion/version.rb

@@ -1,3 +1,3 @@
 module Dandelion
-  VERSION = '0.4.4'
+  VERSION = '0.4.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dandelion
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Scott Nelson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-15 00:00:00.000000000 Z
+date: 2014-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged