dust-deploy 0.15.1 → 0.15.2

data/changelog.md

@@ -1,6 +1,13 @@
 Changelog
 =============
 
+0.15.2
+------------
+
+-  fixes a bug in node.manage_user, now returns correctly if user is already set up
+-  node.manage_user now honors options correctly
+
+
 0.15.1
 ------------
 

data/lib/dust.rb

@@ -1,7 +1,6 @@
 require 'dust/runner'
 require 'dust/version'
 require 'dust/helper'
-require 'dust/print_status'
 require 'dust/messaging'
 require 'dust/server'
 require 'dust/recipe'

data/lib/dust/helper.rb

@@ -43,7 +43,7 @@ class Hash
 
   # converts each value to an array, so .each and .combine won't get hickups
   def values_to_array!
-    self.keys.each { |k| self[k] = [ self[k] ] unless self[k].is_a? Array }
+    self.keys.each { |k| self[k] = Array(self[k]) }
   end
 
   # converts each value that is a boolean to 'yes' resp. 'no' strings

data/lib/dust/recipes/newrelic.rb

@@ -1,9 +1,9 @@
 class Newrelic < Recipe
   desc 'newrelic:deploy', 'installs and configures newrelic system monitoring'
   def deploy
-    return Dust.print_failed 'no key specified' unless @config
+    return @node.messages.add('no key specified').failed unless @config
 
-    unless @node.install_package 'newrelic-sysmond'
+    unless @node.install_package('newrelic-sysmond')
       @node.messages.add('installing newrelic monitoring daemon failed, did you setup the newrelic repositories?').failed
       return
     end

data/lib/dust/recipes/pacemaker.rb

@@ -10,8 +10,8 @@ class Pacemaker < Recipe
 
     # return if no authkey is given
     unless @config['authkey']
-      return ::Dust.print_failed 'no authkey given. generate it using "corosync-keygen" ' +
-                                 'and convert it to base64 using "base64 -w0 /etc/corosync/authkey"'
+      return @node.messages.add('no authkey given. generate it using "corosync-keygen" ' +
+                                'and convert it to base64 using "base64 -w0 /etc/corosync/authkey"').failed
     end
 
     @node.collect_facts

data/lib/dust/runner.rb

@@ -35,7 +35,7 @@ module  Dust
     def deploy
       return unless check_dust_dir
       initialize_thorfiles
-      Dust.print_failed 'no servers match this filter' if load_servers.empty?
+      puts 'no servers match this filter'.red if load_servers.empty?
 
       # set global variables
       $summary = options['summary']
@@ -46,10 +46,10 @@ module  Dust
       @nodes.each_with_index do |node, i|
         if $parallel
           threads[i] = Thread.new do
-            Thread.current['hostname'] = node['hostname'] if run_recipes node, 'deploy'
+            Thread.current['hostname'] = node['hostname'] if run_recipes(node, 'deploy')
           end
         else
-          run_recipes node, 'deploy'
+          run_recipes(node, 'deploy')
         end
       end
 
@@ -73,7 +73,7 @@ module  Dust
     def status
       return unless check_dust_dir
       initialize_thorfiles
-      Dust.print_failed 'no servers match this filter' if load_servers.empty?
+      puts 'no servers match this filter'.red if load_servers.empty?
 
       # set global variables
       $summary = options['summary']
@@ -84,10 +84,10 @@ module  Dust
       @nodes.each_with_index do |node, i|
         if $parallel
           threads[i] = Thread.new do
-            Thread.current['hostname'] = node['hostname'] if run_recipes node, 'status'
+            Thread.current['hostname'] = node['hostname'] if run_recipes(node, 'status')
           end
         else
-          run_recipes node, 'status'
+          run_recipes(node, 'status')
         end
       end
 
@@ -110,7 +110,7 @@ module  Dust
     def system_update
       return unless check_dust_dir
       initialize_thorfiles
-      Dust.print_failed 'no servers match this filter' if load_servers.empty?
+      puts 'no servers match this filter'.red if load_servers.empty?
 
       # set global variables
       $summary = options['summary']
@@ -148,7 +148,7 @@ module  Dust
     def exec cmd, yaml=''
       return unless check_dust_dir
       initialize_thorfiles
-      Dust.print_failed 'no servers match this filter' if load_servers.empty?
+      puts 'no servers match this filter'.red if load_servers.empty?
 
       # set global variables
       $summary = options['summary']
@@ -182,10 +182,9 @@ module  Dust
 
     # 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
+    def new(name)
+      puts "spawning new dust directory skeleton with examples into '#{name}.dust'"
+      FileUtils.cp_r(File.dirname(__FILE__) + '/examples', "#{name}.dust")
     end
 
     desc 'version', 'displays version number'
@@ -198,13 +197,13 @@ module  Dust
 
     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
+        puts 'current directory does not end with .dust, are you in your dust directory?'.red
+        puts "try running 'dust new mynetwork' to let me create one for you with tons of examples!\n"
         return false
       end
 
-      unless File.directory? './nodes'
-        Dust.print_failed 'could not find \'nodes\' folder in your dust directory. cannot continue.'
+      unless File.directory?('./nodes')
+        puts 'could not find \'nodes\' folder in your dust directory. cannot continue.'.red
         return false
       end
 
@@ -218,7 +217,7 @@ module  Dust
       # skip this node if there are no recipes found
       return false unless node['recipes']
 
-      recipes = generate_recipes node, context
+      recipes = generate_recipes(node, context)
 
       # skip this node unless we're actually having recipes to cook
       return false if recipes.empty?
@@ -230,7 +229,7 @@ module  Dust
       # 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
+        send(recipe, 'prepare', node['server'], recipe, context, config, options)
       end
 
       node['server'].disconnect
@@ -252,7 +251,7 @@ module  Dust
     end
 
     # generate list of recipes for this node
-    def generate_recipes node, context
+    def generate_recipes(node, context)
       recipes = {}
       node['recipes'].each do |recipe, config|
 
@@ -263,9 +262,9 @@ module  Dust
         next if config == 'disabled' or config.is_a? FalseClass
 
         # check if method and thor task actually exist
-        k = Thor::Util.find_by_namespace recipe
+        k = Thor::Util.find_by_namespace(recipe)
         next unless k
-        next unless k.method_defined? context
+        next unless k.method_defined?(context)
 
         recipes[recipe] = config
       end
@@ -308,9 +307,9 @@ module  Dust
       # 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']
+        if File.directory?(options['yaml'])
           yaml_files = Dir["#{options['yaml']}/**/*.yaml"]
-        elsif File.exists? options['yaml']
+        elsif File.exists?(options['yaml'])
           yaml_files = options['yaml']
         end
       else
@@ -318,7 +317,7 @@ module  Dust
       end
 
       unless yaml_files
-        Dust.print_failed "#{yaml} doesn't exist. exiting."
+        puts "#{yaml} doesn't exist. exiting.".red
         exit
       end
 
@@ -356,7 +355,7 @@ module  Dust
 
           # if hostname is a valid ip address, don't add domain
           # so we can connect via ip address only
-          unless IPAddress.valid? hostname
+          unless IPAddress.valid?(hostname)
             n['fqdn'] += '.' + n['domain'] if n['domain']
           end
 
@@ -364,7 +363,7 @@ module  Dust
           n['proxy'] = options['proxy'] if options['proxy']
 
           # add this node to the global node array
-          @nodes.push n unless filtered? n
+          @nodes.push(n) unless filtered?(n)
         end
       end
     end
@@ -372,7 +371,7 @@ module  Dust
     # 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
+    def filtered?(node)
 
       # if filter is not specified, instantly return false
       return false unless options['filter']

data/lib/dust/server.rb

@@ -722,11 +722,11 @@ module Dust
       # delete user from system
       if options['remove']
         if user_exists?(user, :quiet => true)
-           msg = messages.add("deleting user #{user} from system", :indent => options[:indent])
+           msg = messages.add("deleting user #{user} from system", { :indent => options[:indent] }.merge(options))
            return msg.parse_result(exec("userdel --remove #{user}")[:exit_code])
         end
 
-        return messages.add("user #{user} not present in system").ok
+        return messages.add("user #{user} not present in system", options).ok
       end
 
       if user_exists?(user, :quiet => true)
@@ -737,8 +737,10 @@ module Dust
         args << " --gid #{options['gid']}" if options['gid']
         args << " --append --groups #{Array(options['groups']).join(',')}" if options['groups']
 
-        unless args.empty?
-          msg = messages.add("modifying user #{user}", :indent => options[:indent])
+        if args.empty?
+          return messages.add("user #{user} already set up correctly", options).ok
+        else
+          msg = messages.add("modifying user #{user}", { :indent => options[:indent] }.merge(options))
           return msg.parse_result(exec("usermod #{user} #{args}")[:exit_code])
         end
 
@@ -752,7 +754,7 @@ module Dust
         args << " --gid #{options['gid']}" if options['gid']
         args << " --groups #{Array(options['groups']).join(',')}" if options['groups']
 
-        msg = messages.add("creating user #{user}", :indent => options[:indent])
+        msg = messages.add("creating user #{user}", { :indent => options[:indent] }.merge(options))
         return msg.parse_result(exec("useradd #{user} #{args}")[:exit_code])
       end
     end

data/lib/dust/version.rb

@@ -1,3 +1,3 @@
 module Dust
-  VERSION = "0.15.1"
+  VERSION = "0.15.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dust-deploy
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.15.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-26 00:00:00.000000000 Z
+date: 2012-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -165,7 +165,6 @@ files:
 - lib/dust/examples/templates/ssh_authorized_keys/users.yaml
 - lib/dust/helper.rb
 - lib/dust/messaging.rb
-- lib/dust/print_status.rb
 - lib/dust/recipe.rb
 - lib/dust/recipes/aliases.rb
 - lib/dust/recipes/apt.rb
@@ -183,7 +182,6 @@ files:
 - lib/dust/recipes/limits.rb
 - lib/dust/recipes/locale.rb
 - lib/dust/recipes/logrotate.rb
-- lib/dust/recipes/make.rb
 - lib/dust/recipes/motd.rb
 - lib/dust/recipes/mysql.rb
 - lib/dust/recipes/newrelic.rb

data/lib/dust/print_status.rb

@@ -1,70 +0,0 @@
-require 'colorize'
-
-module Dust
-  $stdout.sync = true # autoflush
-
-  def self.print_result ret, options={:quiet => false, :indent => 1}
-    if ret == 0 or ret.is_a? TrueClass
-      print_ok '', options
-      return true
-    else
-      print_failed '', options
-      return false
-    end
-  end
-
-  def self.print_ok string='', options={:quiet => false, :indent => 1}
-    opts = options.clone
-    opts[:indent] = 0 if string.empty?
-    print_msg "#{string} #{'[ ok ]'.green}\n", opts
-    true
-  end
-
-  def self.print_failed string='', options={:quiet => false, :indent => 1}
-    opts = options.clone
-    opts[:indent] = 0 if string.empty?
-    print_msg "#{string} #{'[ failed ]'.red}\n", opts
-    false
-  end
-
-  def self.print_warning string='', options={:quiet => false, :indent => 1}
-    opts = options.clone
-    opts[:indent] = 0 if string.empty?
-    print_msg "#{string} #{'[ warning ]'.yellow}\n", opts
-  end
-
-  def self.print_hostname hostname, options={:quiet => false, :indent => 0}
-    print_msg "\n[ #{hostname.blue} ]\n\n", options
-  end
-
-  def self.print_recipe recipe, options={:quiet => false, :indent => 0}
-    print_msg "|#{recipe}|\n".green, options
-  end
-
-  # prints stdout in grey and stderr in red (if existend)
-  def self.print_ret ret, options={:quiet => false, :indent => -1}
-    opts = options.clone
-
-    opts[:indent] += 1
-    print_msg "#{ret[:stdout].chomp.green}\n", opts unless ret[:stdout].empty?
-    print_msg "#{ret[:stderr].chomp.red}\n", opts unless ret[:stderr].empty?
-  end
-
-  # indent according to options[:indent]
-  # indent 0
-  #  - indent 1
-  #    - indent 2
-  def self.print_msg string, options={:quiet => false, :indent => 1}
-    # just return if in quiet mode
-    return if options[:quiet]
-
-    options[:indent] ||= 1
-
-    if options[:indent] == 0
-      print string
-    else
-      print ' ' + '  ' * (options[:indent] - 1) + '- ' + string
-    end
-  end
-
-end

data/lib/dust/recipes/make.rb

@@ -1,29 +0,0 @@
-class Make < Recipe
-  desc 'make:deploy', 'configure, make, make install'
-  def deploy 
-    # install dependencies (defaults, build-essential | make, gcc)
-    @node.install_package 'build-essential'
-
-    # create temporary directory
-    ret = @node.exec 'mktemp -d --tmpdir dust_make.XXXXXXXXX'
-    return ::Dust.print_failed 'error creating temporary directory' if ret[:exit_code] != 0
-    tempdir = ret[:stdout].chomp
-
-    url = 'http://www.securixlive.com/download/barnyard2/barnyard2-1.9.tar.gz'
-
-    if url =~ /\.(tar.gz|tgz)$/
-    elsif url.end_with? '.tar.bz2'
-    elsif url.end_with? '.zip'
-    else
-    end
-
-    # if @config['svn']
-    # if @config['git']
-
-    # get url, svn, git repository
-    # unpack bz2, tgz, zip
-   
-    # run commands (default [ './configure --prefix=/usr/local/', 'make', 'make install' ]
-    # symlink
-  end
-end