bguthrie-awsymandias 0.2.0 → 0.2.1

data/README.rdoc

@@ -45,7 +45,9 @@ This should allow you to re-launch and deploy that AWS stack from any one of sev
 
 == Contributors
 
-* Paul Gross (pgross@gmail.com)
+* {Paul Gross}[http://www.pgrs.net] {github}[http://github.com/pgr0ss] {email}[mailto:pgross@gmail.com]
+* Rob Sweet (rob@ldg.net)
+* Kris Hicks (krishicks at gmail dot com)
 
 == License
 

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/awsymandias.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{awsymandias}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian Guthrie"]
-  s.date = %q{2009-07-14}
+  s.date = %q{2009-07-15}
   s.description = %q{A library for helping you set up, track, and tear down complicated deployment configurations in Amazon EC2.}
   s.email = %q{btguthrie@gmail.com}
   s.extra_rdoc_files = [

data/lib/awsymandias.rb

@@ -5,6 +5,7 @@ require 'aws_sdb'
 require 'money'
 require 'activesupport'
 require 'activeresource'
+require 'net/telnet'
 
 module Awsymandias
   class << self
@@ -97,14 +98,6 @@ module Awsymandias
       def public_dns;  dns_name;         end
       def private_dns; private_dns_name; end
 
-      def public_ip
-        dns_to_ip(public_dns)
-      end
-
-      def private_ip
-        dns_to_ip(private_dns)
-      end
-    
       def pending?
         instance_state.name == "pending"
       end
@@ -112,7 +105,11 @@ module Awsymandias
       def running?
         instance_state.name == "running"
       end
-    
+      
+      def port_open?(port)
+        Net::Telnet.new("Host" => public_dns, "Port" => port) && true rescue false
+      end
+      
       def terminated?
         instance_state.name == "terminated"
       end
@@ -203,13 +200,6 @@ module Awsymandias
           find(instance_id)
         end
       end
-
-      private
-
-      def dns_to_ip(dns)
-        match = dns.match(/(ec2|ip)-(\d+)-(\d+)-(\d+)-(\d+)/)
-        match.captures[1..-1].join(".")
-      end
     end
       
     # Goal:
@@ -284,6 +274,10 @@ module Awsymandias
         launched? && @instances.values.all?(&:running?)
       end
       
+      def port_open?(port)
+        @instances.values.all? { |instance| instance.port_open?(port) }
+      end
+      
       def running_cost
         return Money.new(0) unless launched?
         @instances.values.sum { |instance| instance.running_cost }
@@ -327,7 +321,8 @@ module Awsymandias
       def connection(opts={})
         @connection ||= ::AwsSdb::Service.new({
           :access_key_id     => Awsymandias.access_key_id     || ENV['AMAZON_ACCESS_KEY_ID'],
-          :secret_access_key => Awsymandias.secret_access_key || ENV['AMAZON_SECRET_ACCESS_KEY']
+          :secret_access_key => Awsymandias.secret_access_key || ENV['AMAZON_SECRET_ACCESS_KEY'],
+          :logger            => Logger.new("/dev/null")
         }.merge(opts))
       end
       

data/spec/awsymandias_spec.rb

@@ -428,13 +428,6 @@ describe Awsymandias do
         end
       end
       
-      describe "public_ip" do
-        it "should parse the public dns to get the public IP address" do
-          stub_connection_with DESCRIBE_INSTANCES_SINGLE_RESULT_RUNNING_XML 
-          Awsymandias::EC2::Instance.find("i-some-instance").public_ip.should == "174.129.118.52"
-        end
-      end
-
       describe "private_dns" do
         it "should return the private dns from the xml" do
           stub_connection_with DESCRIBE_INSTANCES_SINGLE_RESULT_RUNNING_XML 
@@ -442,13 +435,6 @@ describe Awsymandias do
         end
       end
 
-      describe "private_ip" do
-        it "should parse the private dns to get the private IP address" do
-          stub_connection_with DESCRIBE_INSTANCES_SINGLE_RESULT_RUNNING_XML 
-          Awsymandias::EC2::Instance.find("i-some-instance").private_ip.should == "10.244.226.239"
-        end
-      end
-  
       describe "running_cost" do
         it "should be zero if the instance has not yet been launched" do
           stub_connection_with DESCRIBE_INSTANCES_SINGLE_RESULT_PENDING_XML
@@ -487,6 +473,24 @@ describe Awsymandias do
           instance.running_cost.should == expected_cost          
         end
       end
+      
+      describe "port_open?" do
+        it "should return true if telnet does not raise" do
+          stub_connection_with DESCRIBE_INSTANCES_SINGLE_RESULT_RUNNING_XML
+          instance = Awsymandias::EC2::Instance.find("i-some-instance")
+          Net::Telnet.should_receive(:new).with("Host" => "ec2-174-129-118-52.compute-1.amazonaws.com",
+                                                "Port" => 100).and_return(true)
+          instance.port_open?(100).should be_true
+        end
+        
+        it "should return false if telnet does raise" do
+          stub_connection_with DESCRIBE_INSTANCES_SINGLE_RESULT_RUNNING_XML
+          instance = Awsymandias::EC2::Instance.find("i-some-instance")
+          Net::Telnet.should_receive(:new).with("Host" => "ec2-174-129-118-52.compute-1.amazonaws.com",
+                                                "Port" => 100).and_raise(Timeout::Error)
+          instance.port_open?(100).should be_false
+        end
+      end
     end
 
     describe ApplicationStack = Awsymandias::EC2::ApplicationStack do
@@ -704,6 +708,65 @@ describe Awsymandias do
           s.should be_running
         end
       end
+      
+      describe "port_open?" do
+        it "should return true if there is one instance with the port open" do
+          s = ApplicationStack.new("test") do |s| 
+            s.role "app1", :instance_type => Awsymandias::EC2::InstanceTypes::C1_XLARGE
+          end
+  
+          instance = stub_instance
+          instance.should_receive(:port_open?).with(100).and_return(true)
+          Instance.stub!(:launch).and_return(instance)
+        
+          s.launch
+          s.port_open?(100).should be_true
+        end
+      
+        it "should return false if there is one instance with the port closed" do
+          s = ApplicationStack.new("test") do |s| 
+            s.role "app1", :instance_type => Awsymandias::EC2::InstanceTypes::C1_XLARGE
+          end
+  
+          instance = stub_instance
+          instance.should_receive(:port_open?).with(100).and_return(false)
+          Instance.stub!(:launch).and_return(instance)
+        
+          s.launch
+          s.port_open?(100).should be_false
+        end
+        
+        it "should return true if there are multiple instances all with the port open" do
+          s = ApplicationStack.new("test") do |s| 
+            s.role "app1", :instance_type => Awsymandias::EC2::InstanceTypes::C1_XLARGE
+            s.role "app2", :instance_type => Awsymandias::EC2::InstanceTypes::C1_XLARGE
+          end
+  
+          instance1, instance2 = [stub_instance, stub_instance]
+          instance1.should_receive(:port_open?).with(100).and_return(true)
+          instance2.should_receive(:port_open?).with(100).and_return(true)
+          Instance.stub!(:launch).and_return(instance1, instance2)
+        
+          s.launch
+          s.port_open?(100).should be_true
+        end
+
+        it "should return false if there are multiple instances with at least one port closed" do
+          s = ApplicationStack.new("test") do |s| 
+            s.role "app1", :instance_type => Awsymandias::EC2::InstanceTypes::C1_XLARGE
+            s.role "app2", :instance_type => Awsymandias::EC2::InstanceTypes::C1_XLARGE
+          end
+  
+          instance1, instance2 = [stub_instance, stub_instance]
+          instance1.should_receive(:port_open?).with(100).and_return(true)
+          instance2.should_receive(:port_open?).with(100).and_return(false)
+          Instance.stub!(:launch).and_return(instance1, instance2)
+        
+          s.launch
+          s.port_open?(100).should be_false
+        end
+
+      end
 
       describe "terminate!" do
         it "should not do anything if not running" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bguthrie-awsymandias
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Brian Guthrie
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-14 00:00:00 -07:00
+date: 2009-07-15 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency