rudy 0.2.2 → 0.2.3

data/bin/rudy

@@ -188,6 +188,8 @@ 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|
+  obj.print_header
+
   if obj.create
     puts "Make sure the machine is clean. I don't want archive no crud!"
     exit unless you_are_sure?
@@ -197,13 +199,13 @@ command :images => Rudy::Command::Images do |obj|
   end
 end
 
-command :release => Rudy::Command::Release do |obj| 
+command :stage => Rudy::Command::Stage do |obj| 
   obj.print_header
   
   raise "No SCM defined. Set RUDY_SVN_BASE or RUDY_GIT_BASE." unless obj.scm
   
-  #exit unless you_are_sure?
-  obj.create_release
+  exit unless you_are_sure?
+  obj.push_to_stage
   
 end
 

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  = 2.freeze unless defined? TINY
+    TINY  = 3.freeze unless defined? TINY
     def self.to_s
       [MAJOR, MINOR, TINY].join('.')
     end

data/lib/rudy/command/base.rb

@@ -11,6 +11,8 @@ module Rudy
       
       attr_accessor :access_key
       attr_accessor :secret_key
+      attr_accessor :accnt_num
+      
       attr_accessor :ec2_cert
       attr_accessor :ec2_private_key
       attr_accessor :keypairs
@@ -32,6 +34,7 @@ module Rudy
       def init
         @access_key = ENV['AWS_ACCESS_KEY'] unless @access_key
         @secret_key = ENV['AWS_SECRET_KEY'] unless @secret_key
+        @account_num = ENV['AWS_ACCOUNT_NUMBER'] unless @account_num
         
         @ec2_cert        = ENV['EC2_CERT'] unless @ec2_cert
         @ec2_private_key = ENV['EC2_PRIVATE_KEY'] unless @ec2_private_key

data/lib/rudy/command/images.rb

@@ -30,6 +30,8 @@ module Rudy
         
         puts "The new image will be based on #{machine_group}_01"
         
+        @account ||= @account_num
+        
         unless @account
           puts "Enter your 12 digit Amazon account number:"
           @account = gets.chomp

data/lib/rudy/command/{release.rb → stage.rb}

@@ -2,10 +2,10 @@
 
 module Rudy
   module Command
-    class Release < Rudy::Command::Base
+    class Stage < Rudy::Command::Base
       
       
-      def create_release
+      def push_to_stage
         
         if @user != "root"
           #puts "This command will be run as root"
@@ -21,7 +21,7 @@ module Rudy
         raise "Please start an instance in #{machine_group} before releasing! (rudy -e stage instances --start)" if list.empty?
         puts "Creating release from: #{Dir.pwd}"
         
-        tag = @scm.create_release 
+        tag = @scm.create_release_tag
         
         machine = list.values.first # NOTE: we're assuming there's only one machine
         

data/lib/rudy/scm/svn.rb

@@ -10,7 +10,7 @@ module Rudy
         @base_uri = uri
       end
       
-      def create_release
+      def create_release_tag
         raise "There are local changes. Please revert or check them in!" unless everything_checked_in?
         raise "Invalid base URI (#{@base_uri}). Check RUDY_SVN_BASE." unless valid_uri?(@base_uri)
         raise "You must run this command from SVN you want to release from!" unless svn_dir?(Dir.pwd)
@@ -18,7 +18,7 @@ module Rudy
         re = `svn info`.match /^URL:\s+(.+)$/
         release = re[1] if re
         
-        release_tag = "#{@base_uri}/#{generate_release_tag}"
+        release_tag = "#{@base_uri}/#{generate_release_tag_name}"
         
         puts "Creating tag: #{release_tag}"
         cmd = "svn copy -m 'Another Release by Rudy!' #{release} #{release_tag}"
@@ -28,7 +28,7 @@ module Rudy
         release_tag
       end
       
-      def generate_release_tag
+      def generate_release_tag_name
         now = Time.now
         mon = now.mon.to_s.rjust(2, '0')
         day = now.day.to_s.rjust(2, '0')

data/rudy.gemspec

@@ -1,6 +1,6 @@
 @spec = Gem::Specification.new do |s|
 	s.name = "rudy"
-	s.version = "0.2.2"
+	s.version = "0.2.3"
 	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"
@@ -30,7 +30,7 @@
   lib/rudy/command/images.rb
   lib/rudy/command/instances.rb
   lib/rudy/command/metadata.rb
-  lib/rudy/command/release.rb
+  lib/rudy/command/stage.rb
   lib/rudy/command/volumes.rb
   lib/rudy/metadata/disk.rb
   lib/rudy/metadata/environment.rb

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rudy
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -43,7 +43,7 @@ files:
 - lib/rudy/command/images.rb
 - lib/rudy/command/instances.rb
 - lib/rudy/command/metadata.rb
-- lib/rudy/command/release.rb
+- lib/rudy/command/stage.rb
 - lib/rudy/command/volumes.rb
 - lib/rudy/metadata/disk.rb
 - lib/rudy/metadata/environment.rb