cloud_info 0.1.5 → 0.1.6

data/TODO

@@ -1,2 +1,28 @@
+0.1.6
+* dont overwrite cache if the hosts is empty
+
+TODO:
+* support regex filter
+* port rake br:setup -> cloud_info --update-ssh-config
 * clean up the messy code
 * write real specs
+
+
+
+CloudInfo::Instances outline
+1. connect to ec2
+
+2. find instances that are in the ey-env
+find ey instances from ey-recipes for specific environment
+  grab aws_group from one of the instances in the ey-env
+  instances in group
+  I can simply also just grab the instances from ey-recipes instead of working back from the aws_group..
+
+3. connect to instances (ssh) and build info
+connect to servers
+download json and store in dictionary lookup
+at this point we have enough data about the servers to build up the info we want
+
+4. hosts
+{:prod_app0 => 'xx.xx.xx.xx', :prod_app1 => 'xx.xx.xx.xx'}
+

data/bin/cloud_info

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+require 'cloud_info/cli'
+
+CloudInfo::CLI.run(ARGV)

data/config/cloud_info.yml

@@ -5,8 +5,9 @@ prod_br:
   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-174-129-55-203.compute-1.amazonaws.com
-  prod_br_app2: ec2-75-101-183-44.compute-1.amazonaws.com
-  prod_br_app3: ec2-184-73-5-255.compute-1.amazonaws.com
+  prod_br_app1: ec2-75-101-183-44.compute-1.amazonaws.com
+  prod_br_app2: ec2-184-73-92-49.compute-1.amazonaws.com
+  prod_br_app3: ec2-174-129-48-17.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
+  prod_br_dj0: ec2-184-73-13-18.compute-1.amazonaws.com

data/gemspec.rb

@@ -1,3 +1,5 @@
+require 'lib/cloud_info/version'
+
 GEM_NAME = 'cloud_info'
 GEM_FILES = FileList['**/*'] - FileList['coverage', 'coverage/**/*', 'pkg', 'pkg/**/*']
 GEM_SPEC = Gem::Specification.new do |s|
@@ -16,5 +18,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.5"
+  s.version = CloudInfo::Version
 end

data/lib/cloud_info.rb

@@ -1,8 +1,19 @@
 require 'rubygems'
 require 'yaml'
 require 'pp'
+require File.join(%W/#{File.dirname(__FILE__)} cloud_info version/)
 require File.join(%W/#{File.dirname(__FILE__)} cloud_info instances/)
+require File.join(%W/#{File.dirname(__FILE__)} cloud_info cli/)
 
+# usage:
+# require "cloud_info"
+# irb(main):003:0> cloud_info = CloudInfo.new("prod",:private_key => "~/.ssh/id_rsa-private-key")
+# irb(main):005:0> pp cloud_info.apps
+# [["prod_app0", "xxx.xxx.xxx.xxx"],
+#  ["prod_app1", "xxx.xxx.xxx.xxx"],
+#  ["prod_app2", "xxx.xxx.xxx.xxx"],
+#  ["prod_app3", "xxx.xxx.xxx.xxx"]]
+# 
 class CloudInfo
   attr_reader :env_name
   def initialize(env_name, options = {})
@@ -28,7 +39,7 @@ class CloudInfo
       else
         all_hosts = {}
       end
-      all_hosts[env_name] = @hosts
+      all_hosts[env_name] = @hosts unless @hosts.empty? # do not replace cached version if its empty
       CloudInfo.write_yaml(@cache_path, all_hosts)
     end
     @hosts
@@ -43,6 +54,9 @@ class CloudInfo
   def utils
     utils = hosts.select{|k,v| k =~ Regexp.new("#{@env_name}_util")}.sort {|a,b| a[0] <=> b[0] }
   end
+  def djs
+    utils = hosts.select{|k,v| k =~ Regexp.new("#{@env_name}_dj")}.sort {|a,b| a[0] <=> b[0] }
+  end
   
   def self.all_hosts(options = {})
     all_hosts = {}

data/lib/cloud_info/cli.rb

@@ -0,0 +1,85 @@
+require 'optparse'
+require 'logger'
+require 'pp'
+
+class CloudInfo
+  class CLI
+    
+    def self.run(args)
+      cli = new(args)
+      cli.parse_options!
+      cli.run
+    end
+    
+    # The array of (unparsed) command-line options
+    attr_reader :args
+    # The hash of (parsed) command-line options
+    attr_reader :options
+    
+    def initialize(args)
+      @args = args.dup
+    end
+    
+    # Return an OptionParser instance that defines the acceptable command
+    # line switches for cloud_info, and what their corresponding behaviors
+    # are.
+    def option_parser
+      # @logger = Logger.new
+      @option_parser ||= OptionParser.new do |opts|
+        opts.banner = "Usage: #{File.basename($0)} [options] action ..."
+        
+        opts.on("-d", "--debug",
+          "Debug mode, more output"
+        ) { |value| options[:debug] = true }
+        
+        opts.on("-u", "--user USER",
+          "ssh user"
+        ) { |value| options[:user] = value }
+        
+        opts.on("-h", "--help", "Display this help message.") do
+          puts opts
+          exit
+        end
+
+        opts.on("-V", "--version",
+          "Display the cloud_info version, and exit."
+        ) do
+          require 'cloud_info/version'
+          puts "CloudInfo v#{CloudInfo::Version}"
+          exit
+        end
+
+      end
+    end
+    
+    def parse_options!
+      @options = {:actions => []}
+      
+      if args.empty?
+        warn "Please specifiy an action to execute."
+        warn option_parser
+        exit 1
+      end
+      
+      option_parser.parse!(args)
+      coerce_variable_types!
+      extract_environment_variables!
+      
+      options[:actions].concat(args)
+    end
+    
+    # Extracts name=value pairs from the remaining command-line arguments
+    # and assigns them as environment variables.
+    def extract_environment_variables! #:nodoc:
+      args.delete_if do |arg|
+        next unless arg.match(/^(\w+)=(.*)$/)
+        ENV[$1] = $2
+      end
+    end
+
+    def run
+      puts "TODO FINISH LOGIC"
+      pp options
+    end
+  end
+end

data/lib/cloud_info/instances.rb

@@ -129,22 +129,6 @@ class CloudInfo
       h
     end
     
-    module Aws
-      def aws_instances
-        @@aws_instances ||= @ec2.describe_instances
-      end
-
-      def aws_groups
-        @@aws_groups ||= aws_instances.collect{|x| x[:aws_groups]}.flatten.uniq
-      end
-
-      def aws_group_for_instance_id(instance_id)
-        instance = aws_instances.find{|x| x[:aws_instance_id] == instance_id}
-        aws_group = instance[:aws_groups].first
-      end
-    end
-    include Aws
-    
     def self.ey_recipes
       @@ey_recipes ||= `ey-recipes`
     end
@@ -179,6 +163,22 @@ class CloudInfo
       instance_ids
     end
     
+    module Aws
+      def aws_instances
+        @@aws_instances ||= @ec2.describe_instances
+      end
+
+      def aws_groups
+        @@aws_groups ||= aws_instances.collect{|x| x[:aws_groups]}.flatten.uniq
+      end
+
+      def aws_group_for_instance_id(instance_id)
+        instance = aws_instances.find{|x| x[:aws_instance_id] == instance_id}
+        aws_group = instance[:aws_groups].first
+      end
+    end
+    include Aws
+    
   end
 end
 

data/lib/cloud_info/version.rb

@@ -0,0 +1,3 @@
+class CloudInfo
+  Version = "0.1.6"
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Tung Nguyen
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-11 00:00:00 -08:00
+date: 2010-03-24 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -71,7 +71,9 @@ files:
 - bin/cloud_info
 - config/cloud_info.yml
 - gemspec.rb
+- lib/cloud_info/cli.rb
 - lib/cloud_info/instances.rb
+- lib/cloud_info/version.rb
 - lib/cloud_info.rb
 - MIT-LICENSE
 - Rakefile