server-blender 0.0.8 → 0.0.10

data/.document

@@ -1,4 +1,4 @@
-README.rdoc
+README.markdown
 lib/**/*.rb
 bin/*
 features/**/*.feature

data/VERSION

@@ -1 +1 @@
-0.0.8
+0.0.10

data/files/mix.sh

@@ -0,0 +1,35 @@
+#!/bin/bash -eu
+
+trap "echo FAILED" EXIT
+
+# ensure_gem GEM [VERSION]
+function ensure_gem()
+{
+	if [ $# -eq 2 ]; then
+		# name + version
+		if ! gem list $1 | grep -q "$1 (\([^,]*, \)*${2//./\\.}\(, [^,]*\)*)$"; then
+			echo installing $1 $2
+			gem install --no-ri --no-rdoc $1 -v$2
+		fi
+	else
+		# name only
+		if ! gem list $1 | grep -q "^$1 ";then
+			echo installing $1
+			gem install --no-ri --no-rdoc $1
+		fi
+	fi
+}
+
+ensure_gem shadow_puppet 0.3.2
+ensure_gem ruby-debug
+ensure_gem server-blender-manifest 0.0.9
+
+cd /var/lib/blender/recipes
+echo "Running Puppet [recipe: $RECIPE]"
+
+blender-mix-recipe $RECIPE
+
+trap - EXIT
+
+echo
+echo Your ServerShake is ready

data/lib/blender/cli/init.rb

@@ -41,4 +41,4 @@ def run(*cmd)
   system(*cmd)
 end
 
-run "cat files/bootstrap.sh | ssh #{host} USE_SYSTEM_GEMS=#{options[:system_gems]}#{extra} /bin/bash -eu"
+run "cat #{File.expand_path("files/bootstrap.sh", Blender::ROOT)} | ssh #{host} USE_SYSTEM_GEMS=#{options[:system_gems]}#{extra} /bin/bash -eu"

data/lib/blender/cli/mix.rb

@@ -49,23 +49,19 @@ end
 
 File.file?(File.join(dir, recipe = options[:recipe])) ||
   File.file?(File.join(dir, recipe = "#{options[:recipe]}.rb")) ||
-  abort("recipe #{recipe} not found\n#{opts}")
+  abort("recipe #{options[:recipe]} not found\n#{opts}")
 
 WORK_DIR = "/var/lib/blender/recipes"
-LOCAL_MANIFEST_DIR = File.expand_path("../../manifest", __FILE__)
-REMOTE_MANIFEST_DIR = "/var/lib/blender/manifest"
-ROOT_MANIFEST = File.join(REMOTE_MANIFEST_DIR, "root.rb")
 
 def run(*cmd)
   puts ">> #{cmd * ' '}"
   system(*cmd)
 end
 
-run("rsync -azP --delete --exclude '.*' #{LOCAL_MANIFEST_DIR}/ #{host}:#{REMOTE_MANIFEST_DIR}") &&
-run("rsync -azP --delete --exclude '.*' --exclude other #{dir}/ #{host}:#{WORK_DIR}") &&
+run("rsync -azP --delete --exclude '.*' #{dir}/ #{host}:#{WORK_DIR}") &&
 
-extra=""
-extra << " NODE=#{options[:node]}" if options[:node]
-extra << " ROLES=#{options[:roles]}" if options[:roles]
+env_config = "RECIPE=#{recipe}"
+env_config << " NODE=#{options[:node]}" if options[:node]
+env_config << " ROLES=#{options[:roles]}" if options[:roles]
 
-run("ssh", host, "echo 'Running Puppet [recipe: #{recipe}]...';cd #{WORK_DIR} && RECIPE=#{recipe} #{extra} shadow_puppet #{ROOT_MANIFEST}")
+run "cat #{File.expand_path("files/mix.sh", Blender::ROOT)} | ssh #{host} #{env_config} /bin/bash -eu"

data/server-blender.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{server-blender}
-  s.version = "0.0.8"
+  s.version = "0.0.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Vitaly Kushner"]
@@ -36,6 +36,7 @@ http://reductivelabs.com/products/puppet/
      "VERSION",
      "bin/blender",
      "files/bootstrap.sh",
+     "files/mix.sh",
      "lib/blender.rb",
      "lib/blender/cli/init.rb",
      "lib/blender/cli/mix.rb",

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 8
-  version: 0.0.8
+  - 10
+  version: 0.0.10
 platform: ruby
 authors: 
 - Vitaly Kushner
@@ -71,6 +71,7 @@ files:
 - VERSION
 - bin/blender
 - files/bootstrap.sh
+- files/mix.sh
 - lib/blender.rb
 - lib/blender/cli/init.rb
 - lib/blender/cli/mix.rb