dust-deploy 0.10.0 → 0.10.1

data/changelog.md

@@ -1,6 +1,17 @@
 Changelog
 =============
 
+0.10.1
+------------
+
+-  fixes an issue, where node.scp / node.write were not preserved if the file existed before
+-  repositories recipe now accepts multiple releases for custom repos
+
+   recipes:
+     repositories:
+       release: [ myrelease1, myrelease2 ]
+
+
 0.10.0
 ------------
 

data/lib/dust/recipes/repositories.rb

@@ -93,8 +93,10 @@ class Repositories < Recipe
   def generate_repo repo
     # add url to sources.list
     sources = ''
-    sources << "deb #{repo['url']} #{repo['release']} #{repo['components']}\n" if repo['binary']
-    sources << "deb-src #{repo['url']} #{repo['release']} #{repo['components']}\n" if repo['source']
+    repo['release'].to_array.each do |release|
+      sources << "deb #{repo['url']} #{release} #{repo['components']}\n" if repo['binary']
+      sources << "deb-src #{repo['url']} #{release} #{repo['components']}\n" if repo['source']
+    end
     sources
   end
   

data/lib/dust/server.rb

@@ -115,13 +115,9 @@ module Dust
       f.print content
       f.close
 
-      file_existed = file_exists? destination, :quiet => true
-
       ret = Dust.print_result scp(f.path, destination, :quiet => true), options
       f.unlink
 
-      # default to 644 unless file existed before
-      chmod '0644', destination, options unless file_existed
       ret
     end
 
@@ -144,6 +140,15 @@ module Dust
 
       Dust.print_msg "deploying #{File.basename source}", options
 
+      # save permissions if the file already exists
+      ret = exec "stat -c %a:%u:%g #{destination}" 
+      if ret[:exit_code] == 0
+        permissions, user, group = ret[:stdout].chomp.split ':'
+      else
+        # files = 644, dirs = 755
+        permissions = 'ug-x,o-wx,u=rwX,g=rX,o=rX'
+      end
+
       # if in sudo mode, copy file to temporary place, then move using sudo
       if @node['sudo'] 
         ret = exec 'mktemp --tmpdir dust.XXXXXXXXXX' 
@@ -166,6 +171,10 @@ module Dust
         Dust.print_ok '', options
       end
 
+      # set file permissions
+      chown "#{user}:#{group}", destination, :quiet => true if user and group
+      chmod permissions, destination, :quiet => true
+
       restorecon destination, options # restore SELinux labels
     end
   

data/lib/dust/version.rb

@@ -1,3 +1,3 @@
 module Dust
-  VERSION = "0.10.0"
+  VERSION = "0.10.1"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 10
-  - 0
-  version: 0.10.0
+  - 1
+  version: 0.10.1
 platform: ruby
 authors: 
 - kris kechagia
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-03 00:00:00 +02:00
+date: 2012-04-05 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency