dust-deploy 0.8.3 → 0.9.0

data/changelog.md

@@ -1,6 +1,24 @@
 Changelog
 =============
 
+
+0.9.0
+------------
+
+-  @node.exec now supports a :as_user => username argument, and then executes the command as the specified user
+-  fixes a bug where @noed.uses_* methods wherent properly cached
+-  sudo prompt is not displayed anymore when using :live => true
+-  duplicity recipe and cronjob example now inverts the --exclude and --include order. this is more what you probably want. 
+   BE CAREFUL: you may have to adapt your cronjob.erb for duplicity. have a look at the updated example
+
+-  adds ruby_rvm recipe, you can now maintain your ruby version with dust and rvm.
+
+   recipes:
+     ruby_rvm:
+       # installs a specified ruby version using rvm for this user
+       myuser: '1.9.3-p125'
+
+
 0.8.3
 ------------
 

data/lib/dust/examples/templates/duplicity/cronjob.erb

@@ -41,12 +41,13 @@ nice -n $NICE slapcat > /root/.ldap-<%= config['interval'] %> &> /dev/null
 # backup selected directories
 nice -n <%= config['nice'] %> duplicity --archive-dir <%= config['archive'] %> \
   --full-if-older-than <%= config['full-if-older-than'] %> --exclude-device-files / \
-% config['include'].each do |dir|
-  --include <%= dir %> \
-% end
-% config['exclude'].each do |dir|
+% config['exclude'].to_array.each do |dir|
   --exclude <%= dir %> \
 % end
+% config['include'].to_array.each do |dir|
+  --include <%= dir %> \
+% end
+  --exclude '**' \
   <%= File.join(config['backend'], config['directory']) %> &> /dev/null
 
 unset PASSPHRASE

data/lib/dust/recipes/cjdroute.rb

@@ -40,7 +40,7 @@ class Cjdroute< Recipe
       'bin_dir' => '/usr/local/bin',
       'etc_dir' => '/etc/cjdns/',
       'tun' => 'cjdroute0',
-      'loglevel' => 'WARN'
+      'loglevel' => 'INFO'
     }
   end
 
@@ -103,6 +103,7 @@ class Cjdroute< Recipe
     if @node.uses_apt?
       return false unless @node.install_package 'git-core', :indent => 2
       return false unless @node.install_package 'build-essential', :indent => 2
+      return false unless @node.install_package 'psmisc', :indent => 2
       return false unless @node.install_package 'coreutils', :indent => 2
     elsif @node.uses_rpm?
       return false unless @node.install_package 'git', :indent => 2
@@ -197,9 +198,7 @@ class Cjdroute< Recipe
   # kill any cjdroute processes that might be running
   def stop_cjdroute
     ::Dust.print_msg 'stopping cjdroute'
-    pids = @node.exec("ps ax |grep cjdroute |grep -v grep |awk '{print $1}'")[:stdout]
-    pids.each_line { |pid| @node.exec "kill #{pid}" }
-    ::Dust.print_ok
+    ::Dust.print_result @node.exec('killall cjdroute')[:exit_code]
   end
 
   # fire up cjdroute

data/lib/dust/recipes/duplicity.rb

@@ -11,7 +11,7 @@ class Duplicity < Recipe
 
     @config.each do |scenario, c|
       # cloning is necessary if we have configurations with multiple hostnames
-      config = c.clone
+      config = default_config.merge c
 
       # if directory config options is not given, use hostname-scenario
       config['directory'] ||= "#{@node['hostname']}-#{scenario}"
@@ -47,7 +47,7 @@ class Duplicity < Recipe
 
       # adjust and upload cronjob
       ::Dust.print_msg "adjusting and deploying cronjob (scenario: #{scenario}, interval: #{config['interval']})\n"
-      config['options'].each { |option| ::Dust.print_ok "adding option: #{option}", :indent => 2 }
+      config['options'].to_array.each { |option| ::Dust.print_ok "adding option: #{option}", :indent => 2 }
 
       @node.deploy_file "#{@template_path}/cronjob", cronjob_path, :binding => binding
 
@@ -63,8 +63,8 @@ class Duplicity < Recipe
   def status
     return unless @node.package_installed? 'duplicity'
 
-    @config.each do |scenario, conf|
-      config = conf.clone
+    @config.each do |scenario, c|
+      config = default_config.merge c
 
       # if directory config option is not given, use hostname-scenario
       config['directory'] ||= "#{@node['hostname']}-#{scenario}"
@@ -95,6 +95,20 @@ class Duplicity < Recipe
   end
 
   private
+  def default_config
+    {
+      'interval' => 'daily',
+      'nice' => 10,
+      'keep-n-full' => 5,
+      'full-if-older-than' => '7D',
+      'archive' => '/tmp/duplicity',
+      'options' => [],
+      'include' => [],
+      'exclude' => []
+    }
+  end
+
+
   # removes all duplicity cronjobs
   def remove_duplicity_cronjobs
     ::Dust.print_msg 'deleting old duplicity cronjobs'

data/lib/dust/recipes/ruby_rvm.rb

@@ -0,0 +1,74 @@
+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
+    # TODO: these are only debian/ubuntu dependencies, add for other distributions as well
+    if @node.uses_apt?
+      return unless @node.install_package 'bash'
+      return unless @node.install_package 'curl'
+      return unless @node.install_package 'dh-autoreconf'
+      @node.install_package 'libxml2-dev'
+      @node.install_package 'libxslt1-dev'
+      @node.install_package 'libreadline6-dev'
+      @node.install_package 'zlib1g-dev'
+    end
+
+    @config.each do |user, version|
+      unless @node.user_exists? user, :quiet => true
+        ::Dust.print_warning "user #{user} doesn't exist. skipping"
+        next
+      end
+
+      return unless install_rvm user
+      return unless install_ruby user, version
+      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}"
+      ret = @node.exec 'rvm use', :as_user => user
+      ::Dust.print_result ret[:exit_code]
+      ::Dust.print_ret ret
+    end
+  end
+
+
+  private
+
+  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]
+
+    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]
+    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]
+  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]
+  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"
+    end
+    false
+  end
+end

data/lib/dust/server.rb

@@ -50,7 +50,7 @@ module Dust
       @ssh.close
     end
   
-    def exec command, options={:live => false}
+    def exec command, options={:live => false, :as_user => false}
       sudo_authenticated = false
       stdout = ''
       stderr = ''
@@ -58,7 +58,10 @@ module Dust
       exit_signal = nil
 
       @ssh.open_channel do |channel|
-        
+
+        # if :as_user => user is given, execute as user (be aware of ' usage)
+        command = "su #{options[:as_user]} -l -c '#{command}'" if options[:as_user]
+
         # request a terminal (sudo needs it)
         # and prepend "sudo"
         if @node['sudo']          
@@ -78,9 +81,8 @@ module Dust
               sudo_authenticated = true
             else
               stdout += data
+              Dust.print_msg "#{Dust.green 0}#{data}#{Dust.none}", :indent => 0 if options[:live] and not data.empty?
             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|
@@ -374,7 +376,7 @@ module Dust
     def uses_apt? options = {}
       options = default_options(:quiet => true).merge options
 
-      return @uses_apt if @uses_apt
+      return @uses_apt if defined? @uses_apt
       Dust.print_msg 'determining whether node uses apt', options
       @uses_apt = Dust.print_result exec('test -e /etc/debian_version')[:exit_code], options
     end
@@ -382,7 +384,7 @@ module Dust
     def uses_rpm? options = {}
       options = default_options(:quiet => true).merge options
 
-      return @uses_rpm if @uses_rpm
+      return @uses_rpm if defined? @uses_rpm
       Dust.print_msg 'determining whether node uses rpm', options
       @uses_rpm = Dust.print_result exec('test -e /etc/redhat-release')[:exit_code], options
     end
@@ -390,7 +392,7 @@ module Dust
     def uses_emerge? options = {}
       options = default_options(:quiet => true).merge options
 
-      return @uses_emerge if @uses_emerge
+      return @uses_emerge if defined? @uses_emerge
       Dust.print_msg 'determining whether node uses emerge', options
       @uses_emerge = Dust.print_result exec('test -e /etc/gentoo-release')[:exit_code], options
     end

data/lib/dust/version.rb

@@ -1,3 +1,3 @@
 module Dust
-  VERSION = "0.8.3"
+  VERSION = "0.9.0"
 end

metadata

@@ -1,92 +1,80 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: dust-deploy
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 8
-  - 3
-  version: 0.8.3
+version: !ruby/object:Gem::Version
+  version: 0.9.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - kris kechagia
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-14 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-03-23 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: net-ssh
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  requirement: &70183130378760 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: net-scp
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: *70183130378760
+- !ruby/object:Gem::Dependency
+  name: net-scp
+  requirement: &70183130378280 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: net-sftp
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: *70183130378280
+- !ruby/object:Gem::Dependency
+  name: net-sftp
+  requirement: &70183130377840 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: thor
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: *70183130377840
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: &70183130377320 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: ipaddress
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: *70183130377320
+- !ruby/object:Gem::Dependency
+  name: ipaddress
+  requirement: &70183130376860 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id005
-description: when puppet and chef suck because you want to be in control and sprinkle just cannot do enough for you
-email: 
+  prerelease: false
+  version_requirements: *70183130376860
+description: when puppet and chef suck because you want to be in control and sprinkle
+  just cannot do enough for you
+email:
 - kk@rndsec.net
-executables: 
+executables:
 - dust
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - LICENSE
@@ -145,6 +133,7 @@ files:
 - lib/dust/recipes/remove_packages.rb
 - lib/dust/recipes/repositories.rb
 - lib/dust/recipes/resolv_conf.rb
+- lib/dust/recipes/ruby_rvm.rb
 - lib/dust/recipes/ssh_authorized_keys.rb
 - lib/dust/recipes/sshd.rb
 - lib/dust/recipes/sudoers.rb
@@ -153,35 +142,28 @@ files:
 - lib/dust/recipes/zabbix_agent.rb
 - lib/dust/server.rb
 - lib/dust/version.rb
-has_rdoc: true
-homepage: ""
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: dust-deploy
-rubygems_version: 1.3.6
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: small server deployment tool for complex environments
 test_files: []
-