dust-deploy 0.1.6 → 0.1.7

data/bin/dust

@@ -70,32 +70,14 @@ module  Dust
     # run specified recipes in the given context
     def run_recipes context
       @nodes.each do |node|
-        recipes =  {}
-
-         # skip this node if there are no recipes found
+        # skip this node if there are no recipes found
         next unless node['recipes']
-
-        # generate list of recipes for this node
-        node['recipes'].each do |recipe, ingredients|
-
-          # in case --recipes was set, skip unwanted recipes
-          next unless options[:recipes].include?(recipe) if options[:recipes]
-
-          # skip disabled recipes
-          next if ingredients == 'disabled'
-
-          # 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] = ingredients
-        end
+          
+        recipes = generate_recipes node, context
 
         # skip this node unless we're actually having recipes to cook
         next if recipes.empty?
 
-
         # connect to server
         server = Server.new node
         next unless server.connect
@@ -111,6 +93,28 @@ module  Dust
         server.disconnect
       end
     end
+    
+    # generate list of recipes for this node
+    def generate_recipes node, context
+      recipes = {}  
+      node['recipes'].each do |recipe, ingredients|
+      
+        # in case --recipes was set, skip unwanted recipes
+        next unless options[:recipes].include?(recipe) if options[:recipes]
+      
+        # skip disabled recipes
+        next if ingredients == 'disabled'
+      
+        # 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] = ingredients
+      end
+      recipes
+    end
+    
 
     # overwrite thorfiles to look for tasks in the recipes directories
     def thorfiles(relevant_to=nil, skip_lookup=false)

data/lib/dust/recipes/repositories.rb

@@ -83,6 +83,10 @@ class Repositories < Thor
     else
       ::Dust.print_failed 'os not supported'
     end
+
+    # fetch new stuff
+    puts
+    node.update_repos
   end
 end
 

data/lib/dust/server.rb

@@ -202,7 +202,7 @@ module Dust
     def update_repos quiet=false, indent=1
       Dust.print_msg('updating system repositories', indent) unless quiet
       if uses_apt? true
-        Dust.print_result exec('DEBIAN_FRONTEND=noninteractive aptitude update')[:exit_code], quiet
+        Dust.print_result exec('aptitude update')[:exit_code], quiet
       elsif uses_emerge? true
         Dust.print_result exec('emerge --sync')[:exit_code], quiet
       elsif uses_rpm? true

data/lib/dust/version.rb

@@ -1,3 +1,3 @@
 module Dust
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 6
-  version: 0.1.6
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - kris kechagia
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-25 00:00:00 +01:00
+date: 2011-12-30 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency