dust-deploy 0.12.2 → 0.13.0

data/lib/dust/recipe.rb

@@ -8,7 +8,7 @@ class Recipe < Thor
     @node = node
     @options = options
 
-    # if this recipe just was defined as true, yes or 'enabled', 
+    # if this recipe just was defined as true, yes or 'enabled',
     # continue with empty @config, so defaults get used
     if config.is_a? TrueClass or config == 'enabled'
       @config = {}
@@ -16,6 +16,9 @@ class Recipe < Thor
       @config = config
     end
 
+    # prepare messaging class for this recipe
+    @node.messages.start_recipe(recipe)
+
     # run task
     send context
   end

data/lib/dust/recipes/aliases.rb

@@ -5,15 +5,15 @@ class Aliases < Recipe
     
     @node.deploy_file "#{@template_path}/aliases", '/etc/aliases', :binding => binding
 
-    ::Dust.print_msg 'running newaliases'
-    ::Dust.print_result @node.exec('newaliases')[:exit_code]
+    msg = @node.messages.add('running newaliases')
+    msg.parse_result(@node.exec('newaliases')[:exit_code])
   end
   
   desc 'aliases:status', 'shows current aliases'
   def status
-    ::Dust.print_msg 'getting /etc/aliases'
+    msg = @node.messages.add('getting /etc/aliases')
     ret = @node.exec 'cat /etc/aliases'
-    ::Dust.print_result ret[:exit_code]
-    ::Dust.print_ret ret
+    msg.parse_result(ret[:exit_code])
+    msg.print_output(ret)
   end
 end

data/lib/dust/recipes/apt.rb

@@ -9,7 +9,7 @@ class Apt < Recipe
     proxy @config.delete('proxy')
 
     @config.each do |name, settings|
-      ::Dust.print_msg "deploying apt settings #{name}\n"
+      @node.messages.add("deploying apt settings #{name}\n")
       conf = ''
       settings.to_array.each do |setting|
         conf << "#{setting}\n"
@@ -40,7 +40,7 @@ class Apt < Recipe
 
     @node.install_package 'unattended-upgrades'
 
-    ::Dust.print_msg "deploying unattended upgrades configuration\n"
+    @node.messages.add("deploying unattended upgrades configuration\n")
     periodic = ''
     periodic << "APT::Periodic::Enable \"#{config['enable']}\";\n"
     periodic << "APT::Periodic::Update-Package-Lists \"#{config['update-package-lists']}\";\n"
@@ -60,13 +60,13 @@ class Apt < Recipe
       # skip 02proxy, because we're going to overwrite it anyways
       next if file == '/etc/apt/apt.conf.d/02proxy'
 
-      ::Dust.print_warning "found proxy configuration in file #{file}, commenting out"
+      @node.messages.add("found proxy configuration in file #{file}, commenting out").warning
       @node.exec "sed -i 's/^\\(acquire::http::proxy.*\\)/#\\1/i' #{file}"
     end
 
     return if config.is_a? FalseClass or config == 'disabled'
     
-    ::Dust.print_msg "deploying proxy configuration\n"
+    @node.messages.add("deploying proxy configuration\n")
     proxy = "Acquire::http::Proxy \"#{config}\";\n"
 
     @node.write '/etc/apt/apt.conf.d/02proxy', proxy, :indent => 2

data/lib/dust/recipes/cjdroute.rb

@@ -2,7 +2,7 @@ require 'json'
 
 class Cjdroute< Recipe
   desc 'cjdroute:deploy', 'installs / updates cjdns'
-  def deploy 
+  def deploy
     # apply default configuration
     @config = default_config.merge @config
 
@@ -12,7 +12,6 @@ class Cjdroute< Recipe
     # clean up building directory, if --restart is given
     # using --restart, since there's no --cleanup
     return unless make_clean if @options.restart?
-    return unless @node.mkdir "#{@config['build_dir']}/build"
 
     # compiling action
     return unless run_make
@@ -32,7 +31,7 @@ class Cjdroute< Recipe
 
   private
   def default_config
-    { 
+    {
       'git_repo' => 'git://github.com/cjdelisle/cjdns.git',
       'git_branch' => 'master',
       'build_dir' => '/tmp/cjdns-tmp',
@@ -45,14 +44,14 @@ class Cjdroute< Recipe
 
   # installs cmake, git and other building tools needed
   def install_dependencies
-    ::Dust.print_msg "installing build dependencies\n"
+    @node.messages.add("installing build dependencies\n")
 
     return false unless @node.install_package 'cmake', :indent => 2
 
     # check cmake version
     ret = @node.exec 'cmake --version'
     ver = ret[:stdout].match(/2.[0-9]/)[0].to_f
-    return ::Dust.print_failed 'cjdroute requires cmake 2.8 or higher' if ver < 2.8
+    return @node.messages.add('cjdroute requires cmake 2.8 or higher').failed if ver < 2.8
 
 
     if @node.uses_apt?
@@ -66,7 +65,6 @@ class Cjdroute< Recipe
       return false unless @node.install_package 'make', :indent => 2
     end
 
-    puts
     true
   end
 
@@ -76,64 +74,60 @@ class Cjdroute< Recipe
 
       # check if build directory is maintained by git
       unless @node.dir_exists? "#{@config['build_dir']}/.git", :quiet => true
-        return ::Dust.print_failed "#{@config['build_dir']} doesn't appear to be a git repository"
+        return @node.messages.add("#{@config['build_dir']} doesn't appear to be a git repository").failed
       end
 
       # git pull latest changes
-      ::Dust.print_msg "checking out branch '#{@config['git_branch']}'"
+      msg = @node.messages.add("checking out branch '#{@config['git_branch']}'")
       ret = @node.exec("cd #{@config['build_dir']}; git checkout #{@config['git_branch']}")[:exit_code]
-      return unless Dust.print_result(ret)
+      return unless msg.parse_result(ret)
 
-      ::Dust.print_msg "pulling latest changes from repository\n"
-      ret = @node.exec "cd #{@config['build_dir']}; git pull", :live => true
-      return ::Dust.print_failed 'error pulling from git repository' unless ret[:exit_code] == 0
+      msg = @node.messages.add('pulling latest changes from repository')
+      ret = @node.exec("cd #{@config['build_dir']}; git pull", :live => true)[:exit_code]
+      return unless msg.parse_result(ret)
 
     else
       # create build directory
       unless @node.mkdir @config['build_dir']
-        return ::Dust.print_failed "couldn't create build directory #{@config['build_dir']}"
+        return @node.messages.add("couldn't create build directory #{@config['build_dir']}").failed
       end
 
       # git clone cjdns repository
-      ::Dust.print_msg "cloning cjdns repository into #{@config['build_dir']}\n"
-      ret = @node.exec "git clone #{@config['git_repo']} -b #{@config['git_branch']} #{@config['build_dir']}", :live => true
-      return ::Dust.print_failed 'error cloning git repository' unless ret[:exit_code] == 0
+      msg = @node.messages.add("cloning cjdns repository into #{@config['build_dir']}")
+      ret = @node.exec("git clone #{@config['git_repo']} -b #{@config['git_branch']} #{@config['build_dir']}", :live => true)
+      return unless msg.parse_result(ret[:exit_code])
     end
 
     # reset to the wanted commit if given
     if @config['commit']
-      ::Dust.print_msg "resetting to commit: #{@config['commit']}"
-      ::Dust.print_result @node.exec("cd #{@config['build_dir']}; git reset --hard #{@config['commit']}")[:exit_code]
+      msg = @node.messages.add("resetting to commit: #{@config['commit']}")
+      msg.parse_result(@node.exec("cd #{@config['build_dir']}; git reset --hard #{@config['commit']}")[:exit_code])
     end
 
-    puts
     true
   end
 
   # remove and recreate building directory
   def make_clean
-    ::Dust.print_msg 'cleaning up'
-    return false unless ::Dust.print_result @node.exec("rm -rf #{@config['build_dir']}/build")[:exit_code]
-    true
+    msg = @node.messages.add('cleaning up')
+    msg.parse_result(@node.exec("rm -rf #{@config['build_dir']}/build")[:exit_code])
   end
 
   def run_make
-    ::Dust.print_msg "compiling cjdns\n"
-    ret = @node.exec "export Log_LEVEL=#{@config['loglevel']}; cd #{@config['build_dir']}; ./do", :live => true
-    return ::Dust.print_failed 'error compiling cjdroute' unless ret[:exit_code] == 0
-    true
+    msg = @node.messages.add('compiling cjdns')
+    msg.parse_result(@node.exec("export Log_LEVEL=#{@config['loglevel']}; cd #{@config['build_dir']}; ./do", :live => true)[:exit_code])
   end
 
   # generate cjdroute.conf
   def generate_config
     if @node.file_exists? "#{@config['etc_dir']}/cjdroute.conf", :quiet => true
-      ::Dust.print_warning 'found a cjdroute.conf, not overwriting'
+      @node.messages.add('found a cjdroute.conf, not overwriting').warning
       return true
     end
-    
-    ::Dust.print_msg 'generating config file'
+
+    msg = @node.messages.add('generating config file')
     ret = @node.exec("#{@config['bin_dir']}/cjdroute --genconf")
-    return false unless ::Dust.print_result ret[:exit_code]
+    return false unless msg.parse_result(ret[:exit_code])
 
     # parse generated json
     cjdroute_conf = JSON.parse ret[:stdout]
@@ -147,14 +141,17 @@ class Cjdroute< Recipe
 
   # kill any cjdroute processes that might be running
   def stop_cjdroute
-    ::Dust.print_msg 'stopping cjdroute'
-    ::Dust.print_result @node.exec('killall cjdroute')[:exit_code]
+    msg = @node.messages.add('stopping cjdroute')
+    msg.parse_result(@node.exec('killall cjdroute')[:exit_code])
+
+    msg = @node.messages.add('waiting 2 seconds for cjdroute to finish')
+    sleep 2
+    msg.ok
   end
 
   # fire up cjdroute
   def start_cjdroute
-    sleep 2 # sleep to make sure old cjdroute is dead
-    ::Dust.print_msg 'fireing up cjdroute'
-    ::Dust.print_result @node.exec("nohup #{@config['bin_dir']}/cjdroute < #{@config['etc_dir']}/cjdroute.conf &> /dev/null &")[:exit_code]
+    msg = @node.messages.add('fireing up cjdroute')
+    msg.parse_result(@node.exec("nohup #{@config['bin_dir']}/cjdroute < #{@config['etc_dir']}/cjdroute.conf &> /dev/null &")[:exit_code])
   end
 end

data/lib/dust/recipes/cups_client.rb

@@ -3,18 +3,18 @@ class CupsClient < Recipe
   def deploy 
     return false unless install
     
-    return ::Dust.print_failed 'no printserver specified.' unless @config
+    return @node.messages.add('no printserver specified.').failed unless @config
     
-    ::Dust.print_ok "setting servername to: #{@config}"
+    @node.messages.add("setting servername to: #{@config}").ok
     @node.write '/etc/cups/client.conf', "ServerName #{@config}\n"
   end
   
   desc 'cups_client:status', 'shows current /etc/cups/client.conf'
   def status
-    ::Dust.print_msg 'getting /etc/cups/client.conf'
+    msg = @node.messages.add('getting /etc/cups/client.conf')
     ret = @node.exec 'cat /etc/cups/client.conf'
-    ::Dust.print_result ret[:exit_code]
-    ::Dust.print_ret ret
+    msg.parse_result(ret[:exit_code])
+    msg.print_output(ret)
   end
   
   private

data/lib/dust/recipes/debsecan.rb

@@ -6,7 +6,7 @@ class Debsecan < Recipe
     if @node.is_os? ['ubuntu', 'debian']
       @node.install_package 'debsecan'
 
-      ::Dust.print_msg 'configuring debsecan'
+      msg = @node.messages.add('configuring debsecan')
 
       # if config is simply set to "true", use defaults
       config = {} unless config.is_a? Hash
@@ -21,7 +21,7 @@ class Debsecan < Recipe
       # configures whether daily reports are sent
       config_file << "# If true, enable daily reports, sent by email.\n" +
                      "REPORT=#{config['report'].to_s}\n\n"
-     
+
       # configures the suite
       config_file << "# For better reporting, specify the correct suite here, using the code\n" +
                      "# name (that is, \"sid\" instead of \"unstable\").\n" +
@@ -37,9 +37,9 @@ class Debsecan < Recipe
                      "SOURCE=#{config['source']}\n\n"
 
       @node.write '/etc/default/debsecan', config_file, :quiet => true
-      ::Dust.print_ok
+      msg.ok
     else
-      ::Dust.print_failed 'os not supported'
+      msg.failed('os not supported')
     end
   end
 end

data/lib/dust/recipes/duplicity.rb

@@ -18,13 +18,13 @@ class Duplicity < Recipe
 
       # check whether backend is specified, skip to next scenario if not
       unless config['backend'] and config['passphrase']
-        ::Dust.print_failed "scenario #{scenario}: backend or passphrase missing.", 1
+        @node.messages.add("scenario #{scenario}: backend or passphrase missing.").failed
         next
       end
 
       # check if interval is correct
       unless [ 'monthly', 'weekly', 'daily', 'hourly' ].include? config['interval']
-        return ::Dust.print_failed "invalid interval: '#{config['interval']}'"
+        return @node.messages.add("invalid interval: '#{config['interval']}'").failed
       end
 
       # check whether we need ncftp
@@ -35,8 +35,8 @@ class Duplicity < Recipe
 
       # add hostkey to known_hosts
       if config['hostkey']
-        ::Dust.print_msg 'checking if ssh key is in known_hosts'
-        unless ::Dust.print_result @node.exec("grep -q '#{config['hostkey']}' /root/.ssh/known_hosts")[:exit_code] == 0
+        msg = @node.messages.add('checking if ssh key is in known_hosts')
+        unless msg.parse_result(@node.exec("grep -q '#{config['hostkey']}' /root/.ssh/known_hosts")[:exit_code] == 0)
           @node.mkdir '/root/.ssh', :indent => 2
           @node.append '/root/.ssh/known_hosts', "#{config['hostkey']}\n", :indent => 2
         end
@@ -46,14 +46,13 @@ class Duplicity < Recipe
       cronjob_path = "/etc/cron.#{config['interval']}/duplicity-#{scenario}"
 
       # adjust and upload cronjob
-      ::Dust.print_msg "adjusting and deploying cronjob (scenario: #{scenario}, interval: #{config['interval']})\n"
-      config['options'].to_array.each { |option| ::Dust.print_ok "adding option: #{option}", :indent => 2 }
+      @node.messages.add("adjusting and deploying cronjob (scenario: #{scenario}, interval: #{config['interval']})\n")
+      config['options'].to_array.each { |option| @node.messages.add("adding option: #{option}", :indent => 2).ok }
 
       @node.deploy_file "#{@template_path}/cronjob", cronjob_path, :binding => binding
 
       # making cronjob executeable
       @node.chmod '0700', cronjob_path
-      puts
     end
   end
 
@@ -70,9 +69,9 @@ class Duplicity < Recipe
       config['directory'] ||= "#{@node['hostname']}-#{scenario}"
 
       # check whether backend is specified, skip to next scenario if not
-      return ::Dust.print_failed 'no backend specified.' unless config['backend']
+      return @node.messages.add('no backend specified.').failed unless config['backend']
 
-      ::Dust.print_msg "running collection-status for scenario '#{scenario}'"
+      msg = @node.messages.add("running collection-status for scenario '#{scenario}'")
       cmd = "nice -n #{config['nice']} duplicity collection-status " +
             "--archive-dir #{config['archive']} " +
             "#{File.join(config['backend'], config['directory'])}"
@@ -82,15 +81,14 @@ class Duplicity < Recipe
       ret = @node.exec cmd
 
       # check exit code and stdout shouldn't be empty
-      ::Dust.print_result( (ret[:exit_code] == 0 and ret[:stdout].length > 0) )
+      msg.parse_result( (ret[:exit_code] == 0 and ret[:stdout].length > 0) )
 
       if options.long?
-        ::Dust.print_msg ret[:stdout], :indent => 0
+        @node.messages.add(ret[:stdout], :indent => 0)
       else
-        ::Dust.print_msg "\t" + ret[:stdout].sub(/^\s+([a-zA-Z]+)\s+(\w+\s+\w+\s+\d+\s+\d+:\d+:\d+\s+\d+)\s+(\d+)$/, 'Last backup: \1 (\3 sets) on \2'), :indent => 0
+        @node.messages.add("\t" + ret[:stdout].sub(/^\s+([a-zA-Z]+)\s+(\w+\s+\w+\s+\d+\s+\d+:\d+:\d+\s+\d+)\s+(\d+)$/, 'Last backup: \1 (\3 sets) on \2'), :indent => 0)
       end
 
-      puts
     end
   end
 
@@ -111,9 +109,9 @@ class Duplicity < Recipe
 
   # removes all duplicity cronjobs
   def remove_duplicity_cronjobs
-    ::Dust.print_msg 'deleting old duplicity cronjobs'
+    msg = @node.messages.add('deleting old duplicity cronjobs')
     @node.rm '/etc/cron.*/duplicity*', :quiet => true
-    ::Dust.print_ok
+    msg.ok
   end
 
 end

data/lib/dust/recipes/etc_hosts.rb

@@ -12,9 +12,9 @@ class EtcHosts < Recipe
 
   desc 'etc_hosts:status', 'shows current /etc/hosts'
   def status
-    ::Dust.print_msg 'getting /etc/hosts'
+    msg = @node.messages.add('getting /etc/hosts')
     ret = @node.exec 'cat /etc/hosts'
-    ::Dust.print_result ret[:exit_code]
-    ::Dust.print_ret ret
+    msg.parse_result(ret[:exit_code])
+    msg.print_output(ret)
   end
 end

data/lib/dust/recipes/hash_check.rb

@@ -1,5 +1,5 @@
 class HashCheck < Recipe
-  
+
   desc 'hash_check:deploy', 'checks /etc/shadow for weak hashes'
   def deploy
     # those keys indicate that no password is set, or login is disabled
@@ -8,7 +8,7 @@ class HashCheck < Recipe
     weak_passwords = File.open "#{@template_path}/weak_passwords", 'r'
 
     shadow = @node.exec('getent shadow')[:stdout]
-    ::Dust.print_msg "checking for weak password hashes\n"
+    @node.messages.add("checking for weak password hashes\n")
 
     found_weak = false
     shadow.each_line do |line|
@@ -25,17 +25,16 @@ class HashCheck < Recipe
         ret = @node.exec("python -c \"import crypt; print(crypt.crypt('#{password}', '\\$#{method}\\$#{salt}\\$'));\"")
 
         unless ret[:exit_code] == 0
-          ::Dust.print_failed 'error during hash creation (is python installed?)'
-          return false
+          return msg.failed('error during hash creation (is python installed?)')
         end
         if hash == ret[:stdout].chomp
-          ::Dust.print_failed "user #{user} has a weak password! (#{password})", :indent => 2
+          @node.messages.add("user #{user} has a weak password! (#{password})", :indent => 2).failed
           found_weak = true
         end
       end
     end
 
     weak_passwords.close
-    ::Dust.print_ok 'none found.', :indent => 2 unless found_weak
+    @node.messages.add('none found.', :indent => 2).ok unless found_weak
   end
 end

data/lib/dust/recipes/iptables.rb

@@ -24,7 +24,7 @@ class Iptables < Recipe
       @script = ''
       @ip_version = v
 
-      ::Dust.print_msg "generating ipv#{@ip_version} rules\n"
+      @node.messages.add("generating ipv#{@ip_version} rules\n")
 
       clear_all
       populate_rule_defaults
@@ -32,18 +32,15 @@ class Iptables < Recipe
 
       deploy_script
       apply_rules
-
-      puts
     end
   end
 
   desc 'iptables:status', 'displays iptables rules'
   def status
-    ::Dust.print_ok 'displaying iptables rules (ipv4)'
-    ::Dust.print_msg @node.exec('iptables -L -v -n')[:stdout], :indent => 0
-    puts
-    ::Dust.print_ok 'displaying iptables rules (ipv6)'
-    ::Dust.print_msg @node.exec('ip6tables -L -v -n')[:stdout], :indent => 0
+    @node.messages.add('displaying iptables rules (ipv4)').ok
+    @node.messages.add(@node.exec('iptables -L -v -n')[:stdout], :indent => 0)
+    @node.messages.add('displaying iptables rules (ipv6)').ok
+    @node.messages.add(@node.exec('ip6tables -L -v -n')[:stdout], :indent => 0)
   end
 
   private
@@ -152,14 +149,13 @@ class Iptables < Recipe
       rules = get_rules_for_table chain_rules, table
       next if rules.empty?
 
-      #::Dust.print_msg "#{::Dust.pink}#{chain}#{::Dust.none} rules\n", :indent => 3
       rules.sort.each do |name, rule|
         next unless rule['table'].include? table
         next unless check_ip_version rule
 
-        ::Dust.print_msg "adding rule: #{name}", :indent => 2
+        msg = @node.messages.add("adding rule: #{name}", :indent => 2)
         generate_iptables_string chain, rule
-        ::Dust.print_ok
+        msg.ok
       end
     end
     @script << "COMMIT\n" if @node.uses_rpm?
@@ -187,7 +183,6 @@ class Iptables < Recipe
   # generates the iptables string out of a rule
   def generate_iptables_string chain, rule
     parse_rule(rule).each do |r|
-      #::Dust.print_msg "#{::Dust.grey}#{r.join ' '}#{::Dust.none}\n", :indent => 5
       @script << "--append #{chain.upcase} #{r.join ' '}\n"
     end
   end
@@ -290,22 +285,22 @@ class Iptables < Recipe
   # apply newly pushed rules
   def apply_rules
     if @options.restart?
-      ::Dust.print_msg "applying ipv#{@ip_version} rules"
+      msg = @node.messages.add("applying ipv#{@ip_version} rules")
 
       if @node.uses_rpm?
-        ::Dust.print_result @node.exec("/etc/init.d/#{cmd} restart")[:exit_code]
+        msg.parse_result(@node.exec("/etc/init.d/#{cmd} restart")[:exit_code])
 
       else
         ret = @node.exec get_target
-        ::Dust.print_result( (ret[:exit_code] == 0 and ret[:stdout].empty? and ret[:stderr].empty?) )
+        msg.parse_result( (ret[:exit_code] == 0 and ret[:stdout].empty? and ret[:stderr].empty?) )
       end
     end
 
     # on gentoo, rules have to be saved using the init script,
     # otherwise they won't get re-applied on next startup
     if @node.uses_emerge?
-      ::Dust.print_msg "saving ipv#{@ip_version} rules"
-      ::Dust.print_result @node.exec("/etc/init.d/#{cmd} save")[:exit_code]
+      msg = @node.messages.add("saving ipv#{@ip_version} rules")
+      msg.parse_result(@node.exec("/etc/init.d/#{cmd} save")[:exit_code])
     end
   end