dust-deploy 0.1.3 → 0.1.5

data/README.md

@@ -61,7 +61,7 @@ you can then save the file, and tell dust to get to work:
        - installing git-core [ ok ]
      - checking if rsync is installed [ ok ]
 
-you should see dust connecting to the node, checking if the requestet packages are installed, and if not, install them.
+you should see dust connecting to the node, checking if the requested packages are installed, and if not, install them.
 dust works with aptitude, yum and emerge systems at the moment (testet with ubuntu, debian, gentoo, scientificlinux, centos).
 feel free to contribute to dust, so that your system is also supported. contribution is easy! just send me a github pull request. You can find the repository here: https://github.com/kechagia/dust-deploy
 
@@ -112,7 +112,7 @@ you can then inherit these templates in your yourhost.yaml:
 running dust now, will use the inherited settings as well.
 you can also overwrite settings in the template with the ones in yourhost.yaml
 
-**NOTE** hashes will be deep merged with inherited hashes, other types will be overwritten!
+**NOTE:** hashes will be deep merged with inherited hashes, other types will be overwritten!
 
     $ dust deploy
 
@@ -142,6 +142,7 @@ filters and proxy
 ------------
 
 because that's not awesome enough, you can also filter your hosts using the --filter flag
+
      $ dust deploy --filter hostname:myhost-1,otherhost
 
      $ dust deploy --filter group:debian
@@ -168,7 +169,7 @@ dust comes with a set of predifined, (almost) ready to use recipes managing a lo
 -   install basic system tools and pushing .configuration files for root
 -   iptables firewall
 -   debian/ubuntu debsecan security notifications
--   debian/ubunto repositories
+-   debian/ubuntu repositories
 -   duplicity backups
 -   mysql server configuration
 -   postgresql server configuration (including corosync scripts)
@@ -181,9 +182,9 @@ dust comes with a set of predifined, (almost) ready to use recipes managing a lo
 writing your own recipes
 ------------
 
-because the above recipes will probably not in all cases fullfill your needs, it's pretty easy to write your own recipes. You can either file them in using a git pull request (if you think it's a generic one which others might use as well), or place them locally in the "recipes" folder in your mynetwork.dust directory.
+because the above recipes will probably not in all cases fulfill your needs, it's pretty easy to write your own recipes. You can either file them in using a git pull request (if you think it's a generic one which others might use as well), or place them locally in the "recipes" folder in your mynetwork.dust directory.
 
-dust comes with a set of predifined functions to perform system taks, which you can (and should!) use.
+dust comes with a set of predefined functions to perform system tasks, which you can (and should!) use.
 
 ### the server.rb methods you can (and should!) use
 

data/bin/dust

@@ -7,42 +7,6 @@ require 'yaml'
 require 'fileutils'
 require 'dust'
 
-# stole this from rails
-# https://github.com/rails/rails/blob/c0262827cacc1baf16668af65c35a09138166394/activesupport/lib/active_support/core_ext/hash/deep_merge.rb
-class Hash
-  # Returns a new hash with +self+ and +other_hash+ merged recursively.
-  def deep_merge(other_hash)
-    dup.deep_merge!(other_hash)
-  end
-
-  # Returns a new hash with +self+ and +other_hash+ merged recursively.
-  # Modifies the receiver in place.
-  def deep_merge!(other_hash)
-    other_hash.each_pair do |k,v|
-      tv = self[k]
-      self[k] = tv.is_a?(Hash) && v.is_a?(Hash) ? tv.deep_merge(v) : v
-    end
-    self
-  end
-end
-
-# stole this from Afz902k who posted something similar at stackoverflow.com
-# adds ability to check if a class with the name of a string exists
-class String
-    def to_class
-        Kernel.const_get self.capitalize
-    rescue NameError 
-        nil
-    end
-
-    def is_a_defined_class?
-        true if self.to_class
-    rescue NameError
-        false
-    end
-end
-
-
 module  Dust
   class Deploy < Thor::Runner
 
@@ -139,6 +103,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, ingredients|
+          ::Dust.print_recipe recipe
           send recipe, context, server, ingredients, options
           puts
         end

data/lib/dust.rb

@@ -1,3 +1,4 @@
+require 'dust/helper'
 require 'dust/print_status'
 require 'dust/convert_size'
 require 'dust/server'

data/lib/dust/helper.rb

@@ -0,0 +1,51 @@
+# combines two arrays
+# stolen from Juan Matias (jmrepetti) from stackoverflow.com
+class Array
+  def combine a
+    return a if self.empty?
+    return self if a.empty?
+
+    aux = []
+    self.each do |self_elem|
+      a.each do |other_elem|
+        aux << [ self_elem, other_elem ]
+      end
+    end
+    aux.map {|elem| elem.flatten }
+  end
+end
+
+# stole this from rails
+# https://github.com/rails/rails/blob/c0262827cacc1baf16668af65c35a09138166394/activesupport/lib/active_support/core_ext/hash/deep_merge.rb
+class Hash
+  # Returns a new hash with +self+ and +other_hash+ merged recursively.
+  def deep_merge(other_hash)
+    dup.deep_merge!(other_hash)
+  end
+
+  # Returns a new hash with +self+ and +other_hash+ merged recursively.
+  # Modifies the receiver in place.
+  def deep_merge!(other_hash)
+    other_hash.each_pair do |k,v|
+      tv = self[k]
+      self[k] = tv.is_a?(Hash) && v.is_a?(Hash) ? tv.deep_merge(v) : v
+    end
+    self
+  end
+end
+
+# stole this from Afz902k who posted something similar at stackoverflow.com
+# adds ability to check if a class with the name of a string exists
+class String
+    def to_class
+        Kernel.const_get self.capitalize
+    rescue NameError 
+        nil
+    end
+
+    def is_a_defined_class?
+        true if self.to_class
+    rescue NameError
+        false
+    end
+end

data/lib/dust/version.rb

@@ -1,3 +1,3 @@
 module Dust
-  VERSION = "0.1.3"
+  VERSION = "0.1.5"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - kris kechagia
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-20 00:00:00 +01:00
+date: 2011-12-23 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -109,6 +109,7 @@ files:
 - lib/dust/examples/templates/postgres/recovery.conf.erb
 - lib/dust/examples/templates/ssh_authorized_keys/users.yaml
 - lib/dust/examples/templates/zabbix_agent/zabbix_agentd.conf.erb
+- lib/dust/helper.rb
 - lib/dust/print_status.rb
 - lib/dust/recipes/aliases.rb
 - lib/dust/recipes/basic_setup.rb