dust-deploy 0.7.3 → 0.7.4

data/changelog.md

@@ -1,11 +1,21 @@
 Changelog
 =============
 
+0.7.4
+------------
+
+-  node.install_package now repsects options
+-  make sure openssh-clients is installed on rpm machines before trying to scp
+-  node.exec now supports :live => true option, which displays stdout/stderr live
+-  'dust system_update' uses this new live function, so you can now watch the update process live
+
+
 0.7.3
 ------------
 
 -  fixes issue in node.get_home (errors when there were two similar usernames or two passwd entries for the same user)
 
+
 0.7.2
 ------------
 

data/lib/dust/print_status.rb

@@ -55,8 +55,8 @@ module Dust
     opts = options.clone
 
     opts[:indent] += 1
-    print_msg "#{grey}#{ret[:stdout].chomp}#{none}\n", opts unless ret[:stdout].empty?
-    print_msg "#{red}#{ret[:stderr].chomp}#{none}\n", opts unless ret[:stderr].empty?
+    print_msg "#{green 0}#{ret[:stdout].chomp}#{none}\n", opts unless ret[:stdout].empty?
+    print_msg "#{red 0}#{ret[:stderr].chomp}#{none}\n", opts unless ret[:stderr].empty?
   end
 
   # indent according to options[:indent]

data/lib/dust/server.rb

@@ -50,7 +50,7 @@ module Dust
       @ssh.close
     end
   
-    def exec command
+    def exec command, options={:live => false}
       sudo_authenticated = false
       stdout = ''
       stderr = ''
@@ -78,10 +78,16 @@ module Dust
               sudo_authenticated = true
             else
               stdout += data
-            end            
+            end
+
+            Dust.print_msg "#{Dust.green 0}#{data}#{Dust.none}", :indent => 0 if options[:live] and not data.empty?
+          end
+
+          channel.on_extended_data do |ch, type, data|
+            stderr += data
+            Dust.print_msg "#{Dust.red 0}#{data}#{Dust.none}", :indent => 0 if options[:live] and not data.empty?
           end
 
-          channel.on_extended_data { |ch, type, data| stderr += data }
           channel.on_request('exit-status') { |ch, data| exit_code = data.read_long }
           channel.on_request('exit-signal') { |ch, data| exit_signal = data.read_long }
         end
@@ -124,6 +130,9 @@ module Dust
     def scp source, destination, options = {}
       options = default_options.merge options
 
+      # make sure scp is installed on client
+      install_package 'openssh-clients', :quiet => true if uses_rpm?
+
       Dust.print_msg "deploying #{File.basename source}", options
 
       # if in sudo mode, copy file to temporary place, then move using sudo
@@ -244,11 +253,11 @@ module Dust
       options = default_options.merge options
       options[:env] ||= ''
       
-      if package_installed? package, :quiet=>true
-        return Dust.print_ok "package #{package} already installed"
+      if package_installed? package, :quiet => true
+        return Dust.print_ok "package #{package} already installed", options
       end
 
-      Dust.print_msg "installing #{package}"
+      Dust.print_msg "installing #{package}", options
 
       if uses_apt?
         exec "DEBIAN_FRONTEND=noninteractive aptitude install -y #{package}"
@@ -257,11 +266,11 @@ module Dust
       elsif uses_rpm?
         exec "yum install -y #{package}"
       else
-        Dust.print_failed 'install_package only supports apt, emerge and rpm systems at the moment'
+        Dust.print_failed 'install_package only supports apt, emerge and rpm systems at the moment', options
       end
 
       # check if package actually was installed
-      Dust.print_result package_installed? package, :quiet => true
+      Dust.print_result package_installed?(package, :quiet => true), options
     end
 
     def remove_package package, options = {}
@@ -287,38 +296,53 @@ module Dust
       options = default_options.merge options
 
       Dust.print_msg 'updating system repositories', options
+      puts if options[:live]
 
       if uses_apt?
-        Dust.print_result exec('aptitude update')[:exit_code], options
+        ret = exec 'aptitude update', options
       elsif uses_emerge?
-        Dust.print_result exec('emerge --sync')[:exit_code], options
+        ret = exec 'emerge --sync', options
       elsif uses_rpm?
-        Dust.print_result exec('yum check-update')[:exit_code], options
+        ret = exec 'yum check-update', options
       else
-        Dust.print_failed '', options
+        return Dust.print_failed '', options
+      end
+
+      if options[:live]
+        puts
+      else
+        Dust.print_result ret[:exit_code], options
       end
+ 
+      ret[:exit_code]
     end
 
     def system_update options = {}
-      options = default_options.merge options
+      options = default_options.merge(:live => true).merge(options)
     
       update_repos
       
       Dust.print_msg 'installing system updates', options
+      puts if options[:live]
 
       if uses_apt?
-        ret = exec 'DEBIAN_FRONTEND=noninteractive aptitude full-upgrade -y'
+        ret = exec 'DEBIAN_FRONTEND=noninteractive aptitude full-upgrade -y', options
       elsif uses_emerge?
-        ret = exec 'emerge -uND @world'
+        ret = exec 'emerge -uND @world', options
       elsif uses_rpm?
-        ret = exec 'yum upgrade -y'
+        ret = exec 'yum upgrade -y', options
       else
-        Dust.print_failed "\nsystem not (yet) supported", options
+        Dust.print_failed 'system not (yet) supported', options
         return false
       end
-     
-      Dust.print_result ret[:exit_code], options
-      Dust.print_ret ret, options
+
+      if options[:live] 
+        puts
+      else
+        Dust.print_result ret[:exit_code], options
+      end
+
+      ret[:exit_code]
     end
 
     # determining the system packet manager has to be done without facter
@@ -350,8 +374,8 @@ module Dust
     def is_os? os_list, options = {}
       options = default_options(:quiet => true).merge options
 
-      Dust.print_msg "checking if this machine runs #{os_list.join(' or ')}", options
-      collect_facts options
+      Dust.print_msg "checking if this machine runs #{os_list.join(' or ')}", options      
+      return Dust.print_failed '', options unless collect_facts options
 
       os_list.each do |os|
         if @node['operatingsystem'].downcase == os.downcase
@@ -537,7 +561,7 @@ module Dust
       end
 
       unless package_installed? 'facter', :quiet => true
-        install_package 'facter', :quiet => false
+        return false unless install_package 'facter', :quiet => false
       end
 
       Dust.print_msg "collecting additional system facts (using facter)", options

data/lib/dust/version.rb

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

metadata

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