solutious-rudy 0.9.3 → 0.9.4

data/lib/rudy/cli/aws/ec2/keypairs.rb

@@ -12,11 +12,11 @@ module AWS; module EC2;
     def create_keypairs
       kp = execute_action { Rudy::AWS::EC2::Keypairs.create(@argv.name) }
       if [:s, :string].member?(@@global.format)
-        puts "Name: #{kp.name}"
-        puts "Fingerprint: #{kp.fingerprint}", $/
-        puts "Copy the following private key data into a file."
-        puts "Set the permissions to 0600 and keep it safe.", $/
-        puts kp.private_key
+        li "Name: #{kp.name}"
+        li "Fingerprint: #{kp.fingerprint}", $/
+        li "Copy the following private key data into a file."
+        li "Set the permissions to 0600 and keep it safe.", $/
+        li kp.private_key
       else
          print_stobject kp
       end
@@ -29,7 +29,7 @@ module AWS; module EC2;
     def destroy_keypairs
       raise "Keypair #{@argv.name} does not exist" unless Rudy::AWS::EC2::Keypairs.exists?(@argv.name)
       kp = Rudy::AWS::EC2::Keypairs.get(@argv.name)
-      puts "Destroying: #{kp.name}"
+      li "Destroying: #{kp.name}"
       execute_check(:medium)
       execute_action { Rudy::AWS::EC2::Keypairs.destroy(kp.name) }
     end

data/lib/rudy/cli/aws/ec2/snapshots.rb

@@ -23,7 +23,7 @@ module AWS; module EC2;
       true
     end
     def destroy_snapshots
-      puts "Destroying: #{@snap.awsid}"
+      li "Destroying: #{@snap.awsid}"
       execute_check(:medium)
       execute_action { Rudy::AWS::EC2::Snapshots.destroy(@snap.awsid) }
     end

data/lib/rudy/cli/aws/ec2/volumes.rb

@@ -12,12 +12,12 @@ module AWS; module EC2;
       true
     end
     def volumes_create
-      puts "Creating #{@option.size}GB volume in #{@@global.zone}"
+      li "Creating #{@option.size}GB volume in #{@@global.zone}"
       execute_check(:low)
       vol = execute_action("Create Failed") { 
         Rudy::AWS::EC2::Volumes.create(@option.size, @@global.zone, @option.snapshot) 
       }
-      puts @global.verbose > 1 ? vol.inspect : vol.dump(@@global.format)
+      li @global.verbose > 1 ? vol.inspect : vol.dump(@@global.format)
     end
 
 
@@ -39,13 +39,13 @@ module AWS; module EC2;
       raise "Volume #{@volume.awsid} is still attached" if @volume.attached?
       raise "Volume #{@volume.awsid} is not available (#{@volume.state})" unless @volume.available?
       
-      puts "Destroying #{@volume.awsid}"
+      li "Destroying #{@volume.awsid}"
       execute_check(:medium)
       execute_action("Destroy Failed") { Rudy::AWS::EC2::Volumes.destroy(@volume.awsid) }
       
       vol = Rudy::AWS::EC2::Volumes.get(@volume.awsid)
 
-      puts @global.verbose > 1 ? vol.inspect : vol.dump(@@global.format)
+      li @global.verbose > 1 ? vol.inspect : vol.dump(@@global.format)
     end
     
     
@@ -60,14 +60,14 @@ module AWS; module EC2;
       raise "Volume #{@argv.volid} is already attached" if Rudy::AWS::EC2::Volumes.attached?(@argv.volid)
       raise "Instance #{@option.instance} does not exist" unless Rudy::AWS::EC2::Instances.exists?(@option.instance)
       
-      puts "Attaching #{@argv.volid} to #{@option.instance} on #{@option.device}"
+      li "Attaching #{@argv.volid} to #{@option.instance} on #{@option.device}"
       execute_check(:low)
       execute_action("Attach Failed") { 
         Rudy::AWS::EC2::Volumes.attach(@argv.volid, @option.instance, @option.device) 
       }
       
       vol = Rudy::AWS::EC2::Volumes.get(@argv.volid)
-      puts @global.verbose > 1 ? vol.inspect : vol.dump(@@global.format)
+      li @global.verbose > 1 ? vol.inspect : vol.dump(@@global.format)
     end
     
     def volumes_detach_valid?
@@ -80,21 +80,21 @@ module AWS; module EC2;
       vol = Rudy::AWS::EC2::Volumes.get(@argv.volid)
       raise "Volume #{vol.awsid} is not attached" unless vol.attached?
       
-      puts "Detaching #{vol.awsid} from #{vol.instid}"
+      li "Detaching #{vol.awsid} from #{vol.instid}"
       execute_check(:medium)
       execute_action("Detach Failed") { Rudy::AWS::EC2::Volumes.detach(vol.awsid) }
       
       vol = Rudy::AWS::EC2::Volumes.get(vol.awsid)
-      puts @global.verbose > 1 ? vol.inspect : vol.dump(@@global.format)
+      li @global.verbose > 1 ? vol.inspect : vol.dump(@@global.format)
     end
     
     
     def volumes
       volumes = Rudy::AWS::EC2::Volumes.list || []
       volumes.each do |vol|
-        puts @global.verbose > 1 ? vol.inspect : vol.dump(@@global.format)
+        li @global.verbose > 1 ? vol.inspect : vol.dump(@@global.format)
       end
-      puts "No volumes" if volumes.empty?
+      li "No volumes" if volumes.empty?
     end
     
   end

data/lib/rudy/cli/backups.rb

@@ -13,12 +13,12 @@ module Rudy
       def backups_wash
         dirt = (get_backups || []).select { |b| !b.snapshot_exists? }
         if dirt.empty?
-          puts "Nothing to wash in #{current_machine_group}"
+          li "Nothing to wash in #{current_machine_group}"
           return
         end
         
-        puts "The following backup metadata will be deleted:"
-        puts dirt.collect {|b| b.name }
+        li "The following backup metadata will be deleted:"
+        li dirt.collect {|b| b.name }
         
         execute_check(:medium)
 
@@ -38,9 +38,9 @@ module Rudy
       
       def backups_create
         @dlist.each do |d|
-          puts "Creating backup for #{d.name}"
+          li "Creating backup for #{d.name}"
           back = d.archive
-          puts back
+          li back
         end
       end
       

data/lib/rudy/cli/base.rb

@@ -26,8 +26,8 @@ module Rudy::CLI
       begin
         Rudy::Huxtable.update_config
       rescue Caesars::SyntaxError => ex
-        STDERR.puts ex.message
-        STDERR.puts ex.backtrace if @@global.verbose > 0
+        le ex.message
+        le ex.backtrace if @@global.verbose > 0
         exit 81
       end
       
@@ -41,13 +41,13 @@ module Rudy::CLI
       end
       
       unless @@global.accesskey && @@global.secretkey
-        STDERR.puts "No AWS credentials. Check your configs!"
-        STDERR.puts "Try: rudy init"
+        le "No AWS credentials. Check your configs!"
+        le "Try: rudy init"
         exit 1
       end
 
       if @@global.environment =~ /^prod/ && Rudy.debug?
-        puts Rudy::Utils.banner("PRODUCTION ACCESS IS DISABLED IN DEBUG MODE")
+        li Rudy::Utils.banner("PRODUCTION ACCESS IS DISABLED IN DEBUG MODE")
         exit 1
       end
 
@@ -55,7 +55,7 @@ module Rudy::CLI
         format = @@global.format == :json ? :json : :yaml
         gcopy = @@global.dup
         gcopy.secretkey = "[HIDDEN]"
-        puts "# GLOBALS: ", gcopy.dump(format)
+        li "# GLOBALS: ", gcopy.dump(format)
       end
       
       Rudy::Metadata.connect @@global.accesskey, @@global.secretkey, @@global.region
@@ -86,12 +86,12 @@ module Rudy::CLI
       # updated after initialization but before the command was executed
       Rudy::Huxtable.update_global @global
 
-      puts Rudy::CLI.generate_header(@@global, @@config) if @@global.print_header
+      li Rudy::CLI.generate_header(@@global, @@config) if @@global.print_header
 
       unless @@global.quiet
         if @@global.environment == "prod"
           msg = "YOU ARE PLAYING WITH PRODUCTION"
-          puts Rudy::Utils.banner(msg, :normal), $/
+          li Rudy::Utils.banner(msg, :normal), $/
         end
       end
     end
@@ -108,7 +108,7 @@ module Rudy::CLI
       format = @@global.format
       format = :yaml if @@global.verbose > 0 && @@global.format == :string
       format = :string if noverbose
-      puts obj.dump(format)
+      li obj.dump(format)
     end
     
     def machine_separator(name, awsid)

data/lib/rudy/cli/candy.rb

@@ -9,7 +9,7 @@ module Rudy
         if machines
           `open http://#{machines.first.dns_public}`
         else
-          puts "No machines"
+          li "No machines"
         end
       end
 

data/lib/rudy/cli/config.rb

@@ -50,23 +50,23 @@ module Rudy
         if @option.project
           rf = File.join(RUDY_HOME, 'Rudyfile')
           raise "Cannot find: #{rf}" unless File.exists?(rf)
-          puts File.read(rf)
+          li File.read(rf)
           
         elsif @option.script
           conf = fetch_script_config
-          puts conf.to_hash.send(outform) if conf
+          li conf.to_hash.send(outform) if conf
           
         else
-          #puts "# ACCOUNTS: [not displayed]" if types.delete(:accounts)
+          #li "# ACCOUNTS: [not displayed]" if types.delete(:accounts)
           types.each do |conftype|
-            puts "# #{conftype.to_s.upcase}"
+            li "# #{conftype.to_s.upcase}"
             next unless @@config[conftype]  # Nothing to output
             if conftype == :accounts
               skey = @@config[conftype][:aws][:secretkey]
               @@config[conftype][:aws][:secretkey] = hide_secret_key(skey)
             end
             
-            puts @@config[conftype].to_hash.send(outform)
+            li @@config[conftype].to_hash.send(outform)
           end
         end
         
@@ -81,7 +81,7 @@ module Rudy
         gtmp = @@global.clone
         gtmp.format = "yaml" if gtmp.format == :s || gtmp.format == :string
         gtmp.secretkey = hide_secret_key(gtmp.secretkey)
-        puts gtmp.dump(gtmp.format)
+        li gtmp.dump(gtmp.format)
       end
       
       private

data/lib/rudy/cli/disks.rb

@@ -22,7 +22,7 @@ module Rudy
           print_stobject d
           if @option.backups
             d.backups.each_with_index do |b, index|
-              puts '  %s' % b.name
+              li '  %s' % b.name
               ##break if @option.all.nil? && index >= 2 # display only 3, unless all
             end
           end
@@ -32,12 +32,12 @@ module Rudy
       def disks_wash
         dirt = (get_disks || []).select { |d| !d.volume_exists? }
         if dirt.empty?
-          puts "Nothing to wash in #{current_machine_group}"
+          li "Nothing to wash in #{current_machine_group}"
           return
         end
         
-        puts "The following disk metadata will be deleted:"
-        puts dirt.collect {|d| d.name }
+        li "The following disk metadata will be deleted:"
+        li dirt.collect {|d| d.name }
         
         execute_check(:medium)
 
@@ -63,7 +63,7 @@ module Rudy
       
       def disks_create
         @mlist.each do |m|  
-          puts machine_separator(m.name, m.instid)
+          li machine_separator(m.name, m.instid)
           rbox = Rudy::Routines::Handlers::RyeTools.create_box m
           rbox.stash = m
           disk = Rudy::Disk.new m.position, @argv.first

data/lib/rudy/cli/images.rb

@@ -19,7 +19,7 @@ module Rudy
       def bundle
 
         @machines.each do |m|
-          puts machine_separator(m.name, m.instid)
+          li machine_separator(m.name, m.instid)
 
           cmd = "ec2-bundle-instance"
           args = [m.instid, "--region", @@global.region.to_s]
@@ -31,21 +31,21 @@ module Rudy
           args += ["--no-bucket-setup"] if @@global.region.to_s == 'eu-west-1'
           
           if @@global.verbose > 0
-            puts "Running: " << Rye.prepare_command(cmd, args), $/
+            li "Running: " << Rye.prepare_command(cmd, args), $/
           end
           
           unless @@global.quiet
-            puts "Bundling can take up to 60 minutes."
-            puts "Check the status with the following command:"
-            puts Rudy::Huxtable.generate_rudy_command('bundle-status').bright
-            puts $/, "When complete, register the image with the command:"
-            puts Rudy::Huxtable.generate_rudy_command('images', '-R', @argv.name).bright
+            li "Bundling can take up to 60 minutes."
+            li "Check the status with the following command:"
+            li Rudy::Huxtable.generate_rudy_command('bundle-status').bright
+            li $/, "When complete, register the image with the command:"
+            li Rudy::Huxtable.generate_rudy_command('images', '-R', @argv.name).bright
           end
           
           execute_check(:medium)
           
           ret = Rye.shell cmd, args
-          puts ret.stderr, ret.stdout
+          li ret.stderr, ret.stdout
         end
       end
       
@@ -55,11 +55,11 @@ module Rudy
         args += ["-K", @@global.pkey, "-C", @@global.cert]
         
         if @@global.verbose > 0
-          puts "Running: " << Rye.prepare_command(cmd, args), $/
+          li "Running: " << Rye.prepare_command(cmd, args), $/
         end
         
         ret = Rye.shell cmd, args
-        puts ret.stderr, ret.stdout
+        li ret.stderr, ret.stdout
           
       end
       
@@ -71,7 +71,7 @@ module Rudy
       end
       def register_images
         name = "#{@@global.bucket}/#{@argv.name}.manifest.xml"
-        puts Rudy::AWS::EC2::Images.register(name)
+        li Rudy::AWS::EC2::Images.register(name)
       end
       
       def deregister_images_valid?
@@ -82,7 +82,7 @@ module Rudy
       end
       def deregister_images
         execute_check(:low)
-        puts Rudy::AWS::EC2::Images.deregister(@argv.ami) ? "Done" : "Unknown error"
+        li Rudy::AWS::EC2::Images.deregister(@argv.ami) ? "Done" : "Unknown error"
       end
       
       def images

data/lib/rudy/cli/info.rb

@@ -13,34 +13,34 @@ module Rudy
             process_region region
           end
         else
-          puts $/, "Other regions: " << oregions.join(', ')
+          li $/, "Other regions: " << oregions.join(', ')
         end
       end
       
       
       private 
       def process_region(region)
-        puts " Region: %s %30s".att(:reverse) % [region, '']
-        puts "  Machines".bright
+        li " Region: %s %30s".att(:reverse) % [region, '']
+        li "  Machines".bright
         
         (get_machines(:region => region) rescue []).collect do |m| 
           m.refresh!
-          puts "    " << m.to_s.noatt
+          li "    " << m.to_s.noatt
         end
         
-        puts "  Disks".bright
+        li "  Disks".bright
         (get_disks(:region => region) || []).collect do |d|
           d.refresh!
-          puts "    " << d.to_s.noatt
+          li "    " << d.to_s.noatt
         end
                 
-        puts "  Backups".bright
+        li "  Backups".bright
         (get_backups(:region => region) || []).collect do |b|
           b.refresh!
-          puts "    " << b.to_s.noatt
+          li "    " << b.to_s.noatt
         end
         
-        puts
+        li
       end
       
     end

data/lib/rudy/cli/keypairs.rb

@@ -10,7 +10,7 @@ module Rudy
       end
       
       def keypairs_add 
-        puts current_group_name
+        li current_group_name
       end
       
       def keypairs_valid?
@@ -22,7 +22,7 @@ module Rudy
       end
       
       def keypairs
-        puts Rudy::AWS::EC2::Keypairs.get(current_user_keypairname)
+        li Rudy::AWS::EC2::Keypairs.get(current_user_keypairname)
       end
 
       def keypairs_show_valid?
@@ -32,9 +32,9 @@ module Rudy
       def keypairs_show
         content = File.read(@pkey)
         rkey = Rye::Key.new content
-        puts "# #{@pkey}"
-        puts content
-        puts rkey.public_key
+        li "# #{@pkey}"
+        li content
+        li rkey.public_key
       end
       
     end

data/lib/rudy/cli/machines.rb

@@ -12,16 +12,16 @@ module Rudy
       def machines_console
         mlist = get_machines
         mlist.each do |machine|
-          puts machine_separator(machine.name, machine.instid)
-          puts machine.get_console
+          li machine_separator(machine.name, machine.instid)
+          li machine.get_console
         end
       end
       
       def machines_password
         mlist = get_machines
         mlist.each do |machine|
-          puts machine_separator(machine.name, machine.instid)
-          puts "Password for %s: %s" % [machine.dns_public, machine.get_password]
+          li machine_separator(machine.name, machine.instid)
+          li "Password for %s: %s" % [machine.dns_public, machine.get_password]
         end
         Rudy::Routines::Handlers::Group.authorize rescue nil
       end
@@ -31,12 +31,12 @@ module Rudy
         dirt = mlist.select { |m| !m.instance_running? }
         
         if dirt.empty?
-          puts "Nothing to wash in #{current_machine_group}"
+          li "Nothing to wash in #{current_machine_group}"
           return
         end
         
-        puts "The following machine metadata will be deleted:".bright
-        puts dirt.collect {|m| m.name.bright }
+        li "The following machine metadata will be deleted:".bright
+        li dirt.collect {|m| m.name.bright }
         execute_check(:medium)
         
         dirt.each do |m|
@@ -92,8 +92,8 @@ module Rudy
       
       def associate_machines 
         
-        puts "Assigning static IP addresses for:"
-        puts @mlist.collect { |m| m.name }
+        li "Assigning static IP addresses for:"
+        li @mlist.collect { |m| m.name }
         
         execute_check(:medium)
         
@@ -101,7 +101,7 @@ module Rudy
           next if @mlist_static.member?(m)
           address = @alist_unused.shift
           address ||= Rudy::AWS::EC2::Addresses.create.ipaddress
-          puts "Associating #{address} to #{m.name} (#{m.instid})"
+          li "Associating #{address} to #{m.name} (#{m.instid})"
           Rudy::AWS::EC2::Addresses.associate(address, m.instid)
           sleep 2
           m.refresh!
@@ -116,7 +116,7 @@ module Rudy
         
         unless @mlist_static.empty?
           @mlist_static.each do |m|
-            puts "%s: %s" % [m.name, m.dns_public]
+            li "%s: %s" % [m.name, m.dns_public]
           end
         end
       end
@@ -137,15 +137,15 @@ module Rudy
       
       def disassociate_machines
         if @mlist_static.empty?
-          puts "No machines in #{current_group_name} have static IP addresses"
+          li "No machines in #{current_group_name} have static IP addresses"
         else
-          puts "The following machines will be updated:"
-          puts @mlist_static.collect { |m| m.name }
-          puts "NOTE: Unassigned IP addresses are not removed from your account"
+          li "The following machines will be updated:"
+          li @mlist_static.collect { |m| m.name }
+          li "NOTE: Unassigned IP addresses are not removed from your account"
           execute_check(:medium)
           @mlist_static.each do |m|
             address = Resolv.getaddress m.dns_public
-            puts "Disassociating #{address} from #{m.name} (#{m.instid})"
+            li "Disassociating #{address} from #{m.name} (#{m.instid})"
             Rudy::AWS::EC2::Addresses.disassociate(address)
           end
         end
@@ -156,7 +156,7 @@ module Rudy
         rset = Rye::Set.new(current_group_name, :parallel => @@global.parallel, :user => 'root')
         os = current_machine_os
         mlist.each do |m|
-          puts "Updating #{m.name}"
+          li "Updating #{m.name}"
           m.refresh!
           rbox = Rye::Box.new(m.dns_public, :user => 'root')
           rbox.add_key user_keypairpath('root')
@@ -164,16 +164,16 @@ module Rudy
           rbox.stash = m
           rset.add_boxes rbox
           if m.os.to_s != os.to_s
-            puts "os: #{os}"
+            li "os: #{os}"
             m.os = os
           end
           m.save :replace
         end
         
         unless os.to_s == 'windows'
-          puts "Updating hostnames for #{current_group_name}"
+          li "Updating hostnames for #{current_group_name}"
           Rudy::Routines::Handlers::Host.set_hostname rset
-          puts rset.hostname.flatten
+          li rset.hostname.flatten
         end
         
       end
@@ -188,7 +188,7 @@ module Rudy
             Rudy::Utils.service_available?(m.dns_public, port)
           }
           available = Rudy::Utils.service_available?(m.dns_public, port)
-          puts available ? 'up' : 'down'
+          li available ? 'up' : 'down'
         end
         
       end
@@ -205,7 +205,7 @@ module Rudy
         # TODO: Give this method a good look over
         pkey = current_user_keypairpath
         unless pkey
-          puts "No private key configured for #{current_machine_user} in #{current_machine_group}"
+          li "No private key configured for #{current_machine_user} in #{current_machine_group}"
         end
         
         # Options to be sent to Rye::Box
@@ -221,7 +221,7 @@ module Rudy
         local_keys = Rye.keys
         rye_opts[:keys] += local_keys if local_keys.is_a?(Array)
         
-        puts "# SSH OPTS", rye_opts.to_yaml if @@global.verbose > 3
+        li "# SSH OPTS", rye_opts.to_yaml if @@global.verbose > 3
         
         # The user specified a command to run. We won't create an interactive
         # session so we need to prepare the command and its arguments
@@ -251,9 +251,9 @@ module Rudy
             if @@global.quiet
               print "You are #{rye_opts[:user].to_s.bright}. " if !checked # only the 1st
             else
-              puts machine_separator(machine.name, machine.instid)
-              puts "Connecting #{rye_opts[:user].to_s.bright}@#{machine.dns_public} "
-              puts
+              li machine_separator(machine.name, machine.instid)
+              li "Connecting #{rye_opts[:user].to_s.bright}@#{machine.dns_public} "
+              li
             end
           else
             unless @global.parallel