rudy 0.2.3 → 0.2.4

data/CHANGES.txt

@@ -4,8 +4,7 @@ RUDY, CHANGES
 
 NOTE: This is a complete re-write from 0.1
 
-* UPGRADE: drydock 0.3.3
-* NEW: Commands: myaddress, addresses, images, instances, disks, connect release
+* NEW: Commands: myaddress, addresses, images, instances, disks, connect, copy release
 * NEW: Metadata storage to SimpleDB
 * NEW: Creates EBS volumes based on startup from metadata
 * NEW: Automated release process
@@ -14,6 +13,7 @@ NOTE: This is a complete re-write from 0.1
 * NEW: Manage system based on security groups. 
 * NEW: "rudy groups" overhaul. Display, creates, destroys groups. 
 * CHANGE: Added Environment variables
+* UPGRADE: drydock 0.3.3
 
 
 #### 0.1 (2009-02-06) ###############################

data/bin/rudy

@@ -113,6 +113,17 @@ command :connect => Rudy::Command::Environment do |obj|
   end
 end
 
+debug :on
+option :r, :remote, "Copy FROM the remote machine to the local machine"
+option :p, :print, "Only print the SSH command, don't connect"
+usage "rudy [-e env] [-u user] copy [-p] -r [from path] [to path]"
+command :copy => Rudy::Command::Environment do |obj, argv|
+  capture(:stderr) do
+    obj.print_header
+    raise "No path specified (rudy copy FROM-PATH [FROM-PATH ...] TO-PATH)" unless argv.size >= 2
+    obj.copy(argv)
+  end
+end
 
 
 option :all, "Display all disk definitions"
@@ -124,7 +135,7 @@ option :D, :destroy, "Destroy a disk definition"
 option :A, :attach, "Attach a disk"
 usage "rudy [global options] disks [-C -p path -d device -s size] [-A] [-D] [disk name]"
 command :disks => Rudy::Command::Disks do |obj, argv|
-  #capture(:stderr) do
+  capture(:stderr) do
   obj.print_header
   if obj.create
     raise "No filesystem path specified" unless obj.path
@@ -141,7 +152,7 @@ command :disks => Rudy::Command::Disks do |obj, argv|
     obj.print_disks
   end
   obj.print_footer
-  #end
+  end
 end
 
 #command :volumes => Rudy::Command::Volumes do |obj|
@@ -188,6 +199,7 @@ option :b, :bucket_name, String, "The name of the bucket that will store the ima
 option :C, :create, "Create an image"
 usage "rudy images [-C -i image -b bucket -a account]"
 command :images => Rudy::Command::Images do |obj|
+  capture(:stderr) do
   obj.print_header
 
   if obj.create
@@ -198,18 +210,22 @@ command :images => Rudy::Command::Images do |obj|
     obj.print_images
   end
 end
+end
 
 command :stage => Rudy::Command::Stage do |obj| 
+  capture(:stderr) do
   obj.print_header
   
   raise "No SCM defined. Set RUDY_SVN_BASE or RUDY_GIT_BASE." unless obj.scm
   
   exit unless you_are_sure?
   obj.push_to_stage
-  
+  end
 end
 
 
+
+
 option :all, "Display all security groups"
 option :r, :protocols, Array, "Comma-separated list of protocols. One of: tcp (default), udp, icmp"
 option :p, :ports, Array, "List of comma-separated ports to authorize (default: 22,80,443)"
@@ -219,6 +235,9 @@ option :D, :destroy, "Destroy a security group"
 option :M, :modify, "Modify a security group"
 usage "rudy [global options] groups [-C] [-a IP addresses] [-p ports] [group name]"
 command :groups => Rudy::Command::Groups do |obj, argv|
+  capture(:stderr) do
+  obj.print_header
+  
   if obj.create
     obj.create_group(argv.first)
   
@@ -232,6 +251,7 @@ command :groups => Rudy::Command::Groups do |obj, argv|
   else
     obj.print_groups(argv.first)
   end
+  end
 end
 
 

data/lib/drydock.rb

@@ -1,8 +1,7 @@
 require 'optparse'
 require 'ostruct'
 
-#
-#
+
 module Drydock
   # The base class for all command objects. There is an instance of this class
   # for every command defined. Global and command-specific options are added

data/lib/rudy.rb

@@ -33,7 +33,7 @@ module Rudy #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0.freeze unless defined? MAJOR
     MINOR = 2.freeze unless defined? MINOR
-    TINY  = 3.freeze unless defined? TINY
+    TINY  = 4.freeze unless defined? TINY
     def self.to_s
       [MAJOR, MINOR, TINY].join('.')
     end
@@ -81,19 +81,33 @@ def sh(command, chdir=false)
 end
 
 # TODO: Net::SSH
-def ssh(host, keypair, user, command, chdir=false, verbose=false)
-  cmd = "ssh -q -i #{keypair} #{user}@#{host} '"
-  cmd += "cd #{chdir} && " if chdir
-  cmd += " #{command}'"
+def ssh(host, keypair, user, command=false, chdir=false, verbose=false, printonly=false)
+  puts "CONNECTING TO #{host}..."
+  cmd = "ssh -q -i #{keypair} #{user}@#{host} "
+  command = "cd #{chdir} && #{command}" if chdir 
+  cmd += " '#{command}'" if command
   puts cmd if verbose
-  system(cmd)
+  printonly ? (puts cmd) : system(cmd)
 end
 
 
-def scp(host, keypair, user, local_path, remote_path, verbose=false)
-  cmd = "scp -i #{keypair} #{local_path} #{user}@#{host}:#{remote_path}"
+def scp(host, keypair, user, paths, to_path, to_local=false, verbose=false, printonly=false)
+  puts "CONNECTING TO #{host}..."
+  paths = [paths] unless paths.is_a?(Array)
+  from_paths = ""
+  if to_local
+    paths.each do |path|
+      from_paths << "#{user}@#{host}:#{path} "
+    end
+  else
+    to_path = "#{user}@#{host}:#{to_path}"
+    from_paths = paths.join(' ')
+  end
+  
+  cmd = "scp -i #{keypair} #{from_paths} #{to_path}"
+
   puts cmd if verbose
-  system(cmd)
+  printonly ? (puts cmd) : system(cmd)
 end
 
 

data/lib/rudy/command/base.rb

@@ -86,6 +86,13 @@ module Rudy
         #@s3 = Rudy::AWS::SimpleDB.new(@access_key, @secret_key)
       end
       
+      # Raises exceptions if the requested user does 
+      # not have a valid keypair configured. (See: EC2_KEYPAIR_*)
+      def check_keys
+        raise "No SSH key provided for #{keypairname}!" unless has_keypair?(keypairname)
+        raise "SSH key provided but cannot be found! (#{keypairpath})" unless File.exists?(keypairpath)
+      end  
+      
       def has_pem_keys?
         (@ec2_cert        && File.exists?(@ec2_cert) && 
          @ec2_private_key && File.exists?(@ec2_private_key))
@@ -185,26 +192,27 @@ module Rudy
       # Print a default header to the screen for every command.
       # +cmd+ is the name of the command current running. 
       def print_header(cmd=nil)
-        print "RUDY v#{Rudy::VERSION}"
-        print " -- #{@alias}" if @alias
-        puts
-        
-        criteria = []
-        [:zone, :environment, :role, :position].each do |n|
-          val = instance_variable_get("@#{n}")
-          criteria << "[#{n} = #{val}]"
-        end
-        puts criteria.join(" and ")
-        
+        title = "RUDY v#{Rudy::VERSION}"
+        title << " -- #{@alias}" if @alias
+        puts title, $/
+
         if (@environment == "prod") 
-          puts %q(
-=======================================================
+          puts %q(=======================================================
 =======================================================
 !!!!!!!!!   YOU ARE PLAYING WITH PRODUCTION   !!!!!!!!!
 =======================================================
 =======================================================
-          )
+
+)
+        end
+
+        criteria = []
+        [:zone, :environment, :role, :position].each do |n|
+          val = instance_variable_get("@#{n}")
+          criteria << "[#{n} = #{val}]"
         end
+        puts criteria.join(" and ")
+        puts 
         
       end
       

data/lib/rudy/command/environment.rb

@@ -13,20 +13,34 @@
 module Rudy
   module Command
     class Environment < Rudy::Command::Base
-
-      def connect
-        raise "No SSH key provided for #{keypairname}!" unless has_keypair?(keypairname)
-        raise "SSH key provided but cannot be found! (#{keypairpath})" unless File.exists?(keypairpath)
+      
+      # Returns a hash of info for the requested machine. If the requested machine
+      # is not running, it will raise an exception. 
+      def find_requested_machine
         machine_list = @ec2.instances.list(machine_group)
         machine = machine_list.values.first  # NOTE: Only one machine per group, for now...
-        
         raise "There's no machine running in #{machine_group}" unless machine
         raise "The primary machine in #{machine_group} is not in a running state" unless machine[:aws_state] == 'running'
-        cmd = "ssh -i #{keypairpath} #{user}@#{machine[:dns_name]}"
-        puts cmd
-        system(cmd) unless @print
+
+        machine
       end
       
+      def connect
+        check_keys
+        machine = find_requested_machine
+        ssh machine[:dns_name], keypairpath, user, false, false, false, @print
+      end
+      
+      # +paths+ an array of paths to copy. The last element is the "to" path. 
+      def copy(paths)
+        check_keys
+        machine = find_requested_machine
+        paths = paths.flatten
+        to_path = paths.pop
+        scp machine[:dns_name], keypairpath, user, paths, to_path, @remote, false, @print
+      end
+      
+      
       # Start EC2 instances to run the stage. 
       # Returns a hash in the same format as +instances+
       def build_stage

data/rudy.gemspec

@@ -1,6 +1,6 @@
 @spec = Gem::Specification.new do |s|
 	s.name = "rudy"
-	s.version = "0.2.3"
+	s.version = "0.2.4"
 	s.summary = "Rudy is a handy staging and deployment tool for Amazon EC2."
 	s.description = "Rudy is a handy staging and deployment tool for Amazon EC2."
 	s.author = "Delano Mandelbaum"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rudy
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-23 00:00:00 -05:00
+date: 2009-02-24 00:00:00 -05:00
 default_executable: 
 dependencies: []