solutious-rudy 0.7.4 → 0.7.5

data/CHANGES.txt

@@ -5,7 +5,12 @@ RUDY, CHANGES
 * TODO: Tests for zone and region support
 * TODO: Support for machine image attributes
 * TODO: Support for product codes
-* TODO: Tests for AWS HTTPS
+
+#### 0.7.5 (2009-05-??) ###############################
+
+* CHANGE: rudy-ec2 console now displays windows password automatically if keypair is supplied.
+* ADDED: register and destroy commands to rudy-ec2 images
+
 
 #### 0.7.4 (2009-05-10) ###############################
 

data/README.rdoc

@@ -105,6 +105,14 @@ I'm very open to contributions!
 * Rudy::AWS::SDB adapted from aws_sdb by Tim Dysinger (http://dysinger.net)
 
 
+== Related Projects
+
+* Pool Party -- http://www.poolpartyrb.com/
+* Rubber -- http://github.com/wr0ngway/rubber/wikis
+* Moonshine -- http://github.com/railsmachine/moonshine/tree
+* Boto -- http://code.google.com/p/boto/
+
+
 == License
 
 See: LICENSE.txt

data/Rudyfile

@@ -169,13 +169,13 @@ routines do
   
   anything do                        # $ rudy anything
     before :display_uptime           # Specify a dependency
-    script Rudy.sysinfo.user do      # This is Ruby, so any valid syntax
-      ls :l, Rudy.sysinfo.home       # can be used in the definitions. 
+    script :rudy do                  # This is Ruby, so any valid syntax
+      ls :l                          # can be used in the definitions. 
     end                              # See: SysInfo gem for more info.
   end
   
   display_uptime do                  # $ rudy display-uptime
-    script Rudy.sysinfo.user do      # NOTE: You can use 'dashes' on the
+    script :rudy do                  # NOTE: You can use 'dashes' on the
       uptime                         # command-line instead of underscores
     end
   end

data/bin/rudy

@@ -10,7 +10,7 @@
 
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib') # Put our local lib in first place
 $:.unshift File.join(File.dirname(__FILE__), '..', '..', 'drydock', 'lib') 
-#require 'rubygems'
+require 'rubygems'
 
 #$SAFE = 1   # require is unsafe in Ruby 1.9??
 
@@ -21,7 +21,7 @@ require 'rudy/cli'
 # Command-line interface for /bin/rudy
 class RudyCLI < Rudy::CLI::Base
   
-  debug :off
+  debug :on
   default :machines
   trawler :passthrough
   

data/bin/rudy-ec2

@@ -102,6 +102,7 @@ module RudyCLI_EC2
   usage "rudy-ec2 images -o 123456789012"
   usage "rudy-ec2 images -o amazon"
   usage "rudy-ec2 images -o self"
+  usage "rudy-ec2 images -R bucket/ami-name.manifest.xml"
   option :o, :owner, String, "Amazon Account Number or one of: amazon, self"
   option :l, :all, "Display all registered machine images (warning: slow)"
   #option :p, :private, "Private images only"
@@ -110,6 +111,7 @@ module RudyCLI_EC2
   option :u, :user, String, "Username to connect as (used for creating an image)"
   action :C, :create, "Create an image"
   #action :P, :prepare, "Prepare a running instance to be used as an image"
+  action :R, :register, "Register an image"
   action :D, :destroy, "Deregister an image (does not remove image files from S3)"
   argv :ami
   command :images => Rudy::CLI::AWS::EC2::Images

data/lib/rudy.rb

@@ -4,8 +4,8 @@ unless defined?(RUDY_HOME)
   RUDY_LIB = File.join(File.dirname(__FILE__), '..', 'lib')
 end
 
-#local_libs = %w{net-scp amazon-ec2 aws-s3 caesars drydock rye storable sysinfo annoy}
-#local_libs.each { |dir| $:.unshift File.join(RUDY_HOME, '..', dir, 'lib') }
+local_libs = %w{net-scp amazon-ec2 aws-s3 caesars drydock rye storable sysinfo annoy}
+local_libs.each { |dir| $:.unshift File.join(RUDY_HOME, '..', dir, 'lib') }
 
 require 'digest/md5'
 require 'stringio'

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

@@ -106,7 +106,7 @@ module Rudy::AWS
           :image_id => id
         }
         ret = @ec2.deregister_image(opts)
-        puts ret.to_yaml
+        return false unless ret && ret.is_a?(Hash)
         true
       end
       
@@ -117,8 +117,8 @@ module Rudy::AWS
           :image_location => path
         }
         ret = @ec2.register_image(opts)
-        puts ret.to_yaml
-        true
+        return nil unless ret && ret.is_a?(Hash)
+        ret['imageId']
       end
       
       #     imageOwnerId: "203338247012"

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

@@ -155,24 +155,24 @@ module AWS; module EC2;
       
     end
     
-    def deregister_valid?
+    def destroy_images_valid?
       unless @argv.ami && Rudy::Utils.is_id?(:image, @argv.ami)  
-        raise "You must supply an AMI ID (ami-XXXXXXX)" 
+        raise "Must supply an AMI ID (ami-XXXXXXX)" 
       end
+      @rimages = Rudy::AWS::EC2::Images.new(@@global.accesskey, @@global.secretkey, @@global.region)
     end
-    def deregister
-      puts "Deregistering #{@argv.ami}"
-      
-      execute_check(:medium)
-      
-      rimages = Rudy::AWS::EC2::Images.new(@@global.accesskey, @@global.secretkey, @@global.region)
-      
-      if rimages.deregister(ami)
-        puts "Done!"
-      else
-        puts "There was an unknown problem!"
+    def destroy_images
+     puts @rimages.deregister(@argv.ami) ? "Done" : "Unknown error"
+    end 
+    
+    def register_images_valid?
+      unless @argv.first
+        raise "Must supply a valid manifest path (bucket/ami-name.manifest.xml)"
       end
-      
+      @rimages = Rudy::AWS::EC2::Images.new(@@global.accesskey, @@global.secretkey, @@global.region)
+    end
+    def register_images
+      puts @rimages.register(@argv.first)
     end
 
 

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

@@ -144,11 +144,8 @@ module AWS; module EC2;
             encrtypted_text = ($1 || '').strip
             k = Rye::Key.from_file(@@global.pkey)
             pword = k.decrypt(encrtypted_text)
-            ret = Annoy.pose_question("Display password?\a ", /yes|y|ya|sure|you bet!/i, STDERR)
-            if ret
-              answer = "%s: %s" % ['password', pword] 
-              Annoy.timed_display(answer, STDERR, 10)
-            end
+            answer = "%s: %s" % ['password', pword] 
+            Annoy.timed_display(answer, STDERR, 10)
             puts
           else
             puts "Please supply a private key path to decode the administrator password"

data/lib/rudy/routines.rb

@@ -94,13 +94,11 @@ module Rudy
           end
         }
         
-        unless has_remote_task?(routine)
-          puts "[no remote tasks]"
-          return
-        end
-        
         # Execute the action (create, list, destroy, restart) & apply the block to each
+        machines = []
         rmach.send(machine_action) do |machine|
+          machines << machine
+          
           puts machine_separator(machine.name, machine.awsid) unless skip_header
           
           unless skip_check
@@ -152,6 +150,10 @@ module Rudy
             }
           end
           
+          unless has_remote_task?(routine)
+            puts "[no remote tasks]"
+            next
+          end
           
           enjoy_every_sandwich {
             if Rudy::Routines::UserHelper.adduser?(routine)       # adduser

data/lib/rudy/routines/startup.rb

@@ -10,16 +10,14 @@ module Rudy; module Routines;
     # * +each_mach+ is an optional block which is executed between 
     # disk creation and the after scripts. The will receives two 
     # arguments: instances of Rudy::Machine and Rye::Box.
+    # Returns an Array of Rudy::Machine objects
     def execute(&each_mach)
       routine_separator(:startup)
       unless @routine
         STDERR.puts "[this is a generic startup routine]"
         @routine = {}
       end
-      machines = []
-      generic_machine_runner(:create) do |machine,rbox|
-        machines << machine
-      end
+      machines = generic_machine_runner(:create) 
       machines
     end
 

data/rudy.gemspec

@@ -1,7 +1,7 @@
 @spec = Gem::Specification.new do |s|
 	s.name = "rudy"
   s.rubyforge_project = 'rudy'
-	s.version = "0.7.4"
+	s.version = "0.7.5"
 	s.summary = "Rudy: Not your grandparents' EC2 deployment tool."
 	s.description = s.summary
 	s.author = "Delano Mandelbaum"
@@ -14,11 +14,11 @@
   s.require_paths = %w[lib]
   s.rubygems_version = '1.1.1'
   
-  s.add_dependency 'drydock', '>= 0.6.2'
-  s.add_dependency 'caesars', '>= 0.6.4'
-  s.add_dependency 'rye', '>= 0.6.4'
+  s.add_dependency 'drydock', '>= 0.6.3'
+  s.add_dependency 'caesars', '>= 0.6.6'
+  s.add_dependency 'rye', '>= 0.6.5'
   s.add_dependency 'sysinfo', '>= 0.5.1'
-  s.add_dependency 'storable', '>= 0.5.1'
+  s.add_dependency 'storable', '>= 0.5.2'
   s.add_dependency 'annoy', '>= 0.5.0'
   
   s.add_dependency 'grit'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: solutious-rudy
 version: !ruby/object:Gem::Version 
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.6.2
+        version: 0.6.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: caesars
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.6.4
+        version: 0.6.6
     version: 
 - !ruby/object:Gem::Dependency 
   name: rye
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.6.4
+        version: 0.6.5
     version: 
 - !ruby/object:Gem::Dependency 
   name: sysinfo
@@ -60,7 +60,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.5.1
+        version: 0.5.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: annoy