rudy 0.7.3 → 0.7.4

data/bin/rudy-ec2

@@ -10,8 +10,6 @@
 # 
 
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib') # Put our local lib in first place
-$:.unshift File.join(File.dirname(__FILE__), '..', 'vendor', 'highline-1.5.1', 'lib')
-#%w{net-scp amazon-ec2 caesars rye}.each { |dir| $:.unshift File.join(File.dirname(__FILE__), '..', '..', dir, 'lib') }
 #require 'rubygems'
 
 require 'rudy'
@@ -63,13 +61,10 @@ module RudyCLI_EC2
   usage "rudy-ec2 download remote-source target"
   usage "NOTE: Use quotes when using a tilda or asterisk in remote paths ('~/')."
   usage "rudy-ec2 download '~/*' /tmp/"
-  option :r, :recursive, "Recursively copy entire directories"
-  option :p, :preserve, "Preserve atimes and ctimes."
-  option :d, :download, "Download FROM the remote machine to the local machine"
-  option :print, "Only print the SSH command, don't connect"
+  #option :r, :recursive, "Recursively copy entire directories"
+  #option :p, :preserve, "Preserve atimes and ctimes."
   option :g, :group, String, "A security group name"
   option :i, :awsid, String, "An instance ID"
-  option :u, :user, String, "Username"
   command :copy => Rudy::CLI::AWS::EC2::Candy 
   command_alias :copy, :ul
   command_alias :copy, :dl
@@ -114,8 +109,8 @@ module RudyCLI_EC2
   option :n, :name, String, "The name of the image file (to create)"
   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 :D, :destroy, "Deregister an image (does not remove image files from S3)"
+  #action :P, :prepare, "Prepare a running instance to be used as an image"
+  action :D, :destroy, "Deregister an image (does not remove image files from S3)"
   argv :ami
   command :images => Rudy::CLI::AWS::EC2::Images
   command_alias :images, :image
@@ -167,7 +162,7 @@ module RudyCLI_EC2
   argv :snapid
   command :snapshots => Rudy::CLI::AWS::EC2::Snapshots
   command_alias :snapshots, :snapshot
-  command_alias :snapshots, :t
+  command_alias :snapshots, :s
   
   about "Open an SSH connection"
   usage "rudy-ec2 ssh"

data/bin/rudy-s3

@@ -10,8 +10,6 @@
 # 
 
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib') # Put our local lib in first place
-$:.unshift File.join(File.dirname(__FILE__), '..', 'vendor', 'highline-1.5.1', 'lib')
-#%w{amazon-ec2 caesars rye}.each { |dir| $:.unshift File.join(File.dirname(__FILE__), '..', '..', dir, 'lib') }
 #require 'rubygems'
 
 require 'rudy'
@@ -27,7 +25,7 @@ module RudyCLI_S3
   
   about "Amazon S3 Buckets"
   usage "rudy-s3 buckets"
-  option :l, :list, "List bucket objects"
+  option :l, :location, String, "Specify a bucket location. One of: us, eu"
   action :C, :create, "Create a bucket"
   action :D, :destroy, "Destroy a bucket"
   argv :name

data/bin/rudy-sdb

@@ -10,8 +10,6 @@
 # 
 
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib') # Put our local lib in first place
-$:.unshift File.join(File.dirname(__FILE__), '..', 'vendor', 'highline-1.5.1', 'lib')
-#%w{amazon-ec2 caesars rye}.each { |dir| $:.unshift File.join(File.dirname(__FILE__), '..', '..', dir, 'lib') }
 #require 'rubygems'
 
 require 'rudy'

data/examples/README.md

@@ -0,0 +1,10 @@
+# Rudy Configuration Examples
+
+*NOTE: The examples are a work in progress*
+
+## Contributions
+
+I'm very open to contributions! Rudy supports all Linux-based platforms (with partial Solaris support) and software (rails, sinatra, MySQL, PostgreSQL, etc...) so it's possible to write examples for pretty much anything. If you're interested in writing new examples, I'll gladly accept them and include them here (with credit of course!). 
+
+
+

data/examples/debian-sinatra-passenger/commands.rb

@@ -0,0 +1,19 @@
+# ----------------------------------------------------------- COMMANDS --------
+# The commands block defines shell commands that can be used in routines. The
+# ones defined here are added to the default list defined by Rye::Cmd (Rudy 
+# executes all SSH commands via Rye). 
+#
+# Usage: 
+#
+# allow COMMAND-NAME
+# allow COMMAND-NAME, '/path/2/COMMAND'
+# allow COMMAND-NAME, '/path/2/COMMAND', 'default argument', 'another arg'
+#
+commands do
+  allow :apt_get, "apt-get", :y, :q
+  allow :gem_install, "/usr/bin/gem", "install", :n, '/usr/bin', :y, :V, "--no-rdoc", "--no-ri"
+  allow :gem_sources, "/usr/bin/gem", "sources"
+  allow :passenger_install_apache2, "passenger-install-apache2-module", '--auto'
+  allow :passenger_install_nginx, "passenger-install-nginx-module", '--auto', '--autodownload'
+  allow :apache2ctl
+end

data/examples/debian-sinatra-passenger/machines.rb

@@ -0,0 +1,32 @@
+
+# ---------------------------------------------------------  MACHINES  --------
+# The machines block describes the "physical" characteristics
+# of your environments. 
+machines do
+  
+  # We've defined an environment called "stage" with one role: "app". 
+  # The configuration inside the env block is available to all its 
+  # roles. The configuration inside the role blocks is available only
+  # to machines in that specific role. 
+  env :dev, :stage, :prod do
+    ami "ami-e348af8a"   # Debian 5.0 32-bit, Alestic
+    size 'm1.small'
+    
+    role :app do
+      # You can define disks for the stage-app machines. Rudy uses 
+      # this configuration when it executes a routine (see below).
+      disks do
+        path "/rudy/disk1" do
+          size 10
+          device "/dev/sdr"
+          fstype 'ext3'
+        end
+      end
+    
+    end
+
+  end  
+  
+end
+
+

data/examples/debian-sinatra-passenger/routines.rb

@@ -0,0 +1,30 @@
+
+routines do
+  
+  sysupdate do
+    script :root do                  
+      apt_get "update"               
+      apt_get "install", "build-essential", "git-core"
+      apt_get "install", "sqlite3", "libsqlite3-dev"
+      apt_get "install", "ruby1.8-dev", "rubygems"
+      apt_get "install", "nginx"
+      apt_get "install", "apache2-mpm-prefork", "apache2-prefork-dev", "libapr1-dev"
+      apt_get "install", "libfcgi-dev", "libfcgi-ruby1.8"
+      gem_sources :a, "http://gems.github.com"
+    end
+  end
+  
+  installdeps do
+    script :root do
+      gem_install "test-spec", "rspec", "camping", "fcgi", "memcache-client"
+      gem_install "rake", "passenger"
+      passenger_install_apache2
+      passenger_install_nginx
+      gem_install "rack", :v, "0.9.1"   # 0.9.1 required by sinatra
+      gem_install "sinatra"
+    end
+  end
+  
+  
+  
+end

data/examples/debian-sinatra-thin/commands.rb

@@ -0,0 +1,17 @@
+# ----------------------------------------------------------- COMMANDS --------
+# The commands block defines shell commands that can be used in routines. The
+# ones defined here are added to the default list defined by Rye::Cmd (Rudy 
+# executes all SSH commands via Rye). 
+#
+# Usage: 
+#
+# allow COMMAND-NAME
+# allow COMMAND-NAME, '/path/2/COMMAND'
+# allow COMMAND-NAME, '/path/2/COMMAND', 'default argument', 'another arg'
+#
+commands do
+  allow :apt_get, "apt-get", :y, :q
+  allow :gem_install, "/usr/bin/gem", "install", :n, '/usr/bin', :y, :V, "--no-rdoc", "--no-ri"
+  allow :gem_sources, "/usr/bin/gem", "sources"
+  allow :thin, "/usr/local/bin/thin", :d, :R, './config.ru', :l, './thin.log', :P, './thin.pid'
+end

data/examples/debian-sinatra-thin/machines.rb

@@ -0,0 +1,35 @@
+# THIS EXAMPLE IS INCOMPLETE -- 2009-05-03
+
+# ---------------------------------------------------------  MACHINES  --------
+# The machines block describes the "physical" characteristics
+# of your environments. 
+machines do
+  
+  # We've defined an environment called "stage" with one role: "app". 
+  # The configuration inside the env block is available to all its 
+  # roles. The configuration inside the role blocks is available only
+  # to machines in that specific role. 
+  env :dev, :stage, :prod do
+    ami "ami-e348af8a"   # Debian 5.0 32-bit, Alestic
+    size 'm1.small'
+    
+    role :app do
+      #positions 2
+    
+      # You can define disks for the stage-app machines. Rudy uses 
+      # this configuration when it executes a routine (see below).
+      disks do
+        path "/rudy/disk1" do
+          size 10
+          device "/dev/sdr"
+          fstype 'ext2'
+        end
+      end
+    
+    end
+
+  end  
+  
+end
+
+

data/examples/debian-sinatra-thin/routines.rb

@@ -0,0 +1,72 @@
+# THIS EXAMPLE IS INCOMPLETE -- 2009-05-03
+
+# Rudy -- debian-sinatra-thin
+#
+# Notes:
+# * Change :rudy to the name of your user remote deployment user
+# 
+sinatra_home = "/rudy/disk1/sinatra"
+routines do
+  
+  sysupdate do
+    script :root do                  
+      apt_get "update"               
+      apt_get "install", "build-essential", "git-core"
+      apt_get "install", "sqlite3", "libsqlite3-dev"
+      apt_get "install", "ruby1.8-dev", "rubygems"
+      apt_get "install", "apache2-prefork-dev", "libapr1-dev"
+      apt_get "install", "libfcgi-dev", "libfcgi-ruby1.8"
+      gem_sources :a, "http://gems.github.com"
+    end
+  end
+  
+  installdeps do
+    script :root do
+      gem_install "test-spec", "rspec", "camping", "fcgi", "memcache-client"
+      gem_install "mongrel"
+      gem_install 'ruby-openid', :v, "2.0.4" # thin requires 2.0.x
+      gem_install "rack", :v, "0.9.1"
+      gem_install "macournoyer-thin"         # need 1.1.0 which works with rack 0.9.1
+      gem_install "sinatra"
+    end
+  end
+  
+  environment :dev, :stage do
+
+    startup do      
+      adduser :rudy
+      authorize :rudy  
+      disks do
+        create "/rudy/disk1"
+      end
+    end
+    shutdown do
+      disks do
+        destroy "/rudy/disk1"   
+      end
+    end
+    
+    restart do
+      after :rudy do
+        thin :c, sinatra_home, "restart"
+      end
+    end
+    start do
+      after :rudy do
+        thin :c, sinatra_home, "start"
+      end
+    end
+    stop do
+      after :rudy do
+        thin :c, sinatra_home, "stop"
+      end
+    end
+
+    
+  end
+  
+end
+
+
+
+

data/lib/rudy.rb

@@ -4,6 +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') }
 
 require 'digest/md5'
 require 'stringio'
@@ -14,28 +16,19 @@ require 'logger'
 require 'socket'
 require 'timeout'
 require 'tempfile'
-
+require 'rudy/mixins'
 require 'storable'
-require 'console'
 require 'sysinfo'
 require 'annoy'
-
 require 'rye'
 
-require 'net/ssh'
-require 'net/scp'
-require 'net/ssh/multi'
-require 'net/ssh/gateway'
-
-require 'rudy/mixins/hash'
 
 
 # = Rudy
 #
-# == About
 #
 # Rudy is a development and deployment tool for the Amazon Elastic Compute Cloud
-# (EC2). See README.rdoc for more information. 
+# (EC2). <a href="wiki.github.com/solutious/rudy/getting-started">Getting Started</a> today!
 # 
 # 
 module Rudy
@@ -45,7 +38,7 @@ module Rudy
     unless defined?(MAJOR)
       MAJOR = 0.freeze
       MINOR = 7.freeze
-      TINY  = 3.freeze
+      TINY  = 4.freeze
     end
     def self.to_s; [MAJOR, MINOR, TINY].join('.'); end
     def self.to_f; self.to_s.to_f; end
@@ -71,13 +64,13 @@ module Rudy
     DEFAULT_EC2_HOST = "ec2.amazonaws.com"
     DEFAULT_EC2_PORT = 443
     
-    MAX_INSTANCES = 3.freeze
+    MAX_INSTANCES = 5.freeze
     
     SUPPORTED_SCM_NAMES = [:svn, :git].freeze
   
     ID_MAP = {
-      :instance => 'i',
       :disk => 'disk',
+      :instance => 'i',
       :backup => 'back',
       :machine => 'm',
       :volume => 'vol',
@@ -96,7 +89,7 @@ module Rudy
     
     @@quiet = false
     @@debug = false
-    @@sysinfo = SystemInfo.new.freeze
+    @@sysinfo = SysInfo.new.freeze
     
   end
   
@@ -164,8 +157,6 @@ require 'rudy/config'     # of
 require 'rudy/huxtable'   # requires
 require 'rudy/aws'        # is
 require 'rudy/metadata'   # important
-
-require 'rudy/disks'
 require 'rudy/machines'
 require 'rudy/routines'
 require 'rudy/scm'

data/lib/rudy/aws.rb

@@ -1,7 +1,6 @@
 
 
-require 'EC2'       # A
-require 'aws_sdb'   # motley
+require 'EC2'       # Motley
 require 'aws/s3'    # crew
 
 module Rudy

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

@@ -71,7 +71,6 @@ module Rudy::AWS
         address = address.ipaddress if address.is_a?(Rudy::AWS::EC2::Address)
         instance = instance.awsid if instance.is_a?(Rudy::AWS::EC2::Instance)
         raise UnknownAddress unless exists?(address)
-        p address
         raise AddressNotAssociated unless associated?(address)
         
         opts ={

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

@@ -21,6 +21,17 @@ module Rudy::AWS
         @@sformat % [liner_note,  @volid, @status]
       end
       
+      def inspect
+        lines = []
+        lines << liner_note
+        field_names.each do |key|
+          next unless self.respond_to?(key)
+          val = self.send(key)
+          lines << sprintf(" %22s: %s", key, (val.is_a?(Array) ? val.join(', ') : val))
+        end
+        lines.join($/)
+      end
+      
       def completed?
         self.status && self.status == 'completed'
       end

data/lib/rudy/aws/s3.rb

@@ -28,8 +28,10 @@ module Rudy::AWS
       ::AWS::S3::Service.buckets
     end
     
-    def create_bucket(name)
-      ::AWS::S3::Bucket.create(name)
+    def create_bucket(name, location=nil)
+      opts = {}
+      opts[:location] = location.to_s.upcase if location
+      ::AWS::S3::Bucket.create(name, opts)
     end
     
     def destroy_bucket(name)
@@ -37,7 +39,8 @@ module Rudy::AWS
     end
     
     def find_bucket(name)
-      ::AWS::S3::Bucket.delete(name)
+      blist = ::AWS::S3::Service.buckets
+      blist.select { |bobj| bobj.name == name }.first
     end
     
     def list_bucket_objects(name)

data/lib/rudy/cli.rb

@@ -1,6 +1,7 @@
 
 require 'drydock'
 
+
 module Rudy
     
   # = CLI
@@ -26,7 +27,10 @@ module Rudy
     protected
       def init
         
-        #Caesars.enable_debug
+        if Drydock.debug?
+          #Caesars.enable_debug
+          Rudy.enable_debug
+        end
         
         # The CLI wants output!
         Rudy::Huxtable.update_logger STDOUT
@@ -43,6 +47,12 @@ module Rudy
           STDERR.puts ex.backtrace if @@global.verbose > 0
           exit 81
         end
+        
+        # And then update global again b/c some values come from @@config
+        Rudy::Huxtable.update_global
+        
+        @@global.nocolor ? String.disable_color : String.enable_color
+        @@global.yes ? Annoy.enable_skip : Annoy.disable_skip
       
         unless @@global.accesskey && @@global.secretkey
           STDERR.puts "No AWS credentials. Check your configs!"
@@ -86,7 +96,7 @@ module Rudy
         unless @@global.quiet
           if @@global.environment == "prod"
             msg = "YOU ARE PLAYING WITH PRODUCTION"
-            puts Rudy::Utils.banner(msg, :huge, :red), $/
+            puts Rudy::Utils.banner(msg, :normal), $/
           end
           puts Rudy::Utils.banner("THIS IS EC2"), $/ if Rudy.in_situ?
         end