server-blender 0.0.13 → 0.0.14

data/VERSION

@@ -1 +1 @@
-0.0.13
+0.0.14

data/bin/blender

@@ -18,4 +18,5 @@ Run "blender COMMAND -h" to get help about a command
 end
 
 require 'optparse'
-require File.expand_path(File.join(__FILE__, "../../lib/blender/cli/", command))
+require File.expand_path(File.join(__FILE__, "../../lib/blender/cli/", command))
+main

data/files/init.sh

@@ -0,0 +1,2 @@
+mkdir -p /var/lib/blender/{recipes,logs,tmp}
+chmod 0700 /var/lib/blender/

data/files/mix.sh

@@ -1,7 +1,7 @@
-#!/bin/bash -eu
+set -ue
 
 SHADOW_PUPPET_VERSION="0.3.2"
-MANIFEST_VERSION="0.0.14"
+MANIFEST_VERSION="0.0.15"
 
 trap "echo FAILED" EXIT
 
@@ -33,25 +33,31 @@ function use_system_ruby() {
 	fi
 }
 
-use_system_ruby
-ensure_gem shadow_puppet $SHADOW_PUPPET_VERSION
-ensure_gem ruby-debug
-ensure_gem server-blender-manifest $MANIFEST_VERSION
-
-echo "Mix: [recipe: $RECIPE, node: ${NODE:-}, roles: ${ROLES:-}]"
+function run_recipe() {
+	echo "Mix: [recipe: $RECIPE, node: ${NODE:-}, roles: ${ROLES:-}]"
 
-# rvm substitutes cd with its scripts/cd which accesses unbound variables
-set +u
-cd /var/lib/blender/recipes
-set -u
+	# rvm substitutes cd with its scripts/cd which accesses unbound variables
+	set +u
+	cd /var/lib/blender/recipes
+	set -u
 
-ruby -rrubygems <<-RUBY
+	/usr/bin/ruby -rrubygems <<-RUBY
 gem 'server-blender-manifest', '$MANIFEST_VERSION'
 require 'blender/manifest'
 Blender::Manifest.run("${SHADOW_PUPPET_VERSION}") || exit(1)
 RUBY
+}
 
-trap - EXIT
+use_system_ruby
+ensure_gem shadow_puppet $SHADOW_PUPPET_VERSION
+ensure_gem ruby-debug
+ensure_gem server-blender-manifest $MANIFEST_VERSION
+if run_recipe; then
+	echo
+	echo "Your ServerShake is ready. Have fun!"
+else
+	echo
+	echo "Failed to mix your ServerShake. Check error messages above for details"
+fi
 
-echo
-echo Your ServerShake is ready. Have fun!
+trap - EXIT

data/lib/blender/cli/init.rb

@@ -1,44 +1,57 @@
-options = {
-  :system_gems => 'y'
-}
-OptionParser.new do |opts|
-  opts.banner = "Usage: blender init [OPTIONS] HOST"
-  opts.separator ""
-  opts.separator "Common options:"
+def parse_options
+  options = {
+    :system_gems => 'y'
+  }
+  OptionParser.new do |opts|
+    opts.banner = "Usage: blender init [OPTIONS] HOST"
+    opts.separator ""
+    opts.separator "Common options:"
 
-  opts.on("-u", "--upstream-gems", "don't use the system gems, download and install upstream version instead") do
-    options[:system_gems] = 'n'
-  end
+    opts.on("-u", "--upstream-gems", "don't use the system gems, download and install upstream version instead") do
+      options[:system_gems] = 'n'
+    end
 
-  opts.on("-N", "--node NODE", "force NODE as the current nodename") do |val|
-    options[:node] = val
-  end
+    opts.on("-N", "--node NODE", "force NODE as the current nodename") do |val|
+      options[:node] = val
+    end
 
-  opts.on("-t", "--trace", "dump trace to the stdout") do |val|
-    options[:trace] = true
-  end
+    opts.on("-t", "--trace", "dump trace to the stdout") do |val|
+      options[:trace] = true
+    end
 
-  opts.on("-H", "--hostname HOSTNAME", "set HOSTNAME") do |val|
-    options[:hostname] = val
-  end
+    opts.on("-H", "--hostname HOSTNAME", "set HOSTNAME") do |val|
+      options[:hostname] = val
+    end
 
-  opts.on("-h", "--help", "Show this message") do
-    puts opts
-    exit
-  end
+    opts.on("-h", "--help", "Show this message") do
+      raise(opts.to_s)
+    end
 
-end.parse!
+  end.parse!
 
-abort("please provide a hostname") unless host = ARGV.shift
+  raise("please provide a hostname\n#{opts}") unless host = ARGV.shift
 
-extra=""
-extra << " TRACE=1" if options[:trace]
-extra << " HOSTNAME=#{options[:hostname]}" if options[:hostname]
-extra << " NODE=#{options[:node]}" if options[:node]
+  options.merge(:host => host)
+end
 
 def run(*cmd)
-  puts ">> #{cmd * ' '}"
+  STDERR.puts ">> #{cmd * ' '}"
   system(*cmd)
 end
 
-run "cat #{File.expand_path("files/bootstrap.sh", Blender::ROOT)} | ssh #{host} USE_SYSTEM_GEMS=#{options[:system_gems]}#{extra} /bin/bash -eu"
+def bootstrap(options)
+  extra=""
+  extra << " TRACE=1" if options[:trace]
+  extra << " HOSTNAME=#{options[:hostname]}" if options[:hostname]
+  extra << " NODE=#{options[:node]}" if options[:node]
+
+  run "cat #{File.expand_path("files/bootstrap.sh", Blender::ROOT)} | ssh #{options[:host]} USE_SYSTEM_GEMS=#{options[:system_gems]}#{extra} /bin/bash -eu"
+end
+
+def main
+  options = parse_options
+  bootstrap(options)
+
+rescue => e
+  abort(e.to_s)
+end

data/lib/blender/cli/mix.rb

@@ -1,71 +1,89 @@
-options = {}
-opts = OptionParser.new do |opts|
-  opts.banner = "Usage: blender mix [OPTIONS] [DIR] HOST"
-  opts.separator "Options:"
+def parse_options
+  options = {}
+  opts = OptionParser.new do |opts|
+    opts.banner = "Usage: blender mix [OPTIONS] [DIR] HOST"
+    opts.separator "Options:"
 
-  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
+    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
 
-  opts.on("-N", "--node NODE", "force NODE as the current nodename") do |val|
-    options[:node] = val
-  end
+    opts.on("-N", "--node NODE", "force NODE as the current nodename") do |val|
+      options[:node] = val
+    end
 
-  opts.on("-R", "--roles ROLES", "comma delimited list of roles that should execute") do |val|
-    options[:roles] = val
-  end
+    opts.on("-R", "--roles ROLES", "comma delimited list of roles that should execute") do |val|
+      options[:roles] = val
+    end
+
+    opts.separator ""
+    opts.separator "Common options:"
+
+    opts.on("-h", "--help", "Show this message") do
+      raise(opts.to_s)
+    end
 
-  opts.separator ""
-  opts.separator "Common options:"
+    opts.separator ""
+    opts.separator "Notes:"
+    opts.separator '    "." used if DIR not specified'
 
-  opts.on("-h", "--help", "Show this message") do
-    puts opts
-    exit
   end
+  opts.parse!
 
-  opts.separator ""
-  opts.separator "Notes:"
-  opts.separator '    "." used if DIR not specified'
+  options[:usage] = opts.to_s
 
-end
-opts.parse!
-
-dir = ARGV.shift
-host = ARGV.shift
-abort("unexpected: #{ARGV*" "}\n#{opts}") unless ARGV.empty?
-if host.nil?
-  host = dir
-  dir = "."
-end
+  dir = ARGV.shift
+  host = ARGV.shift
+  raise("unexpected: #{ARGV*" "}\n#{opts}") unless ARGV.empty?
 
-abort(opts.to_s) unless dir && host
+  if host.nil?
+    host = dir
+    dir = "."
+  end
 
-unless File.directory?(dir)
-  puts "#{dir} is not a directory"
-  abort(opts.to_s)
-end
+  raise(opts.to_s) unless dir && host
+
+  raise("#{dir} is not a directory\n#{opts}") unless File.directory?(dir)
 
-# check for recipe, recipe.rb, directory_name.rb, and default.rb
-recipes = []
-if rname = options[:recipe]
-  recipes << rname << "#{rname}.rb"
+  options.merge(:dir => dir, :host => host)
 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"
+def find_recipe(options)
+  # 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(options[:dir]))}.rb" << "blender-recipe.rb"
+
+  recipe = recipes.detect {|r| File.file?(File.join(options[:dir], r))} ||
+    raise("recipe not found (looking for #{recipes * ' '})\n#{options[:usage]}")
+end
 
 def run(*cmd)
-  puts ">> #{cmd * ' '}"
+  STDERR.puts ">> #{cmd * ' '}"
   system(*cmd)
 end
 
-run("rsync -azP --delete --exclude '.*' #{dir}/ #{host}:#{WORK_DIR}") &&
 
-env_config = "RECIPE=#{recipe}"
-env_config << " NODE=#{options[:node]}" if options[:node]
-env_config << " ROLES=#{options[:roles]}" if options[:roles]
+def run_recipe(recipe, options)
+  run "cat #{File.expand_path("files/init.sh", Blender::ROOT)} | ssh #{options[:host]} /bin/bash -l" or raise("failed init.sh")
+
+  run("rsync -qazP --delete --exclude '.*' #{options[:dir]}/ #{options[:host]}:/var/lib/blender/recipes") or raise("failed rsync")
+
+  env_config = "RECIPE=#{recipe}"
+  env_config << " NODE=#{options[:node]}" if options[:node]
+  env_config << " ROLES=#{options[:roles]}" if options[:roles]
 
-run "cat #{File.expand_path("files/mix.sh", Blender::ROOT)} | ssh #{host} #{env_config} /bin/bash -eu"
+  run "cat #{File.expand_path("files/mix.sh", Blender::ROOT)} | ssh #{options[:host]} #{env_config} /bin/bash -l" or raise("failed mix.sh")
+end
+
+def main
+  options = parse_options
+  recipe = find_recipe(options)
+  run_recipe(recipe, options)
+
+rescue => e
+  abort(e.to_s)
+end

data/lib/blender/cli/start.rb

@@ -1,64 +1,70 @@
 require 'pp'
-options = {}
 
-AMI_64 = "ami-55739e3c"
-AMI_32 = "ami-bb709dd2"
+def parse_options
+  options = {}
 
-OptionParser.new do |opts|
-  opts.banner = "Usage: blender start [OPTIONS] [-- [ec2run options]]"
-  opts.separator "Options:"
+  AMI_64 = "ami-55739e3c"
+  AMI_32 = "ami-bb709dd2"
 
-  opts.on("--ami AMI",
-    "use specified AMI instead of the default one.",
-    "If you don't specify your own AMI blender will choose a defaule one:",
-    "* #{AMI_32} for 32 bits",
-    "* #{AMI_64} for 64 bits",
-    "You can change the defaults by writing your own AMIs",
-    "into ~/.blender/ami and ~/.blender/ami64 files",
-    " "
-  ) do |val|
-    options[:ami] = val
-  end
-  opts.on("--key KEY",
-    "use KEY when starting instance. KEY should already be generated.",
-    "If you don't specify a KEY blender will try to use the key from your EC2 account",
-    "Note: There must be only ONE key on the account for it to work. ",
-    " "
-  ) do |val|
-    options[:key] = val
-  end
+  OptionParser.new do |opts|
+    opts.banner = "Usage: blender start [OPTIONS] [-- [ec2run options]]"
+    opts.separator "Options:"
 
-  opts.on("--64", "use 64 bit default AMI. This does nothing if you specify your own AMI") do
-    options[64] = true
-  end
+    opts.on("--ami AMI",
+      "use specified AMI instead of the default one.",
+      "If you don't specify your own AMI blender will choose a defaule one:",
+      "* #{AMI_32} for 32 bits",
+      "* #{AMI_64} for 64 bits",
+      "You can change the defaults by writing your own AMIs",
+      "into ~/.blender/ami and ~/.blender/ami64 files",
+      " "
+    ) do |val|
+      options[:ami] = val
+    end
+    opts.on("--key KEY",
+      "use KEY when starting instance. KEY should already be generated.",
+      "If you don't specify a KEY blender will try to use the key from your EC2 account",
+      "Note: There must be only ONE key on the account for it to work. ",
+      " "
+    ) do |val|
+      options[:key] = val
+    end
 
-  opts.on("-n", "--dry-run", "Don't do anything, just print the command line to be executed") do |val|
-    options[:dry] = true
-  end
+    opts.on("--64", "use 64 bit default AMI. This does nothing if you specify your own AMI") do
+      options[64] = true
+    end
 
-  opts.separator "\nCommon options:"
+    opts.on("-n", "--dry-run", "Don't do anything, just print the command line to be executed") do |val|
+      options[:dry] = true
+    end
 
-  opts.on("-h", "--help", "Show this message") do
-    puts opts
-    exit
-  end
+    opts.separator "\nCommon options:"
 
-  opts.on_tail <<-EXAMPLE
+    opts.on("-h", "--help", "Show this message") do
+      puts opts
+      exit
+    end
 
-Example:
+    opts.on_tail <<-EXAMPLE
 
-# start a 64bit instance with default options
-blender start -64
+  Example:
 
-# start with a custom ami
-blender start --ami ami-2d4aa444
+  # start a 64bit instance with default options
+  blender start -64
 
-# start with passing arguments to ec2run: use security group default+test
-blender start -- -g default -g test
-  EXAMPLE
+  # start with a custom ami
+  blender start --ami ami-2d4aa444
 
+  # start with passing arguments to ec2run: use security group default+test
+  blender start -- -g default -g test
+    EXAMPLE
 
-end.parse!
+
+  end.parse!
+
+
+  options
+end
 
 def default_ami(options)
   name = options[64] ? "~/.blender/ami64" : "~/.blender/ami"
@@ -74,9 +80,24 @@ def default_key(options)
   keys.first.split("\t")[1] || raise("invalid key")
 end
 
-ami = options[:ami] || default_ami(options)
-key = options[:key] || default_key(options)
+def run(*cmd)
+  system(*cmd)
+end
+
+def start_ami(options)
+  ami = options[:ami] || default_ami(options)
+  key = options[:key] || default_key(options)
+
+  cmd = ["ec2run", ami, "-k", key, *ARGV]
+
+  STDERR.puts ">> #{cmd * ' '}"
+  run(cmd) unless options[:dry]
+end
+
+def main
+  options = parse_options
+  start_ami(options)
 
-cmd = ["ec2run", ami, "-k", key, *ARGV]
-puts cmd * " "
-system(*cmd) unless options[:dry]
+rescue => e
+  abort(e.to_s)
+end

data/server-blender.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{server-blender}
-  s.version = "0.0.13"
+  s.version = "0.0.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Vitaly Kushner"]
-  s.date = %q{2010-06-23}
+  s.date = %q{2010-07-04}
   s.default_executable = %q{blender}
   s.description = %q{Boostrap and manage servers with shadow_puppet
 
@@ -36,6 +36,7 @@ http://reductivelabs.com/products/puppet/
      "VERSION",
      "bin/blender",
      "files/bootstrap.sh",
+     "files/init.sh",
      "files/mix.sh",
      "lib/blender.rb",
      "lib/blender/cli/init.rb",
@@ -44,20 +45,7 @@ http://reductivelabs.com/products/puppet/
      "server-blender.gemspec",
      "spec/server-blender_spec.rb",
      "spec/spec.opts",
-     "spec/spec_helper.rb",
-     "vendor/server-blender-manifests/.gitignore",
-     "vendor/server-blender-manifests/LICENSE",
-     "vendor/server-blender-manifests/README.markdown",
-     "vendor/server-blender-manifests/Rakefile",
-     "vendor/server-blender-manifests/VERSION",
-     "vendor/server-blender-manifests/lib/blender/manifest/init.rb",
-     "vendor/server-blender-manifests/lib/blender/manifest/mixer.rb",
-     "vendor/server-blender-manifests/lib/blender/manifest/nodes.rb",
-     "vendor/server-blender-manifests/lib/blender/manifest/roles.rb",
-     "vendor/server-blender-manifests/lib/blender/manifest/root.rb",
-     "vendor/server-blender-manifests/server-blender-manifest.gemspec",
-     "vendor/server-blender-manifests/spec/spec.opts",
-     "vendor/server-blender-manifests/spec/spec_helper.rb"
+     "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://astrails.com/opensource/server-blender}
   s.rdoc_options = ["--charset=UTF-8"]

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 13
-  version: 0.0.13
+  - 14
+  version: 0.0.14
 platform: ruby
 authors: 
 - Vitaly Kushner
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-23 00:00:00 +03:00
+date: 2010-07-04 00:00:00 +03:00
 default_executable: blender
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -71,6 +71,7 @@ files:
 - VERSION
 - bin/blender
 - files/bootstrap.sh
+- files/init.sh
 - files/mix.sh
 - lib/blender.rb
 - lib/blender/cli/init.rb
@@ -80,19 +81,6 @@ files:
 - spec/server-blender_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-- vendor/server-blender-manifests/.gitignore
-- vendor/server-blender-manifests/LICENSE
-- vendor/server-blender-manifests/README.markdown
-- vendor/server-blender-manifests/Rakefile
-- vendor/server-blender-manifests/VERSION
-- vendor/server-blender-manifests/lib/blender/manifest/init.rb
-- vendor/server-blender-manifests/lib/blender/manifest/mixer.rb
-- vendor/server-blender-manifests/lib/blender/manifest/nodes.rb
-- vendor/server-blender-manifests/lib/blender/manifest/roles.rb
-- vendor/server-blender-manifests/lib/blender/manifest/root.rb
-- vendor/server-blender-manifests/server-blender-manifest.gemspec
-- vendor/server-blender-manifests/spec/spec.opts
-- vendor/server-blender-manifests/spec/spec_helper.rb
 has_rdoc: true
 homepage: http://astrails.com/opensource/server-blender
 licenses: []

data/vendor/server-blender-manifests/.gitignore

@@ -1,26 +0,0 @@
-## MISC
-pkg
-tags
-.yardoc
-
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC

data/vendor/server-blender-manifests/LICENSE

@@ -1,20 +0,0 @@
-Copyright (c) 2009 Vitaly Kushner
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/vendor/server-blender-manifests/README.markdown

@@ -1,23 +0,0 @@
-# server-blender-manifest
-
-This gem is part of the [server-blender](http://astrails.com/opensource/server-blender) family.
-
-It contains server-side root manifest implementation for blender recipes. See server-blender for more information.
-
-* Home: [http://astrails.com/opensource/server-blender](http://astrails.com/opensource/server-blender)
-* Code: [http://github.com/astrails/server-blender-manifest](http://github.com/astrails/server-blender-manifest)
-* Blog: [http://blog.astrails.com/server-blender](http://blog.astrails.com/server-blender)
-
-## Note on Patches/Pull Requests
- 
-* Fork the project.
-* Make your feature addition or bug fix.
-* Add tests for it. This is important so I don't break it in a
-  future version unintentionally.
-* Commit, do not mess with rakefile, version, or history.
-  (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
-* Send me a pull request. Bonus points for topic branches.
-
-## Copyright
-
-Copyright (c) 2010 Vitaly Kushner. See LICENSE for details.

data/vendor/server-blender-manifests/Rakefile

@@ -1,40 +0,0 @@
-require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "server-blender-manifest"
-    gem.summary = %Q{server-side root manifest implementation for server-blender}
-    gem.description = <<-DESC
-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.
-    DESC
-    gem.email = "vitaly@astrails.com"
-    gem.homepage = "http://astrails.com/opensource/server-blender"
-    gem.authors = ["Vitaly Kushner"]
-    gem.add_development_dependency "rspec", ">= 1.2.9"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
-
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
-task :spec => :check_dependencies
-
-task :default => :spec
-
-# documentaion is included in the parent server-blender gem

data/vendor/server-blender-manifests/VERSION

@@ -1 +0,0 @@
-0.0.8

data/vendor/server-blender-manifests/lib/blender/manifest/init.rb

@@ -1,23 +0,0 @@
-module Blender::Manifest::Init
-  def self.included(base)
-    base.class_eval do
-      recipe :create_blender_directories
-    end
-  end
-
-  # create blender directories
-  # @return dependency ref for the direcotires creation
-  def create_blender_directories
-    @create_blender_directories ||=
-      begin
-        dep = directory "/var/lib/blender", :mode => 0700
-        dep = directory "/var/lib/blender/logs", :require => dep
-        dep = directory "/var/lib/blender/tmp", :require => dep
-      end
-  end
-
-  # @return dependency for blender directories
-  def builder_deps
-    create_blender_directories
-  end
-end

data/vendor/server-blender-manifests/lib/blender/manifest/mixer.rb

@@ -1,35 +0,0 @@
-module Blender::Manifest::Mixer
-  # mixes recipe module
-  #
-  # The purpose is to make the mixing of recipes cleaner and easier on the eyes :)
-  # i.e. instead of
-  #     require 'foo'
-  #     include Blender::Recipes::Foo
-  #     require 'bar'
-  #     include Blender::Recipes::Bar
-  # you can just
-  #     mix :foo, :bar
-  # @param [[String, Symbol, Module]] recipes to mix
-  def mix(*recipes)
-
-    recipes.each do |recipe|
-
-      next if Root.mixed_recipes.include?(recipe)
-      Root.mixed_recipes << recipe
-
-      case recipe
-      when String, Symbol
-        require recipe.to_s
-        mixin = "Blender::Recipes::#{recipe.to_s.camelize}".constantize
-      when Module
-        mixin = recipe
-      else
-        raise "Expecting String, Symbol or Module. don't know what do do with #{recipe.inspect}"
-      end
-
-      puts "MIX: #{mixin}"
-      ::Root.send :include, mixin
-    end
-  end
-
-end

data/vendor/server-blender-manifests/lib/blender/manifest/nodes.rb

@@ -1,94 +0,0 @@
-# This module encapsulates nodes handeling
-# Nodes can be declared both on a class level and inside a recipe
-# When defining a node an 'id' is associated with its hostname
-# and the node can later be reffered by this id (for example
-# to get its ip)
-module Blender::Manifest::Nodes
-
-  def self.included(base)
-    base.send :extend, self
-  end
-
-  # this holds the map from host ids to hostnames
-  @@internal_hostnames = {}
-  @@external_hostnames = {}
-
-  # returns hostname by id or local host's name if the id is nil
-  def hostname(id = nil, external = false)
-    if id
-      (external ? @@external_hostnames : @@internal_hostnames)[id]
-    else
-      external ? Facter.fqdn : Facter.hostname
-    end
-  end
-
-  # returns id of the node we are running at
-  # Note: will ONLY return non-nil value after (or during) node definition
-  #   unless node is forced by environment NODE variable or /etc/node file
-  def current_node
-    node = ENV['NODE'] ||
-      (File.exists?("/etc/node") && File.read("/etc/node").strip) ||
-      @@internal_hostnames.index(hostname) ||
-      @@external_hostnames.index(hostname(nil, true))
-    node && node.to_sym
-  end
-
-  # @return true if we are running on the node with the given `id`
-  def current_node?(id)
-    current_node == id.to_sym
-  end
-
-  # resolves host name using 'host' executable
-  # @return host's IP by its name or nil if not found
-  def host_ip(name)
-    res = `host #{name}`.split("\n").grep(/has address/).first
-    res && res.split.last
-  end
-
-  # define node and conditionally execute code block only on the specific node
-  # Note: can be called multiple times without internal_name and external_name parameters
-  #   in which case will only do the conditional execution
-  # @param [Symbol, String] id of the host to define or test for
-  # @param [String] internal_name short hostname for the host
-  # @param [String] external_name full dns hostname for the host
-  # @example
-  #    node :app, "host5", "host5.serverfarm2.localdomain" do
-  #      ...
-  #    end
-  #
-  #    node :app do
-  #      ...
-  #    end
-  #
-  def node(id, internal_name = nil, external_name = internal_name)
-    return if false == internal_name # can be used to temporary 'disable' host's definition
-    # like:
-    # host :app2, false do .. end
-    @@internal_hostnames[id] = internal_name if internal_name
-    @@external_hostnames[id] = external_name if external_name
-
-    if block_given? && current_node?(id)
-      puts "NODE: #{id} / #{current_node}"
-      @node = id
-      yield
-    end
-  end
-
-  # find out node addr. try to use external, then internal, then the host id to determine ip
-  # @param [Symbol, String] id id of the host to resolve
-  def addr(id)
-    [hostname(id, true).to_s, hostname(id).to_s, id.to_s].each do |name|
-      ip = host_ip(name)
-      return ip if ip
-    end
-
-    # if all else fails, we should still be able to address the current node
-    current_node?(id) ? "127.0.0.1" : nil
-  end
-
-  # same as addr but throws exception if IP can't be found
-  def addr!(id)
-    addr(id) or raise "Can't find address for '#{id}'"
-  end
-
-end

data/vendor/server-blender-manifests/lib/blender/manifest/roles.rb

@@ -1,40 +0,0 @@
-module Blender::Manifest::Roles
-
-  def self.included(base)
-    base.send :extend, self
-  end
-
-  # A very simple mechanism to define roles
-  #
-  # Roles to accept can be defined from environment, /etc/roles file
-  # or can be explicitly defined like 'roles xxx, yyy'
-  # usually the 'roles a,b,c' call will come inside of
-  # a `node` block and so will be conditionally executed depending on the
-  # running host
-
-  def current_roles
-    @current_roles ||=
-      if ENV['ROLES']
-        ENV['ROLES'].split(",")
-      elsif File.exists?("/etc/roles")
-        File.read("/etc/roles").strip.split
-      else
-        []
-      end
-  end
-
-  # ADDS roles to the currently defined roles
-  def roles *roles
-    current_roles.concat(roles.map {|r| r.to_s})
-  end
-
-  # conditionally runs the code block if the role 'r' is
-  # currently defined
-  def role r
-    if block_given? && current_roles.include?(r.to_s)
-      puts "ROLE: #{r}"
-      yield
-    end
-  end
-
-end

data/vendor/server-blender-manifests/lib/blender/manifest/root.rb

@@ -1,38 +0,0 @@
-require 'ruby-debug'
-$: << File.dirname(__FILE__) # FIXME: remove?
-
-module Blender
-  module Manifest; end
-  module Recipes; end
-end
-require 'init'
-require 'nodes'
-require 'roles'
-require 'mixer'
-
-class Root < ::ShadowPuppet::Manifest
-  include Blender::Manifest::Init
-  include Blender::Manifest::Nodes
-  include Blender::Manifest::Roles
-
-  @@mixed_recipes = []
-  def self.mixed_recipes
-    @@mixed_recipes
-  end
-
-  def execute_user_recipe
-    raise "no RECIPE to execute" unless recipe = ENV['RECIPE']
-
-    code = open(recipe).read
-    instance_eval(code, recipe)
-  end
-  recipe :execute_user_recipe
-end
-
-include Blender::Manifest::Mixer
-
-# "standard" recipe directories
-$: << "recipes" << "recipes/astrails" << "lib/astrails/blender/recipes"
-
-# add all libs in the ./vendor directory to the path
-$:.concat Dir["vendor/*/"]

data/vendor/server-blender-manifests/server-blender-manifest.gemspec

@@ -1,58 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{server-blender-manifest}
-  s.version = "0.0.8"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Vitaly Kushner"]
-  s.date = %q{2010-06-15}
-  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.
-}
-  s.email = %q{vitaly@astrails.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.markdown"
-  ]
-  s.files = [
-    ".gitignore",
-     "LICENSE",
-     "README.markdown",
-     "Rakefile",
-     "VERSION",
-     "lib/blender/manifest/init.rb",
-     "lib/blender/manifest/mixer.rb",
-     "lib/blender/manifest/nodes.rb",
-     "lib/blender/manifest/roles.rb",
-     "lib/blender/manifest/root.rb",
-     "server-blender-manifest.gemspec",
-     "spec/spec.opts",
-     "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://astrails.com/opensource/server-blender}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{server-side root manifest implementation for server-blender}
-  s.test_files = [
-    "spec/spec_helper.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
-    else
-      s.add_dependency(%q<rspec>, [">= 1.2.9"])
-    end
-  else
-    s.add_dependency(%q<rspec>, [">= 1.2.9"])
-  end
-end
-

data/vendor/server-blender-manifests/spec/spec.opts

@@ -1 +0,0 @@
---color

data/vendor/server-blender-manifests/spec/spec_helper.rb

@@ -1,9 +0,0 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'server-blender-manifest'
-require 'spec'
-require 'spec/autorun'
-
-Spec::Runner.configure do |config|
-  
-end