cloud_info 0.1.2 → 0.1.3

data/Rakefile

@@ -14,10 +14,8 @@ end
 desc "Install gem"
 task :install do
   Rake::Task['gem'].invoke
-  $stdout.puts "Use sudo?"
-  sudo = ($stdin.gets.downcase[0..0] == 'y') ? 'sudo ' : ''
   $stdout.puts "Installing gem..."
-  `#{sudo} gem install pkg/#{GEM_NAME}*.gem`
+  `gem install pkg/#{GEM_NAME}*.gem`
   `rm -Rf pkg`
 end
 

data/gemspec.rb

@@ -16,5 +16,5 @@ GEM_SPEC = Gem::Specification.new do |s|
   s.name = GEM_NAME
   s.platform = Gem::Platform::RUBY
   s.require_path = "lib"
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 end

data/lib/cloud_info.rb

@@ -12,7 +12,7 @@ class CloudInfo
   end
   
   # if a cache exist it uses it instead of finding the servers
-  def hosts(use_cache = true)
+  def hosts(use_cache = false)
     # check yaml file first
     if use_cache and File.exist?(@cache_path)
       @hosts = (CloudInfo.read_yaml(@cache_path) || {})[env_name]

data/lib/cloud_info/instances.rb

@@ -43,10 +43,16 @@ class CloudInfo
     
     def connect_to_servers
       thread = Thread.current
-      hosts = instances.collect {|i| i[:dns_name]}
+      hosts_with_blanks = instances.select{|i| i[:aws_state] == 'running'}.collect {|i| i[:dns_name]}
+      hosts = hosts_with_blanks.select{|i| i[:dns_name] != ""}
+      if hosts_with_blanks.size != hosts.size
+        puts "WARNING: some hosts do not have dns_name's yet, amazon is not yet ready"
+      end
+      
       threads = hosts.collect do |host|
         Thread.new {
           @sessions << Net::SSH.start(host, @user, {:keys => @private_key})
+          @sessions
         }
       end
       threads.collect {|t| t.join}
@@ -64,9 +70,13 @@ class CloudInfo
     
     def execute_on_servers
       connect_to_servers
+      threads = []
       sessions.each do |ssh|
-        yield(ssh)
+        threads << Thread.new {
+          yield(ssh)
+        }
       end
+      threads.collect{|t| t.join}
     end
     
     # builds up the hosts hash

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Tung Nguyen
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-04 00:00:00 -08:00
+date: 2010-03-07 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -69,7 +69,6 @@ extra_rdoc_files:
 - README.markdown
 files: 
 - bin/cloud_info
-- config/cloud_info.yml
 - gemspec.rb
 - lib/cloud_info/instances.rb
 - lib/cloud_info.rb

data/config/cloud_info.yml

@@ -1,12 +0,0 @@
---- 
-prod_br: 
-  prod_br_app0: 184.73.240.218
-  prod_br_util0: ec2-174-129-69-169.compute-1.amazonaws.com
-  prod_br_memcached0: ec2-204-236-244-26.compute-1.amazonaws.com
-  prod_br_util1: ec2-174-129-111-60.compute-1.amazonaws.com
-  prod_br_memcached1: ec2-184-73-18-219.compute-1.amazonaws.com
-  prod_br_app1: ec2-75-101-183-44.compute-1.amazonaws.com
-  prod_br_app2: ec2-174-129-55-203.compute-1.amazonaws.com
-  prod_br_app3: ec2-184-73-5-255.compute-1.amazonaws.com
-  prod_br_db0: ec2-174-129-47-164.compute-1.amazonaws.com
-  prod_br_db1: ec2-72-44-44-156.compute-1.amazonaws.com