jzimmek-ec2 0.0.10 → 0.0.11

data/VERSION

@@ -1 +1 @@
-0.0.10
+0.0.11

data/ec2.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ec2}
-  s.version = "0.0.10"
+  s.version = "0.0.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jan Zimmek"]
-  s.date = %q{2009-09-15}
+  s.date = %q{2009-09-24}
   s.email = %q{jan.zimmek@web.de}
   s.extra_rdoc_files = [
     "README"

data/lib/ec2/dsl/cloud.rb

@@ -5,7 +5,7 @@ module Ec2
   module Dsl
     class Cloud < ::EasyDsl::Container
       def initialize(name)
-        super(name, nil)
+        super(nil, name)
         nested :group, Group
         
         attribute :ssh_key_file,        :required => true
@@ -26,7 +26,7 @@ module Ec2
       
       def dump
 
-        print "hostname".ljust(10)
+        print "fqdn".ljust(30)
         print "ami".ljust(15)
         print "ari".ljust(15)
         print "aki".ljust(15)
@@ -39,7 +39,7 @@ module Ec2
 
         @all_group.values.each do |grp|
           grp.all_instance.values.each do |i|
-            print i.name.ljust(10)
+            print i.fqdn.ljust(30)
             print i.ami.ljust(15)
             print (i.ari||"").ljust(15)
             print (i.aki||"").ljust(15)

data/lib/ec2/dsl/group.rb

@@ -4,7 +4,7 @@ require 'ec2/dsl/instance'
 module Ec2
   module Dsl
     class Group < ::EasyDsl::Container
-      def initialize(name, container)
+      def initialize(container, name)
         super
         nested    :instance, Instance
 
@@ -15,6 +15,7 @@ module Ec2
         attribute :security_group,      :inheritable => true
         attribute :availability_zone,   :inheritable => true
         attribute :domain,              :inheritable => true
+        attribute :version,             :inheritable => true
         attribute :userdata,            :inheritable => true, :base64 => true, :strip => true
         
       end

data/lib/ec2/dsl/instance.rb

@@ -3,7 +3,7 @@ require 'easy_dsl/container'
 module Ec2
   module Dsl
     class Instance < ::EasyDsl::Container
-      def initialize(name, container)
+      def initialize(container, name)
         super
         attribute :ami,                 :inheritable => true, :required => true
         attribute :ari,                 :inheritable => true
@@ -13,7 +13,16 @@ module Ec2
         attribute :availability_zone,   :inheritable => true
         attribute :userdata,            :inheritable => true, :base64 => true, :strip => true
         attribute :elastic_ip,          :inheritable => true
-        attribute :domain,              :inheritable => true
+        attribute :hostname,            :inheritable => true, :required => true
+        attribute :domain,              :inheritable => true, :required => true
+      end
+      
+      def options
+        @options ||= {}
+      end
+      
+      def fqdn
+        "#{hostname}.#{domain}"
       end
     end
   end

data/lib/ec2/instance_binding.rb

@@ -6,7 +6,6 @@ require 'net/scp'
 module Ec2
   class InstanceBinding
     
-    attr_reader :hostname
     attr_reader :public_ip
     attr_reader :state
     
@@ -21,15 +20,11 @@ module Ec2
       @private_dns_name   = private_dns_name
 
       @ssh = Net::SSH.start(@public_dns_name, "root", :keys => [@cloud.ssh_key_file], :paranoid => false)
-
-      # user_data = fetch_from_url("http://169.254.169.254/2009-04-04/user-data")
-
-      # @hostname = user_data.index("Not Found") ? nil : user_data
       
-      @hostname = fetch_from_file("/root/.hostname")
+      @fqdn = fetch_from_file("/root/.fqdn")
     
-      if @hostname
-        Pending.remove(@hostname)
+      if @fqdn
+        Pending.remove(@fqdn)
         
         @public_ip      = fetch_from_url("http://169.254.169.254/latest/meta-data/public-ipv4")
         cfg             = fetch_from_file("~/.configuration")
@@ -39,20 +34,48 @@ module Ec2
       
     end
     
+    def fqdn
+      instance.try(:fqdn) || @fqdn
+    end
+    
+    def hostname
+      instance.hostname
+    end
+    
     def configured?(name)
       @configuration[name] == true
     end
     
-    def ensure_configured(name, &block)
-      if configured?(name)
-        puts "#{name} already configured on instance #{@hostname}"
+    def ensure_configured(name, opts={}, &block)
+      
+      opts = {
+        :if => lambda { |binding| true }
+      }.merge(opts)
+
+      # only run this configuration when :if is true
+      if opts[:if].call(self) == true
+        
+        if configured?(name)
+          puts "#{name} already configured on instance #{@fqdn}"
+        else
+          puts "#{name} not configured on instance #{@fqdn}"
+          block.call(@ssh)
+          __mark_configured(name)
+        end
+        
       else
-        puts "#{name} not configured on instance #{@hostname}"
-        block.call(@ssh)
-        __mark_configured(name)
+        puts "skipping configuration #{name} on instance #{@fqdn} - :if is false"
       end
     end
     
+    def file_exist?(file)
+      @ssh.exec!("[ -f #{file} ] && echo 1 || echo 0").strip == "1"
+    end
+
+    def dir_exist?(dir)
+      @ssh.exec!("[ -d #{fir} ] && echo 1 || echo 0").strip == "1"
+    end
+    
     def terminate!
       @ws.terminate_instances(:instance_id => [@id])
     end
@@ -60,7 +83,7 @@ module Ec2
     def __mark_configured(name)
       @configuration[name] = true
       write_to_file("~/.configuration", @configuration.to_yaml)
-      puts "#{name} configured on instance #{@hostname}"
+      puts "#{name} configured on instance #{@fqdn}"
     end
     
     def valid?
@@ -72,7 +95,7 @@ module Ec2
     end
     
     def instance
-      @cloud.instances.find{|it| it.name == @hostname}
+      @cloud.instances.find{|it| it.fqdn == @fqdn}
     end
     
     def disconnect!
@@ -103,6 +126,9 @@ module Ec2
     end
     
     def upload_file(local, remote)
+      
+      puts "uploading '#{local}' to '#{remote}'"
+      
       Net::SCP.start(@public_dns_name, "root", :keys => [@cloud.ssh_key_file], :paranoid => false) do |scp|
         scp.upload!(local, remote)
       end

data/lib/ec2/manager.rb

@@ -40,16 +40,18 @@ module Ec2
           binding = InstanceBinding.new(@cloud, @ws, id, launch_time, public_dns_name, private_dns_name)
         rescue Exception => e
           puts "instance #{id} failed to bind: #{e}"
+          puts e.backtrace
           next
         end
 
-        hostname = binding.hostname
+        fqdn = binding.fqdn
 
-        next unless hostname
-
-        raise "multiple instance using hostname #{binding.hostname}" if bindings.key?(hostname)
+        # maybe a manually started instance ?
+        next unless fqdn
+        
+        raise "multiple instance using fqdn #{binding.fqdn}" if bindings.key?(fqdn)
 
-        bindings[hostname] = binding
+        bindings[fqdn] = binding
       end
       
       bindings
@@ -57,31 +59,31 @@ module Ec2
     
     def startup(instance)
       
-      unless Pending.pending?(instance.name)
+      unless Pending.pending?(instance.fqdn)
         
         user_data = instance.userdata
         
-        user_data << "\necho \"#{instance.name}\" > /root/.hostname" if user_data
+        user_data << "\necho \"#{instance.fqdn}\" > /root/.fqdn" if user_data
         
         opts = {
           :image_id           => instance.ami, 
           :min_count          => 1, 
           :max_count          => 1,
           :key_name           => instance.keypair,
-          # :user_data          => Base64.encode64(instance.name),
           :user_data          => Base64.encode64(user_data),
+          :group_id           => instance.security_group,
           :instance_type      => "m1.small"
         }
 
         opts[:availability_zone] = instance.availability_zone if instance.availability_zone
       
-        puts "startup #{instance.name}: #{opts.inspect}"
+        puts "startup #{instance.fqdn}: #{opts.inspect}"
       
         @ws.run_instances(opts)
 
-        Pending.add(instance.name)
+        Pending.add(instance.fqdn)
       else
-        puts "instance #{instance.name} is pending"
+        puts "instance #{instance.fqdn} is pending"
       end
     end
     
@@ -89,20 +91,20 @@ module Ec2
       
       bindings = instance_bindings
       
-      bindings.each_pair do |hostname, binding|
+      bindings.each_pair do |fqdn, binding|
         begin
           yield(binding)
         rescue Exception => e
+          puts "error while processing fqdn: #{fqdn}"
           puts e
+          puts e.backtrace
         ensure
           binding.disconnect!
         end
       end
       
       @cloud.instances.each do |instance|
-        unless bindings.key?(instance.name)
-          startup(instance)
-        end
+        startup(instance) unless bindings.key?(instance.fqdn)
       end
       
     end

data/test/ec2_test.rb

@@ -12,17 +12,22 @@ class Ec2Test < Test::Unit::TestCase
       security_group    "mysecuritygroup"
       group "app_server" do
         ami "ami999"
+        domain "mydomain"
         instance "app01" do
+          hostname            "app01"
           security_group    "default2"
           availability_zone "zone-1"
         end
         instance "app02" do
-          ami "ami123"
+          hostname "app02"
+          ami  "ami123"
           security_group    "default"
         end
       end
       group "webserver" do
+        domain "mydomain"
         instance "web01" do
+          hostname "web01"
           ami "webXYZ"
           availability_zone "zone-3"
         end
@@ -51,6 +56,8 @@ class Ec2Test < Test::Unit::TestCase
     assert_equal "default2",    app01.security_group
     assert_equal "ami999",      app01.ami
     assert_equal "app01",       app01.name
+    assert_equal "app01",       app01.hostname
+    assert_equal "mydomain",    app01.domain
     assert_equal "zone-1",      app01.availability_zone
     assert_equal grp_app,       app01.container
     assert_equal cloud,         app01.cloud
@@ -59,6 +66,8 @@ class Ec2Test < Test::Unit::TestCase
     assert_equal "default",     app02.security_group
     assert_equal "ami123",      app02.ami
     assert_equal "app02",       app02.name
+    assert_equal "app02",       app02.hostname
+    assert_equal "mydomain",    app01.domain
     assert_equal "zone-2",      app02.availability_zone
     assert_equal grp_app,       app02.container
     assert_equal cloud,         app02.cloud
@@ -74,6 +83,8 @@ class Ec2Test < Test::Unit::TestCase
     assert_equal "mysecuritygroup",   web01.security_group
     assert_equal "webXYZ",            web01.ami
     assert_equal "web01",             web01.name
+    assert_equal "web01",             web01.hostname
+    assert_equal "mydomain",          web01.domain
     assert_equal "zone-3",            web01.availability_zone
     assert_equal grp_web,             web01.container
     assert_equal cloud,               web01.cloud

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jzimmek-ec2
 version: !ruby/object:Gem::Version 
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors: 
 - Jan Zimmek
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-15 00:00:00 -07:00
+date: 2009-09-24 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -37,6 +37,7 @@ files:
 - test/test_helper.rb
 has_rdoc: false
 homepage: http://github.com/jzimmek/ec2
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -57,7 +58,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Management tool for EC2 clouds