server-blender 0.0.14 → 0.0.15

data/.gitignore

@@ -25,3 +25,4 @@ pkg
 
 ## PROJECT::SPECIFIC
 doc
+log/

data/VERSION

@@ -1 +1 @@
-0.0.14
+0.0.15

data/bin/blender

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
-require File.expand_path(File.join(__FILE__, "../../lib/blender"))
+$:.unshift File.expand_path(File.join(__FILE__, "../../lib"))
+require 'blender'
 include Blender
 
 # commands are just ruby scripts in lib/blender/cli
@@ -18,5 +19,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))
-main
+require "blender/cli/#{command}"
+Blender::Cli.const_get(command.capitalize).new(ARGV).execute

data/files/bootstrap.sh

@@ -70,6 +70,7 @@ function supported_version()
 
 	case "`distribution`" in
 		"Ubuntu 10.04") true;;
+		"Ubuntu 10.10") true;;
 	  *) false;;
 	esac
 }

data/files/mix.sh

@@ -1,7 +1,7 @@
 set -ue
 
 SHADOW_PUPPET_VERSION="0.3.2"
-MANIFEST_VERSION="0.0.15"
+MANIFEST_VERSION="0.0.17"
 
 trap "echo FAILED" EXIT
 
@@ -54,10 +54,10 @@ ensure_gem ruby-debug
 ensure_gem server-blender-manifest $MANIFEST_VERSION
 if run_recipe; then
 	echo
-	echo "Your ServerShake is ready. Have fun!"
+	echo "Your mix is ready. Have fun!"
 else
 	echo
-	echo "Failed to mix your ServerShake. Check error messages above for details"
+	echo "Mix failed. Check error messages above for details"
 fi
 
 trap - EXIT

data/lib/blender/cli.rb

@@ -0,0 +1,13 @@
+module Blender
+  class Cli
+    def initialize(args)
+      @args = args
+    end
+
+    def run(*cmd)
+      STDERR.puts ">> #{cmd * ' '}"
+      system(*cmd) unless @dry
+    end
+
+  end
+end

data/lib/blender/cli/init.rb

@@ -1,57 +1,59 @@
-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("-N", "--node NODE", "force NODE as the current nodename") do |val|
-      options[:node] = val
-    end
+require 'blender/cli'
+
+class Blender::Cli::Init < Blender::Cli
+  def parse_options(args)
+    options = {
+      :system_gems => 'y'
+    }
+    opts = 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("-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("-H", "--hostname HOSTNAME", "set HOSTNAME") do |val|
+        options[:hostname] = val
+      end
+
+      opts.on("-h", "--help", "Show this message") do
+        raise(opts.to_s)
+      end
 
-    opts.on("-t", "--trace", "dump trace to the stdout") do |val|
-      options[:trace] = true
     end
+    opts.parse!(args)
 
-    opts.on("-H", "--hostname HOSTNAME", "set HOSTNAME") do |val|
-      options[:hostname] = val
-    end
+    raise("please provide a hostname\n#{opts}") unless host = args.shift
 
-    opts.on("-h", "--help", "Show this message") do
-      raise(opts.to_s)
-    end
+    raise("unexpected: #{args*" "}\n#{opts}") unless args.empty?
 
-  end.parse!
+    options.merge(:host => host)
+  end
 
-  raise("please provide a hostname\n#{opts}") unless host = ARGV.shift
+  def bootstrap(options)
+    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)
-  STDERR.puts ">> #{cmd * ' '}"
-  system(*cmd)
-end
-
-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
+    run "cat #{File.expand_path("files/bootstrap.sh", Blender::ROOT)} | ssh #{options[:host]} USE_SYSTEM_GEMS=#{options[:system_gems]}#{extra} /bin/bash -eu" or raise "failed bootstrap.sh"
+  end
 
-def main
-  options = parse_options
-  bootstrap(options)
+  def execute
+    options = parse_options(@args)
+    bootstrap(options)
 
-rescue => e
-  abort(e.to_s)
+  rescue => e
+    abort(e.to_s)
+  end
 end

data/lib/blender/cli/mix.rb

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

data/lib/blender/cli/start.rb

@@ -1,103 +1,104 @@
-require 'pp'
+require 'blender/cli'
 
-def parse_options
-  options = {}
+class Blender::Cli::Start < Blender::Cli
 
   AMI_64 = "ami-55739e3c"
   AMI_32 = "ami-bb709dd2"
 
-  OptionParser.new do |opts|
-    opts.banner = "Usage: blender start [OPTIONS] [-- [ec2run options]]"
-    opts.separator "Options:"
-
-    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
+  def parse_options(args)
+    options = {}
 
-    opts.on("--64", "use 64 bit default AMI. This does nothing if you specify your own AMI") do
-      options[64] = true
-    end
+    opts = OptionParser.new do |opts|
+      opts.banner = "Usage: blender start [OPTIONS] [-- [ec2run options]]"
+      opts.separator "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("-a", "--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.separator "\nCommon options:"
+      opts.separator ""
 
-    opts.on("-h", "--help", "Show this message") do
-      puts opts
-      exit
-    end
+      opts.on("-k", "--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.separator ""
 
-    opts.on_tail <<-EXAMPLE
+      opts.on("--64", "use 64 bit default AMI. This does nothing if you specify your own AMI") do
+        options[64] = true
+      end
 
-  Example:
+      opts.on("-n", "--dry-run", "Don't do anything, just print the command line to be executed") do |val|
+        @dry = options[:dry] = true
+      end
 
-  # start a 64bit instance with default options
-  blender start -64
+      opts.separator "\nCommon options:"
 
-  # start with a custom ami
-  blender start --ami ami-2d4aa444
+      opts.on("-h", "--help", "Show this message") do
+        raise(opts.to_s)
+      end
 
-  # start with passing arguments to ec2run: use security group default+test
-  blender start -- -g default -g test
-    EXAMPLE
+      opts.on_tail <<-EXAMPLE
 
+Example:
 
-  end.parse!
+# start a 64bit instance with default options
+blender start -64
+
+# 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
+    opts.parse!(args)
 
+    raise("unexpected: #{args*" "}\n#{opts}") unless args.empty?
 
-  options
-end
+    options
+  end
 
-def default_ami(options)
-  name = options[64] ? "~/.blender/ami64" : "~/.blender/ami"
-  ami = File.read(File.expand_path(name)) rescue nil
-  ami = options[64] ? AMI_64 : AMI_32 if ami.nil? || ami.empty?
-  ami
-end
+  def default_ami(options = {})
+    name = options[64] ? "~/.blender/ami64" : "~/.blender/ami"
+    ami = File.read(File.expand_path(name)).strip rescue nil
+    ami = options[64] ? AMI_64 : AMI_32 if ami.nil? || ami.empty?
+    ami
+  end
 
-def default_key(options)
-  keys = `ec2dkey`.strip.split("\n")
-  abort("too many keys") if keys.length > 1
-  abort("can't find any keys") if keys.length != 1
-  keys.first.split("\t")[1] || raise("invalid key")
-end
+  def default_key
+    keys = `ec2dkey`.strip.split("\n")
+    raise("too many keys") if keys.length > 1
+    raise("can't find any keys") if keys.length != 1
+    keys.first.split("\t")[1].strip || raise("invalid key")
+  end
 
-def run(*cmd)
-  system(*cmd)
-end
+  def start_ami(options = {}, args = [])
+    ami = options[:ami] || default_ami(options)
+    key = options[:key] || default_key
 
-def start_ami(options)
-  ami = options[:ami] || default_ami(options)
-  key = options[:key] || default_key(options)
+    cmd = ["ec2run", ami, "-k", key, *args]
 
-  cmd = ["ec2run", ami, "-k", key, *ARGV]
+    run(*cmd) or raise "failed to start ami"
+  end
 
-  STDERR.puts ">> #{cmd * ' '}"
-  run(cmd) unless options[:dry]
-end
+  def execute
+    options = parse_options(@args)
+    start_ami(options, *@args)
 
-def main
-  options = parse_options
-  start_ami(options)
+  rescue => e
+    abort(e.to_s)
+  end
 
-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.14"
+  s.version = "0.0.15"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Vitaly Kushner"]
-  s.date = %q{2010-07-04}
+  s.date = %q{2010-11-28}
   s.default_executable = %q{blender}
   s.description = %q{Boostrap and manage servers with shadow_puppet
 
@@ -39,21 +39,26 @@ http://reductivelabs.com/products/puppet/
      "files/init.sh",
      "files/mix.sh",
      "lib/blender.rb",
+     "lib/blender/cli.rb",
      "lib/blender/cli/init.rb",
      "lib/blender/cli/mix.rb",
      "lib/blender/cli/start.rb",
      "server-blender.gemspec",
-     "spec/server-blender_spec.rb",
+     "spec/cli/init_spec.rb",
+     "spec/cli/mix_spec.rb",
+     "spec/cli/start_spec.rb",
      "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.rubygems_version = %q{1.3.7}
   s.summary = %q{Server provisioning and configuration management tool}
   s.test_files = [
-    "spec/server-blender_spec.rb",
+    "spec/cli/init_spec.rb",
+     "spec/cli/mix_spec.rb",
+     "spec/cli/start_spec.rb",
      "spec/spec_helper.rb"
   ]
 
@@ -61,7 +66,7 @@ http://reductivelabs.com/products/puppet/
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_development_dependency(%q<yard>, [">= 0"])
     else

data/spec/cli/init_spec.rb

@@ -0,0 +1,80 @@
+require 'spec_helper'
+require 'blender/cli/init'
+
+describe Blender::Cli::Init do
+  before(:each) do
+    @init = Blender::Cli::Init.new []
+  end
+
+  describe :parse_options do
+    it "should throw usage on --help" do
+      proc {
+        @init.parse_options(%w/-h/)
+      }.should raise_error(RuntimeError, /\AUsage:/)
+
+      proc {
+        @init.parse_options(%w/--help/)
+      }.should raise_error(RuntimeError, <<-USAGE)
+Usage: blender init [OPTIONS] HOST
+
+Common options:
+    -u, --upstream-gems              don't use the system gems, download and install upstream version instead
+    -N, --node NODE                  force NODE as the current nodename
+    -t, --trace                      dump trace to the stdout
+    -H, --hostname HOSTNAME          set HOSTNAME
+    -h, --help                       Show this message
+      USAGE
+    end
+
+    it "should throw usage on missing parameters" do
+      proc {
+        @init.parse_options(%w//)
+      }.should raise_error(RuntimeError, /\Aplease provide a hostname/)
+    end
+
+    it "should throw usage on extra args" do
+      proc {
+        @init.parse_options(%w/aaa bbb/)
+      }.should raise_error(RuntimeError, /\Aunexpected: bbb\nUsage:/)
+    end
+
+    it "should parse host" do
+      opts = @init.parse_options(%w/aaa/)
+      opts[:host].should == "aaa"
+    end
+
+    it "should parse -u" do
+      @init.parse_options(%w/-u host/)[:system_gems].should == 'n'
+    end
+
+    it "should parse -N" do
+      @init.parse_options(%w/-N node1 host/)[:node].should == "node1"
+    end
+
+    it "should parse -t" do
+      @init.parse_options(%w/-t host/)[:trace].should == true
+    end
+
+    it "should parse -H" do
+      @init.parse_options(%w/-H hostname host/)[:hostname].should == "hostname"
+    end
+
+  end
+
+  describe :bootstrap do
+    it "should raise if mix fails" do
+     mock(File).expand_path("files/bootstrap.sh", Blender::ROOT) {"path/to/files/bootstrap.sh"}
+     mock(@init).run("cat path/to/files/bootstrap.sh | ssh host USE_SYSTEM_GEMS= TRACE=1 HOSTNAME=foobar.com NODE=zoo /bin/bash -eu") {false}
+     proc {
+       @init.bootstrap :trace => true, :hostname => "foobar.com", :node => "zoo", :host => "host"
+     }.should raise_error(RuntimeError, "failed bootstrap.sh")
+    end
+
+    it "should run bootstrap and return true" do
+     mock(File).expand_path("files/bootstrap.sh", Blender::ROOT) {"path/to/files/bootstrap.sh"}
+     mock(@init).run("cat path/to/files/bootstrap.sh | ssh host USE_SYSTEM_GEMS= TRACE=1 HOSTNAME=foobar.com NODE=zoo /bin/bash -eu") {true}
+     @init.bootstrap(:trace => true, :hostname => "foobar.com", :node => "zoo", :host => "host").should == true
+    end
+  end
+
+end

data/spec/cli/mix_spec.rb

@@ -0,0 +1,157 @@
+require 'spec_helper'
+require 'blender/cli/mix'
+
+describe Blender::Cli::Mix do
+  before(:each) do
+    @mix = Blender::Cli::Mix.new []
+  end
+
+  describe :parse_options do
+    it "should throw usage on --help" do
+      proc {
+        @mix.parse_options(%w/-h/)
+      }.should raise_error(RuntimeError, <<-USAGE)
+Usage: blender mix [OPTIONS] [DIR] HOST
+Options:
+    -r, --recipe RECIPE              if RECIPE is not specified blender will first look for <directory_name>.rb and then for blender-recipe.rb
+    -N, --node NODE                  force NODE as the current nodename
+    -R, --roles ROLES                comma delimited list of roles that should execute
+
+Common options:
+    -h, --help                       Show this message
+
+Notes:
+    "." used if DIR not specified
+      USAGE
+
+      proc {
+        @mix.parse_options(%w/--help/)
+      }.should raise_error(RuntimeError, /\AUsage:/)
+    end
+
+    it "should throw usage on missing parameters" do
+      proc {
+        @mix.parse_options(%w//)
+      }.should raise_error(RuntimeError, /\AUsage:/)
+    end
+
+    it "should throw usage on extra args" do
+      proc {
+        @mix.parse_options(%w/aaa bbb ccc/)
+      }.should raise_error(RuntimeError, /\Aunexpected: ccc\nUsage:/)
+    end
+
+    it "should only arg as host and dir as ." do
+        opts = @mix.parse_options(%w/aaa/)
+        opts[:host].should == "aaa"
+        opts[:dir].should == "."
+    end
+
+    it "should throw usage if dir doesn't exist" do
+      proc {
+        @mix.parse_options(%w/aaa bbb/)
+      }.should raise_error(RuntimeError, /\Aaaa is not a directory/)
+    end
+
+    it "should parse host and dir args" do
+      opts = @mix.parse_options(%w/spec some-host/)
+      opts[:dir].should == "spec"
+      opts[:host].should == "some-host"
+    end
+
+    it "should parse -N" do
+      @mix.parse_options(%w/-N node1 host/)[:node].should == "node1"
+    end
+
+    it "should parse -R" do
+      @mix.parse_options(%w/-R role1 host/)[:roles].should == "role1"
+    end
+
+    it "should parse -r" do
+      @mix.parse_options(%w/-r foo host/)[:recipe].should == "foo"
+    end
+  end
+
+  describe :find_recipe do
+    it "should return recipe if exists" do
+      mock(File).file?("path/to/foo/bar") {true}
+      @mix.find_recipe(:dir => "path/to/foo", :recipe => "bar").should == "bar"
+    end
+
+    it "should return recipe.rb if exists" do
+      mock(File).file?("path/to/foo/bar") {false}
+      mock(File).file?("path/to/foo/bar.rb") {true}
+      @mix.find_recipe(:dir => "path/to/foo", :recipe => "bar").should == "bar.rb"
+    end
+
+    it "should return dirname.rb if exists" do
+      mock(File).file?("path/to/foo/foo.rb") {true}
+      @mix.find_recipe(:dir => "path/to/foo").should == "foo.rb"
+    end
+
+    it "should return blender-recipe.rb if exists" do
+      mock(File).file?("path/to/foo/foo.rb") {false}
+      mock(File).file?("path/to/foo/blender-recipe.rb") {true}
+      @mix.find_recipe(:dir => "path/to/foo").should == "blender-recipe.rb"
+    end
+
+    it "should return raise error if no recipe found" do
+      proc {
+        @mix.find_recipe(:dir => "path/to/foo", :usage => "Usage:")
+      }.should raise_error(
+        RuntimeError,
+        /recipe not found \(looking for foo.rb blender-recipe.rb\)\nUsage:/)
+    end
+
+    it "should NOT look for directory.rb if given recipe" do
+      mock(File).file?("path/to/foo/bar") {false}
+      mock(File).file?("path/to/foo/bar.rb") {false}
+      dont_allow(File).file?("path/to/foo/foo.rb") {false}
+      dont_allow(File).file?("path/to/foo/blender-recipe.rb") {false}
+      proc {
+        @mix.find_recipe(:dir => "path/to/foo", :recipe => "bar")
+      }.should raise_error(RuntimeError, /recipe not found \(looking for bar bar.rb\)/)
+    end
+
+  end
+
+  describe :run_recipe do
+    it "should raise if init.sh fails" do
+      mock(File).expand_path("files/init.sh", Blender::ROOT) {"path/to/files/init.sh"}
+      mock(@mix).run("cat path/to/files/init.sh | ssh host /bin/bash -l") {false}
+      proc {
+        @mix.run_recipe "foo.rb", :host => "host"
+      }.should raise_error(RuntimeError, "failed init.sh")
+    end
+
+    it "should raise if rsync fails" do
+      stub(File).expand_path("files/init.sh", Blender::ROOT) {"path/to/files/init.sh"}
+      stub(@mix).run("cat path/to/files/init.sh | ssh host /bin/bash -l") {true}
+      mock(@mix).run("rsync -qazP --delete --exclude '.*' foo/ host:/var/lib/blender/recipes") {false}
+      proc {
+        @mix.run_recipe "foo.rb", :host => "host", :dir => "foo"
+      }.should raise_error(RuntimeError, "failed rsync")
+    end
+
+    it "should raise if mix fails" do
+      stub(File).expand_path("files/init.sh", Blender::ROOT) {"path/to/files/init.sh"}
+      stub(@mix).run("cat path/to/files/init.sh | ssh host /bin/bash -l") {true}
+      stub(@mix).run("rsync -qazP --delete --exclude '.*' foo/ host:/var/lib/blender/recipes") {true}
+      mock(File).expand_path("files/mix.sh", Blender::ROOT) {"path/to/files/mix.sh"}
+      mock(@mix).run("cat path/to/files/mix.sh | ssh host RECIPE=foo.rb NODE=zoo ROLES=a,b /bin/bash -l") {false}
+      proc {
+        @mix.run_recipe "foo.rb", :host => "host", :dir => "foo", :roles => "a,b", :node => "zoo"
+      }.should raise_error(RuntimeError, "failed mix.sh")
+    end
+
+    it "should run init, rsync and mix and return true" do
+      mock(File).expand_path("files/init.sh", Blender::ROOT) {"path/to/files/init.sh"}
+      mock(@mix).run("cat path/to/files/init.sh | ssh host /bin/bash -l") {true}
+      mock(@mix).run("rsync -qazP --delete --exclude '.*' foo/ host:/var/lib/blender/recipes") {true}
+      mock(File).expand_path("files/mix.sh", Blender::ROOT) {"path/to/files/mix.sh"}
+      mock(@mix).run("cat path/to/files/mix.sh | ssh host RECIPE=foo.rb NODE=zoo ROLES=a,b /bin/bash -l") {true}
+      @mix.run_recipe("foo.rb", :host => "host", :dir => "foo", :roles => "a,b", :node => "zoo").should == true
+    end
+  end
+
+end

data/spec/cli/start_spec.rb

@@ -0,0 +1,168 @@
+require 'spec_helper'
+require 'blender/cli/start'
+
+describe Blender::Cli::Start do
+  before(:each) do
+    @start = Blender::Cli::Start.new []
+  end
+
+  describe :parse_options do
+    it "should throw usage on --help" do
+      proc {
+        @start.parse_options(%w/-h/)
+      }.should raise_error(RuntimeError, /\AUsage:/)
+
+      proc {
+        @start.parse_options(%w/--help/)
+      }.should raise_error(RuntimeError, <<-USAGE)
+Usage: blender start [OPTIONS] [-- [ec2run options]]
+Options:
+    -a, --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-bb709dd2 for 32 bits
+                                     * ami-55739e3c for 64 bits
+                                     You can change the defaults by writing your own AMIs
+                                     into ~/.blender/ami and ~/.blender/ami64 files
+
+    -k, --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.
+
+        --64                         use 64 bit default AMI. This does nothing if you specify your own AMI
+    -n, --dry-run                    Don't do anything, just print the command line to be executed
+
+Common options:
+    -h, --help                       Show this message
+
+Example:
+
+# start a 64bit instance with default options
+blender start -64
+
+# 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
+      USAGE
+    end
+
+    it "should not fail with no parameters" do
+      proc {
+        @start.parse_options(%w//)
+      }.should_not raise_error
+    end
+
+    it "should throw usage on extra args" do
+      proc {
+        @start.parse_options(%w/aaa/)
+      }.should raise_error(RuntimeError, /\Aunexpected: aaa\nUsage:/)
+    end
+
+    it "should parse -a" do
+      @start.parse_options(%w/-a ami123/)[:ami].should == "ami123"
+    end
+
+    it "should parse -k" do
+      @start.parse_options(%w/-k mykey/)[:key].should == "mykey"
+    end
+
+    it "should parse --64" do
+      @start.parse_options(%w/--64/)[64].should == true
+    end
+
+    it "should parse -n" do
+      @start.parse_options(%w/-n/)[:dry].should == true
+    end
+
+  end
+
+  describe :default_ami do
+    it "should read ~/.blender/ami for 32 bit" do
+      mock(File).expand_path("~/.blender/ami") {"/path/to/home/.blender/ami"}
+      mock(File).read("/path/to/home/.blender/ami") {"foo"}
+      @start.default_ami.should == "foo"
+    end
+
+    it "should read ~/.blender/ami64 for 64 bit" do
+      mock(File).expand_path("~/.blender/ami64") {"/path/to/home/.blender/ami64"}
+      mock(File).read("/path/to/home/.blender/ami64") {"foo"}
+      @start.default_ami(64 => true).should == "foo"
+    end
+
+    it "should return AMI_32 when file fails to read" do
+      mock(File).expand_path("~/.blender/ami") {"/path/to/home/.blender/ami"}
+      mock(File).read("/path/to/home/.blender/ami") {raise "boom"}
+      @start.default_ami.should == Blender::Cli::Start::AMI_32
+    end
+
+    it "should return AMI_32 when file is empty" do
+      mock(File).expand_path("~/.blender/ami") {"/path/to/home/.blender/ami"}
+      mock(File).read("/path/to/home/.blender/ami") {" "}
+      @start.default_ami.should == Blender::Cli::Start::AMI_32
+    end
+  end
+
+  describe :default_key do
+    it "should fail if more then 1 key found" do
+      mock(@start).__double_definition_create__.call(:`, "ec2dkey") {"aaa\nbbb"}
+
+      proc {
+        @start.default_key
+      }.should raise_error(RuntimeError, "too many keys")
+    end
+
+    it "should fail if no keys found" do
+      mock(@start).__double_definition_create__.call(:`, "ec2dkey") {""}
+
+      proc {
+        @start.default_key
+      }.should raise_error(RuntimeError, "can't find any keys")
+    end
+
+    it "should parse and return single key" do
+      mock(@start).__double_definition_create__.call(:`, "ec2dkey") {"KEYPAIR	keyname	12:34:56:78:90"}
+      @start.default_key.should == "keyname"
+    end
+
+  end
+
+  describe :start_ami do
+    it "should start ami with default params" do
+      mock(@start).default_ami(anything) {"def-ami"}
+      mock(@start).default_key {"def-key"}
+      mock(@start).run(*%w"ec2run def-ami -k def-key") {true}
+      @start.start_ami.should be_true
+    end
+
+    it "should raise error if run fails" do
+      mock(@start).default_ami(anything) {"def-ami"}
+      mock(@start).default_key {"def-key"}
+      mock(@start).run(*%w"ec2run def-ami -k def-key") {false}
+      proc {
+        @start.start_ami.should be_true
+      }.should raise_error(RuntimeError, "failed to start ami")
+    end
+  end
+
+
+
+
+
+  #describe :bootstrap do
+    #it "should raise if mix fails" do
+     #mock(File).expand_path("files/bootstrap.sh", Blender::ROOT) {"path/to/files/bootstrap.sh"}
+     #mock(@start).run("cat path/to/files/bootstrap.sh | ssh host USE_SYSTEM_GEMS= TRACE=1 HOSTNAME=foobar.com NODE=zoo /bin/bash -eu") {false}
+     #proc {
+       #@start.bootstrap :trace => true, :hostname => "foobar.com", :node => "zoo", :host => "host"
+     #}.should raise_error(RuntimeError, "failed bootstrap.sh")
+    #end
+
+    #it "should run bootstrap and return true" do
+     #mock(File).expand_path("files/bootstrap.sh", Blender::ROOT) {"path/to/files/bootstrap.sh"}
+     #mock(@start).run("cat path/to/files/bootstrap.sh | ssh host USE_SYSTEM_GEMS= TRACE=1 HOSTNAME=foobar.com NODE=zoo /bin/bash -eu") {true}
+     #@start.bootstrap(:trace => true, :hostname => "foobar.com", :node => "zoo", :host => "host").should == true
+    #end
+  #end
+
+end

data/spec/spec.opts

@@ -1 +1,5 @@
---color
+--colour
+--format nested
+--format profile:log/spec-benchmark.log
+--loadby mtime
+--reverse

data/spec/spec_helper.rb

@@ -1,9 +1,13 @@
+require 'rubygems'
+require 'ruby-debug'
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'server-blender'
+require 'blender'
 require 'spec'
 require 'spec/autorun'
 
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+
 Spec::Runner.configure do |config|
-  
+  config.mock_with :rr
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: server-blender
 version: !ruby/object:Gem::Version 
+  hash: 1
   prerelease: false
   segments: 
   - 0
   - 0
-  - 14
-  version: 0.0.14
+  - 15
+  version: 0.0.15
 platform: ruby
 authors: 
 - Vitaly Kushner
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-04 00:00:00 +03:00
+date: 2010-11-28 00:00:00 +02:00
 default_executable: blender
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 1
         - 2
@@ -35,9 +38,11 @@ dependencies:
   name: yard
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -74,11 +79,14 @@ files:
 - files/init.sh
 - files/mix.sh
 - lib/blender.rb
+- lib/blender/cli.rb
 - lib/blender/cli/init.rb
 - lib/blender/cli/mix.rb
 - lib/blender/cli/start.rb
 - server-blender.gemspec
-- spec/server-blender_spec.rb
+- spec/cli/init_spec.rb
+- spec/cli/mix_spec.rb
+- spec/cli/start_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
@@ -91,26 +99,32 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Server provisioning and configuration management tool
 test_files: 
-- spec/server-blender_spec.rb
+- spec/cli/init_spec.rb
+- spec/cli/mix_spec.rb
+- spec/cli/start_spec.rb
 - spec/spec_helper.rb

data/spec/server-blender_spec.rb

@@ -1,7 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe "ServerBlender" do
-  it "fails" do
-    fail "hey buddy, you should probably rename this file and start specing for real"
-  end
-end