rudy 0.6.8 → 0.7.0

data/lib/rudy/scm/svn.rb

@@ -12,7 +12,7 @@ module Rudy
       
       def create_release(username=nil, msg=nil)
         local_uri, local_revision = local_info
-        rtag = generate_release_tag_name(username)
+        rtag = find_next_rtag(username)
         release_uri = "#{@base_uri}/#{rtag}"
         msg ||= 'Another Release by Rudy!'
         msg.tr!("'", "\\'")
@@ -24,12 +24,12 @@ module Rudy
       end
       
       def switch_working_copy(tag)
-        raise "Invalid release tag (#{tag})." unless valid_uri?(tag)
+        raise "Invalid release tag (#{tag})." unless valid_rtag?(tag)
         `svn switch #{tag}`
       end
       
       # rel-2009-03-05-user-rev
-      def generate_release_tag_name(username=nil)
+      def find_next_rtag(username=nil)
         now = Time.now
         mon = now.mon.to_s.rjust(2, '0')
         day = now.day.to_s.rjust(2, '0')
@@ -38,7 +38,7 @@ module Rudy
         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}"))
+        tag.succ! while (valid_rtag?("#{@base_uri}/#{tag}"))
         tag
       end
       
@@ -55,12 +55,13 @@ module Rudy
         (File.exists?(File.join(path, '.svn')))
       end
       
-      def valid_uri?(uri)
+      def valid_rtag?(uri)
         ret = `svn info #{uri} 2>&1` || '' # Valid SVN URIs will return some info
         (ret =~ /Repository UUID/) ? true : false
       end
       
-      def everything_checked_in?
+      # Are all local changes committed?
+      def clean_working_copy?
         `svn diff . 2>&1` == '' # svn diff should return nothing
       end
     end

data/lib/rudy/utils.rb

@@ -70,7 +70,7 @@ module Rudy
     # * +duration+ seconds to wait between tries (default: 2).
     # * +max+ maximum time to wait (default: 120). Throws an exception when exceeded.
     # * +logger+ IO object to print +dot+ to.
-    # * +msg+ the message to print on success
+    # * +msg+ the message to print before executing the block. 
     # * +bells+ number of terminal bells to ring. Set to nil or false to keep the waiter silent
     #
     # The +check+ block must return false while waiting. Once it returns true
@@ -82,6 +82,10 @@ module Rudy
       max = duration*2 if max < duration
       dot = '.'
       begin
+        if msg && logger
+          logger.print msg 
+          logger.flush
+        end
         Timeout::timeout(max) do
           while !check.call
             sleep duration
@@ -93,7 +97,12 @@ module Rudy
         retry if Annoy.pose_question(" Keep waiting?\a ", /yes|y|ya|sure|you bet!/i, logger)
         return false
       end
-      logger.puts msg if msg
+      
+      if msg && logger
+        logger.puts " done"
+        logger.flush
+      end
+      
       Rudy::Utils.bell(bells, logger)
       true
     end
@@ -274,35 +283,8 @@ module Rudy
     
     ######### Everything below here is TO BE REMOVED. 
     
-    #
-    #
-    # Run a shell command (TO BE REMOVED)
-    def sh(command, chdir=false, verbose=false)
-      prevdir = Dir.pwd
-      Dir.chdir chdir if chdir
-      puts command if verbose
-      system(command)
-      Dir.chdir prevdir if chdir
-    end
-
-    #
-    # Run an SSH command  (TO BE REMOVED)
-    def ssh_command(host, keypair, user, command=false, printonly=false, verbose=false)
-      #puts "CONNECTING TO #{host}..."
-      cmd = "ssh -i #{keypair} #{user}@#{host} "
-      cmd += " '#{command}'" if command
-      puts cmd if verbose
-      return cmd if printonly
-      # backticks returns STDOUT
-      # exec replaces current process (it's just like running ssh)
-      # -- UPDATE -- Some problem with exec. "Operation not supported"
-      # using system (http://www.mail-archive.com/mongrel-users@rubyforge.org/msg02018.html)
-      (command) ? `#{cmd}` : Kernel.system(cmd)
-    end
-
-    
     # (TO BE REMOVED)
-    # TODO: This is old and insecure. 
+    # TODO: This is old and nasty.
     def scp_command(host, keypair, user, paths, to_path, to_local=false, verbose=false, printonly=false)
 
       paths = [paths] unless paths.is_a?(Array)

data/lib/storable.rb

@@ -16,7 +16,7 @@ class Storable
   unless defined?(SUPPORTED_FORMATS) # We can assume all are defined
     VERSION = 5
     NICE_TIME_FORMAT  = "%Y-%m-%d@%H:%M:%S".freeze 
-    SUPPORTED_FORMATS = %w{tsv csv yaml json s string}.freeze 
+    SUPPORTED_FORMATS = [:tsv, :csv, :yaml, :json, :s, :string].freeze 
   end
   
   # This value will be used as a default unless provided on-the-fly.
@@ -25,6 +25,7 @@ class Storable
   
   # See SUPPORTED_FORMATS for available values
   def format=(v)
+    v &&= v.to_sym
     raise "Unsupported format: #{v}" unless SUPPORTED_FORMATS.member?(v)
     @format = v
   end
@@ -84,6 +85,7 @@ class Storable
 
   # Dump the object data to the given format. 
   def dump(format=nil, with_titles=false)
+    format &&= format.to_sym
     format ||= 's' # as in, to_s
     raise "Format not defined (#{format})" unless SUPPORTED_FORMATS.member?(format)
     send("to_#{format}", with_titles) 
@@ -106,6 +108,7 @@ class Storable
   def to_file(file_path=nil, with_titles=true)
     raise "Cannot store to nil path" if file_path.nil?
     format = File.extname(file_path).tr('.', '')
+    format &&= format.to_sym
     format ||= @format
     Storable.write_file(file_path, dump(format, with_titles))
   end

data/lib/sysinfo.rb

@@ -265,6 +265,16 @@ class SystemInfo < Storable
     end
   end
   
+  def shell
+    if @os == :unix
+      (ENV['SHELL'] || 'bash').to_sym
+    elsif @os == :win32
+      :dos
+    else
+      raise "paths not implemented for: #{@os}"
+    end
+  end
+  
   # Print friendly system information. 
   def to_s
     sprintf("Hostname: %s#{$/}IP Address: %s#{$/}System: %s#{$/}Uptime: %.2f (hours)#{$/}Ruby: #{ruby.join('.')}", 

data/rudy.gemspec

@@ -1,8 +1,8 @@
 @spec = Gem::Specification.new do |s|
 	s.name = "rudy"
   s.rubyforge_project = 'rudy'
-	s.version = "0.6.8"
-	s.summary = "Rudy: Not your grandparent's deployment tool."
+	s.version = "0.7.0"
+	s.summary = "Rudy: Not your grandparents' EC2 deployment tool."
 	s.description = s.summary
 	s.author = "Delano Mandelbaum"
 	s.email = "delano@solutious.com"
@@ -14,11 +14,13 @@
   s.require_paths = %w[lib]
   s.rubygems_version = '1.1.1'
   
-  s.add_dependency 'drydock', '>= 0.5.6'  
-  s.add_dependency 'caesars', '>= 0.5.4'  
-  s.add_dependency 'rye', '>= 0.5.4'
+  s.add_dependency 'drydock', '>= 0.6.0'
+  s.add_dependency 'caesars', '>= 0.6.1'
+  s.add_dependency 'rye', '>= 0.6.3'
   
+  s.add_dependency 'grit'
   s.add_dependency 'echoe'
+  s.add_dependency 'json'
   s.add_dependency 'amazon-ec2', '>= 0.3.8'  # Region fix
   s.add_dependency 'aws-s3', '>= 0.6.1'      # Ruby 1.9.1 compatability
   s.add_dependency 'net-ssh', '>= 2.0.9'
@@ -32,7 +34,7 @@
   #s.add_development_dependency('jgre-monkeyspecdoc', '>= 0.1.0')
   #s.add_development_dependency('thoughtbot-shoulda', '>= 0.1.0')
   
-  s.executables = %w[ird rudy rudy-ec2 rudy-sdb rudy-s3]
+  s.executables = %w[rudy rudy-ec2 rudy-sdb rudy-s3]
   
   # = MANIFEST =
   # git ls-files
@@ -42,7 +44,6 @@
   README.rdoc
   Rakefile
   Rudyfile
-  bin/ird
   bin/rudy
   bin/rudy-ec2
   bin/rudy-s3
@@ -87,15 +88,23 @@
   lib/rudy/config/objects.rb
   lib/rudy/disks.rb
   lib/rudy/global.rb
+  lib/rudy/guidelines.rb
   lib/rudy/huxtable.rb
   lib/rudy/machines.rb
   lib/rudy/metadata.rb
+  lib/rudy/mixins/hash.rb
   lib/rudy/routines.rb
+  lib/rudy/routines/helper.rb
   lib/rudy/routines/helpers/diskhelper.rb
+  lib/rudy/routines/helpers/scmhelper.rb
   lib/rudy/routines/helpers/scripthelper.rb
+  lib/rudy/routines/helpers/userhelper.rb
+  lib/rudy/routines/passthrough.rb
   lib/rudy/routines/release.rb
   lib/rudy/routines/shutdown.rb
   lib/rudy/routines/startup.rb
+  lib/rudy/scm.rb
+  lib/rudy/scm/git.rb
   lib/rudy/scm/svn.rb
   lib/rudy/utils.rb
   lib/storable.rb
@@ -106,8 +115,11 @@
   support/randomize-root-password
   support/rudy-ec2-startup
   support/update-ec2-ami-tools
-  test/05_config/00_setup_test.rb
-  test/05_config/30_machines_test.rb
+  test/01_mixins/10_hash_test.rb
+  test/10_config/00_setup_test.rb
+  test/10_config/30_machines_test.rb
+  test/15_scm/00_setup_test.rb
+  test/15_scm/20_git_test.rb
   test/20_sdb/00_setup_test.rb
   test/20_sdb/10_domains_test.rb
   test/25_ec2/00_setup_test.rb

data/test/01_mixins/10_hash_test.rb

@@ -0,0 +1,25 @@
+require File.join(File.dirname(__FILE__), '..', 'helper')
+
+module Rudy::Test
+
+  class Case_01_Mixins < Test::Unit::TestCase
+    
+    def one_level; {:empty=>1}; end
+    def two_levels; {:l1 => {:empty=>1}}; end
+    def three_levels; { :l1 => { :l2 => {:empty=>1, :empty=>1} } }; end
+    def six_levels; {:l1 => {:l2 => {:l3 => {:l4 => {:l5 => {}, :empty=>1}, :empty=>1}}}}; end
+     
+    context "#{name}_10 Hash" do
+      
+      should "(10) should calculate deepest point" do
+        assert_equal one_level.deepest_point, 1
+        assert_equal two_levels.deepest_point, 2
+        assert_equal three_levels.deepest_point, 3
+        assert_equal six_levels.deepest_point, 6
+      end
+      
+    end
+    
+  end
+  
+end

data/test/{05_config → 10_config}/00_setup_test.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), '..', 'helper')
 
 module Rudy::Test
 
-  class Case_05_Config < Test::Unit::TestCase
+  class Case_10_Config < Test::Unit::TestCase
     include Rudy::Huxtable
     
     @@logger = STDERR #StringIO.new

data/test/{05_config → 10_config}/30_machines_test.rb

@@ -1,6 +1,6 @@
 
 module Rudy::Test
-  class Case_05_Config
+  class Case_10_Config
     
     context "#{name}_30 Machines" do
       

data/test/15_scm/00_setup_test.rb

@@ -0,0 +1,20 @@
+require File.join(File.dirname(__FILE__), '..', 'helper')
+
+module Rudy::Test
+
+  class Case_15_SCM < Test::Unit::TestCase
+    include Rudy::Huxtable
+    
+    @@logger = STDERR #StringIO.new
+    @@zone = @@global.zone.to_s
+    
+    context "#{name}_00 Setup" do
+      should "(00) have class variables setup" do
+        stop_test !@@global.is_a?(Rudy::Global), "We don't have global (#{@@global})"
+        stop_test !@@config.is_a?(Rudy::Config), "We don't have an instance of Rudy::Config (#{@@config})"
+      end
+    end
+    
+    
+  end
+end

data/test/15_scm/20_git_test.rb

@@ -0,0 +1,61 @@
+
+module Rudy::Test
+  class Case_15_SCM
+    
+    def generate_rtag(username=nil)
+      now = Time.now
+      mon = now.mon.to_s.rjust(2, '0')
+      day = now.day.to_s.rjust(2, '0')
+      rev = "01"
+      criteria = ['rel', now.year, mon, day, rev]
+      criteria.insert(-2, username) if username
+      criteria.join(Rudy::DELIM)
+    end
+    
+    context "#{name}_20 Git" do
+      setup do
+        @strand = Rudy::Utils.strand
+        @scm = Rudy::SCM::GIT.new({
+          :path => "/tmp/git-#{@strand}"
+        })
+        stop_test !Rudy::SCM::GIT.working_copy?, "Not in working directory"
+      end
+      
+      
+      should "(10) know when a tag is invalid" do
+        bad_tag = generate_rtag(@strand)
+        assert !@scm.valid_rtag?(bad_tag), "Said bad tag was valid"
+      end
+      
+      should "(20) generate release tag name" do
+        rtag_should = generate_rtag(@strand)
+        rtag = @scm.find_next_rtag(@strand)
+        assert_equal rtag_should, rtag, "Bad tag"
+      end
+      
+      should "(30) create release" do
+        rtag_should = generate_rtag(@strand)
+        rtag = @scm.create_release(@strand)
+        assert_equal rtag_should, rtag, "Bad tag"
+        assert @scm.delete_rtag(rtag), "Could not delete tag"
+      end
+      
+      should "(31) know when a tag is valid" do
+        rtag = @scm.create_release(@strand)
+        assert @scm.valid_rtag?(rtag), "Said bad tag was invalid"
+        assert @scm.delete_rtag(rtag), "Could not delete tag"
+      end
+      
+      should "(40) get remote URI" do
+        rtag = @scm.get_remote_uri
+        assert !@scm.get_remote_uri.nil? && !@scm.get_remote_uri.empty?, "No remote URI"
+      end
+      
+      xshould "(90) raises exception when deleting a nonexistent tag" do
+        
+      end
+    end
+    
+    
+  end
+end

data/test/helper.rb

@@ -1,7 +1,7 @@
 
 libdir = File.join(File.dirname(__FILE__), '..', 'lib')
 $:.unshift libdir
-%w{amazon-ec2 drydock caesars rye}.each { |dir| $: << File.join(File.dirname(__FILE__), '..', '..', dir, 'lib') }
+%w{amazon-ec2 drydock caesars rye}.each { |dir| $:.unshift File.join(File.dirname(__FILE__), '..', '..', dir, 'lib') }
 
 require 'rubygems'
 require 'test/unit'

data/vendor/highline-1.5.1/Rakefile

@@ -26,7 +26,7 @@ Rake::RDocTask.new do |rdoc|
   rdoc.title    = "HighLine Documentation"
 end
 
-desc "Upload current documentation to Rubyforge"
+about "Upload current documentation to Rubyforge"
 task :upload_docs => [:rdoc] do
   sh "scp -r doc/html/* " +
      "bbazzarrakk@rubyforge.org:/var/www/gforge-projects/highline/doc/"
@@ -68,7 +68,7 @@ Rake::GemPackageTask.new(spec) do |pkg|
   pkg.need_tar = true
 end
 
-desc "Show library's code statistics"
+about "Show library's code statistics"
 task :stats do
   require 'code_statistics'
   CodeStatistics.new( ["HighLine", "lib"], 
@@ -76,7 +76,7 @@ task :stats do
                       ["Units", "test"] ).to_s
 end
 
-desc "Add new files to Subversion"
+about "Add new files to Subversion"
 task :add_to_svn do
   sh %Q{svn status | ruby -nae 'system "svn add \#{$F[1]}" if $F[0] == "?"' }
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rudy
 version: !ruby/object:Gem::Version 
-  version: 0.6.8
+  version: 0.7.0
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-24 00:00:00 -04:00
+date: 2009-05-02 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.5.6
+        version: 0.6.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: caesars
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.5.4
+        version: 0.6.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: rye
@@ -40,7 +40,17 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.5.4
+        version: 0.6.3
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: grit
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
   name: echoe
@@ -52,6 +62,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: json
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: amazon-ec2
   type: :runtime
@@ -112,10 +132,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-description: "Rudy: Not your grandparent's deployment tool."
+description: "Rudy: Not your grandparents' EC2 deployment tool."
 email: delano@solutious.com
 executables: 
-- ird
 - rudy
 - rudy-ec2
 - rudy-sdb
@@ -133,7 +152,6 @@ files:
 - README.rdoc
 - Rakefile
 - Rudyfile
-- bin/ird
 - bin/rudy
 - bin/rudy-ec2
 - bin/rudy-s3
@@ -178,15 +196,23 @@ files:
 - lib/rudy/config/objects.rb
 - lib/rudy/disks.rb
 - lib/rudy/global.rb
+- lib/rudy/guidelines.rb
 - lib/rudy/huxtable.rb
 - lib/rudy/machines.rb
 - lib/rudy/metadata.rb
+- lib/rudy/mixins/hash.rb
 - lib/rudy/routines.rb
+- lib/rudy/routines/helper.rb
 - lib/rudy/routines/helpers/diskhelper.rb
+- lib/rudy/routines/helpers/scmhelper.rb
 - lib/rudy/routines/helpers/scripthelper.rb
+- lib/rudy/routines/helpers/userhelper.rb
+- lib/rudy/routines/passthrough.rb
 - lib/rudy/routines/release.rb
 - lib/rudy/routines/shutdown.rb
 - lib/rudy/routines/startup.rb
+- lib/rudy/scm.rb
+- lib/rudy/scm/git.rb
 - lib/rudy/scm/svn.rb
 - lib/rudy/utils.rb
 - lib/storable.rb
@@ -197,8 +223,11 @@ files:
 - support/randomize-root-password
 - support/rudy-ec2-startup
 - support/update-ec2-ami-tools
-- test/05_config/00_setup_test.rb
-- test/05_config/30_machines_test.rb
+- test/01_mixins/10_hash_test.rb
+- test/10_config/00_setup_test.rb
+- test/10_config/30_machines_test.rb
+- test/15_scm/00_setup_test.rb
+- test/15_scm/20_git_test.rb
 - test/20_sdb/00_setup_test.rb
 - test/20_sdb/10_domains_test.rb
 - test/25_ec2/00_setup_test.rb
@@ -253,7 +282,7 @@ post_install_message:
 rdoc_options: 
 - --line-numbers
 - --title
-- "Rudy: Not your grandparent's deployment tool."
+- "Rudy: Not your grandparents' EC2 deployment tool."
 - --main
 - README.rdoc
 require_paths: 
@@ -276,6 +305,6 @@ rubyforge_project: rudy
 rubygems_version: 1.3.2
 signing_key: 
 specification_version: 3
-summary: "Rudy: Not your grandparent's deployment tool."
+summary: "Rudy: Not your grandparents' EC2 deployment tool."
 test_files: []