dandelion 0.4.0.beta2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0db6d6a95dd6dd735cef40b26ee73e674c17060a
-  data.tar.gz: a78f497fa3447eaa7e2049aa45ebbaec0238095b
+  metadata.gz: f59aa5e5acccd85dd1817152e3ccc785c47eee57
+  data.tar.gz: 9df39ffc76d631968539f2bf32f608ff5df90ac2
 SHA512:
-  metadata.gz: ef112d609e8e09b892039db536142f4d5ee270ec78aa90b29cfa3ecd15f2250a8e2919a081b757b97fce41b66b17579b08644ee433801710fb26fe9b2e0c0bc4
-  data.tar.gz: b16bfa52c5b20874e17454175b076ec3d3ae905e99b6853ae239a59e8810d507a5ef4c375a042c33ec45728e07507cf1801dda1d62473a7ba62ff899ae59524b
+  metadata.gz: be0340dee738190692e082c98a1bd4e95d5d3dfa9d15ad3243af6387c8ff3997d02e2c6f89c07d3d635c2e6d41744e5f400397b368b812e5482783541d0b5d70
+  data.tar.gz: 43c8d4fae12b32497eecf8c89b289be5a9746fab0a297249adc0a1e1d6ba1958b1713df81bbfe7201e198d3f54b93d8aa0da629b4873506d567f7b51f2df9dc6

data/README.md

@@ -93,6 +93,10 @@ Required:
  * `secret_access_key`
  * `bucket_name`
 
+Optional:
+
+ * `host` (defaults to s3.amazonaws.com)
+
 Usage
 -----
 

data/lib/dandelion/command.rb

@@ -44,6 +44,18 @@ module Dandelion
             opts.on('--config=[CONFIG]', 'Use the given config file') do |config|
               options[:config] = config
             end
+
+            opts.on('--log=[level]', 'Use the given log level (fatal, error, warn, info, debug)') do |level|
+              levels = {
+                fatal: Logger::FATAL,
+                error: Logger::ERROR,
+                warn: Logger::WARN,
+                info: Logger::INFO,
+                debug: Logger::DEBUG
+              }
+
+              Dandelion.logger.level = levels[level.to_sym]
+            end
           end
         end
       end

data/lib/dandelion/deployer.rb

@@ -23,13 +23,25 @@ module Dandelion
           local_path, remote_path = path.first
         end
 
-        log.debug("Writing file:  #{local_path} -> #{remote_path}")
-        @adapter.write(remote_path, IO.read(local_path))
+        if File.directory?(local_path)
+          paths = expand_paths(local_path, remote_path)
+        else
+          paths = [[local_path, remote_path]]
+        end
+
+        paths.each do |local_path, remote_path|
+          deploy_file!(local_path, remote_path)
+        end
       end
     end
 
   private
 
+    def deploy_file!(local_path, remote_path)
+      log.debug("Writing file:  #{local_path} -> #{remote_path}")
+      @adapter.write(remote_path, IO.read(local_path))
+    end
+
     def deploy_change!(change)
       case change.type
       when :write
@@ -46,6 +58,21 @@ module Dandelion
       excluded.map { |e| path.start_with?(e) }.any?
     end
 
+    def expand_paths(dir, remote_path)
+      paths = Dir.glob(File.join(dir, '**/*')).map do |path|
+        trimmed = trim_path(dir, path)
+        [path, File.join(remote_path, trimmed)]
+      end
+
+      paths.reject do |local_path, remote_path|
+        File.directory?(local_path)
+      end
+    end
+
+    def trim_path(dir, path)
+      path[dir.length..-1]
+    end
+
     def log
       Dandelion.logger
     end

data/lib/dandelion/version.rb

@@ -1,3 +1,3 @@
 module Dandelion
-  VERSION = '0.4.0.beta2'
-end
+  VERSION = '0.4.0'
+end

data/spec/dandelion/command_spec.rb

@@ -66,5 +66,10 @@ describe Dandelion::Command::Base do
       parser.order!(['--config=foo'])
       expect(options[:config]).to eq 'foo'
     end
+
+    it 'parses log level' do
+      parser.order!(['--log=warn'])
+      expect(Dandelion.logger.level).to eq Logger::WARN
+    end
   end
 end

data/spec/dandelion/deployer_spec.rb

@@ -35,6 +35,8 @@ describe Dandelion::Deployer do
     before(:each) do
       IO.stub(:read).with('a.txt').and_return('A')
       IO.stub(:read).with('b.txt').and_return('B')
+      IO.stub(:read).with('c/a.txt').and_return('cA')
+      IO.stub(:read).with('c/b.txt').and_return('cB')
     end
 
     context 'local paths' do
@@ -61,5 +63,25 @@ describe Dandelion::Deployer do
         deployer.deploy_files!(files)
       end
     end
+
+    context 'directory' do
+      let(:files) {[
+        { 'c/' => 'C/' }
+      ]}
+
+      before(:each) do
+        File.stub(:directory?).with('c/').and_return(true)
+        File.stub(:directory?).with('c/a.txt').and_return(false)
+        File.stub(:directory?).with('c/b.txt').and_return(false)
+        Dir.stub(:glob).with('c/**/*').and_return(['c/a.txt', 'c/b.txt'])
+      end
+
+      it 'performs writes on adapter' do
+        adapter.should_receive(:write).with('C/a.txt', 'cA')
+        adapter.should_receive(:write).with('C/b.txt', 'cB')
+
+        deployer.deploy_files!(files)
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dandelion
 version: !ruby/object:Gem::Version
-  version: 0.4.0.beta2
+  version: 0.4.0
 platform: ruby
 authors:
 - Scott Nelson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-01 00:00:00.000000000 Z
+date: 2014-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged
@@ -122,9 +122,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.14