awsborn 0.8.7 → 0.9.0

data/.gitignore

@@ -13,6 +13,9 @@ tmtags
 ## VIM
 *.swp
 
+## RUBYMINE
+.idea/
+
 ## PROJECT::GENERAL
 coverage
 rdoc

data/Gemfile

@@ -0,0 +1,60 @@
+# A sample Gemfile
+source "http://rubygems.org"
+
+gem 'jeweler', '1.4.0'
+gem 'icehouse-right_aws', '2.2.0'
+#gem 'gemcutter', '0.6.1'
+gem 'rake', '0.8.7'
+gem 'rspec', '2.6.0'
+gem 'webmock', '1.6.4'
+
+# gem 'addressable', '2.2.6, 2.2.1)
+# gem 'awsborn', '0.8.7, 0.8.6, 0.8.1, 0.8.0, 0.7.0, 0.6.0)
+# gem 'bundler', '1.0.0)
+# gem 'crack', '0.1.8)
+# gem 'diff-lcs', '1.1.2)
+# gem 'extlib', '0.9.15)
+# gem 'git', '1.2.5)
+# gem 'json', '1.4.6)
+# gem 'json_pure', '1.5.2, 1.5.1, 1.4.6)
+# gem 'launchy', '0.4.0)
+# gem 'mixlib-cli', '1.2.0)
+# gem 'mixlib-config', '1.1.2)
+# gem 'mixlib-log', '1.2.0)
+# gem 'ohai', '0.5.8)
+# gem 'right_aws', '2.1.0)
+# gem 'right_http_connection', '1.3.0, 1.2.4)
+# gem 'rspec-core', '2.6.4)
+# gem 'rspec-expectations', '2.6.0)
+# gem 'rspec-mocks', '2.6.0)
+# gem 'rubyforge', '2.0.4)
+# gem 'systemu', '1.2.0)
+
+
+# addressable (2.2.6, 2.2.1)
+# awsborn (0.8.7, 0.8.6, 0.8.1, 0.8.0, 0.7.0, 0.6.0)
+# bundler (1.0.0)
+# crack (0.1.8)
+# diff-lcs (1.1.2)
+# extlib (0.9.15)
+# gemcutter (0.6.1)
+# git (1.2.5)
+# icehouse-right_aws (2.2.0)
+# jeweler (1.4.0)
+# json (1.4.6)
+# json_pure (1.5.2, 1.5.1, 1.4.6)
+# launchy (0.4.0)
+# mixlib-cli (1.2.0)
+# mixlib-config (1.1.2)
+# mixlib-log (1.2.0)
+# ohai (0.5.8)
+# rake (0.8.7)
+# right_aws (2.1.0)
+# right_http_connection (1.3.0, 1.2.4)
+# rspec (2.6.0)
+# rspec-core (2.6.4)
+# rspec-expectations (2.6.0)
+# rspec-mocks (2.6.0)
+# rubyforge (2.0.4)
+# systemu (1.2.0)
+# webmock (1.6.4, 1.3.5)

data/Gemfile.lock

@@ -0,0 +1,40 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    addressable (2.2.6)
+    crack (0.3.1)
+    diff-lcs (1.1.3)
+    gemcutter (0.7.0)
+    git (1.2.5)
+    icehouse-right_aws (2.2.0)
+      right_http_connection (>= 1.2.5)
+    jeweler (1.4.0)
+      gemcutter (>= 0.1.0)
+      git (>= 1.2.5)
+      rubyforge (>= 2.0.0)
+    json_pure (1.6.1)
+    rake (0.8.7)
+    right_http_connection (1.3.0)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
+    rubyforge (2.0.4)
+      json_pure (>= 1.1.7)
+    webmock (1.6.4)
+      addressable (~> 2.2, > 2.2.5)
+      crack (>= 0.1.7)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  icehouse-right_aws (= 2.2.0)
+  jeweler (= 1.4.0)
+  rake (= 0.8.7)
+  rspec (= 2.6.0)
+  webmock (= 1.6.4)

data/README.mdown

@@ -184,6 +184,33 @@ which does the following:
 The `key_pair` is a temporary key pair that is used only for launching this cluster.
 In case of a failed launch, the private key is available as `/tmp/temp_key_*`.
 
+### Supplying user-data
+
+Instances can be supplied user-data at launch, which can be used to integrate
+with e.g. cloud-init or similar. See http://docs.amazonwebservices.com/AWSEC2/2007-03-01/DeveloperGuide/AESDG-chapter-instancedata.html
+
+In Awsborn, you can supply user-data by defining a user_data instance method on the
+Server class which must return a string.
+
+    class LogServer < Awsborn::Server
+      instance_type    :m1_small
+      image_id         'ami-2fc2e95b', :sudo_user => 'ubuntu'
+      security_group   'Basic web'
+      keys             '../keys/*'
+      bootstrap_script 'chef-bootstrap.sh'
+      monitor          true
+
+      cluster do
+        domain 'releware.net'
+        server :log_a, :zone => :eu_west_1a, :disk => {:sdf => "vol-a857b8c1"}, :ip => 'log-a'
+        server :log_b, :zone => :eu_west_1b, :disk => {:sdf => "vol-aa57b8c3"}, :ip => 'log-b'
+      end
+
+      def user_data
+        "hostname=#{name}"
+      end
+    end
+
 ## A bootstrapping script
 
 This is what we use with the AMI above:

data/VERSION

@@ -1 +1 @@
-0.8.7
+0.9.0

data/awsborn.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{awsborn}
-  s.version = "0.8.7"
+  s.version = "0.9.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Vrensk", "Jean-Louis Giordano"]
-  s.date = %q{2011-10-06}
+  s.date = %q{2011-11-11}
   s.description = %q{Awsborn lets you define and launch a server cluster on Amazon EC2.}
   s.email = %q{david@icehouse.se}
   s.extra_rdoc_files = [
@@ -19,6 +19,8 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
      ".gitignore",
+     "Gemfile",
+     "Gemfile.lock",
      "LICENSE",
      "README.mdown",
      "Rakefile",

data/lib/awsborn/ec2.rb

@@ -95,5 +95,10 @@ module Awsborn
       end
     end
 
+    def set_instance_name (name)
+      raise "Instance hasn't been launched yet" unless instance_id
+      connection.create_tags(instance_id, {"Name" => name})
+    end
+
   end
 end

data/lib/awsborn/server.rb

@@ -59,14 +59,36 @@ module Awsborn
       end
     end
 
-    def running?
+    def find_instance_id_by_name
+      instances = ec2.connection.describe_instances(
+        :filters => {'tag:Name' => full_name,
+                     'instance-state-name' => ['pending', 'running']}
+      )
+      if instances.count > 1
+        raise ServerError, "Found multiple instances with full_name = #{full_name}."
+      end
+      instances.empty? ? nil : instances.first[:aws_instance_id]
+    end
+
+    def find_instance_id_by_volume
       map = {}
       disk_volume_ids.each { |vol_id| map[vol_id] = ec2.instance_id_for_volume(vol_id) }
       ids = map.values.uniq
       if ids.size > 1
         raise ServerError, "Volumes for #{self.class.name}:#{name} are connected to several instances: #{map.inspect}"
       end
-      ec2.instance_id = ids.first
+      ids.first
+    end
+
+    def running?
+      name_id = find_instance_id_by_name
+      volume_id = find_instance_id_by_volume
+
+      if name_id && volume_id && name_id != volume_id
+        raise ServerError, "Volumes #{disk_volume_ids} are attached to #{volume_id}, not to instance #{name_id} with name #{full_name}"
+      else
+        ec2.instance_id = name_id || volume_id
+      end
     end
 
     def refresh
@@ -111,10 +133,13 @@ module Awsborn
         :availability_zone => symbol_to_aws_zone(zone),
         :key_name => key_pair.name,
         :group_ids => security_group,
-        :monitoring_enabled => monitor
+        :monitoring_enabled => monitor,
+        :user_data => user_data
       )
       logger.debug @launch_response
 
+      ec2.set_instance_name full_name
+
       Awsborn.wait_for("instance #{instance_id} (#{name}) to start", 10) { instance_running? }
       self.host_name = aws_dns_name
     end
@@ -162,7 +187,7 @@ module Awsborn
     end
     
     def attach_volumes
-      logger.debug "Attaching volumes #{disk.values.join(', ')} to #{name}"
+      logger.debug "Attaching volumes #{disk.values.join(', ')} to #{name}" unless disk.empty?
       disk.each_pair do |device, str_or_ary|
         volume = str_or_ary.is_a?(Array) ? str_or_ary.first : str_or_ary
         device = "/dev/#{device}" if device.is_a?(Symbol) || ! device.match('/')
@@ -218,7 +243,7 @@ module Awsborn
         @options[:zone]
       end
       def disk
-        @options[:disk]
+        @options[:disk] || {}
       end
       def disk_volume_ids
         disk.values.map { |str_or_ary| str_or_ary.is_a?(Array) ? str_or_ary.first : str_or_ary }
@@ -292,7 +317,14 @@ module Awsborn
         @describe_instance ||= ec2.describe_instance
       end
       def cluster_name
-        ServerCluster.cluster_for(self).name
+        cluster = ServerCluster.cluster_for(self)
+        cluster ? cluster.name : "<unknown>"
+      end
+      def full_name
+        "#{self.class.name.downcase}-#{cluster_name}-#{name}"
+      end
+      def user_data
+        '' # Likely overridden in subclass
       end
     end
 

data/lib/awsborn/server_cluster.rb

@@ -18,13 +18,14 @@ module Awsborn
       clusters.each do |cluster|
         return cluster if cluster.detect { |i| i == instance }
       end
+      nil
     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 = "cluster#{@next_name_counter}"
         @next_name_counter += 1
       end while old_names.include?(next_name)
       next_name

data/spec/ec2_spec.rb

@@ -1,4 +1,22 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe Awsborn::Ec2 do
+  before do
+    @ec2 = Awsborn::Ec2.new :eu_west_1
+  end
+
+  describe "#set_instance_name" do
+    it "sets the name tag of the instance (if launched)" do
+      @ec2.stub!(:instance_id).and_return("i-123")
+      connection = mock("connection")
+      @ec2.stub!(:connection).and_return(connection)
+
+      connection.should_receive(:create_tags).with("i-123", {"Name" => "foo"})
+      @ec2.set_instance_name "foo"
+    end
+    it "raises an exception if the instance hasn't been launched" do
+      @ec2.stub!(:instance_id).and_return nil
+      expect {@ec2.set_instance_name "foo"}.to raise_error()
+    end
+  end
 end

data/spec/server_spec.rb

@@ -47,6 +47,82 @@ describe Awsborn::Server do
     end
   end
 
+  describe "running?" do
+    it "first tries to set instance_id using find_instance_id_by_name" do
+      @server.stub!(:find_instance_id_by_name).and_return("i-1234")
+      @server.stub!(:find_instance_id_by_volume).and_return(nil)
+      @server.ec2.should_receive(:instance_id=).with("i-1234")
+      @server.running?
+    end
+    it "defaults back to using find_instance_by_volume" do
+      @server.stub!(:find_instance_id_by_name).and_return(nil)
+      @server.stub!(:find_instance_id_by_volume).and_return("i-2345")
+      @server.ec2.should_receive(:instance_id=).with("i-2345")
+      @server.running?
+    end
+    it "returns the value that instance_id was set to" do
+      @server.stub!(:find_instance_id_by_name).and_return("i-1234")
+      @server.stub!(:find_instance_id_by_volume).and_return(nil)
+      @server.running?.should == "i-1234"
+    end
+    it "raises a ServerError if find_instance_id_by_name and find_instance_id_by_volume doesn't match" do
+      @server.stub!(:find_instance_id_by_name).and_return("i-1234")
+      @server.stub!(:find_instance_id_by_volume).and_return("i-2345")
+      expect {@server.running?}.to raise_error(Awsborn::ServerError)
+    end
+  end
+
+  describe "#find_instance_id_by_volume" do
+    it "returns the instance id of the (hopefully unique) instance to which all defined disks are attached" do
+      @server.stub!(:disk_volume_ids).and_return(["volume_id_1", "volume_id_2"])
+      @server.ec2.stub!(:instance_id_for_volume).and_return("i-123")
+      @server.find_instance_id_by_volume.should == "i-123"
+    end
+
+    it "returns nil if no instance was found" do
+      @server.stub!(:disk_volume_ids).and_return([])
+      @server.find_instance_id_by_volume.should be_nil
+    end
+
+    it "raises a ServerError if multiple instances were found" do
+      @server.stub!(:disk_volume_ids).and_return(["volume_id_1", "volume_id_2"])
+      @server.ec2.stub!(:instance_id_for_volume).and_return do |vol_id|
+        {"volume_id_1" => "i-1",
+         "volume_id_2" => "i-2"}[vol_id]
+      end
+      expect {@server.find_instance_id_by_volume}.to raise_error(Awsborn::ServerError)
+    end
+  end
+
+  describe "#find_instance_id_by_name" do
+    before do
+      @connection = mock("connection")
+      @server.stub!(:full_name).and_return "fyllenamn"
+      @server.ec2.stub!(:connection).and_return @connection
+    end
+
+    it "returns the instance id of the (hopefully unique) pending or running instance with the correct name" do
+      instance = {:aws_instance_id => "i-1234"}
+      @connection.should_receive(:describe_instances).
+          with(:filters => {
+                'tag:Name' => "fyllenamn",
+                'instance-state-name' => ['pending', 'running']
+               }).
+          and_return [instance]
+      @server.find_instance_id_by_name.should == "i-1234"
+    end
+
+    it "returns nil if no instance was found" do
+      @connection.stub!(:describe_instances).and_return []
+      @server.find_instance_id_by_name.should be_nil
+    end
+
+    it "raises an exception if too many instances were found" do
+      @connection.stub!(:describe_instances).and_return ["too", "many"]
+      expect {@server.find_instance_id_by_name}.to raise_error(Awsborn::ServerError)
+    end
+  end
+
   # TODO
   # context "first of all" do
   #   it "should have a connection to the EU service point"
@@ -79,6 +155,7 @@ describe Awsborn::Server do
         image_id.should == 'ami-2fc2e95b'
         options[:group_ids].should == ['Common', 'Other', 'SecureServer sample']
       end
+      ec2.stub!(:set_instance_name)
       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)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: awsborn
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 59
   prerelease: false
   segments: 
   - 0
-  - 8
-  - 7
-  version: 0.8.7
+  - 9
+  - 0
+  version: 0.9.0
 platform: ruby
 authors: 
 - David Vrensk
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-06 00:00:00 +02:00
+date: 2011-11-11 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -109,6 +109,8 @@ extra_rdoc_files:
 files: 
 - .document
 - .gitignore
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.mdown
 - Rakefile