dust-deploy 0.13.10 → 0.13.11

data/changelog.md

@@ -1,6 +1,12 @@
 Changelog
 =============
 
+0.13.11
+------------
+
+-  fixes node.scp issue, when target was a directory instead of a full path (including filename)
+
+
 0.13.10
 ------------
 

data/lib/dust/server.rb

@@ -149,9 +149,12 @@ module Dust
 
       msg = messages.add("deploying #{File.basename source}", options)
 
+      # check if destination is a directory
+      is_dir = dir_exists?(destination, :quiet => true)
+
       # save permissions if the file already exists
       ret = exec "stat -c %a:%u:%g #{destination}"
-      if ret[:exit_code] == 0
+      if ret[:exit_code] == 0 and not is_dir
         permissions, user, group = ret[:stdout].chomp.split ':'
       else
         # files = 644, dirs = 755
@@ -173,6 +176,11 @@ module Dust
         chown @node['user'], tmpfile, :quiet => true
         @ssh.scp.upload! source, tmpfile
         chown 'root', tmpfile, :quiet => true
+
+        # if destination is a directory, append real filename
+        destination = "#{destination}/#{File.basename(source)}" if is_dir
+
+        # move the file from the temporary location to where it actually belongs
         msg.parse_result(exec("mv -f #{tmpfile} #{destination}")[:exit_code])
 
       else

data/lib/dust/version.rb

@@ -1,3 +1,3 @@
 module Dust
-  VERSION = "0.13.10"
+  VERSION = "0.13.11"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dust-deploy
 version: !ruby/object:Gem::Version
-  version: 0.13.10
+  version: 0.13.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-16 00:00:00.000000000 Z
+date: 2012-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json