dust-deploy 0.12.2 → 0.13.0

data/lib/dust/recipes/redis.rb

@@ -3,18 +3,17 @@ class Redis < Recipe
   def deploy
     @node.install_package 'redis-server'
     @node.write '/etc/redis/redis.conf', generate_redis_conf
-    configure_sysctl
     @node.restart_service 'redis-server' if @options.restart
   end
 
   desc 'redis:status', 'displays redis-cli info'
   def status
     return false unless @node.package_installed? 'redis-server'
-    ::Dust.print_msg 'running "redis-cli info"'
+    msg = @node.messages.add('running "redis-cli info"')
     ret = @node.exec 'redis-cli info'
-    ::Dust.print_result ret[:exit_code]
+    msg.parse_result(ret[:exit_code])
 
-    ::Dust.print_msg ret[:stdout], :indent => 0 unless ret[:stdout].empty?
+    @node.messages.add(ret[:stdout], :indent => 0) unless ret[:stdout].empty?
   end
   
   
@@ -71,25 +70,4 @@ class Redis < Recipe
     
     redis_conf
   end
-  
-  # redis complains if vm.overcommit_memory != 1
-  def configure_sysctl
-    if @node.uses_apt?
-      ::Dust.print_msg "setting redis sysctl keys\n"
-      
-      ::Dust.print_msg 'setting overcommit memory to 1', :indent => 2
-      ::Dust.print_result @node.exec('sysctl -w vm.overcommit_memory=1')[:exit_code]
-      ::Dust.print_msg 'setting swappiness to 0', :indent => 2
-      ::Dust.print_result @node.exec('sysctl -w vm.swappiness=0')[:exit_code]
-      
-      file = ''
-      file << "vm.overcommit_memory=1\n"
-      file << "vm.swappiness=0\n"
-      
-      @node.write "/etc/sysctl.d/30-redis.conf", file
-      
-    else
-      ::Dust.print_warning 'sysctl configuration not supported for your os'
-    end
-  end
 end

data/lib/dust/recipes/repositories.rb

@@ -5,22 +5,21 @@ class Repositories < Recipe
 
     delete_old_repositories
     deploy_repositories
-    
+
     # fetch new stuff
-    puts
-    @node.update_repos if options.restart? or options.reload?        
+    @node.update_repos if options.restart? or options.reload?
   end
-  
-  
+
+
   private
-  
+
   # deletes all .list files under /etc/apt/sources.list.d
   def delete_old_repositories
-    :: Dust.print_msg 'deleting old repositories'
+    msg = @node.messages.add('deleting old repositories')
     @node.rm '/etc/apt/sources.list.d/*.list', :quiet => true if @node.uses_apt?
-    ::Dust.print_ok     
+    msg.ok
   end
-  
+
   def deploy_repositories
     @config.each do |name, repo|
 
@@ -28,16 +27,16 @@ class Repositories < Recipe
       repo = {} unless repo.is_a? Hash
 
       merge_with_default_settings repo
-      
+
       # the default repository in /etc/apt/sources.list (debian)
       if name == 'default'
-        ::Dust.print_msg 'deploying default repository'        
-        sources = generate_default_repo repo 
-        ::Dust.print_result @node.write('/etc/apt/sources.list', sources, :quiet => true)        
+        msg = @node.messages.add('deploying default repository'        )
+        sources = generate_default_repo repo
+        msg.parse_result(@node.write('/etc/apt/sources.list', sources, :quiet => true)        )
       else
-        ::Dust.print_msg "adding repository '#{name}' to sources"        
+        msg = @node.messages.add("adding repository '#{name}' to sources"        )
         sources = generate_repo repo
-        ::Dust.print_result @node.write("/etc/apt/sources.list.d/#{name}.list", sources, :quiet => true)        
+        msg.parse_result(@node.write("/etc/apt/sources.list.d/#{name}.list", sources, :quiet => true)        )
         add_repo_key name, repo
       end
     end
@@ -48,20 +47,20 @@ class Repositories < Recipe
     # setting defaults
     repo['url'] ||= 'http://ftp.debian.org/debian/' if @node.is_debian?
     repo['url'] ||= 'http://archive.ubuntu.com/ubuntu/' if @node.is_ubuntu?
-    
+
     repo['release'] ||= @node['lsbdistcodename']
     repo['components'] ||= 'main'
-    
+
     # ||= doesn't work for booleans
     repo['source'] = repo['source'].nil? ? true : repo['source']
     repo['binary'] = repo['binary'].nil? ? true : repo['binary']
-  end  
-  
+  end
+
   def generate_default_repo repo
     sources = ''
     sources << "deb #{repo['url']} #{repo['release']} #{repo['components']}\n"
     sources << "deb-src #{repo['url']} #{repo['release']} #{repo['components']}\n\n"
-    
+
     # security
     if @node.is_debian?
       sources << "deb http://security.debian.org/ #{repo['release']}/updates #{repo['components']}\n"
@@ -70,17 +69,17 @@ class Repositories < Recipe
       sources << "deb http://security.ubuntu.com/ubuntu/ #{repo['release']}-security #{repo['components']}\n"
       sources << "deb-src http://security.ubuntu.com/ubuntu/ #{repo['release']}-security #{repo['components']}\n\n"
     end
-    
+
     # updates
     sources << "deb #{repo['url']} #{repo['release']}-updates #{repo['components']}\n"
     sources << "deb-src #{repo['url']} #{repo['release']}-updates #{repo['components']}\n\n"
-    
+
     # proposed
     if @node.is_ubuntu?
       sources << "deb #{repo['url']} #{repo['release']}-proposed #{repo['components']}\n"
       sources << "deb-src #{repo['url']} #{repo['release']}-proposed #{repo['components']}\n\n"
     end
-    
+
     # backports is enabled per default in ubuntu oneiric
     if @node.is_ubuntu?
       sources << "deb #{repo['url']} #{repo['release']}-backports #{repo['components']}\n"
@@ -89,7 +88,7 @@ class Repositories < Recipe
 
     sources
   end
-  
+
   def generate_repo repo
     # add url to sources.list
     sources = ''
@@ -99,28 +98,27 @@ class Repositories < Recipe
     end
     sources
   end
-  
+
   def add_repo_key name, repo
     # add the repository key
     if repo['key']
-      ::Dust.print_msg "adding #{name} repository key"
+      msg = @node.messages.add("adding #{name} repository key")
 
       # if the key is a .deb, download and install it
       if repo['key'].match /\.deb$/
         ret = @node.exec 'mktemp --tmpdir dust.XXXXXXXXXX'
         if ret[:exit_code] != 0
-          puts
-          ::Dust.print_failed 'could not create temporary file on server'
+          msg.failed('could not create temporary file on server')
           return false
         end
 
         tmpfile = ret[:stdout].chomp
 
-        ::Dust.print_result @node.exec("wget -q -O #{tmpfile} '#{repo['key']}' && dpkg -i #{tmpfile}")[:exit_code]
+        msg.parse_result(@node.exec("wget -q -O #{tmpfile} '#{repo['key']}' && dpkg -i #{tmpfile}")[:exit_code])
 
       # if not, just download and add the key
       else
-        ::Dust.print_result @node.exec("wget -q -O- '#{repo['key']}' |apt-key add -")[:exit_code]
+        msg.parse_result(@node.exec("wget -q -O- '#{repo['key']}' |apt-key add -")[:exit_code])
       end
     end
   end

data/lib/dust/recipes/resolv_conf.rb

@@ -1,7 +1,7 @@
 class ResolvConf < Recipe
   desc 'resolv_conf:deploy', 'configures /etc/resolv.conf'
-  def deploy 
-    ::Dust.print_msg "configuring resolv.conf\n"
+  def deploy
+    msg = @node.messages.add("configuring resolv.conf\n")
 
     # if config is just true, create empty hash and use defaults
     @config = {} unless @config.is_a? Hash
@@ -13,37 +13,37 @@ class ResolvConf < Recipe
 
     # configures whether daily reports are sent
     if @config['search']
-      ::Dust.print_msg "adding search #{@config['search']}", :indent => 2
+      msg = @node.messages.add("adding search #{@config['search']}", :indent => 2)
       config_file << "search #{@config['search']}\n"
-      ::Dust.print_ok
+      msg.ok
     end
 
     if @config['domain']
-      ::Dust.print_msg "adding domain #{@config['domain']}", :indent => 2
+      msg = @node.messages.add("adding domain #{@config['domain']}", :indent => 2)
       config_file << "domain #{@config['domain']}\n"
-      ::Dust.print_ok
+      msg.ok
     end
 
     if @config['options']
-      ::Dust.print_msg "adding options #{@config['options']}", :indent => 2
+      msg = @node.messages.add("adding options #{@config['options']}", :indent => 2)
       config_file << "options #{@config['options']}\n"
-      ::Dust.print_ok
+      msg.ok
     end
 
     @config['nameservers'].each do |nameserver|
-      ::Dust.print_msg "adding nameserver #{nameserver}", :indent => 2
+      msg = @node.messages.add("adding nameserver #{nameserver}", :indent => 2)
       config_file << "nameserver #{nameserver}\n"
-      ::Dust.print_ok
+      msg.ok
     end
- 
+
     @node.write '/etc/resolv.conf', config_file
   end
-  
+
   desc 'resolv_conf:status', 'shows current /etc/resolv.conf'
   def status
-    ::Dust.print_msg 'getting /etc/resolv.conf'
+    msg = @node.messages.add('getting /etc/resolv.conf')
     ret = @node.exec 'cat /etc/resolv.conf'
-    ::Dust.print_result ret[:exit_code]
-    ::Dust.print_ret ret
-  end  
+    msg.parse_result(ret[:exit_code])
+    msg.print_output(ret)
+  end
 end

data/lib/dust/recipes/ruby_rvm.rb

@@ -2,7 +2,7 @@ class RubyRvm < Recipe
   desc 'ruby_rvm:deploy', 'installs rvm and ruby for a user'
   def deploy
     # TODO: rvm only works if your user uses bash/zsh as login shell, check
-    
+
     # dependency needed by rvm
     return unless @node.install_package 'bash'
     return unless @node.install_package 'curl'
@@ -30,7 +30,7 @@ class RubyRvm < Recipe
 
     @config.each do |user, version|
       unless @node.user_exists? user, :quiet => true
-        ::Dust.print_warning "user #{user} doesn't exist. skipping"
+        @node.messages.add("user #{user} doesn't exist. skipping").warning
         next
       end
 
@@ -41,14 +41,14 @@ class RubyRvm < Recipe
       return unless set_default user, version
     end
   end
-  
+
   desc 'ruby_rvm:status', 'shows current ruby version'
   def status
     @config.each do |user, version|
-      ::Dust.print_msg "getting current ruby-version for user #{user}"
+      msg = @node.messages.add("getting current ruby-version for user #{user}")
       ret = @node.exec 'rvm use', :as_user => user
-      ::Dust.print_result ret[:exit_code]
-      ::Dust.print_ret ret
+      msg.parse_result(ret[:exit_code])
+      msg.print_output(ret)
     end
   end
 
@@ -58,31 +58,30 @@ class RubyRvm < Recipe
   def install_rvm user
     # check if rvm is already installed
     if @node.exec('which rvm', :as_user => user)[:exit_code] == 0
-      ::Dust.print_msg "updating rvm for user #{user}"
-      return ::Dust.print_result @node.exec('rvm get latest', :as_user => user)[:exit_code]
+      msg = @node.messages.add("updating rvm for user #{user}")
+      return msg.parse_result(@node.exec('rvm get latest', :as_user => user)[:exit_code])
 
     else
-      ::Dust.print_msg "installing rvm for user #{user}"
-      return ::Dust.print_result @node.exec("curl -s https://raw.github.com/wayneeseguin/rvm/master/binscripts/rvm-installer |bash -s stable",
-                                            :as_user => user)[:exit_code]
+      msg = @node.messages.add("installing rvm for user #{user}")
+      return msg.parse_result(@node.exec("curl -s https://raw.github.com/wayneeseguin/rvm/master/binscripts/rvm-installer |bash -s stable", :as_user => user)[:exit_code])
     end
   end
 
   def install_ruby user, version
     return true if installed? user, version
-    ::Dust.print_msg "downloading, compiling and installing ruby-#{version}"
-    ::Dust.print_result  @node.exec("rvm install ruby-#{version}", :as_user => user)[:exit_code]
+    msg = @node.messages.add("downloading, compiling and installing ruby-#{version}")
+    msg.parse_result( @node.exec("rvm install ruby-#{version}", :as_user => user)[:exit_code])
   end
 
   def set_default user, version
-    ::Dust.print_msg "setting ruby-#{version} as default"
-    ::Dust.print_result @node.exec("rvm use ruby-#{version} --default", :as_user => user)[:exit_code]
+    msg = @node.messages.add("setting ruby-#{version} as default")
+    msg.parse_result(@node.exec("rvm use ruby-#{version} --default", :as_user => user)[:exit_code])
   end
 
   def installed? user, version
     ret = @node.exec "rvm list |grep ruby-#{version}", :as_user => user
     if ret[:exit_code] == 0
-      return ::Dust.print_ok "ruby-#{version} for user #{user} already installed"
+      return @node.messages.add("ruby-#{version} for user #{user} already installed").ok
     end
     false
   end
@@ -92,8 +91,8 @@ class RubyRvm < Recipe
     shell = @node.get_shell user
     return true if shell == '/bin/zsh' or shell == '/bin/bash'
 
-    ::Dust.print_msg "changing shell for #{user} to /bin/bash"
-    ::Dust.print_result@node.exec("chsh -s /bin/bash #{user}")[:exit_code]
+    msg = @node.messages.add("changing shell for #{user} to /bin/bash")
+    msg.parse_result(@node.exec("chsh -s /bin/bash #{user}")[:exit_code])
   end
 
   def create_homedir user

data/lib/dust/recipes/skel.rb

@@ -2,12 +2,11 @@ class Skel < Recipe
   desc 'skel:deploy', 'copy default configuration files to users home directory'
   def deploy 
     @config.to_array.each do |user|
-      ::Dust.print_msg "deploying homedir skeleton for #{user}\n"
+      @node.messages.add("deploying homedir skeleton for #{user}\n")
       Dir["#{@template_path}/.*"].each do |file|
         next unless File.file? file
         @node.deploy_file file, "/#{@node.get_home user}/#{File.basename file}", { :binding => binding, :indent => 2 }
       end
-      puts
     end
   end
 end

data/lib/dust/recipes/ssh_authorized_keys.rb

@@ -5,10 +5,9 @@ class SshAuthorizedKeys < Recipe
   def deploy
 
     @config.each do |remote_user, ssh_users|
-      ::Dust.print_msg "generating authorized_keys for #{remote_user}\n"
+      @node.messages.add("generating authorized_keys for #{remote_user}\n")
       authorized_keys = generate_authorized_keys ssh_users
       deploy_authorized_keys remote_user, authorized_keys
-      puts
     end
   end
   
@@ -23,14 +22,14 @@ class SshAuthorizedKeys < Recipe
     # create the authorized_keys hash for this user
     ssh_users.to_array.each do |ssh_user|
       users[ssh_user]['name'] ||= ssh_user
-      ::Dust.print_msg "adding user #{users[ssh_user]['name']}", :indent => 2
+      msg = @node.messages.add("adding user #{users[ssh_user]['name']}", :indent => 2)
       users[ssh_user]['keys'].each do |key|
         authorized_keys << "#{key}"
         authorized_keys << " #{users[ssh_user]['name']}" if users[ssh_user]['name']
         authorized_keys << " <#{users[ssh_user]['email']}>" if users[ssh_user]['email']
         authorized_keys << "\n"
       end
-      ::Dust.print_ok
+      msg.ok
     end
 
     authorized_keys    
@@ -57,7 +56,7 @@ class SshAuthorizedKeys < Recipe
   # TODO: add this option  
   def cleanup
     if options.cleanup?
-      ::Dust.print_msg "deleting other authorized_keys files\n"
+      @node.messages.add("deleting other authorized_keys files\n")
       @node.get_system_users(:quiet => true).each do |user|
         next if users.keys.include? user
         home = @node.get_home user

data/lib/dust/recipes/sshd.rb

@@ -81,7 +81,7 @@ class Sshd < Recipe
   def check_hostkeys
     @config['HostKey'].each do |hostkey|
       unless @node.file_exists? hostkey, :quiet => true
-        ::Dust.print_warning "hostkey '#{hostkey}' not found. removing from config"
+        @node.messages.add("hostkey '#{hostkey}' not found. removing from config").warning
         @config['HostKey'].delete hostkey
       end
     end

data/lib/dust/recipes/sudoers.rb

@@ -6,7 +6,7 @@ class Sudoers < Recipe
     remove_rules
     
     @config.each do |name, rule|
-      ::Dust.print_msg "deploying sudo rules '#{name}'\n"
+      @node.messages.add("deploying sudo rules '#{name}'\n")
       
       # rulename: 'myrule' 
       if rule.is_a? String
@@ -15,7 +15,7 @@ class Sudoers < Recipe
       # rulename: { user: [ user1, user2 ], command: [ cmd1, cmd2 ] }
       else
         unless rule['user'] and rule['command']
-          ::Dust.print_failed 'user or command missing', :indent => 2
+          @node.messages.add('user or command missing', :indent => 2).failed
           next
         end
         

data/lib/dust/recipes/sysctl.rb

@@ -3,7 +3,7 @@ class Sysctl < Recipe
   def deploy
     # we need support for /etc/sysctl.d/
     unless @node.dir_exists? '/etc/sysctl.d/'
-      return ::Dust.print_warning 'sysctl configuration not supported for your linux distribution'
+      return @node.messages.add('sysctl configuration not supported for your linux distribution').warning
     end
 
     # seperate templates from sysctls
@@ -13,14 +13,13 @@ class Sysctl < Recipe
     # apply template sysctls
     if templates
       templates.to_array.each do |template|
-        ::Dust.print_msg "configuring sysctls for template #{template}\n"
+        @node.messages.add("configuring sysctls for template #{template}\n")
         apply template, self.send(template)
-        puts
       end
     end
 
     # apply plain sysctls
-    ::Dust.print_msg "configuring plain sysctls\n"
+    @node.messages.add("configuring plain sysctls\n")
     apply 'dust', sysctls
   end
 
@@ -30,13 +29,13 @@ class Sysctl < Recipe
   def apply name, sysctl
     sysctl_conf = ''
     sysctl.each do |key, value|
-      ::Dust.print_msg "setting #{key} = #{value}", :indent => 2
-      ::Dust.print_result @node.exec("sysctl -w #{key}=#{value}")[:exit_code]
+      msg = @node.messages.add("setting #{key} = #{value}", :indent => 2)
+      msg.parse_result(@node.exec("sysctl -w #{key}=#{value}")[:exit_code])
       sysctl_conf << "#{key} = #{value}\n"
     end
 
-    ::Dust.print_msg "saving settings to /etc/sysctl.d/10-#{name}.conf", :indent => 2
-    ::Dust.print_result @node.write("/etc/sysctl.d/10-#{name}.conf", sysctl_conf, :quiet => true)
+    msg = @node.messages.add("saving settings to /etc/sysctl.d/10-#{name}.conf", :indent => 2)
+    msg.parse_result(@node.write("/etc/sysctl.d/10-#{name}.conf", sysctl_conf, :quiet => true))
   end
 
 
@@ -47,6 +46,11 @@ class Sysctl < Recipe
     database.merge 'vm.overcommit_memory' => 2
   end
 
+  # redis complains if vm.overcommit_memory != 1
+  def redis
+    { 'vm.overcommit_memory' => 1, 'vm.swappiness' => 0 }
+  end
+
   def mysql
     database
   end