dust-deploy 0.13.18 → 0.14.0

data/bin/dust

@@ -1,408 +1,4 @@
 #!/usr/bin/env ruby
 
-require 'rubygems'
-require 'thor/runner'
-require 'thor/util'
-require 'yaml'
-require 'erb'
-require 'fileutils'
-require 'ipaddress'
 require 'dust'
-require 'colorize'
-
-module  Dust
-  class Deploy < Thor::Runner
-
-    default_task :list
-    check_unknown_options!
-
-    desc 'deploy', 'deploy all recipes to the node(s) specified in server.yaml or to all nodes defined in ./nodes/'
-
-    method_option 'yaml', :type => :string, :desc => 'use only this server.yaml'
-    method_option 'filter', :type => :hash, :desc => 'only deploy to these hosts (e.g. environment:staging)'
-    method_option 'recipes', :type => :array, :desc => 'only deploy these recipes'
-    method_option 'proxy', :type => :string, :desc => 'socks proxy to use'
-    method_option 'restart', :type => :boolean, :desc => 'restart services after deploy'
-    method_option 'reload', :type => :boolean, :desc => 'reload services after deploy'
-    method_option 'parallel', :type => :boolean, :desc => 'deploy to all hosts at the same time using threads'
-    method_option 'summary', :type => :string, :desc => 'print summary of all events (all, warning, failed)'
-
-    def deploy
-      return unless check_dust_dir
-      initialize_thorfiles
-      Dust.print_failed 'no servers match this filter' if load_servers.empty?
-
-      # set global variables
-      $summary = options['summary']
-      $parallel = options['parallel']
-      $summary = 'all' if $parallel and not $summary
-
-      threads = []
-      @nodes.each_with_index do |node, i|
-        if $parallel
-          threads[i] = Thread.new do
-            Thread.current['hostname'] = node['hostname'] if run_recipes node, 'deploy'
-          end
-        else
-          run_recipes node, 'deploy'
-        end
-      end
-
-      if $parallel
-        print 'waiting for servers: '
-        threads.each do |t|
-          t.join # wait for thread
-          print t['hostname'].blue + ' ' if t['hostname']
-        end
-        puts
-      end
-
-      display_summary($summary) if $summary
-    end
-
-
-    desc 'status', 'display status of recipes specified by filter'
-
-    method_option 'yaml', :type => :string, :desc => 'use only this server.yaml'
-    method_option 'filter', :type => :hash, :desc => 'only deploy to these hosts (e.g. environment:staging)'
-    method_option 'recipes', :type => :array, :desc => 'only deploy these recipes'
-    method_option 'proxy', :type => :string, :desc => 'socks proxy to use'
-    method_option 'parallel', :type => :boolean, :desc => 'deploy to all hosts at the same time using threads'
-    method_option 'summary', :type => :string, :desc => 'print summary of all events (all, warning, failed)'
-
-    def status
-      return unless check_dust_dir
-      initialize_thorfiles
-      Dust.print_failed 'no servers match this filter' if load_servers.empty?
-
-      # set global variables
-      $summary = options['summary']
-      $parallel = options['parallel']
-      $summary = 'all' if $parallel and not $summary
-
-      threads = []
-      @nodes.each_with_index do |node, i|
-        if $parallel
-          threads[i] = Thread.new do
-            Thread.current['hostname'] = node['hostname'] if run_recipes node, 'status'
-          end
-        else
-          run_recipes node, 'status'
-        end
-      end
-
-      if $parallel
-        print 'waiting for servers: '
-        threads.each do |t|
-          t.join # wait for thread
-          print t['hostname'].blue + ' ' if t['hostname']
-        end
-        puts
-      end
-
-      display_summary($summary) if $summary
-    end
-
-
-    desc 'system_update', 'perform a full system upgrade (using aptitude, emerge, yum)'
-
-    method_option 'yaml', :type => :string, :desc => 'use only this server.yaml'
-    method_option 'filter', :type => :hash, :desc => 'only deploy to these hosts (e.g. environment:staging)'
-    method_option 'proxy', :type => :string, :desc => 'socks proxy to use'
-    method_option 'parallel', :type => :boolean, :desc => 'deploy to all hosts at the same time using threads'
-    method_option 'summary', :type => :string, :desc => 'print summary of all events (all, warning, failed)'
-
-    def system_update
-      return unless check_dust_dir
-      initialize_thorfiles
-      Dust.print_failed 'no servers match this filter' if load_servers.empty?
-
-      # set global variables
-      $summary = options['summary']
-      $parallel = options['parallel']
-      $summary = 'all' if $parallel and not $summary
-
-      threads = []
-      @nodes.each_with_index do |node, i|
-        if $parallel
-          threads[i] = Thread.new do
-            run_system_update(node)
-            Thread.current['hostname'] = node['hostname']
-          end
-        else
-          run_system_update(node)
-        end
-      end
-
-      if $parallel
-        print 'waiting for servers: '
-        threads.each do |t|
-          t.join # wait for thread
-          print t['hostname'].blue + ' ' if t['hostname']
-        end
-        puts
-      end
-
-      display_summary($summary) if $summary
-    end
-
-
-    desc 'exec <command>', 'run a command on the server'
-
-    method_option 'yaml', :type => :string, :desc => 'use only this server.yaml'
-    method_option 'filter', :type => :hash, :desc => 'only deploy to these hosts (e.g. environment:staging)'
-    method_option 'proxy', :type => :string, :desc => 'socks proxy to use'
-    method_option 'parallel', :type => :boolean, :desc => 'deploy to all hosts at the same time using threads'
-    method_option 'summary', :type => :string, :desc => 'print summary of all events (all, warning, failed)'
-
-    def exec cmd, yaml=''
-      return unless check_dust_dir
-      initialize_thorfiles
-      Dust.print_failed 'no servers match this filter' if load_servers.empty?
-
-      # set global variables
-      $summary = options['summary']
-      $parallel = options['parallel']
-      $summary = 'all' if $parallel and not $summary
-
-      threads = []
-      @nodes.each_with_index do |node, i|
-        if $parallel
-          threads[i] = Thread.new do
-            run_exec(node, cmd)
-            Thread.current['hostname'] = node['hostname']
-          end
-        else
-          run_exec(node, cmd)
-        end
-      end
-
-      if $parallel
-        print 'waiting for servers: '
-        threads.each do |t|
-          t.join # wait for thread
-          print t['hostname'].blue + ' ' if t['hostname']
-        end
-        puts
-      end
-
-      display_summary($summary) if $summary
-    end
-
-
-    # creates directory skeleton for a dust setup
-    desc 'new <name>', 'creates a dust directory skeleton for your network'
-    def new name
-      Dust.print_msg "spawning new dust directory skeleton with examples into '#{name}.dust'"
-      FileUtils.cp_r File.dirname(__FILE__) + '/../lib/dust/examples', "#{name}.dust"
-      Dust.print_ok
-    end
-
-    desc 'version', 'displays version number'
-    def version
-      puts "dust-deploy-#{Dust::VERSION}, running on ruby-#{RUBY_VERSION}"
-    end
-
-
-    private
-
-    def check_dust_dir
-      if Dir.pwd.split('.').last != 'dust'
-        Dust.print_failed 'current directory does not end with .dust, are you in your dust directory?'
-        Dust.print_msg "try running 'dust new mynetwork' to let me create one for you with tons of examples!\n", :indent => 0
-        return false
-      end
-
-      unless File.directory? './nodes'
-        Dust.print_failed 'could not find \'nodes\' folder in your dust directory. cannot continue.'
-        return false
-      end
-
-      true
-    end
-
-    # run specified recipes in the given context
-    # returns false if no recipes where found
-    # true if recipes were run (doesn't indicate, whether the run was sucessful or not)
-    def run_recipes(node, context)
-      # skip this node if there are no recipes found
-      return false unless node['recipes']
-
-      recipes = generate_recipes node, context
-
-      # skip this node unless we're actually having recipes to cook
-      return false if recipes.empty?
-
-      # connect to server
-      node['server'] = Server.new(node)
-      return true unless node['server'].connect
-
-      # runs the method with the recipe name, defined and included in recipe/*.rb
-      # call recipes for each recipe that is defined for this node
-      recipes.each do |recipe, config|
-        send recipe, 'prepare', node['server'], recipe, context, config, options
-      end
-
-      node['server'].disconnect
-      true
-    end
-
-    def run_system_update(node)
-      node['server'] = Server.new(node)
-      return unless node['server'].connect
-      node['server'].system_update
-      node['server'].disconnect
-    end
-
-    def run_exec(node, cmd)
-      node['server'] = Server.new(node)
-      return unless node['server'].connect
-      node['server'].exec(cmd, :live => true)
-      node['server'].disconnect
-    end
-
-    # generate list of recipes for this node
-    def generate_recipes node, context
-      recipes = {}
-      node['recipes'].each do |recipe, config|
-
-        # in case --recipes was set, skip unwanted recipes
-        next unless options['recipes'].include?(recipe) if options['recipes']
-
-        # skip disabled recipes
-        next if config == 'disabled' or config.is_a? FalseClass
-
-        # check if method and thor task actually exist
-        k = Thor::Util.find_by_namespace recipe
-        next unless k
-        next unless k.method_defined? context
-
-        recipes[recipe] = config
-      end
-      recipes
-    end
-
-    def display_summary(level)
-      puts "\n\n------------------------------ SUMMARY ------------------------------".red unless $parallel
-
-      @nodes.each do |node|
-        next unless node['server']
-
-        messages = node['server'].messages.collect(level)
-        next if messages.empty?
-
-        node['server'].messages.print_hostname_header(node['hostname'])
-
-        # display non-recipe messages first
-        msgs = messages.delete '_node'
-        msgs.each { |m| print m } if msgs
-
-        # display messages from recipes
-        messages.each do |recipe, msgs|
-          node['server'].messages.print_recipe_header(recipe)
-          msgs.each { |m| print m }
-        end
-      end
-    end
-
-    # overwrite thorfiles to look for tasks in the recipes directories
-    def thorfiles(relevant_to=nil, skip_lookup=false)
-      Dir[File.dirname(__FILE__) + '/../lib/dust/recipes/*.rb'] | Dir['recipes/*.rb']
-    end
-
-    # loads servers
-    def load_servers
-      @nodes = []
-
-      # if the argument is empty, load all yaml files in the ./nodes/ directory
-      # if the argument is a directory, load yaml files in this directory
-      # if the argument is a file, load the file.
-      if options['yaml']
-        if File.directory? options['yaml']
-          yaml_files = Dir["#{options['yaml']}/**/*.yaml"]
-        elsif File.exists? options['yaml']
-          yaml_files = options['yaml']
-        end
-      else
-        yaml_files = Dir['./nodes/**/*.yaml']
-      end
-
-      unless yaml_files
-        Dust.print_failed "#{yaml} doesn't exist. exiting."
-        exit
-      end
-
-      yaml_files.to_array.each do |file|
-        node = YAML.load ERB.new( File.read(file), nil, '%<>').result
-
-        # if the file is empty, just skip it
-        next unless node
-
-        # if there is not hostname field in the yaml file,
-        # treat this node file as a template, and skip to the next one
-        next unless node['hostname']
-
-        # look for the inherits field in the yaml file,
-        # and merge the templates recursively into this node
-        if node['inherits']
-          inherited = {}
-          node.delete('inherits').each do |file|
-            template = YAML.load ERB.new( File.read("./nodes/#{file}.yaml"), nil, '%<>').result
-            inherited.deep_merge! template
-          end
-          node = inherited.deep_merge node
-        end
-
-        # if more than one hostname is specified, create a node
-        # with the same settings for each hostname
-        node['hostname'].to_array.each do |hostname|
-          n = node.clone
-
-          # overwrite hostname with single hostname (in case there are multiple)
-          n['hostname'] = hostname
-
-          # create a new field with the fully qualified domain name
-          n['fqdn'] = hostname
-
-          # if hostname is a valid ip address, don't add domain
-          # so we can connect via ip address only
-          unless IPAddress.valid? hostname
-            n['fqdn'] += '.' + n['domain'] if n['domain']
-          end
-
-          # pass command line proxy option
-          n['proxy'] = options['proxy'] if options['proxy']
-
-          # add this node to the global node array
-          @nodes.push n unless filtered? n
-        end
-      end
-    end
-
-    # checks if this node was filtered out by command line argument
-    # e.g. --filter environment:staging filters out all machines but
-    # those in the environment staging
-    def filtered? node
-
-      # if filter is not specified, instantly return false
-      return false unless options['filter']
-
-      # remove items if other filter arguments don't match
-      options['filter'].each do |k, v|
-        next unless v # skip empty filters
-
-        # filter if this node doesn't even have the attribute
-        return true unless node[k]
-
-        # allow multiple filters of the same type, divided by ','
-        # e.g. --filter environment:staging,production
-        return true unless v.split(',').include? node[k]
-      end
-
-      # no filter matched, so this host is not filtered.
-      false
-    end
-  end
-
-  Deploy.start
-end
+Dust::Runner.start

data/changelog.md

@@ -1,6 +1,15 @@
 Changelog
 =============
 
+0.14.0
+------------
+
+-  migrates to new runner.rb
+-  fixes bug in print_service_status
+-  checks if sudo password is wrong (and raises an error)
+-  fixes sudoers recipe when using with sudo (was deleting its own rules)
+
+
 0.13.18
 ------------
 

data/lib/dust.rb

@@ -1,3 +1,4 @@
+require 'dust/runner'
 require 'dust/version'
 require 'dust/helper'
 require 'dust/print_status'

data/lib/dust/recipe.rb

@@ -1,3 +1,5 @@
+require 'thor'
+
 class Recipe < Thor
 
   desc 'prepare', 'prepare recipe (do not use manually)'

data/lib/dust/recipes/nginx.rb

@@ -40,7 +40,6 @@ class Nginx < Recipe
 
   desc 'nginx:status', 'displays nginx status'
   def status
-    return unless @node.package_installed? 'nginx'
     @node.print_service_status 'nginx'
   end
 end

data/lib/dust/recipes/ntpd.rb

@@ -4,7 +4,7 @@ class Ntpd < Recipe
     # warn if other ntp package is installed
     [ 'openntpd', 'chrony' ].each do |package|
       if @node.package_installed? package, :quiet => true
-        @node.messages.add("#{package} installed, might conflict with ntpd, might be deleted").warning
+        @node.messages.add("#{package} installed, might conflict with ntpd, might get deleted").warning
       end
     end
 

data/lib/dust/recipes/sudoers.rb

@@ -3,8 +3,6 @@ class Sudoers < Recipe
   def deploy 
     return unless @node.install_package 'sudo'
     
-    remove_rules
-    
     @config.each do |name, rule|
       @node.messages.add("deploying sudo rules '#{name}'\n")
       
@@ -25,21 +23,32 @@ class Sudoers < Recipe
         end
       end
       
-      deploy_rule name, file
+      deploy_rule(name, file)
     end
     
+    remove_other_rules
   end
   
 
   private
   
-  def remove_rules
-    @node.rm '/etc/sudoers.d/*'
+  def remove_other_rules
+    @node.messages.add("deleting old rules\n")
+    ret = @node.exec('ls /etc/sudoers.d/* |cat')
+    if ret[:exit_code] != 0
+      return @node.messages.add('couldn\'t get installed rule list, skipping deletion of old rules').warning
+    end
+
+    # delete file if not in config
+    ret[:stdout].each_line do |file|
+      file.chomp!
+      @node.rm(file, :indent => 2) unless @config.keys.include?(File.basename(file))
+    end
   end
   
-  def deploy_rule name, file
-    @node.write "/etc/sudoers.d/#{name}", file, :indent => 2
-    @node.chmod '0440', "/etc/sudoers.d/#{name}", :indent => 2
-    @node.chown 'root:root', "/etc/sudoers.d/#{name}", :indent => 2    
+  def deploy_rule(name, file)
+    @node.write("/etc/sudoers.d/#{name}", file, :indent => 2)
+    @node.chmod('0440', "/etc/sudoers.d/#{name}", :indent => 2)
+    @node.chown('root:root', "/etc/sudoers.d/#{name}", :indent => 2)
   end
 end

data/lib/dust/runner.rb

@@ -0,0 +1,396 @@
+require 'thor/runner'
+require 'thor/util'
+require 'yaml'
+require 'erb'
+require 'fileutils'
+require 'ipaddress'
+require 'colorize'
+
+module  Dust
+  class Runner < Thor::Runner
+
+    default_task :list
+    check_unknown_options!
+
+    # default options for all tasks
+    def self.default_options
+      method_option 'yaml', :type => :string, :desc => 'use only this server.yaml'
+      method_option 'filter', :type => :hash, :desc => 'only deploy to these hosts (e.g. environment:staging)'
+      method_option 'proxy', :type => :string, :desc => 'socks proxy to use'
+      method_option 'parallel', :type => :boolean, :desc => 'deploy to all hosts at the same time using threads'
+      method_option 'summary', :type => :string, :desc => 'print summary of all events (all, warning, failed)'
+    end
+
+    def self.recipe_options
+      method_option 'recipes', :type => :array, :desc => 'only deploy these recipes'
+    end
+
+
+    desc 'deploy', 'deploy all recipes to the node(s) specified in server.yaml or to all nodes defined in ./nodes/'
+    default_options
+    recipe_options
+    method_option 'restart', :type => :boolean, :desc => 'restart services after deploy'
+    method_option 'reload', :type => :boolean, :desc => 'reload services after deploy'
+
+    def deploy
+      return unless check_dust_dir
+      initialize_thorfiles
+      Dust.print_failed 'no servers match this filter' if load_servers.empty?
+
+      # set global variables
+      $summary = options['summary']
+      $parallel = options['parallel']
+      $summary = 'all' if $parallel and not $summary
+
+      threads = []
+      @nodes.each_with_index do |node, i|
+        if $parallel
+          threads[i] = Thread.new do
+            Thread.current['hostname'] = node['hostname'] if run_recipes node, 'deploy'
+          end
+        else
+          run_recipes node, 'deploy'
+        end
+      end
+
+      if $parallel
+        print 'waiting for servers: '
+        threads.each do |t|
+          t.join # wait for thread
+          print t['hostname'].blue + ' ' if t['hostname']
+        end
+        puts
+      end
+
+      display_summary($summary) if $summary
+    end
+
+
+    desc 'status', 'display status of recipes specified by filter'
+    default_options
+    recipe_options
+
+    def status
+      return unless check_dust_dir
+      initialize_thorfiles
+      Dust.print_failed 'no servers match this filter' if load_servers.empty?
+
+      # set global variables
+      $summary = options['summary']
+      $parallel = options['parallel']
+      $summary = 'all' if $parallel and not $summary
+
+      threads = []
+      @nodes.each_with_index do |node, i|
+        if $parallel
+          threads[i] = Thread.new do
+            Thread.current['hostname'] = node['hostname'] if run_recipes node, 'status'
+          end
+        else
+          run_recipes node, 'status'
+        end
+      end
+
+      if $parallel
+        print 'waiting for servers: '
+        threads.each do |t|
+          t.join # wait for thread
+          print t['hostname'].blue + ' ' if t['hostname']
+        end
+        puts
+      end
+
+      display_summary($summary) if $summary
+    end
+
+
+    desc 'system_update', 'perform a full system upgrade (using aptitude, emerge, yum)'
+    default_options
+
+    def system_update
+      return unless check_dust_dir
+      initialize_thorfiles
+      Dust.print_failed 'no servers match this filter' if load_servers.empty?
+
+      # set global variables
+      $summary = options['summary']
+      $parallel = options['parallel']
+      $summary = 'all' if $parallel and not $summary
+
+      threads = []
+      @nodes.each_with_index do |node, i|
+        if $parallel
+          threads[i] = Thread.new do
+            run_system_update(node)
+            Thread.current['hostname'] = node['hostname']
+          end
+        else
+          run_system_update(node)
+        end
+      end
+
+      if $parallel
+        print 'waiting for servers: '
+        threads.each do |t|
+          t.join # wait for thread
+          print t['hostname'].blue + ' ' if t['hostname']
+        end
+        puts
+      end
+
+      display_summary($summary) if $summary
+    end
+
+
+    desc 'exec <command>', 'run a command on the server'
+    default_options
+
+    def exec cmd, yaml=''
+      return unless check_dust_dir
+      initialize_thorfiles
+      Dust.print_failed 'no servers match this filter' if load_servers.empty?
+
+      # set global variables
+      $summary = options['summary']
+      $parallel = options['parallel']
+      $summary = 'all' if $parallel and not $summary
+
+      threads = []
+      @nodes.each_with_index do |node, i|
+        if $parallel
+          threads[i] = Thread.new do
+            run_exec(node, cmd)
+            Thread.current['hostname'] = node['hostname']
+          end
+        else
+          run_exec(node, cmd)
+        end
+      end
+
+      if $parallel
+        print 'waiting for servers: '
+        threads.each do |t|
+          t.join # wait for thread
+          print t['hostname'].blue + ' ' if t['hostname']
+        end
+        puts
+      end
+
+      display_summary($summary) if $summary
+    end
+
+
+    # creates directory skeleton for a dust setup
+    desc 'new <name>', 'creates a dust directory skeleton for your network'
+    def new name
+      Dust.print_msg "spawning new dust directory skeleton with examples into '#{name}.dust'"
+      FileUtils.cp_r File.dirname(__FILE__) + '/examples', "#{name}.dust"
+      Dust.print_ok
+    end
+
+    desc 'version', 'displays version number'
+    def version
+      puts "dust-deploy-#{Dust::VERSION}, running on ruby-#{RUBY_VERSION}"
+    end
+
+
+    private
+
+    def check_dust_dir
+      if Dir.pwd.split('.').last != 'dust'
+        Dust.print_failed 'current directory does not end with .dust, are you in your dust directory?'
+        Dust.print_msg "try running 'dust new mynetwork' to let me create one for you with tons of examples!\n", :indent => 0
+        return false
+      end
+
+      unless File.directory? './nodes'
+        Dust.print_failed 'could not find \'nodes\' folder in your dust directory. cannot continue.'
+        return false
+      end
+
+      true
+    end
+
+    # run specified recipes in the given context
+    # returns false if no recipes where found
+    # true if recipes were run (doesn't indicate, whether the run was sucessful or not)
+    def run_recipes(node, context)
+      # skip this node if there are no recipes found
+      return false unless node['recipes']
+
+      recipes = generate_recipes node, context
+
+      # skip this node unless we're actually having recipes to cook
+      return false if recipes.empty?
+
+      # connect to server
+      node['server'] = Server.new(node)
+      return true unless node['server'].connect
+
+      # runs the method with the recipe name, defined and included in recipe/*.rb
+      # call recipes for each recipe that is defined for this node
+      recipes.each do |recipe, config|
+        send recipe, 'prepare', node['server'], recipe, context, config, options
+      end
+
+      node['server'].disconnect
+      true
+    end
+
+    def run_system_update(node)
+      node['server'] = Server.new(node)
+      return unless node['server'].connect
+      node['server'].system_update
+      node['server'].disconnect
+    end
+
+    def run_exec(node, cmd)
+      node['server'] = Server.new(node)
+      return unless node['server'].connect
+      node['server'].exec(cmd, :live => true)
+      node['server'].disconnect
+    end
+
+    # generate list of recipes for this node
+    def generate_recipes node, context
+      recipes = {}
+      node['recipes'].each do |recipe, config|
+
+        # in case --recipes was set, skip unwanted recipes
+        next unless options['recipes'].include?(recipe) if options['recipes']
+
+        # skip disabled recipes
+        next if config == 'disabled' or config.is_a? FalseClass
+
+        # check if method and thor task actually exist
+        k = Thor::Util.find_by_namespace recipe
+        next unless k
+        next unless k.method_defined? context
+
+        recipes[recipe] = config
+      end
+      recipes
+    end
+
+    def display_summary(level)
+      puts "\n\n------------------------------ SUMMARY ------------------------------".red unless $parallel
+
+      @nodes.each do |node|
+        next unless node['server']
+
+        messages = node['server'].messages.collect(level)
+        next if messages.empty?
+
+        node['server'].messages.print_hostname_header(node['hostname'])
+
+        # display non-recipe messages first
+        msgs = messages.delete '_node'
+        msgs.each { |m| print m } if msgs
+
+        # display messages from recipes
+        messages.each do |recipe, msgs|
+          node['server'].messages.print_recipe_header(recipe)
+          msgs.each { |m| print m }
+        end
+      end
+    end
+
+    # overwrite thorfiles to look for tasks in the recipes directories
+    def thorfiles(relevant_to=nil, skip_lookup=false)
+      Dir[File.dirname(__FILE__) + '/recipes/*.rb'] | Dir['recipes/*.rb']
+    end
+
+    # loads servers
+    def load_servers
+      @nodes = []
+
+      # if the argument is empty, load all yaml files in the ./nodes/ directory
+      # if the argument is a directory, load yaml files in this directory
+      # if the argument is a file, load the file.
+      if options['yaml']
+        if File.directory? options['yaml']
+          yaml_files = Dir["#{options['yaml']}/**/*.yaml"]
+        elsif File.exists? options['yaml']
+          yaml_files = options['yaml']
+        end
+      else
+        yaml_files = Dir['./nodes/**/*.yaml']
+      end
+
+      unless yaml_files
+        Dust.print_failed "#{yaml} doesn't exist. exiting."
+        exit
+      end
+
+      yaml_files.to_array.each do |file|
+        node = YAML.load ERB.new( File.read(file), nil, '%<>').result
+
+        # if the file is empty, just skip it
+        next unless node
+
+        # if there is not hostname field in the yaml file,
+        # treat this node file as a template, and skip to the next one
+        next unless node['hostname']
+
+        # look for the inherits field in the yaml file,
+        # and merge the templates recursively into this node
+        if node['inherits']
+          inherited = {}
+          node.delete('inherits').each do |file|
+            template = YAML.load ERB.new( File.read("./nodes/#{file}.yaml"), nil, '%<>').result
+            inherited.deep_merge! template
+          end
+          node = inherited.deep_merge node
+        end
+
+        # if more than one hostname is specified, create a node
+        # with the same settings for each hostname
+        node['hostname'].to_array.each do |hostname|
+          n = node.clone
+
+          # overwrite hostname with single hostname (in case there are multiple)
+          n['hostname'] = hostname
+
+          # create a new field with the fully qualified domain name
+          n['fqdn'] = hostname
+
+          # if hostname is a valid ip address, don't add domain
+          # so we can connect via ip address only
+          unless IPAddress.valid? hostname
+            n['fqdn'] += '.' + n['domain'] if n['domain']
+          end
+
+          # pass command line proxy option
+          n['proxy'] = options['proxy'] if options['proxy']
+
+          # add this node to the global node array
+          @nodes.push n unless filtered? n
+        end
+      end
+    end
+
+    # checks if this node was filtered out by command line argument
+    # e.g. --filter environment:staging filters out all machines but
+    # those in the environment staging
+    def filtered? node
+
+      # if filter is not specified, instantly return false
+      return false unless options['filter']
+
+      # remove items if other filter arguments don't match
+      options['filter'].each do |k, v|
+        next unless v # skip empty filters
+
+        # filter if this node doesn't even have the attribute
+        return true unless node[k]
+
+        # allow multiple filters of the same type, divided by ','
+        # e.g. --filter environment:staging,production
+        return true unless v.split(',').include? node[k]
+      end
+
+      # no filter matched, so this host is not filtered.
+      false
+    end
+  end
+end

data/lib/dust/server.rb

@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'net/ssh'
 require 'net/scp'
 require 'net/ssh/proxy/socks5'
@@ -83,15 +82,21 @@ module Dust
           abort "FAILED: couldn't execute command (ssh.channel.exec)" unless success
 
           channel.on_data do |ch, data|
-
             # only send password if sudo mode is enabled,
             # and only send password once in a session (trying to prevent attacks reading out the password)
-            if @node['sudo'] and not sudo_authenticated
-              # skip everything till password is prompted
-              next unless data =~ /^\[sudo\] password for #{@node['user']}/
+            if data =~ /\[sudo\] password for #{@node['user']}/
+
+              raise 'password requested, but none given in config!' if @node['password'].empty?
+              raise 'already sent password, but sudo requested the password again. (wrong password?)' if sudo_authenticated
+
+              # we're not authenticated yet, send password
               channel.send_data "#{@node['password']}\n"
               sudo_authenticated = true
+
             else
+              # skip everything util authenticated (if sudo is used and password given in config)
+              next if @node['sudo'] and not @node['password'].empty? and not sudo_authenticated
+
               stdout += data
               messages.add(data.green, :indent => 0) if options[:live] and not data.empty?
             end
@@ -141,11 +146,11 @@ module Dust
       msg.parse_result(write(destination, content, :quiet => true))
     end
 
-    def scp source, destination, options = {}
+    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?
+      install_package('openssh-clients', :quiet => true) if uses_rpm?
 
       msg = messages.add("deploying #{File.basename source}", options)
 
@@ -153,9 +158,9 @@ module Dust
       is_dir = dir_exists?(destination, :quiet => true)
 
       # save permissions if the file already exists
-      ret = exec "stat -c %a:%u:%g #{destination}"
+      ret = exec("stat -c %a:%u:%g #{destination}")
       if ret[:exit_code] == 0 and not is_dir
-        permissions, user, group = ret[:stdout].chomp.split ':'
+        permissions, user, group = ret[:stdout].chomp.split(':')
       else
         # files = 644, dirs = 755
         permissions = 'ug-x,o-wx,u=rwX,g=rX,o=rX'
@@ -168,9 +173,12 @@ module Dust
 
         # allow user to write file without sudo (for scp)
         # then change file back to root, and copy to the destination
-        chown @node['user'], tmpfile, :quiet => true
-        @ssh.scp.upload! source, tmpfile
-        chown 'root', tmpfile, :quiet => true
+        chown(@node['user'], tmpfile, :quiet => true)
+        @ssh.scp.upload!(source, tmpfile)
+
+        # set file permissions
+        chown("#{user}:#{group}", tmpfile, :quiet => true) if user and group
+        chmod(permissions, tmpfile, :quiet => true)
 
         # if destination is a directory, append real filename
         destination = "#{destination}/#{File.basename(source)}" if is_dir
@@ -179,15 +187,15 @@ module Dust
         msg.parse_result(exec("mv -f #{tmpfile} #{destination}")[:exit_code])
 
       else
-        @ssh.scp.upload! source, destination
+        @ssh.scp.upload!(source, destination)
         msg.ok
-      end
 
-      # set file permissions
-      chown "#{user}:#{group}", destination, :quiet => true if user and group
-      chmod permissions, destination, :quiet => true
+        # set file permissions
+        chown("#{user}:#{group}", destination, :quiet => true) if user and group
+        chmod(permissions, destination, :quiet => true)
+      end
 
-      restorecon destination, options # restore SELinux labels
+      restorecon(destination, options) # restore SELinux labels
     end
 
     # download a file (sudo not yet supported)
@@ -368,7 +376,7 @@ module Dust
         elsif uses_opkg?
           exec "opkg install #{package}"
         else
-          return msg.failed("install_package only supports apt, emerge and yum systems at the moment")
+          return msg.failed("\ninstall_package only supports apt, emerge and yum systems at the moment")
         end
 
         # check if package actually was installed
@@ -690,10 +698,10 @@ module Dust
       service service, 'reload', options
     end
 
-    def print_service_status service, options = {}
-      options = default_options.merge options
-      ret = service service, 'status', options
-      messages.print_output(ret, options)
+    def print_service_status(service, options = {})
+      options = default_options.merge(:indent => 0).merge(options)
+      ret = service(service, 'status', options)
+      messages.add('', options).print_output(ret)
       ret
     end
 

data/lib/dust/version.rb

@@ -1,3 +1,3 @@
 module Dust
-  VERSION = "0.13.18"
+  VERSION = "0.14.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dust-deploy
 version: !ruby/object:Gem::Version
-  version: 0.13.18
+  version: 0.14.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-13 00:00:00.000000000 Z
+date: 2012-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -205,6 +205,7 @@ files:
 - lib/dust/recipes/sudoers.rb
 - lib/dust/recipes/sysctl.rb
 - lib/dust/recipes/zabbix_agent.rb
+- lib/dust/runner.rb
 - lib/dust/server.rb
 - lib/dust/version.rb
 homepage: ''