rudy 0.6.8 → 0.7.0

data/bin/rudy-ec2

@@ -27,7 +27,7 @@ module RudyCLI_EC2
   # -----------------------------------  AMAZON EC2 COMMANDS  --------
   # ------------------------------------------------------------------
   
-  desc "Amazon EC2 Elastic IP addresses"
+  about "Amazon EC2 Elastic IP addresses"
   usage "rudy-ec2 addresses"
   usage "rudy-ec2 addresses -C"
   usage "rudy-ec2 addresses -A -i instance-id address"
@@ -45,7 +45,7 @@ module RudyCLI_EC2
   command_alias :addresses, :address
   command_alias :addresses, :a
   
-  desc "Amazon EC2 instance console output"
+  about "Amazon EC2 instance console output"
   usage "rudy-ec2 console [-g group] [instance ID]"
   option :g, :group, String, "A security group name"
   argv :awsid
@@ -53,7 +53,7 @@ module RudyCLI_EC2
   command_alias :consoles, :console
   command_alias :consoles, :c
   
-  desc "Copy files to or from machines."
+  about "Copy files to or from machines."
   usage "rudy-ec2 copy [-p] [-r] [-u user] [-k path/2/privatekey] source target"
   usage "rudy-ec2 upload -k path/2/privatekey -u username local-source target"
   usage "rudy-ec2 download remote-source target"
@@ -73,7 +73,7 @@ module RudyCLI_EC2
   command_alias :copy, :upload
   command_alias :copy, :download
   
-  desc "Amazon EC2 EC2 Security Groups"
+  about "Amazon EC2 EC2 Security Groups"
   usage "rudy-ec2 groups"
   usage "rudy-ec2 groups -C [-p ports] [-a addresses] [-r protocols] name"
   usage "rudy-ec2 groups -A [-p ports] [-a addresses] [-r protocols] name"
@@ -97,7 +97,7 @@ module RudyCLI_EC2
   command_alias :groups, :group
   command_alias :groups, :g
   
-  desc "Amazon EC2 Machine Images (AMIs)"
+  about "Amazon EC2 Machine Images (AMIs)"
   usage "rudy-ec2 images"
   usage "rudy-ec2 images image-id"
   usage "rudy-ec2 images -o 123456789012"
@@ -117,7 +117,7 @@ module RudyCLI_EC2
   command_alias :images, :image
   command_alias :images, :im
   
-  desc "Amazon EC2 Instances"
+  about "Amazon EC2 Instances"
   usage "rudy-ec2 instances"
   usage "rudy-ec2 instances [-g group-name] [instance-ID]"
   usage "rudy-ec2 instances -C -m ami-235fba4a -s m1.small -k keypair-name"
@@ -142,7 +142,7 @@ module RudyCLI_EC2
   command_alias :instances, :in
   command_alias :instances, :i
   
-  desc "Amazon EC2 KeyPairs"
+  about "Amazon EC2 KeyPairs"
   usage "rudy-ec2 keypairs"
   usage "rudy-ec2 keypairs -C name"
   usage "rudy-ec2 keypairs -D name"
@@ -153,7 +153,7 @@ module RudyCLI_EC2
   command_alias :keypairs, :keypair
   command_alias :keypairs, :k
   
-  desc "Amazon EC2 Snapshots"
+  about "Amazon EC2 Snapshots"
   usage "rudy-ec2 snapshots"
   usage "rudy-ec2 snapshots -C -v volume-id"
   usage "rudy-ec2 snapshots -D snapshot-id"
@@ -165,7 +165,7 @@ module RudyCLI_EC2
   command_alias :snapshots, :snapshot
   command_alias :snapshots, :t
   
-  desc "Open an SSH connection"
+  about "Open an SSH connection"
   usage "rudy-ec2 ssh"
   usage "rudy-ec2 -u root -k path/2/key ssh"
   usage "rudy-ec2 -u root -k path/2/key ssh uname -a"
@@ -178,10 +178,10 @@ module RudyCLI_EC2
   command :ssh => Rudy::CLI::AWS::EC2::Candy 
   command_alias :ssh, :connect
   
-  desc "Amazon EC2 status"
+  about "Amazon EC2 status"
   command :status => Rudy::CLI::AWS::EC2::Candy
   
-  desc "Amazon EC2 Volumes"
+  about "Amazon EC2 Volumes"
   usage "rudy-ec2 volumes"
   usage "rudy-ec2 volumes -C -s size [-d device-path]"
   usage "rudy-ec2 volumes -A volume-id instance-id"
@@ -200,7 +200,7 @@ module RudyCLI_EC2
   command_alias :volumes, :volume
   command_alias :volumes, :v
   
-  desc "Availability Zones"
+  about "Availability Zones"
   usage "rudy-ec2 zones"
   argv :name
   command :zones => Rudy::CLI::AWS::EC2::Zones
@@ -224,11 +224,14 @@ end
 # will run after Rye shuts down the ssh-agent. 
 begin
   Drydock.run!(ARGV, STDIN) if Drydock.run? && !Drydock.has_run?
-rescue Drydock::ArgError, Drydock::OptError=> ex
+rescue Drydock::ArgError, Drydock::OptError => ex
   STDERR.puts ex.message
   STDERR.puts ex.usage
+rescue Drydock::InvalidArgument => ex
+  STDERR.puts ex.message  
 rescue Rudy::Error => ex
   STDERR.puts ex.message
+  STDERR.puts ex.backtrace if Drydock.debug?
 rescue => ex
   STDERR.puts "ERROR (#{ex.class.to_s}): #{ex.message}"
   STDERR.puts ex.backtrace if Drydock.debug?
@@ -239,3 +242,4 @@ rescue SystemExit
   # Don't balk
 end
 
+

data/bin/rudy-s3

@@ -25,7 +25,7 @@ module RudyCLI_S3
   # ------------------------------------  AMAZON S3 COMMANDS  --------
   # ------------------------------------------------------------------
   
-  desc "Amazon S3 Buckets"
+  about "Amazon S3 Buckets"
   usage "rudy-s3 buckets"
   option :l, :list, "List bucket objects"
   action :C, :create, "Create a bucket"
@@ -34,7 +34,7 @@ module RudyCLI_S3
   command :buckets => Rudy::CLI::AWS::S3::Buckets
   command_alias :buckets, :b
 
-  #desc "Amazon S3 Storage Interface"
+  #about "Amazon S3 Storage Interface"
   #usage "rudy-s3 store file-path"
   #option :b, :bucket, String, "Bucket name"
   #argv :path
@@ -61,11 +61,14 @@ end
 # will run after Rye shuts down the ssh-agent. 
 begin
   Drydock.run!(ARGV, STDIN) if Drydock.run? && !Drydock.has_run?
-rescue Drydock::ArgError, Drydock::OptError=> ex
+rescue Drydock::ArgError, Drydock::OptError => ex
   STDERR.puts ex.message
   STDERR.puts ex.usage
+rescue Drydock::InvalidArgument => ex
+  STDERR.puts ex.message  
 rescue Rudy::Error => ex
   STDERR.puts ex.message
+  STDERR.puts ex.backtrace if Drydock.debug?
 rescue => ex
   STDERR.puts "ERROR (#{ex.class.to_s}): #{ex.message}"
   STDERR.puts ex.backtrace if Drydock.debug?
@@ -76,4 +79,3 @@ rescue SystemExit
   # Don't balk
 end
 
-

data/bin/rudy-sdb

@@ -26,7 +26,7 @@ module RudyCLI_SDB
   # ------------------------------------------------------------------
   
   
-  desc "Displays the SimpleDB domains associated to your account"
+  about "Displays the SimpleDB domains associated to your account"
   action :C, :create, "Create a domain"
   action :D, :destroy, "Destroy a domain"
   argv :name
@@ -51,11 +51,14 @@ end
 # will run after Rye shuts down the ssh-agent. 
 begin
   Drydock.run!(ARGV, STDIN) if Drydock.run? && !Drydock.has_run?
-rescue Drydock::ArgError, Drydock::OptError=> ex
+rescue Drydock::ArgError, Drydock::OptError => ex
   STDERR.puts ex.message
   STDERR.puts ex.usage
+rescue Drydock::InvalidArgument => ex
+  STDERR.puts ex.message  
 rescue Rudy::Error => ex
   STDERR.puts ex.message
+  STDERR.puts ex.backtrace if Drydock.debug?
 rescue => ex
   STDERR.puts "ERROR (#{ex.class.to_s}): #{ex.message}"
   STDERR.puts ex.backtrace if Drydock.debug?
@@ -66,5 +69,3 @@ rescue SystemExit
   # Don't balk
 end
 
-
-

data/lib/annoy.rb

@@ -39,7 +39,7 @@ class Annoy
   
   @@randsize = {
     :low      => 10,
-    :medium   => 14,
+    :medium   => 12,
     :high     => 50,
     :insane   => 1000
   }.freeze

data/lib/console.rb

@@ -46,9 +46,7 @@ class String
   end
   
   # Shortcut for att(:bright)
-  def bright
-    att(:bright)
-  end
+  def bright; att(:bright); end
   
   # Print the string at +x+ +y+. When +minus+ is any true value
   # the length of the string is subtracted from the value of x

data/lib/rudy.rb

@@ -9,6 +9,7 @@ require 'digest/md5'
 require 'stringio'
 require 'ostruct'
 require 'yaml'
+require 'json'
 require 'logger'
 require 'socket'
 require 'timeout'
@@ -26,6 +27,7 @@ require 'net/scp'
 require 'net/ssh/multi'
 require 'net/ssh/gateway'
 
+require 'rudy/mixins/hash'
 
 
 # = Rudy
@@ -34,38 +36,16 @@ require 'net/ssh/gateway'
 #
 # Rudy is a development and deployment tool for the Amazon Elastic Compute Cloud
 # (EC2). See README.rdoc for more information. 
-#
-# == Status: Alpha
 # 
-# The current release (0.6) is not ready for general production use. Use it for 
-# exploring EC2 and operating your development / ad-hoc instances. We've put in 
-# a lot of effort to make sure Rudy plays safe, but it's possible we missed
-# something. That's why we consider it alpha code. 
-#
-# To get started right away, try:
-#
-#     $ rudy -h
-#     $ rudy show-commands
-#
-# Also:
-#
-#     $ rudy-ec2 -h
-#     $ rudy-ec2 show-commands
-#
-# And if you're feeling particularly saucey, try Rudy's REPL interface:
-#
-#     $ ird
 # 
-#
-#
 module Rudy
   extend self
   
   module VERSION #:nodoc:
     unless defined?(MAJOR)
       MAJOR = 0.freeze
-      MINOR = 6.freeze
-      TINY  = 8.freeze
+      MINOR = 7.freeze
+      TINY  = 0.freeze
     end
     def self.to_s; [MAJOR, MINOR, TINY].join('.'); end
     def self.to_f; self.to_s.to_f; end
@@ -141,6 +121,11 @@ module Rudy
       lines.join($/)
     end
   end
+  
+  #--
+  # TODO: Update exception Syntax based on:
+  # http://blog.rubybestpractices.com/posts/gregory/anonymous_class_hacks.html
+  #++
   class NoConfig < Rudy::Error
     def message; "No configuration found!"; end
   end
@@ -180,8 +165,9 @@ require 'rudy/huxtable'   # requires
 require 'rudy/aws'        # is
 require 'rudy/metadata'   # important
 
-require 'rudy/machines'
 require 'rudy/disks'
+require 'rudy/machines'
 require 'rudy/routines'
+require 'rudy/scm'
 
 

data/lib/rudy/aws/ec2/instance.rb

@@ -25,7 +25,7 @@ module Rudy::AWS
     
     def liner_note
       info = self.running? ? self.dns_public : self.state
-      "%s  %s" % [self.awsid.bright, info]
+      "%s  %-30s" % [self.awsid.bright, info]
     end
 
     def to_s(with_title=false)

data/lib/rudy/aws/ec2/volume.rb

@@ -101,7 +101,7 @@ module Rudy::AWS
         opts = {
           :volume_id => vol_id, 
           :instance_id => inst_id, 
-          :device => device
+          :device => device.to_s    # Solaris devices are numbers
         }
         ret = execute_request(false) { @ec2.attach_volume(opts) }
         (ret['status'] == 'attaching')
@@ -154,7 +154,7 @@ module Rudy::AWS
     
       def get(vol_id)
         vol_id = Volumes.get_vol_id(vol_id)
-        list(:any, vol_id).first || nil
+        list(:any, vol_id).first rescue nil
       end
     
       # deleting?, available?, etc...

data/lib/rudy/aws/sdb/error.rb

@@ -29,7 +29,7 @@ module Rudy
 
       class FeatureDeprecatedError < RequestError ; end
 
-      class ConnectionError < Error
+      class ConnectionError < Rudy::Error
         attr_reader :response
 
         def initialize(response)
@@ -39,6 +39,7 @@ module Rudy
           )
           @response = response
         end
+        
       end
       
     end

data/lib/rudy/cli.rb

@@ -25,7 +25,10 @@ module Rudy
       
     protected
       def init
-
+        
+        
+        Rudy::Huxtable.update_config
+        
         # The CLI wants output!
         Rudy::Huxtable.update_logger STDOUT
         
@@ -80,6 +83,12 @@ module Rudy
         end
       end
       
+      def machine_separator(name, awsid)
+        dashes = 80 - name.size # 
+        dashes = 0 if dashes < 1
+        ('%s %-63s awsid: %s ' % [$/, name, awsid]).att(:reverse)
+      end
+      
     end
 
     def self.generate_header(global, config)

data/lib/rudy/cli/aws/ec2/addresses.rb

@@ -23,7 +23,7 @@ module AWS; module EC2;
       raise "Could not fetch #{address.ipaddress}" unless address
       
       puts "Destroying address: #{@argv.ipaddress}"
-      puts "NOTE: this IP address will become available to other EC2 customers.".color(:blue)
+      puts "NOTE: this IP address will become available to other EC2 customers.".bright
       execute_check(:medium)
       execute_action { @radd.destroy(@argv.ipaddress) }
       self.addresses

data/lib/rudy/cli/aws/ec2/images.rb

@@ -93,7 +93,7 @@ module AWS; module EC2;
       opts[:group] = :any if @option.all
       opts[:id] = @option.instid if @option.instid
       
-      puts "You may want to run rudy-ec2 #{@alias} --prepare before this.".color(:blue)
+      puts "You may want to run rudy-ec2 #{@alias} --prepare before this.".bright
       puts "This feature is experimental. Make sure you enter the bucket"
       puts "and image names correctly because if they're wrong the image"
       puts "won't get created and you'll be annoyed that you waited."
@@ -126,6 +126,8 @@ module AWS; module EC2;
         # Open the connection and run the command
         rbox = Rye::Box.new(inst.dns_public, ssh_opts)
         
+        # TODO: Replace with rbox.upload
+        
         # ~/.rudy, /etc/motd, history -c, /etc/hosts, /var/log/rudy*
         cert = File.read(@@global.cert)
         pk = File.read(@@global.privatekey)

data/lib/rudy/cli/aws/ec2/instances.rb

@@ -48,8 +48,8 @@ module AWS; module EC2;
       puts "Creating #{opts[:size]} instance in #{@@global.zone}"
       
       unless opts[:keypair]
-        puts "You did not specify a keypair. Unless you've prepared a user account".color(:blue)
-        puts "on this image (#{opts[:ami]}) you will not be able to log in to it.".color(:blue)
+        puts "You did not specify a keypair. Unless you've prepared a user account".bright
+        puts "on this image (#{opts[:ami]}) you will not be able to log in to it.".bright
         exit unless Annoy.proceed?(:low)
       end
       

data/lib/rudy/cli/candy.rb

@@ -3,6 +3,17 @@ module Rudy
   module CLI
     class Candy < Rudy::CLI::CommandBase
       
+      def open
+        rmach = Rudy::Machines.new
+        machines = rmach.list
+        puts 1
+        if machines
+          `open http://#{machines.first.dns_public}`
+        else
+          puts "No machines"
+        end
+      end
+      
     end
   end
 end

data/lib/rudy/cli/config.rb

@@ -31,54 +31,35 @@ module Rudy
       #     $ rudy config --all
       #
       def config
-        return if @@config.nil? 
+        # if Rudy.in_situ? # TODO: do something intelligent when running on EC2
         
+        if @@config.nil? || @@config.empty?
+          return if @@global.quiet
+          raise Rudy::NoConfig
+        end
+
+        outform = @@global.format == :json ? :to_json : :to_yaml
         
-        @option.group ||= [@@global.environment, @@global.role].join(Rudy::DELIM)
-        
-        return if @@config.empty?
-        
-        # We need to check whether we're running on a human's computer
-        # or within EC2 (we call that running "in-situ"). The userdata
-        # available when running in-situ is in a different format.
-        if Rudy.in_situ?
-          puts "TODO: do something intelligent with config when running on EC2"
+        types = @option.marshal_dump.keys & @@config.keys # Intersections only
+        types = @@config.keys if @option.all
+        types = [:machines] if types.empty?
+          
+        if @option.project
+          rf = File.join(RUDY_HOME, 'Rudyfile')
+          raise "Cannot find: #{rf}" unless File.exists?(rf)
+          puts File.read(rf)
+          
+        elsif @option.script
+          conf = fetch_script_config
+          puts conf.to_hash.send(outform) if conf
+          
         else
-          if @option.all
-            puts "# ACCOUNTS: not displayed"
-            if @@config.machines?
-              puts "# MACHINES: "
-              y @@config.machines.to_hash 
-            end
-            if @@config.routines?
-              puts "# ROUTINES: "
-              y @@config.routines.to_hash 
-            end
-          elsif @option.defaults?
-            y @@config.defaults.to_hash
-          elsif @option.script
-            y fetch_script_config.to_hash
-          elsif @option.project
-            rf = File.join(RUDY_HOME, 'Rudyfile')
-            raise "Cannot find: #{rf}" unless File.exists?(rf)
-            puts File.read(rf)
-          else
-            zon, env, rol = @@global.zone, @@global.environment, @@global.role
-            usr, att = @@global.user, @argv.name
-            val = @@config.machines.find_deferred(zon, env, rol, usr, att) || ''
-            puts (val.is_a?(String)) ? val : val.to_hash.to_yaml
+          puts "# ACCOUNTS: [not displayed]" if types.delete(:accounts)
+          types.each do |conftype|
+            puts "# #{conftype.to_s.upcase}"
+            next unless @@config[conftype]  # Nothing to output
+            puts @@config[conftype].to_hash.send(outform)
           end
-          
-          #name = @argv.first
-          #if name && @@config.userdata.has_key?(which) 
-          #  value = @@config.userdata[which][name.to_s]
-          #  puts value if value
-          #elsif @option.all
-          #  puts @@config.to_yaml
-          #else
-          #  value = @@config.userdata[which] 
-          #  puts value.to_yaml if value
-          #end
         end
         
       end