bigbang 0.0.6 → 0.0.7

data/README.rdoc

@@ -42,7 +42,7 @@ of the instance.
 
 Consider the following universe file:
 
-     universe do
+     BigBang::DSL::Universe.new do
         config do |c|
            c.access_key_id = "YOUR-AMAZON-ACCESS_KEY"
            c.secret_key = "YOUR-AMAZON-SECRET_KEY"

data/bin/bigbang

@@ -9,37 +9,30 @@ end
 
 $universe = nil
 
-def self.universe(&block)
-	dsl = BigBang::DSL.new
-	dsl.instance_eval(&block)
-	$universe = BigBang::Universe.new(dsl)
-end
-
 if ARGV.empty?
 	help
 	exit 1
 end
 
+universe = eval(File.new('./universe.rb').read, binding)
+$universe = BigBang::Universe.new(universe)
+
 case ARGV[0]
 when 'test':
-	load './universe.rb'
 	$universe.test
 when 'explode':
 	if ARGV.size < 2 then
 		puts "#{$0} explode <universe name>"
 		exit 1
 	end
-	require 'universe.rb'
 	$universe.explode(ARGV[1])
 when 'list':
-	require 'universe.rb'
 	$universe.list
 when 'kill':
 	if ARGV.size < 2 then
 		puts "#{$0} kill <universe name>"
 		exit 1
 	end
-	require 'universe.rb'
 	$universe.kill(ARGV[1])
 else
 	puts "unknown command #{ARGV[0]}"

data/lib/bigbang.rb

@@ -1 +1,2 @@
 require 'bigbang/universe'
+require 'bigbang/dsl/dsl'

data/lib/bigbang/dsl/cluster_run.rb

@@ -0,0 +1,23 @@
+require 'bigbang/dsl/run'
+require 'bigbang/dsl/lb'
+
+module BigBang
+	module DSL
+		class ClusterRun < Run
+			attr_accessor :lb
+
+			def initialize(name, instances)
+				super(name, instances)
+			end
+		
+			def availability_zone(h)
+				@zone_sizes.merge!(h)
+			end
+
+			def load_balancer(name, &block)
+				@lb = LoadBalancer.new(name)
+				@lb.instance_eval(&block)
+			end
+		end
+	end
+end

data/lib/bigbang/dsl/config.rb

@@ -0,0 +1,12 @@
+module BigBang
+	module DSL
+		class Config
+			attr_accessor :access_key_id, :secret_key, :dns_opts, :domain, :region
+			def dns(d) @dns_opts = d; end
+			
+			def initialize
+				self.region = "us-east-1"
+			end
+		end
+	end
+end

data/lib/bigbang/dsl/dsl.rb

@@ -0,0 +1,5 @@
+require 'bigbang/dsl/config'
+require 'bigbang/dsl/instance'
+require 'bigbang/dsl/cluster_run'
+require 'bigbang/dsl/run'
+require 'bigbang/dsl/universe'

data/lib/bigbang/dsl/instance.rb

@@ -0,0 +1,14 @@
+module BigBang
+	module DSL
+		class Instance
+			def initialize(name)
+				@name = name
+			end
+
+			attr_accessor :ami, :key_name, :type, 
+				:name,
+				:bootstrap_repo,
+				:bootstrap_params
+		end
+	end
+end

data/lib/bigbang/dsl/lb.rb

@@ -0,0 +1,12 @@
+module BigBang
+	module DSL
+		class LoadBalancer
+			attr_accessor :domains, :name, :listeners, :availability_zones
+			attr_accessor :ec2_elb
+
+			def initialize(name)
+				@name = name
+			end
+		end
+	end
+end

data/lib/bigbang/dsl/run.rb

@@ -0,0 +1,28 @@
+module BigBang
+	module DSL
+		class Run
+			attr_accessor :instance, :domain, :wildcard_domain, :elastic_ip
+			attr_accessor :zone_sizes
+			attr_accessor :ec2_instances
+			attr_accessor :assigned_ips
+
+			def initialize(name, instances)
+				@zone_sizes = {}
+				@ec2_instances = []
+				@assigned_ips = {}
+				@instance = instances.find { |i| i.name == name }
+				raise "instance #{name} not found" if @instance.nil?
+			end
+
+			def zones
+				return @zone_sizes unless @zone_sizes.empty?
+
+				{ nil => 1 }
+			end
+
+			def instances_count
+				zones.values.inject(0) { |m,v| m += v }
+			end
+		end
+	end
+end

data/lib/bigbang/dsl/universe.rb

@@ -0,0 +1,37 @@
+module BigBang
+	module DSL
+		class Universe
+			attr_accessor :instances, :conf, :runs
+			
+			def initialize(&block)
+				@instances = []
+				@runs = []
+				self.instance_eval(&block)
+			end
+			
+			def instance(name, &block)
+				@instances << Instance.new(name).tap do |i|
+					i.instance_eval(&block)
+				end
+			end
+
+			def config(&block)
+				@conf = Config.new.tap do |c|
+					c.instance_eval(&block)
+				end
+			end
+
+			def run_single_instance(name, &block)
+				@runs << Run.new(name, @instances).tap do |r|
+					r.instance_eval(&block)
+				end
+			end
+
+			def run_cluster(name, &block)
+				@runs << ClusterRun.new(name, @instances).tap do |r|
+					r.instance_eval(&block)
+				end
+			end
+		end
+	end
+end

data/lib/bigbang/provider.rb

@@ -4,18 +4,31 @@ module BigBang
 			@config = config
 		end
 
+		def aws_server_config
+			{
+				:access_key_id => @config.access_key_id, 
+				:secret_access_key => @config.secret_key,
+			}
+		end
+		
+		def elb_server_config
+			aws_server_config.merge(
+				:server => "elasticloadbalancing.#{@config.region}.amazonaws.com")
+		end
+
+		def ec2_server_config
+			aws_server_config.merge(
+				:server => "ec2.#{@config.region}.amazonaws.com")
+		end
+
 		def ec2
 			return @ec2 unless @ec2.nil?
-			@ec2 = AWS::EC2::Base.new(
-				:access_key_id => @config.access_key_id, 
-				:secret_access_key => @config.secret_key)
+			@ec2 = AWS::EC2::Base.new(ec2_server_config)
 		end
 
 		def elb
 			return @elb unless @elb.nil?
-			@elb = AWS::ELB::Base.new(
-				:access_key_id => @config.access_key_id, 
-				:secret_access_key => @config.secret_key)
+			@elb = AWS::ELB::Base.new(elb_server_config)
 		end
 
 		def dns

data/lib/bigbang/test.rb

@@ -15,8 +15,6 @@ module BigBang
 					raise "zone '#{zone}' not found"
 				end
 			end
-
-			puts "Availability zones OK"
 		end
 
 		def test_amis
@@ -24,33 +22,33 @@ module BigBang
 				begin
 					provider.ec2.describe_images(:image_id => [ami])
 				rescue AWS::InvalidAMIIDNotFound => e
-					puts "ami #{ami} not found"
+					raise "ami #{ami} not found"
 				end
 			end
-			puts "AMI's OK"
 		end
 
 		def test_dns
 			if provider.configured_zone.nil?
-				puts "Configured DNS domain zone not found"
-			else
-				puts "DNS domain OK"
+				raise "Configured DNS domain zone not found"
 			end
 		end
 
-		def test_elb
-			ap provider.elb.describe_load_balancers
-			puts "elb access OK"
-		end
-
 		def test
-			get_instances
-			puts "ec2 access OK"
+			notify("Testing EC2 access") do
+				get_instances
+			end
 
-			test_elb
-			test_availability_zones
-			test_amis
-			test_dns
+			notify("Testing configured availability zones") do
+				test_availability_zones
+			end
+
+			notify("Testing configured AMI's") do
+				test_amis
+			end
+	
+			notify("Testing DNS API access") do
+				test_dns
+			end
 		end
 	end
 end

data/lib/bigbang/universe.rb

@@ -4,8 +4,7 @@ require 'ap'
 require 'set'
 require 'fog'
 require 'bigbang/provider'
-require 'bigbang/instance'
-require 'bigbang/dsl'
+require 'bigbang/dsl/dsl'
 require 'bigbang/ec2-git-bootstrap'
 require 'bigbang/kill'
 require 'bigbang/test'
@@ -124,8 +123,8 @@ module BigBang
 				puts "\033[01;32mOK\033[00m"
 				return r
 			rescue => e
-				puts "\033[01;31mERROR\033[00m"
-				raise
+				puts "\033[01;31mERROR"
+				puts "#{e.to_s}\033[00m"
 			end
 		end
 		

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bigbang
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Giorgenes Gelatti
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-16 00:00:00 +01:00
+date: 2011-07-18 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,17 +62,18 @@ files:
 - README.rdoc
 - lib/bigbang.rb
 - lib/bigbang/explode.rb
-- lib/bigbang/instance.rb
 - lib/bigbang/provider.rb
-- lib/bigbang/dsl.rb
-- lib/bigbang/run.rb
 - lib/bigbang/universe.rb
 - lib/bigbang/test.rb
 - lib/bigbang/ec2-git-bootstrap.rb
 - lib/bigbang/kill.rb
-- lib/bigbang/config.rb
-- lib/bigbang/cluster_run.rb
-- lib/bigbang/lb.rb
+- lib/bigbang/dsl/instance.rb
+- lib/bigbang/dsl/dsl.rb
+- lib/bigbang/dsl/run.rb
+- lib/bigbang/dsl/universe.rb
+- lib/bigbang/dsl/config.rb
+- lib/bigbang/dsl/cluster_run.rb
+- lib/bigbang/dsl/lb.rb
 has_rdoc: true
 homepage: http://github.com/giorgenes/bigbang/
 licenses: []

data/lib/bigbang/cluster_run.rb

@@ -1,21 +0,0 @@
-require 'bigbang/run'
-require 'bigbang/lb'
-
-module BigBang
-	class ClusterRun < Run
-		attr_accessor :lb
-
-		def initialize(name, instances)
-			super(name, instances)
-		end
-	
-		def availability_zone(h)
-			@zone_sizes.merge!(h)
-		end
-
-		def load_balancer(name, &block)
-			@lb = LoadBalancer.new(name)
-			@lb.instance_eval(&block)
-		end
-	end
-end

data/lib/bigbang/config.rb

@@ -1,6 +0,0 @@
-module BigBang
-	class Config
-		attr_accessor :access_key_id, :secret_key, :dns_opts, :domain
-		def dns(d) @dns_opts = d; end
-	end
-end

data/lib/bigbang/dsl.rb

@@ -1,39 +0,0 @@
-require 'bigbang/config'
-require 'bigbang/instance'
-require 'bigbang/cluster_run'
-require 'bigbang/run'
-
-module BigBang
-	class DSL
-		attr_accessor :instances, :conf, :runs
-		
-		def initialize
-			@instances = []
-			@runs = []
-		end
-
-		def instance(name, &block)
-			@instances << Instance.new(name).tap do |i|
-				i.instance_eval(&block)
-			end
-		end
-
-		def config(&block)
-			@conf = Config.new.tap do |c|
-				c.instance_eval(&block)
-			end
-		end
-
-		def run_single_instance(name, &block)
-			@runs << Run.new(name, @instances).tap do |r|
-				r.instance_eval(&block)
-			end
-		end
-
-		def run_cluster(name, &block)
-			@runs << ClusterRun.new(name, @instances).tap do |r|
-				r.instance_eval(&block)
-			end
-		end
-	end
-end

data/lib/bigbang/instance.rb

@@ -1,12 +0,0 @@
-module BigBang
-	class Instance
-		def initialize(name)
-			@name = name
-		end
-
-		attr_accessor :ami, :key_name, :type, 
-			:name,
-			:bootstrap_repo,
-			:bootstrap_params
-	end
-end

data/lib/bigbang/lb.rb

@@ -1,10 +0,0 @@
-module BigBang
-	class LoadBalancer
-		attr_accessor :domains, :name, :listeners, :availability_zones
-		attr_accessor :ec2_elb
-
-		def initialize(name)
-			@name = name
-		end
-	end
-end

data/lib/bigbang/run.rb

@@ -1,26 +0,0 @@
-module BigBang
-	class Run
-		attr_accessor :instance, :domain, :wildcard_domain, :elastic_ip
-		attr_accessor :zone_sizes
-		attr_accessor :ec2_instances
-		attr_accessor :assigned_ips
-
-		def initialize(name, instances)
-			@zone_sizes = {}
-			@ec2_instances = []
-			@assigned_ips = {}
-			@instance = instances.find { |i| i.name == name }
-			raise "instance #{name} not found" if @instance.nil?
-		end
-
-		def zones
-			return @zone_sizes unless @zone_sizes.empty?
-
-			{ nil => 1 }
-		end
-
-		def instances_count
-			zones.values.inject(0) { |m,v| m += v }
-		end
-	end
-end