server-blender 0.0.19 → 0.0.20

data/VERSION

@@ -1 +1 @@
-0.0.19
+0.0.20

data/files/bootstrap.sh

@@ -73,6 +73,7 @@ function supported_version()
 	. /etc/lsb-release
 
 	case "`distribution`" in
+		"Ubuntu 9.10") true;;
 		"Ubuntu 10.04") true;;
 		"Ubuntu 10.10") true;;
 	  *) false;;
@@ -217,7 +218,7 @@ ENV
 
 	( rm /etc/login.defs; awk "/^\s*ENV_SUPATH/{sub(/.*/, \"ENV_SUPATH      PATH=$ROOT_PATH\")};/^\s*ENV_PATH/{sub(/.*/, \"ENV_PATH        PATH=$USER_PATH\")};{print}" > /etc/login.defs ) < /etc/login.defs
 
-	etckeeper commit "after PATH update"
+	etckeeper commit "after PATH update" || true
 }
 
 function install_rubygems()
@@ -252,8 +253,9 @@ else
 	install_stuff
 	install_system_ruby
 	install_rubygems
+	#add_gems_to_system_path
 
-	etckeeper commit "bootstrapped"
+	etckeeper commit "bootstrapped" || true # might have nothing to commit
 fi
 
 log "Installing some gems"

data/files/mix.sh

@@ -1,7 +1,7 @@
 set -ue
 
 SHADOW_PUPPET_VERSION="0.3.2"
-MANIFEST_VERSION="0.1.0"
+MANIFEST_VERSION="0.1.2"
 
 trap "echo FAILED" EXIT
 

data/lib/blender/cli.rb

@@ -6,7 +6,7 @@ module Blender
 
     def run(*cmd)
       STDERR.puts ">> #{cmd * ' '}"
-      system(*cmd) unless @dry
+      @dry || system(*cmd)
     end
 
   end

data/lib/blender/cli/start.rb

@@ -8,6 +8,15 @@ class Blender::Cli::Start < Blender::Cli
   def parse_options(args)
     options = {}
 
+    args, extra_args = args.inject([[]]) do |result, element|
+      if element == '--'
+        result << []
+      else
+        result.last << element
+      end
+      result
+    end
+
     opts = OptionParser.new do |opts|
       opts.banner = "Usage: blender start [OPTIONS] [-- [ec2run options]]"
       opts.separator "Options:"
@@ -67,7 +76,7 @@ blender start -- -g default -g test
 
     raise("unexpected: #{args*" "}\n#{opts}") unless args.empty?
 
-    options
+    return options, extra_args
   end
 
   def default_ami(options = {})
@@ -94,10 +103,11 @@ blender start -- -g default -g test
   end
 
   def execute
-    options = parse_options(@args)
-    start_ami(options, *@args)
+    options, extra = parse_options(@args)
+    start_ami(options, extra)
 
   rescue => e
+    puts e.backtrace
     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.19"
+  s.version = "0.0.20"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Vitaly Kushner"]
-  s.date = %q{2010-12-10}
+  s.date = %q{2011-01-17}
   s.default_executable = %q{blender}
   s.description = %q{Boostrap and manage servers with shadow_puppet
 

data/spec/cli/start_spec.rb

@@ -60,19 +60,25 @@ blender start -- -g default -g test
     end
 
     it "should parse -a" do
-      @start.parse_options(%w/-a ami123/)[:ami].should == "ami123"
+      @start.parse_options(%w/-a ami123/).first[:ami].should == "ami123"
     end
 
     it "should parse -k" do
-      @start.parse_options(%w/-k mykey/)[:key].should == "mykey"
+      @start.parse_options(%w/-k mykey/).first[:key].should == "mykey"
     end
 
     it "should parse --64" do
-      @start.parse_options(%w/--64/)[64].should == true
+      @start.parse_options(%w/--64/).first[64].should == true
     end
 
     it "should parse -n" do
-      @start.parse_options(%w/-n/)[:dry].should == true
+      @start.parse_options(%w/-n/).first[:dry].should == true
+    end
+
+    it "should allow extra args after --" do
+      args = %w/-a qwe -k somme_key -- -x foo -y bar baz/
+      opts, extra = @start.parse_options(args)
+      extra.should == %w/-x foo -y bar baz/
     end
 
   end
@@ -145,7 +151,13 @@ blender start -- -g default -g test
     end
   end
 
-
+  describe :execute do
+    it "should call run with proper arguments" do
+      @start = Blender::Cli::Start.new %w/-a qwe -k bar -- -g baz/
+      mock(@start).run(*%w/ec2run qwe -k bar -g baz/) {true}
+      @start.execute
+    end
+  end
 
 
 

data/spec/spec_helper.rb

@@ -5,6 +5,7 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'blender'
 require 'spec'
 require 'spec/autorun'
+require 'activesupport'
 
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: server-blender
 version: !ruby/object:Gem::Version 
-  hash: 57
+  hash: 55
   prerelease: false
   segments: 
   - 0
   - 0
-  - 19
-  version: 0.0.19
+  - 20
+  version: 0.0.20
 platform: ruby
 authors: 
 - Vitaly Kushner
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-10 00:00:00 +02:00
+date: 2011-02-01 00:00:00 +02:00
 default_executable: blender
 dependencies: 
 - !ruby/object:Gem::Dependency