madeira 0.2.0 → 0.3.0

data/lib/madeira/provider/ec2.rb

@@ -28,7 +28,7 @@ module Madeira
         server.wait_for { print "."; ready? }
         puts
         tp server, :id, {:dns_name => {:width => 65}}, :public_ip_address, :private_ip_address, :tags, :flavor_id, :key_name, :security_group_ids
-        server.dns_name
+        server
       end
 
 
@@ -42,6 +42,13 @@ module Madeira
         instances = @fog.servers.all
         instance = instances.select {|i| i.dns_name == options[:dns_name] }
         instance[0].destroy
+        instance[0].reload
+        while instance[0].state != "terminated" do
+          print '.'
+          sleep 3
+          instance[0].reload
+        end
+        puts "#{options[:dns_name]} has been terminated."
       end
 
       private

data/lib/madeira/ui/create_command.rb

@@ -35,14 +35,31 @@ command :create do |c|
 
   c.action do |global_options, options, args|
     opts=global_options.merge(options)
-    dns_name = Madeira::Provider::EC2.create(opts)
+    server = Madeira::Provider::EC2.create(opts)
+    pp server
     if opts[:bootstrap]
-      #FIXME: use Fog's server.ready? method before continuing
-      #
-      sleep(20)
-      Madeira::Provisioner::Capistrano.bootstrap(opts.merge(:dns_name => dns_name))
+      server.wait_for { print '.'; openport?(server.public_ip_address, 22) }
+      Madeira::Provisioner::Capistrano.bootstrap(opts.merge(:dns_name => server.dns_name))
+      puts "#{server.dns_name} has been bootstrapped."
     else
-      puts "NOT bootstrapping #{dns_name}"
+      puts "NOT bootstrapping #{server.dns_name}"
     end
   end
 end
+
+#FIXME: move method out of UI into a helper somewhere
+#
+def openport?(host,port)
+  require 'socket'
+  begin
+    aSock = Socket.new(:INET, :STREAM)
+    raw = Socket.sockaddr_in(port, host)
+    if aSock.connect(raw)
+      true
+    end
+  rescue (Errno::ECONNREFUSED)
+    false
+  rescue (Errno::ETIMEDOUT)
+    exit_now!('timed out waiting for instance to be available.')
+  end
+end

data/lib/madeira/version.rb

@@ -1,3 +1,3 @@
 module Madeira
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/madeira.gemspec

@@ -20,7 +20,7 @@ spec = Gem::Specification.new do |s|
   s.add_development_dependency('rake')
   s.add_development_dependency('rdoc')
   s.add_development_dependency('aruba')
-  s.add_runtime_dependency('gli','2.5.5')
+  s.add_runtime_dependency('gli','2.5.6')
   s.add_runtime_dependency('fog','1.10.0')
   s.add_runtime_dependency('table_print')
   s.add_runtime_dependency('capistrano')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: madeira
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-28 00:00:00.000000000 Z
+date: 2013-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.5.5
+        version: 2.5.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.5.5
+        version: 2.5.6
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
@@ -166,7 +166,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -649789194035628970
+      hash: -3429346419975010628
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -175,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -649789194035628970
+      hash: -3429346419975010628
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23