server-blender 0.0.10 → 0.0.11

data/VERSION

@@ -1 +1 @@
-0.0.10
+0.0.11

data/files/bootstrap.sh

@@ -165,13 +165,6 @@ function install_custom_rubygems()
 	ln -sfn /usr/bin/gem1.8 /usr/bin/gem
 }
 
-function install_puppet()
-{
-	log "installing puppet"
-	gem install --no-rdoc --no-ri shadow_puppet -v 0.3.2
-	gem install --no-rdoc --no-ri ruby-debug
-}
-
 # adds /var/lib/gems/1.8/bin to paths. only needed with the system (debian) braindead gems
 
 function add_gems_to_system_path()
@@ -227,10 +220,8 @@ else
 	# upstream rubygems install executables into /usr/bin so no need to fix the path
 fi
 
-
-gem install rdoc # needed by most gems
-
-install_puppet
+gem install --no-rdoc --no-ri rdoc # needed by most gems
+gem install --no-rdoc --no-ri ruby-debug # very useful to debug manifests
 
 date > /etc/bootstraped_at
 etckeeper commit "bootstrapped"

data/files/mix.sh

@@ -1,5 +1,8 @@
 #!/bin/bash -eu
 
+SHADOW_PUPPET_VERSION="0.3.2"
+MANIFEST_VERSION="0.0.11"
+
 trap "echo FAILED" EXIT
 
 # ensure_gem GEM [VERSION]
@@ -20,16 +23,22 @@ function ensure_gem()
 	fi
 }
 
-ensure_gem shadow_puppet 0.3.2
+ensure_gem shadow_puppet $SHADOW_PUPPET_VERSION
 ensure_gem ruby-debug
-ensure_gem server-blender-manifest 0.0.9
+ensure_gem server-blender-manifest $MANIFEST_VERSION
+
+echo "Mix: [recipe: $RECIPE, node: ${NODE:-}, roles: ${ROLES:-}]"
 
 cd /var/lib/blender/recipes
-echo "Running Puppet [recipe: $RECIPE]"
 
-blender-mix-recipe $RECIPE
+ruby -rrubygems <<-RUBY
+gem 'server-blender-manifest', '$MANIFEST_VERSION'
+require 'blender/manifest'
+
+system "shadow_puppet", "_${SHADOW_PUPPET_VERSION}_", Blender::Manifest::ROOT
+RUBY
 
 trap - EXIT
 
 echo
-echo Your ServerShake is ready
+echo Your ServerShake is ready. Have fun!

data/lib/blender/cli/mix.rb

@@ -1,11 +1,9 @@
-options = {
-  :recipe => 'default'
-}
+options = {}
 opts = OptionParser.new do |opts|
   opts.banner = "Usage: blender mix [OPTIONS] [DIR] HOST"
   opts.separator "Options:"
 
-  opts.on("-r", "--recipe RECIPE", "('default' will be used if RECIPE not specified") do |val|
+  opts.on("-r", "--recipe RECIPE", "if RECIPE is not specified blender will first look for <directory_name>.rb and then for blender-recipe.rb") do |val|
     options[:recipe] = val
   end
 
@@ -47,9 +45,15 @@ unless File.directory?(dir)
   abort(opts.to_s)
 end
 
-File.file?(File.join(dir, recipe = options[:recipe])) ||
-  File.file?(File.join(dir, recipe = "#{options[:recipe]}.rb")) ||
-  abort("recipe #{options[:recipe]} not found\n#{opts}")
+# check for recipe, recipe.rb, directory_name.rb, and default.rb
+recipes = []
+if rname = options[:recipe]
+  recipes << rname << "#{rname}.rb"
+end
+recipes << "#{File.basename(File.expand_path(dir))}.rb" << "blender-recipe.rb"
+
+recipe = recipes.detect {|r| File.file?(File.join(dir, r))} ||
+  abort("recipe not found\n#{opts}")
 
 WORK_DIR = "/var/lib/blender/recipes"
 

data/server-blender.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{server-blender}
-  s.version = "0.0.10"
+  s.version = "0.0.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Vitaly Kushner"]

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 10
-  version: 0.0.10
+  - 11
+  version: 0.0.11
 platform: ruby
 authors: 
 - Vitaly Kushner