solutious-rudy 0.7.3 → 0.7.4

data/lib/rudy/scm/svn.rb

@@ -6,8 +6,24 @@ module Rudy
     class SVN
       attr_accessor :base_uri
       
-      def initialize(args={:base => ''})
-        @base_uri = args[:base]
+      attr_reader :changes
+      
+      def initialize(args={})
+        args = {
+          :privatekey => nil,
+          :base_uri => nil,
+          :user => :root,
+          :changes => :enforce,
+          :path => nil
+        }.merge(args)
+        @base_uri, @path = args[:base_uri], args[:path]
+        @user, @pkey, @changes = args[:user], args[:privatekey], args[:changes]
+      end
+      
+      def engine; :svn; end
+      
+      def liner_note
+        "%-40s  (svn:%s:%s)" % [@rtag, @base_uri, @branch]
       end
       
       def create_release(username=nil, msg=nil)
@@ -43,7 +59,7 @@ module Rudy
       end
       
       def local_info
-        ret = `svn info 2>&1`
+        ret = Rye.shell(:svn, "info").join
         # URL: http://some/uri/path
         # Repository Root: http://some/uri
         # Repository UUID: c5abe49d-53e4-4ea3-9314-89e1e25aa7e1
@@ -61,9 +77,34 @@ module Rudy
       end
       
       # Are all local changes committed?
-      def clean_working_copy?
-        `svn diff . 2>&1` == '' # svn diff should return nothing
+      def self.clean_working_copy?(path=Dir.pwd)
+        Rye.shell(:svn, 'diff', '.').stdout == []
+      end
+      def clean_working_copy?; SVN.clean_working_copy?; end
+      
+      def self.working_copy?(path=Dir.pwd)
+        (File.exists?(File.join(path, '.svn')))
+      end
+      def working_copy?; SVN.working_copy?; end
+      
+      
+      def raise_early_exceptions
+        raise NotAWorkingCopy, :svn unless working_copy?
+        raise DirtyWorkingCopy, :svn unless @changes.to_s == 'ignore' || clean_working_copy?
+        #raise NoRemoteURI, "remote.#{@remote}.url not set" if get_remote_uri.nil?
+        raise NoRemotePath, :svn if @path.nil?
+        raise PrivateKeyNotFound, @pkey if @pkey && !File.exists?(@pkey)
+        find_next_rtag # will raise exception is there's a problem
+        
+        # We can't check stuff that requires access to the machine b/c the 
+        # machine may not be running yet. These include:
+        # * Remote checkout path already exists
+        # * No git available
+        # ...
+        # If create_remote_checkout should fail, it should print a message
+        # about the release that was created and how to install it manually
       end
+      
     end
   end
 end

data/lib/rudy/utils.rb

@@ -1,4 +1,5 @@
 
+#require 'drydock/mixins'
 require 'socket'
 require 'open-uri'
 require 'date'
@@ -180,9 +181,9 @@ module Rudy
         :normal => %Q(============  %s  ============)
       }
       size = :normal unless banners.has_key?(size)
-      colour = :black unless Console.valid_colour?(colour)
+      #colour = :black unless Drydock::Console.valid_colour?(colour)
       size, colour = size.to_sym, colour.to_sym
-      sprintf(banners[size], msg).colour(colour).bgcolour(:white).bright
+      sprintf(banners[size], msg).bright.att(:reverse)
     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.3"
+	s.version = "0.7.4"
 	s.summary = "Rudy: Not your grandparents' EC2 deployment tool."
 	s.description = s.summary
 	s.author = "Delano Mandelbaum"
@@ -14,19 +14,19 @@
   s.require_paths = %w[lib]
   s.rubygems_version = '1.1.1'
   
-  s.add_dependency 'drydock', '>= 0.6.1'
-  s.add_dependency 'caesars', '>= 0.6.3'
+  s.add_dependency 'drydock', '>= 0.6.2'
+  s.add_dependency 'caesars', '>= 0.6.4'
   s.add_dependency 'rye', '>= 0.6.4'
+  s.add_dependency 'sysinfo', '>= 0.5.1'
+  s.add_dependency 'storable', '>= 0.5.1'
+  s.add_dependency 'annoy', '>= 0.5.0'
   
   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'
-  s.add_dependency 'net-scp', '>= 1.0.2'
-  s.add_dependency 'net-ssh-gateway'
-  s.add_dependency 'net-ssh-multi'
+  s.add_dependency 'highline', '>= 1.5.1'
+
   
   # http://bit.ly/2WaAgV
   #s.add_runtime_dependency('xml-simple', '>= 1.0.11')
@@ -44,13 +44,18 @@
   README.rdoc
   Rakefile
   Rudyfile
+  bin/ird
   bin/rudy
   bin/rudy-ec2
   bin/rudy-s3
   bin/rudy-sdb
-  lib/annoy.rb
-  lib/console.rb
-  lib/escape.rb
+  examples/README.md
+  examples/debian-sinatra-passenger/commands.rb
+  examples/debian-sinatra-passenger/machines.rb
+  examples/debian-sinatra-passenger/routines.rb
+  examples/debian-sinatra-thin/commands.rb
+  examples/debian-sinatra-thin/machines.rb
+  examples/debian-sinatra-thin/routines.rb
   lib/rudy.rb
   lib/rudy/aws.rb
   lib/rudy/aws/ec2.rb
@@ -65,7 +70,6 @@
   lib/rudy/aws/s3.rb
   lib/rudy/aws/sdb.rb
   lib/rudy/aws/sdb/error.rb
-  lib/rudy/backup.rb
   lib/rudy/cli.rb
   lib/rudy/cli/aws/ec2/addresses.rb
   lib/rudy/cli/aws/ec2/candy.rb
@@ -86,20 +90,27 @@
   lib/rudy/cli/routines.rb
   lib/rudy/config.rb
   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/metadata/backup.rb
+  lib/rudy/metadata/backups.rb
+  lib/rudy/metadata/disk.rb
+  lib/rudy/metadata/disks.rb
+  lib/rudy/metadata/objectbase.rb
+  lib/rudy/mixins.rb
   lib/rudy/mixins/hash.rb
   lib/rudy/routines.rb
   lib/rudy/routines/helper.rb
+  lib/rudy/routines/helpers/dependshelper.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/reboot.rb
   lib/rudy/routines/release.rb
   lib/rudy/routines/shutdown.rb
   lib/rudy/routines/startup.rb
@@ -107,9 +118,6 @@
   lib/rudy/scm/git.rb
   lib/rudy/scm/svn.rb
   lib/rudy/utils.rb
-  lib/storable.rb
-  lib/sysinfo.rb
-  lib/tryouts.rb
   rudy.gemspec
   support/mailtest
   support/randomize-root-password
@@ -136,36 +144,6 @@
   test/30_sdb_metadata/20_backups_test.rb
   test/coverage.txt
   test/helper.rb
-  vendor/highline-1.5.1/CHANGELOG
-  vendor/highline-1.5.1/INSTALL
-  vendor/highline-1.5.1/LICENSE
-  vendor/highline-1.5.1/README
-  vendor/highline-1.5.1/Rakefile
-  vendor/highline-1.5.1/TODO
-  vendor/highline-1.5.1/examples/ansi_colors.rb
-  vendor/highline-1.5.1/examples/asking_for_arrays.rb
-  vendor/highline-1.5.1/examples/basic_usage.rb
-  vendor/highline-1.5.1/examples/color_scheme.rb
-  vendor/highline-1.5.1/examples/limit.rb
-  vendor/highline-1.5.1/examples/menus.rb
-  vendor/highline-1.5.1/examples/overwrite.rb
-  vendor/highline-1.5.1/examples/page_and_wrap.rb
-  vendor/highline-1.5.1/examples/password.rb
-  vendor/highline-1.5.1/examples/trapping_eof.rb
-  vendor/highline-1.5.1/examples/using_readline.rb
-  vendor/highline-1.5.1/lib/highline.rb
-  vendor/highline-1.5.1/lib/highline/color_scheme.rb
-  vendor/highline-1.5.1/lib/highline/compatibility.rb
-  vendor/highline-1.5.1/lib/highline/import.rb
-  vendor/highline-1.5.1/lib/highline/menu.rb
-  vendor/highline-1.5.1/lib/highline/question.rb
-  vendor/highline-1.5.1/lib/highline/system_extensions.rb
-  vendor/highline-1.5.1/setup.rb
-  vendor/highline-1.5.1/test/tc_color_scheme.rb
-  vendor/highline-1.5.1/test/tc_highline.rb
-  vendor/highline-1.5.1/test/tc_import.rb
-  vendor/highline-1.5.1/test/tc_menu.rb
-  vendor/highline-1.5.1/test/ts_all.rb
   )
 
   

data/test/30_sdb_metadata/10_disks_test.rb

@@ -22,7 +22,7 @@ module Rudy::Test
       
       
       should "(10) create a disk object" do
-        disk = Rudy::Disk.new('/rudy/disk', 1, '/dev/sdh')
+        disk = Rudy::MetaData::Disk.new('/rudy/disk', 1, '/dev/sdh')
         
         disk_name_elements = []
         [:zone, :environment, :role, :position].each do |n|
@@ -38,8 +38,8 @@ module Rudy::Test
       end
       
       should "(11) save a disk object" do
-        disk = Rudy::Disk.new('/rudy/disk', 1, '/dev/sdh')
-        assert disk.is_a?(Rudy::Disk), "Not a Rudy::Disk (#{disk})"
+        disk = Rudy::MetaData::Disk.new('/rudy/disk', 1, '/dev/sdh')
+        assert disk.is_a?(Rudy::MetaData::Disk), "Not a Rudy::MetaData::Disk (#{disk})"
         assert disk.save, "Did not save #{disk.name}"
       end
       
@@ -71,10 +71,10 @@ module Rudy::Test
       end
       
       should "(30) get disk from Rudy::Disks, modify, and save" do
-        disk_tmp = Rudy::Disk.new('/rudy/disk', 1, '/dev/sdh')
+        disk_tmp = Rudy::MetaData::Disk.new('/rudy/disk', 1, '/dev/sdh')
         rdisk = Rudy::Disks.new
         disk_orig = rdisk.get(disk_tmp.name)
-        assert_equal Rudy::Disk, disk_orig.class, "Not a Rudy::Disk #{disk_orig}"
+        assert_equal Rudy::MetaData::Disk, disk_orig.class, "Not a Rudy::MetaData::Disk #{disk_orig}"
         assert_equal @@global.zone.to_s, disk_orig.zone.to_s, "Unexpected zone #{disk_orig.zone}"
         sleep 1
         disk_orig.size = 2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: solutious-rudy
 version: !ruby/object:Gem::Version 
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.6.1
+        version: 0.6.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: caesars
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.6.3
+        version: 0.6.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: rye
@@ -43,94 +43,84 @@ dependencies:
         version: 0.6.4
     version: 
 - !ruby/object:Gem::Dependency 
-  name: grit
+  name: sysinfo
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.5.1
     version: 
 - !ruby/object:Gem::Dependency 
-  name: echoe
+  name: storable
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.5.1
     version: 
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: annoy
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.5.0
     version: 
 - !ruby/object:Gem::Dependency 
-  name: amazon-ec2
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.3.8
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: aws-s3
+  name: grit
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.6.1
+        version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: net-ssh
+  name: echoe
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.0.9
+        version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: net-scp
+  name: amazon-ec2
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.2
+        version: 0.3.8
     version: 
 - !ruby/object:Gem::Dependency 
-  name: net-ssh-gateway
+  name: aws-s3
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.6.1
     version: 
 - !ruby/object:Gem::Dependency 
-  name: net-ssh-multi
+  name: highline
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.5.1
     version: 
 description: "Rudy: Not your grandparents' EC2 deployment tool."
 email: delano@solutious.com
@@ -152,13 +142,18 @@ files:
 - README.rdoc
 - Rakefile
 - Rudyfile
+- bin/ird
 - bin/rudy
 - bin/rudy-ec2
 - bin/rudy-s3
 - bin/rudy-sdb
-- lib/annoy.rb
-- lib/console.rb
-- lib/escape.rb
+- examples/README.md
+- examples/debian-sinatra-passenger/commands.rb
+- examples/debian-sinatra-passenger/machines.rb
+- examples/debian-sinatra-passenger/routines.rb
+- examples/debian-sinatra-thin/commands.rb
+- examples/debian-sinatra-thin/machines.rb
+- examples/debian-sinatra-thin/routines.rb
 - lib/rudy.rb
 - lib/rudy/aws.rb
 - lib/rudy/aws/ec2.rb
@@ -173,7 +168,6 @@ files:
 - lib/rudy/aws/s3.rb
 - lib/rudy/aws/sdb.rb
 - lib/rudy/aws/sdb/error.rb
-- lib/rudy/backup.rb
 - lib/rudy/cli.rb
 - lib/rudy/cli/aws/ec2/addresses.rb
 - lib/rudy/cli/aws/ec2/candy.rb
@@ -194,20 +188,27 @@ files:
 - lib/rudy/cli/routines.rb
 - lib/rudy/config.rb
 - 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/metadata/backup.rb
+- lib/rudy/metadata/backups.rb
+- lib/rudy/metadata/disk.rb
+- lib/rudy/metadata/disks.rb
+- lib/rudy/metadata/objectbase.rb
+- lib/rudy/mixins.rb
 - lib/rudy/mixins/hash.rb
 - lib/rudy/routines.rb
 - lib/rudy/routines/helper.rb
+- lib/rudy/routines/helpers/dependshelper.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/reboot.rb
 - lib/rudy/routines/release.rb
 - lib/rudy/routines/shutdown.rb
 - lib/rudy/routines/startup.rb
@@ -215,9 +216,6 @@ files:
 - lib/rudy/scm/git.rb
 - lib/rudy/scm/svn.rb
 - lib/rudy/utils.rb
-- lib/storable.rb
-- lib/sysinfo.rb
-- lib/tryouts.rb
 - rudy.gemspec
 - support/mailtest
 - support/randomize-root-password
@@ -244,36 +242,6 @@ files:
 - test/30_sdb_metadata/20_backups_test.rb
 - test/coverage.txt
 - test/helper.rb
-- vendor/highline-1.5.1/CHANGELOG
-- vendor/highline-1.5.1/INSTALL
-- vendor/highline-1.5.1/LICENSE
-- vendor/highline-1.5.1/README
-- vendor/highline-1.5.1/Rakefile
-- vendor/highline-1.5.1/TODO
-- vendor/highline-1.5.1/examples/ansi_colors.rb
-- vendor/highline-1.5.1/examples/asking_for_arrays.rb
-- vendor/highline-1.5.1/examples/basic_usage.rb
-- vendor/highline-1.5.1/examples/color_scheme.rb
-- vendor/highline-1.5.1/examples/limit.rb
-- vendor/highline-1.5.1/examples/menus.rb
-- vendor/highline-1.5.1/examples/overwrite.rb
-- vendor/highline-1.5.1/examples/page_and_wrap.rb
-- vendor/highline-1.5.1/examples/password.rb
-- vendor/highline-1.5.1/examples/trapping_eof.rb
-- vendor/highline-1.5.1/examples/using_readline.rb
-- vendor/highline-1.5.1/lib/highline.rb
-- vendor/highline-1.5.1/lib/highline/color_scheme.rb
-- vendor/highline-1.5.1/lib/highline/compatibility.rb
-- vendor/highline-1.5.1/lib/highline/import.rb
-- vendor/highline-1.5.1/lib/highline/menu.rb
-- vendor/highline-1.5.1/lib/highline/question.rb
-- vendor/highline-1.5.1/lib/highline/system_extensions.rb
-- vendor/highline-1.5.1/setup.rb
-- vendor/highline-1.5.1/test/tc_color_scheme.rb
-- vendor/highline-1.5.1/test/tc_highline.rb
-- vendor/highline-1.5.1/test/tc_import.rb
-- vendor/highline-1.5.1/test/tc_menu.rb
-- vendor/highline-1.5.1/test/ts_all.rb
 has_rdoc: true
 homepage: http://github.com/solutious/rudy
 post_install_message: