server-blender-manifest 0.0.12 → 0.0.13

data/VERSION

@@ -1 +1 @@
-0.0.12
+0.0.13

data/lib/blender/manifest/init.rb

@@ -18,9 +18,4 @@ module Blender::Manifest::Init
         dep = file(name)
       end
   end
-
-  # @return dependency for blender directories
-  def builder_deps
-    create_blender_directories
-  end
 end

data/lib/blender/manifest/root.rb

@@ -2,7 +2,9 @@ require 'ruby-debug'
 
 module Blender
   module Manifest; end
-  module Recipes; end
+  module Recipes
+    module Os; end
+  end
 end
 
 require 'blender/manifest/init'
@@ -23,18 +25,17 @@ class Root < ::ShadowPuppet::Manifest
   def execute_user_recipe
     raise "no RECIPE to execute" unless recipe = ENV['RECIPE']
 
-    # first load user's recipe
-    code = open(recipe).read
-    instance_eval(code, recipe)
-
-    # next load OS specific recipe. This gives user's recipe
-    # the opportunity to redefine it if needed
-    _os = os.downcase
+    # load OS specific recipe.
+    _os = Facter.value(:operatingsystem).downcase
     unless respond_to?(_os)
-      mix _os
+      mix "os/#{_os}"
     end
     send _os
 
+    # load user's recipe
+    code = open(recipe).read
+    instance_eval(code, recipe)
+
   end
   recipe :execute_user_recipe
 end

data/server-blender-manifest.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{server-blender-manifest}
-  s.version = "0.0.12"
+  s.version = "0.0.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Vitaly Kushner"]
-  s.date = %q{2010-06-17}
+  s.date = %q{2010-06-21}
   s.description = %q{This gem is part of the server-blender family (http://astrails.com/opensource/server-blender)
 It contains server-side root manifest implementation for blender recipes. See server-blender for more information.
 }

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 12
-  version: 0.0.12
+  - 13
+  version: 0.0.13
 platform: ruby
 authors: 
 - Vitaly Kushner
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-17 00:00:00 +03:00
+date: 2010-06-21 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency