rudy 0.3.2 → 0.4.0

data/lib/rudy/scm/svn.rb

@@ -6,41 +6,52 @@ module Rudy
     class SVN
       attr_accessor :base_uri
       
-      def initialize(uri)
-        @base_uri = uri
+      def initialize(args={:base => ''})
+        @base_uri = args[:base]
       end
       
-      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)
-        
-        re = `svn info`.match /^URL:\s+(.+)$/
-        release = re[1] if re
-        
-        release_tag = "#{@base_uri}/#{generate_release_tag_name}"
-        
-        puts "Creating tag: #{release_tag}"
-        cmd = "svn copy -m 'Another Release by Rudy!' #{release} #{release_tag}"
+      def create_release(username=nil, msg=nil)
+        local_uri, local_revision = local_info
+        rtag = generate_release_tag_name(username)
+        release_uri = "#{@base_uri}/#{rtag}"
+        msg ||= 'Another Release by Rudy!'
+        msg.tr!("'", "\\'")
+        cmd = "svn copy -m '#{msg}' #{local_uri} #{release_uri}"
         
         `#{cmd} 2>&1`
         
-        release_tag
+        release_uri
       end
       
-      def generate_release_tag_name
+      def switch_working_copy(tag)
+        raise "Invalid release tag (#{tag})." unless valid_uri?(tag)
+        `svn switch #{tag}`
+      end
+      
+      # rel-2009-03-05-user-rev
+      def generate_release_tag_name(username=nil)
         now = Time.now
         mon = now.mon.to_s.rjust(2, '0')
         day = now.day.to_s.rjust(2, '0')
-        rev = "r01"
-        criteria = ['rudy', now.year, mon, day, rev]
+        rev = "01"
+        criteria = ['rel', now.year, mon, day, rev]
+        criteria.insert(-2, username) if username
         tag = criteria.join(RUDY_DELIM)
-        # Keep incrementing the revision number until we find the next one. 
-        tag.succ! while (valid_uri?("#{@base_uri}/#{tag}")) 
+        # Keep incrementing the revision number until we find the next one.
+        tag.succ! while (valid_uri?("#{@base_uri}/#{tag}"))
         tag
       end
       
-      def svn_dir?(path)
+      def local_info
+        ret = `svn info 2>&1`
+        # URL: http://some/uri/path
+        # Repository Root: http://some/uri
+        # Repository UUID: c5abe49d-53e4-4ea3-9314-89e1e25aa7e1
+        # Revision: 921
+        ret.scan(/URL: (http:.+?)\s*\n.+Revision: (\d+)/m).flatten
+      end
+      
+      def working_copy?(path)
         (File.exists?(File.join(path, '.svn')))
       end
       

data/lib/rudy/utils.rb

@@ -3,7 +3,6 @@ require 'socket'
 require 'open-uri'
 require 'date'
 
-require 'socket'
 require 'timeout'
 
 module Rudy
@@ -49,9 +48,9 @@ module Rudy
     end
     
     
-    def service_available?(host, port)
+    def service_available?(host, port, wait=3)
       begin
-        status = Timeout::timeout(3) do
+        status = Timeout::timeout(wait) do
           socket = Socket.new( AF_INET, SOCK_STREAM, 0 )
           sockaddr = Socket.pack_sockaddr_in( port, host )
           socket.connect( sockaddr )

data/lib/storable.rb

@@ -1,6 +1,7 @@
 #--
 # TODO: Handle nested hashes and arrays. 
 # TODO: to_xml, see: http://codeforpeople.com/lib/ruby/xx/xx-2.0.0/README
+# TODO: Rename to Stuffany
 #++
 
 require 'yaml'
@@ -26,7 +27,10 @@ class Storable
     @format = v
   end
   
+  # TODO: from_args([HASH or ordered params])
+  
   def init
+    # NOTE: I think this can be removed
     self.class.send(:class_variable_set, :@@field_names, []) unless class_variable_defined?(:@@field_names)
     self.class.send(:class_variable_set, :@@field_types, []) unless class_variable_defined?(:@@field_types)
   end

data/lib/tryouts.rb

@@ -0,0 +1,40 @@
+
+require 'ostruct'
+
+module Tryouts
+  
+  def before(&b)
+    b.call
+  end
+  def after(&b)
+    at_exit &b
+  end
+  
+  
+  #    tryout :name do
+  #       ...
+  #    end
+  def tryout(name, &b)
+    puts "Running#{@poop}: #{name}"
+    begin
+      b.call
+      puts $/*2
+      sleep 1
+    rescue Interrupt
+    end
+  end
+  
+  # Ignore everything
+  def xtryout(name, &b)
+  end
+  
+  # Is this wacky syntax useful for anything?
+  #    t2 :set .
+  #       run = "poop"
+  def t2(*args)
+    OpenStruct.new
+  end
+  
+end
+
+include Tryouts

data/rudy.gemspec

@@ -1,58 +1,74 @@
 @spec = Gem::Specification.new do |s|
 	s.name = "rudy"
-	s.version = "0.3.2"
-	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.version = "0.4.0"
+	s.summary = "Your friend in staging and deploying with EC2."
+	s.description = s.summary
 	s.author = "Delano Mandelbaum"
 	s.email = "delano@solutious.com"
 	s.homepage = "http://github.com/solutious/rudy"
  
   # = MANIFEST =
-  # find {bin,lib,support,tryouts} -type f | grep -v git
+  # git ls-files
   s.files = %w(
   CHANGES.txt
   LICENSE.txt
   README.rdoc
   Rakefile
   bin/rudy
+  bin/rudy-ec2
   lib/aws_sdb.rb
   lib/aws_sdb/error.rb
   lib/aws_sdb/service.rb
   lib/console.rb
-  lib/drydock.rb
   lib/rudy.rb
   lib/rudy/aws.rb
   lib/rudy/aws/ec2.rb
   lib/rudy/aws/s3.rb
   lib/rudy/aws/simpledb.rb
   lib/rudy/command/addresses.rb
+  lib/rudy/command/backups.rb
   lib/rudy/command/base.rb
+  lib/rudy/command/config.rb
+  lib/rudy/command/deploy.rb
   lib/rudy/command/disks.rb
   lib/rudy/command/environment.rb
   lib/rudy/command/groups.rb
   lib/rudy/command/images.rb
   lib/rudy/command/instances.rb
+  lib/rudy/command/machines.rb
   lib/rudy/command/metadata.rb
-  lib/rudy/command/stage.rb
+  lib/rudy/command/release.rb
   lib/rudy/command/volumes.rb
+  lib/rudy/config.rb
   lib/rudy/metadata.rb
   lib/rudy/metadata/backup.rb
-  lib/rudy/metadata/config.rb
   lib/rudy/metadata/disk.rb
-  lib/rudy/metadata/environment.rb
   lib/rudy/scm/svn.rb
   lib/rudy/utils.rb
   lib/storable.rb
+  lib/tryouts.rb
   rudy.gemspec
+  support/mailtest
   support/rudy-ec2-startup
+  tryouts/console_tryout.rb
   )
   s.executables = %w[rudy]
   
   s.extra_rdoc_files = %w[README.rdoc LICENSE.txt]
   s.has_rdoc = true
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Rudy: Your friend in staging and deploying with EC2", "--main", "README.rdoc"]
+  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Rudy: #{s.summary}", "--main", "README.rdoc"]
   s.require_paths = %w[lib]
   s.rubygems_version = '1.1.1'
+
   
+  s.add_dependency 'drydock'
+  s.add_dependency 'caesars'
+  s.add_dependency 'net-ssh'
+  s.add_dependency 'net-scp'
+  s.add_dependency 'net-ssh-gateway'
+  s.add_dependency 'net-ssh-multi'
+  s.add_dependency 'highline'
+  
+    
   s.rubyforge_project = 'rudy'
 end

data/support/mailtest

@@ -0,0 +1,40 @@
+#!/usr/bin/env ruby 
+
+# A simple SMTP mailer. 
+# You can use this to test mail configuration between machines. 
+
+# Usage: mailtest hostname email 
+
+require 'net/smtp'
+
+unless ARGV.size == 2
+  puts "Usage: mailtest HOSTNAME EMAIL"
+  exit 1
+end
+
+HOSTNAME = ARGV[0]
+EMAIL = ARGV[1]
+
+def send_email(from, from_alias, to, to_alias, subject, message)
+  msg = <<END_OF_MESSAGE
+From: #{from_alias} <#{from}>
+To: #{to_alias} <#{to}>
+Subject: #{subject}
+
+#{message}
+END_OF_MESSAGE
+
+  Net::SMTP.start(HOSTNAME) do |smtp|
+    smtp.send_message msg, from, to
+  end
+end
+
+begin
+  spice = sprintf("%.3f", rand)
+  send_email(HOSTNAME, "Rudy", EMAIL, "Rudy's Friend", "Mail config (#{spice})", "You received this email via #{HOSTNAME}")
+rescue => ex
+  puts "ERROR: #{ex.message}"
+  exit 1
+end
+
+puts "Success!"

data/support/rudy-ec2-startup

@@ -33,7 +33,8 @@ METADATA = 'http://169.254.169.254/2008-02-01/meta-data'
 
 METADATAPARAMS = ['instance-id', 'instance-type']
 
-RUDY_CONFIG_FILE='.rudy'
+RUDY_CONFIG_DIR=File.join('.rudy')
+RUDY_CONFIG_FILE=File.join('config')
 
 module Rudy
   module EC2Startup
@@ -68,7 +69,11 @@ module Rudy
         
         config = YAML::load(config_yaml)
         config ||= {}
-  
+        
+        # Print to STDOUT and NOT to the log. 
+        # We don't want sensitive config values available in the log
+        puts "CONFIG: " << config_yaml
+        
         zone = config[:zone] ? config[:zone].downcase : "zone"
         environment = config[:environment] ? config[:environment].downcase : "env"
         role = config[:role] ? config[:role].downcase : "role"
@@ -85,9 +90,22 @@ module Rudy
           # TODO: How to we get the path to any user's home directory? 
           # (when we're not running as that user.) 
           config[:userdata].each_pair do |n,hash|
-            fileparts = (n === "root") ? ['/root'] : ['/home', n]
-            fileparts << RUDY_CONFIG_FILE
-            filepath = File.join(fileparts)
+            fileparts = (n == :root) ? ['/root'] : [user_home_dir(n)]
+            fileparts << RUDY_CONFIG_DIR
+            dirpath = File.join(fileparts)
+            filepath = File.join(dirpath, RUDY_CONFIG_FILE)
+            
+            # Backwards compatability
+            if !File.directory?(dirpath)
+              log "Deleting the deprecated #{dirpath} config"
+              File.unlink(dirpath) 
+            end
+            
+            unless File.exists?(dirpath)
+              log "Creating #{dirpath}"
+              Dir.mkdir(dirpath, 0700)
+            end
+            
             log "Writing to #{filepath}"
             user_data = {
               :userdata => hash
@@ -97,15 +115,18 @@ module Rudy
         end
         
         if config[:hosts] && config[:hosts].is_a?(Hash)
-          log "Updating /etc/hosts..."
-          config[:hosts].each_pair do |name, address|
-            # Respect existing entries
-            next if read_file('/etc/hosts') =~ /#{name}/
+          unless read_file('/etc/hosts') =~ /----- RUDY SAYS -----/
+            log "Updating /etc/hosts..."
+            write_to_file("/etc/hosts", "\n# ----- RUDY SAYS -----\n", :append)
+            config[:hosts].each_pair do |name, address|
+              # Respect existing entries
+              next if read_file('/etc/hosts') =~ /#{name}/
       
-            ip_address = (address !~ /^\d.+/) ? Resolv.getaddress(address) : address
+              ip_address = (address !~ /^\d.+/) ? Resolv.getaddress(address) : address
       
-            log "  ---> #{name}: #{ip_address}"
-            write_to_file("/etc/hosts", "\n#{ip_address}\t#{name}\n")
+              log "  ---> #{name}: #{ip_address}"
+              write_to_file("/etc/hosts", "\n#{ip_address}\t#{name}\n", :append)
+            end
           end
         end
         
@@ -143,7 +164,8 @@ module Rudy
       t_out = t.strftime("%H:%M:%S%p (%m/%d/%Y)")
     end
 
-    def write_to_file (filename, s, type='a')
+    def write_to_file(filename, s, type)
+      type = (type == :append) ? 'a' : 'w'
       f = File.open(filename,type)
       f.puts s
       f.close
@@ -161,10 +183,14 @@ module Rudy
       end
       contents
     end
-
+    
+    def user_home_dir(user)
+      (`su #{user} -c "echo \\$HOME"` || '').chomp
+    end
+    
     def log(s)
       msg = "#{get_formatted_time}: #{s}"
-      write_to_file(LOGFILE, msg)
+      write_to_file(LOGFILE, msg, :append)
       puts msg
     end
     

data/tryouts/console_tryout.rb

@@ -0,0 +1,91 @@
+RUDY_HOME = File.join(File.dirname(__FILE__), '..')
+RUDY_LIB = File.join(RUDY_HOME, 'lib')
+$:.unshift RUDY_LIB # Put our local lib in first place
+
+require 'yaml'
+require 'date'
+
+require 'tryouts'
+require 'console'
+
+raise "Sorry Ruby 1.9 only!" unless RUBY_VERSION =~ /1.9/
+
+before do
+  @title = "RUDY v0.3"
+  @now_utc = Time.now.utc.strftime("%Y-%m-%d %H:%M:%S")
+  @props = {
+    :zone => "us-east-1b", 
+    :environment => "stage",
+    :role =>"app", 
+    :position => "01"
+  }
+  # PROMPT_COMMAND
+end
+
+after do 
+  #Console.clear
+end
+
+
+tryout :positioned do
+  Console.print_at(@title, {:y => Cursor.y, :x => Cursor.x })
+  sleep 1
+  Console.print_at(@now_utc, {:y => Cursor.y, :x => Console.width, :minus => true})  
+  puts
+  sleep 1
+  Console.print_left(@title)
+  sleep 1
+  Console.print_right(@now_utc)
+  puts
+  sleep 1
+  Console.print_spaced('1'*25, 2, 3, '4'*30, 5, 6)
+  puts
+  sleep 1
+  Console.print_center(Window.bar(50))
+  
+end
+
+tryout :u_r_d_l do
+  puts
+  Cursor.up && print('.') 
+  sleep 1
+  Cursor.right && print('.')
+  sleep 1
+  Cursor.left && Cursor.down && print('.')
+  sleep 1
+  Cursor.left(3) && print('.')
+end
+
+tryout :update_inplace do
+  [(0..11).to_a, (90..110).to_a].flatten.each do |i|
+    Console.print_at(i, {:y => Cursor.y, :x => 4 })
+    sleep 0.05
+  end
+  
+end
+
+
+tryout :danger! do
+  win = Window.new(:width => 100, :height => 100)
+  
+  # DEBUGGING: There is a threading bug where the values of props and the
+  # string to print are being shared. Make Console and class and give an instance
+  # to each thread. However, that could fuck up shit like Cursor.position. 
+  
+  
+  win.static(:right, 0.2, {:y => 0}) do 
+    Time.now.utc.strftime("%Y-%m-%d %H:%M:%S").colour(:blue, :white, :underline)
+  end
+  win.static(:left, 0.2) do 
+    rand
+  end
+  
+  win.join_threads
+  
+  puts $/, "Done!"
+  
+end
+
+
+  
+