dust-deploy 0.7.4 → 0.7.5

data/bin/dust

@@ -77,9 +77,7 @@ module  Dust
         # connect to server
         server = Server.new node
         next unless server.connect
-        ret = server.exec cmd
-        puts "#{Dust.grey}#{ret[:stdout]}#{Dust.none}"
-        puts "#{Dust.red}#{ret[:stderr]}#{Dust.none}"
+        server.exec cmd, :live => true
         server.disconnect
       end
     end
@@ -210,6 +208,7 @@ module  Dust
 
         # if more than one hostname is specified, create a node
         # with the same settings for each hostname
+        node['hostname'] = [ node['hostname'] ] unless node['hostname'].is_a? Enumerable
         node['hostname'].each do |hostname|
           n = node.clone
 

data/changelog.md

@@ -1,6 +1,13 @@
 Changelog
 =============
 
+0.7.5
+------------
+
+-  dust is now compatible with ruby 1.9 again
+-  'dust exec' now displays stdout/stderr live
+
+
 0.7.4
 ------------
 

data/lib/dust/print_status.rb

@@ -25,25 +25,25 @@ module Dust
   def self.print_ok string='', options={:quiet => false, :indent => 1}
     opts = options.clone
     opts[:indent] = 0 if string.empty?
-    print_msg "#{string} #{blue}[ ok ]#{none}\n", opts
+    print_msg "#{string} #{blue}[ ok ]#{none}\n", opts
     true
   end
 
   def self.print_failed string='', options={:quiet => false, :indent => 1}
     opts = options.clone
     opts[:indent] = 0 if string.empty?
-    print_msg "#{string} #{red}[ failed ]#{none}\n", opts
+    print_msg "#{string} #{red}[ failed ]#{none}\n", opts
     false
   end
 
   def self.print_warning string='', options={:quiet => false, :indent => 1}
     opts = options.clone
     opts[:indent] = 0 if string.empty?
-    print_msg "#{string} #{yellow}[ warning ]#{none}\n", opts
+    print_msg "#{string} #{yellow}[ warning ]#{none}\n", opts
   end
 
   def self.print_hostname hostname, options={:quiet => false, :indent => 0}
-    print_msg "\n[ #{blue}#{hostname}#{none} ]\n\n", options
+    print_msg "\n[ #{blue}#{hostname}#{none} ]\n\n", options
   end
 
   def self.print_recipe recipe, options={:quiet => false, :indent => 0}

data/lib/dust/recipes/hash_check.rb

@@ -11,8 +11,7 @@ class HashCheck < Recipe
     ::Dust.print_msg "checking for weak password hashes\n"
 
     found_weak = false
-
-    shadow.each do |line|
+    shadow.each_line do |line|
       user, hash = line.split(':')[0..1]
       next if keys.include? hash
       method, salt = hash.split('$')[1..2]

data/lib/dust/recipes/iptables.rb

@@ -255,7 +255,7 @@ class Iptables < Recipe
   
   # prepend iptables command on non-centos-like machines
   def prepend_cmd
-    @script = @script.map { |s| "#{cmd} #{s}" }.to_s unless @node.uses_rpm?
+    @script.gsub! /^/, "#{cmd} " unless @node.uses_rpm?
   end
   
   # apply newly pushed rules

data/lib/dust/recipes/rc_local.rb

@@ -6,6 +6,8 @@ class RcLocal < Recipe
       ::Dust.print_msg "configuring custom startup script\n"
 
       rc = ''
+      @config = [ @config ] unless @config.is_a? Enumerable
+
       @config.each do |cmd|
         ::Dust.print_msg "adding command: #{cmd}", :indent => 2
         rc += "#{cmd}\n"

data/lib/dust/recipes/ssh_authorized_keys.rb

@@ -40,14 +40,14 @@ class SshAuthorizedKeys < Recipe
   # creating user if not existent
   def deploy_authorized_keys user, authorized_keys
     # create user, if not existent
-    next unless @node.create_user user
+    return unless @node.create_user user
     
     home = @node.get_home user
     # check and create necessary directories
-    next unless @node.mkdir("#{home}/.ssh")
+    return unless @node.mkdir("#{home}/.ssh")
     
     # deploy authorized_keys
-    next unless @node.write "#{home}/.ssh/authorized_keys", authorized_keys
+    return unless @node.write "#{home}/.ssh/authorized_keys", authorized_keys
     
     # check permissions
     @node.chown "#{user}:#{user}", "#{home}/.ssh"

data/lib/dust/recipes/sudoers.rb

@@ -12,7 +12,7 @@ class Sudoers < Recipe
       if rule.is_a? String
         file = "#{rule}\n"
         
-      # rulename: { user: [ user1, user2 ], command: [ cmd1, cmd2 ] }
+      # rulename: { user: [ user1, user2 ], command: [ cmd1, cmd2 ] }
       else
         unless rule['user'] and rule['command']
           ::Dust.print_failed 'user or command missing', :indent => 2

data/lib/dust/version.rb

@@ -1,3 +1,3 @@
 module Dust
-  VERSION = "0.7.4"
+  VERSION = "0.7.5"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 4
-  version: 0.7.4
+  - 5
+  version: 0.7.5
 platform: ruby
 authors: 
 - kris kechagia
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-17 00:00:00 +01:00
+date: 2012-02-20 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency