awsborn 0.6.0 → 0.7.0

data/README.mdown

@@ -182,6 +182,11 @@ Awsborn integrates with [Chef Solo](http://github.com/opscode/chef).  An example
         server :log_b, :zone => :eu_west_1b, :disk => {:sdf => "vol-aa57b8c3"}, :ip => 'log-b'
       end
 
+      cluster :test do
+        domain 'releware.net'
+        server :test, :zone => :eu_west_1b, :disk => {:sdf => "vol-abababab"}, :ip => 'log-test'
+      end
+
       def chef_dna
         {
           :user => "lumberjack",
@@ -232,6 +237,7 @@ Other rake tasks include:
 * `rake chef` - Run chef on all servers, or the ones specified with `host=name1,name2`.
 * `rake chef:debug` - Ditto, but with chef's log level set to `debug`.
 * `rake start` - Start all servers (or host=name1,name2) but don't run `chef`.
+* `rake start cluster=test` - Start the servers in the named cluster.  Default is the first unnamed cluster.
 
 
 ## Bugs and surprising features
@@ -271,6 +277,25 @@ Other rake tasks include:
 
 ## Changes
 
+### New in 0.7.0
+
+* Allow several security groups per server.
+* Specify `individual_security_group true` to add a unique-ish security group named _`ServerClass servername`_.
+  This security group is created on the fly if it doesn't exist.
+* Server clusters can have names.
+
+### New in 0.6.0
+
+* Uses `right_aws` version 2.
+
+### New in 0.5.4, 0.5.5
+
+* Run `rake list` to see a list of running servers.
+
+### New in 0.5.2, 0.5.3
+
+* Run `rake upgrade_chef host=foo` to upgrade chef on server `foo`.
+
 ### New in 0.5.1
 
 * When awsborn uploads cookbooks and configuration, it looks for a `cookbooks`

data/Rakefile

@@ -13,8 +13,8 @@ begin
     gem.add_dependency "right_aws", ">= 2.1.0"
     gem.add_dependency "json_pure", ">= 1.2.3"
     gem.add_dependency "rake"
-    gem.add_development_dependency "rspec", ">= 1.2.9"
-    gem.add_development_dependency "webmock", ">= 0.9.1"
+    gem.add_development_dependency "rspec", ">= 2.6.0"
+    gem.add_development_dependency "webmock", ">= 1.3.0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new
@@ -22,16 +22,14 @@ 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']
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new do |t|
+  t.rspec_opts = ["-c", "-f progress", "-r ./spec/spec_helper.rb"]
+  t.pattern = 'spec/**/*_spec.rb'
 end
 
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
+RSpec::Core::RakeTask.new(:rcov) do |t|
+  t.rcov_opts =  %q[--exclude "spec"]
 end
 
 task :spec => :check_dependencies

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.7.0

data/lib/awsborn/ec2.rb

@@ -2,9 +2,16 @@ module Awsborn
   class Ec2
     extend Forwardable
     def_delegators :Awsborn, :logger
-    
+
     attr_accessor :instance_id
 
+    class << self
+      def endpoint_for_zone (zone)
+        zone = zone.to_s.sub(/[a-z]$/,'').tr('_','-')
+        "https://#{zone}.ec2.amazonaws.com"
+      end
+    end
+
     def connection
       unless @connection
         env_ec2_url = ENV['EC2_URL']
@@ -18,21 +25,14 @@ module Awsborn
         end
       end
       @connection
-    end      
-    
+    end
+
     def initialize (zone)
-      @endpoint = case zone
-      when :eu_west_1a, :eu_west_1b
-        'https://eu-west-1.ec2.amazonaws.com/'
-      when :us_east_1a, :us_east_1b
-        'https://us-east-1.ec2.amazonaws.com'
-      else
-        'https://ec2.amazonaws.com'
-      end
+      @endpoint = self.class.endpoint_for_zone(zone)
     end
 
     KeyPair = Struct.new :name, :path
-    
+
     def generate_key_pair
       time = Time.now
       key_name = "temp_key_#{time.to_i}_#{time.usec}"
@@ -71,12 +71,12 @@ module Awsborn
       self.instance_id = response[:aws_instance_id]
       response
     end
-    
+
     def get_console_output
       output = connection.get_console_output(instance_id)
       output[:aws_output]
     end
-    
+
     def attach_volume (volume, device)
       connection.attach_volume(volume, instance_id, device)
     end
@@ -84,7 +84,7 @@ module Awsborn
     def monitoring?
       %w[enabled pending].include?(describe_instance[:monitoring_state])
     end
-    
+
     def monitor
       logger.debug "Activating monitoring for #{instance_id}"
       connection.monitor_instances(instance_id)
@@ -95,5 +95,11 @@ module Awsborn
       connection.unmonitor_instances(instance_id)
     end
 
+    def create_security_group_if_missing (group_name, description = "Created by Awsborn")
+      unless connection.describe_security_groups.detect { |group| group[:aws_group_name] == group_name }
+        connection.create_security_group(group_name, description)
+      end
+    end
+
   end
 end

data/lib/awsborn/rake.rb

@@ -17,11 +17,6 @@ module Awsborn
     #
     module Rake
 
-      def default_cluster #:nodoc:
-        default_klass = Awsborn::Server.children.first
-        default_klass.clusters.first
-      end
-
       desc "Default: Start all servers (if needed) and deploy with chef."
       task :all => [:start, "chef:run"]
       task :default => :all
@@ -31,13 +26,13 @@ module Awsborn
 
       desc "Start all servers (or host=name1,name2) but don't run chef."
       task :start do |t,args|
-        default_cluster.launch get_hosts(args)
+        cluster(args).launch get_hosts(args)
       end
 
       desc "Update .ssh/known_hosts with data from all servers (or host=host1,host2)"
       task :update_known_hosts do |t,args|
         hosts = get_hosts(args)
-        default_cluster.each do |server|
+        cluster(args).each do |server|
           server.running? && server.update_known_hosts if hosts.nil? || hosts.include?(server.name.to_s)
         end
       end
@@ -48,7 +43,7 @@ module Awsborn
       namespace :chef do
         task :run => [:check_syntax] do |t,args|
           hosts = get_hosts(args)
-          default_cluster.each do |server|
+          cluster(args).each do |server|
             next unless hosts.nil? || hosts.include?(server.name.to_s)
             puts framed("Running chef on '#{server.name}'")
             server.cook
@@ -79,8 +74,8 @@ module Awsborn
       end
 
       desc "List running servers"
-      task :list do
-        running = default_cluster.select { |server| server.running? }
+      task :list do |t,args|
+        running = cluster(args).select { |server| server.running? }
         max_name_length = running.map { |server| server.name.to_s.size }.max
         running.each do |server|
           h = server.describe_instance
@@ -92,7 +87,7 @@ module Awsborn
       desc "Update chef on the server"
       task :update_chef do |t,args|
         hosts = get_hosts(args)
-        default_cluster.each do |server|
+        cluster(args).each do |server|
           next if hosts && ! hosts.include?(server.name.to_s)
           puts framed("Updating chef on server #{server.name}")
           # Include excplicit path to avoid rvm
@@ -129,6 +124,12 @@ EOH
       def framed (message) #:nodoc:
         '*' * (4 + message.length) + "\n* #{message} *\n" + '*' * (4 + message.length)
       end
+
+      def cluster (args) #:nodoc:
+        name = args[:c] || args[:cluster] || 'cluster 1'
+        Awsborn::ServerCluster.clusters.detect { |c| c.name == name } || raise("Could not find cluster named '#{name}'")
+      end
+
     end
   end
 end

data/lib/awsborn/server.rb

@@ -8,11 +8,8 @@ module Awsborn
     end
     
     class << self
-      attr_accessor :logger, :children, :clusters
-      def inherited (klass)
-        @children ||= []
-        @children << klass
-      end
+      attr_accessor :logger
+
       # Set image_id.  Examples:
       #   image_id 'ami-123123'
       #   image_id 'ami-123123', :sudo_user => 'ubuntu'
@@ -29,9 +26,13 @@ module Awsborn
         @instance_type
       end
       def security_group (*args)
-        @security_group = args.first unless args.empty?
+        @security_group = args unless args.empty?
         @security_group
       end
+      def individual_security_group (*args)
+        @individual_security_group = args.first unless args.empty?
+        @individual_security_group
+      end
       def keys (*args)
         @keys = args unless args.empty?
         @keys
@@ -49,10 +50,8 @@ module Awsborn
         @monitor
       end
       
-      def cluster (&block)
-        @clusters ||= []
-        @clusters << ServerCluster.build(self, &block)
-        @clusters.last
+      def cluster (name = ServerCluster.next_name, &block)
+        ServerCluster.build(self, name, &block)
       end
       def logger
         @logger ||= Awsborn.logger
@@ -171,6 +170,7 @@ module Awsborn
     end
 
     def cook
+      raise "#{host_name} not running" unless running?
       upload_cookbooks
       run_chef
     end
@@ -185,7 +185,7 @@ module Awsborn
       File.open("config/dna.json", "w") { |f| f.write(chef_dna.to_json) }
       system "rsync -rL --delete --exclude '.*' ./ root@#{host_name}:#{Awsborn.remote_chef_path}"
     ensure
-      File.delete("config/dna.json")
+      FileUtils.rm_f("config/dna.json")
       File.delete("cookbooks") if temp_link
     end
 
@@ -202,7 +202,7 @@ module Awsborn
     begin :accessors
       attr_accessor :name, :logger
       def host_name= (string)
-        logger.debug "Setting host_name of #{name} to #{string}"
+        logger.debug "Setting host_name of #{name} to #{string.inspect}"
         @host_name = string
       end
       def host_name
@@ -244,7 +244,15 @@ module Awsborn
         @options[:instance_type] || self.class.instance_type
       end
       def security_group
-        @options[:security_group] || self.class.security_group
+        groups = @options[:security_group] || self.class.security_group || []
+        groups.each { |group_name| ec2.create_security_group_if_missing(group_name) }
+        if self.class.individual_security_group
+          group_name = "#{self.class.name} #{name}"
+          ec2.create_security_group_if_missing(group_name, "#{group_name} private security group")
+          groups + [group_name]
+        else
+          groups
+        end
       end
       def sudo_user
         @options[:sudo_user] || self.class.sudo_user
@@ -283,6 +291,9 @@ module Awsborn
       def describe_instance
         @describe_instance ||= ec2.describe_instance
       end
+      def cluster_name
+        ServerCluster.cluster_for(self).name
+      end
     end
 
     AVAILABILITY_ZONES = %w[
@@ -290,6 +301,7 @@ module Awsborn
       us-west-1a us-west-1b
       eu-west-1a eu-west-1b
       ap-southeast-1a ap-southeast-1b
+      ap-northeast-1a ap-northeast-1b
     ]
     INSTANCE_TYPES_32_BIT = %w[m1.small c1.medium t1.micro]
     INSTANCE_TYPES_64_BIT = %w[m1.large m1.xlarge m2.xlarge m2.2xlarge m2.4xlarge c1.xlarge cc1.4xlarge t1.micro]

data/lib/awsborn/server_cluster.rb

@@ -2,15 +2,39 @@ module Awsborn
   class ServerCluster
     include Enumerable
 
-    def self.build (klass, &block)
-      cluster = new(klass)
+    attr_accessor :name
+
+    def self.build (klass, name, &block)
+      cluster = new(klass, name)
       block.bind(cluster, 'cluster').call
       cluster
     end
 
-    def initialize (klass)
+    def self.clusters
+      @clusters ||= []
+    end
+
+    def self.cluster_for (instance)
+      clusters.each do |cluster|
+        return cluster if cluster.detect { |i| i == instance }
+      end
+    end
+
+    def self.next_name
+      @next_name_counter ||= 1
+      old_names = clusters.map { |c| c.name }
+      begin
+        next_name = "cluster #{@next_name_counter}"
+        @next_name_counter += 1
+      end while old_names.include?(next_name)
+      next_name
+    end
+
+    def initialize (klass, name)
       @klass = klass
+      @name = name.to_s
       @instances = []
+      self.class.clusters << self
     end
     
     def domain (*args)

data/spec/ec2_spec.rb

@@ -0,0 +1,12 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe Awsborn::Ec2 do
+  context ".endpoint_for_zone" do
+    it "should have endpoints for zones in five regions" do
+      Awsborn::Ec2.endpoint_for_zone(:eu_west_1a).should == 'https://eu-west-1.ec2.amazonaws.com'
+      Awsborn::Ec2.endpoint_for_zone("eu_west_1b").should == 'https://eu-west-1.ec2.amazonaws.com'
+      Awsborn::Ec2.endpoint_for_zone(:us_west_1b).should == 'https://us-west-1.ec2.amazonaws.com'
+      Awsborn::Ec2.endpoint_for_zone(:us_east_1b).should == 'https://us-east-1.ec2.amazonaws.com'
+    end
+  end
+end

data/spec/server_spec.rb

@@ -13,6 +13,7 @@ end
 
 describe Awsborn::Server do
   before(:each) do
+    Awsborn.verbose = false
     @server = SampleServer.new :sample, :zone => :eu_west_1a, :disk => {:sdf => "vol-aaaaaaaa"}
   end
 
@@ -54,4 +55,33 @@ describe Awsborn::Server do
     end
     
   end
+
+  context ".security_group" do
+    class SecureServer < Awsborn::Server
+      instance_type :m1_small
+      image_id 'ami-2fc2e95b'
+      security_group 'Common', 'Other'
+      individual_security_group true
+    end
+
+    before do
+      @server = SecureServer.new :sample, :zone => :eu_west_1a, :disk => {:sdf => "vol-aaaaaaaa"}
+    end
+    it "allows multiple security groups" do
+      key_pair = mock(:key_pair)
+      key_pair.should_receive(:name).and_return('fake')
+      ec2 = mock(:ec2)
+      ec2.should_receive(:instance_id).and_return('i-asdf')
+      ec2.should_receive(:launch_instance).with do |image_id, options|
+        image_id.should == 'ami-2fc2e95b'
+        options[:group_ids].should == ['Common', 'Other', 'SecureServer sample']
+      end
+      ec2.should_receive(:create_security_group_if_missing).exactly(3).times
+      @server.stub(:ec2).and_return(ec2)
+      @server.should_receive(:instance_running?).and_return(true)
+      @server.should_receive(:aws_dns_name).and_return('asdf')
+      @server.launch_instance(key_pair)
+    end
+  end
+
 end

data/spec/spec_helper.rb

@@ -1,14 +1,9 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'awsborn'
-require 'spec'
-require 'spec/autorun'
+require 'rspec'
 
 require 'rubygems'
 require 'webmock/rspec'
-include WebMock
+include WebMock::API
 WebMock.disable_net_connect!
-
-Spec::Runner.configure do |config|
-  
-end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: awsborn
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 3
   prerelease: false
   segments: 
   - 0
-  - 6
+  - 7
   - 0
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors: 
 - David Vrensk
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-18 00:00:00 +02:00
+date: 2011-06-15 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -72,12 +72,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 23
         segments: 
-        - 1
         - 2
-        - 9
-        version: 1.2.9
+        - 6
+        - 0
+        version: 2.6.0
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -88,12 +88,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 57
+        hash: 27
         segments: 
-        - 0
-        - 9
         - 1
-        version: 0.9.1
+        - 3
+        - 0
+        version: 1.3.0
   type: :development
   version_requirements: *id005
 description: Awsborn lets you define and launch a server cluster on Amazon EC2.
@@ -125,6 +125,7 @@ files:
 - lib/awsborn/rake.rb
 - lib/awsborn/server.rb
 - lib/awsborn/server_cluster.rb
+- spec/ec2_spec.rb
 - spec/server_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
@@ -163,5 +164,6 @@ signing_key:
 specification_version: 3
 summary: Awsborn defines servers as instances with a certain disk volume, which makes it easy to restart missing servers.
 test_files: 
+- spec/ec2_spec.rb
 - spec/server_spec.rb
 - spec/spec_helper.rb