CloudyScripts 1.8.37 → 1.8.38

data/Rakefile

@@ -12,7 +12,7 @@ require 'rake/testtask'
 
 spec = Gem::Specification.new do |s|
   s.name = 'CloudyScripts'
-  s.version = '1.8.37'
+  s.version = '1.8.38'
   s.has_rdoc = true
   s.extra_rdoc_files = ['README.rdoc', 'LICENSE']
   s.summary = 'Scripts to facilitate programming for infrastructure clouds.'

data/lib/audit/lib/connection/ssh_connection.rb

@@ -44,8 +44,21 @@ class SshConnection
 			@@logger.error("No SSH authentication method found in parameters")
 			raise "No authentication method found"
 		end
-		
-		@ssh_session = Net::SSH.start(host, user, parameters)
+
+		connected = false
+		trials = 5
+		while !connected and trials > 0
+			begin
+				@ssh_session = Net::SSH.start(host, user, parameters)
+				connected = true
+			rescue Exception => e
+				@@logger.warn("connection attempt failed due to #{e.backtrace}")
+			end
+			trials -= 1
+			if !connected
+				sleep(20)
+			end
+		end
 	
 		if block then
 			yield self

data/lib/audit/lib/util/random_string.rb

@@ -2,21 +2,31 @@
 # and open the template in the editor.
 
 # Ruby 1.8 does not contains sample() function
+# NB:
+#   - ruby 1.8.6 has no equivalent method
+#   - ruby 1.8.7 has choice() method
+#   - ruby 1.9 has sample() method
 class Array
-  def sample()
-    return self.choice() 
+  def sec_sample()
+    if self.respond_to?(:sample, true)
+      return self.sample()
+    elsif self.respond_to?(:choice, true)
+      return self.choice() 
+    else
+      return (('A' .. 'Z').to_a + ('a' .. 'z').to_a + ('0' .. '9').to_a)[Kernel.srand.modulo(62)]
+    end
   end
 end
 
 class RandomString
   def initialize
-    
   end
+
   def self.generate(length = 20, alphabet = ('A' .. 'Z').to_a + ('a' .. 'z').to_a + ('0' .. '9').to_a)
-    return (0 .. length).map { alphabet.sample }.join
+    return (0 .. length).map { alphabet.sec_sample }.join
   end
 
   def self.generate_name(length = 20)
-    return (('A' .. 'Z').to_a + ('a' .. 'z').to_a).sample + generate(length - 1)
+    return (('A' .. 'Z').to_a + ('a' .. 'z').to_a).sec_sample + generate(length - 1)
   end
 end

data/lib/scripts/ec2/audit_via_ssh.rb

@@ -101,7 +101,9 @@ class AuditViaSsh < Ec2Script
                         :connection_params => {:user => @context[:ssh_user],
                                                :keys => @context[:ssh_key_file],
                                                :host => @context[:public_dns_name],
-                                               :paranoid => false},
+                                               :paranoid => false}, 
+                                               #:timeout => 120,
+                                               #:verbose => :warn},
                                                :logger => nil)
       audit.start(false)
       @context[:result][:audit_test] = []

data/lib/scripts/ec2/download_snapshot.rb

@@ -117,10 +117,14 @@ class DownloadSnapshot < Ec2Script
       @context[:script].post_message("Going to prepare the two volumes for the zip-operation.")
       @context[:result][:os] =
         connect(@context[:dns_name], @context[:ssh_username], @context[:ssh_keyfile], @context[:ssh_keydata])
+      # source
       source_dir = "/mnt/tmp_#{@context[:source_volume_id]}"
-      dest_dir = @context[:zip_file_dest]
-      create_fs(@context[:dns_name], @context[:dest_device])
       mount_fs(source_dir, @context[:source_device])
+      @context[:fs_type], @context[:label] = get_partition_fs_type_and_label(source_dir)
+      # target
+      dest_dir = @context[:zip_file_dest]
+      #create_fs(@context[:dns_name], @context[:dest_device])
+      create_labeled_fs(@context[:dns_name], @context[:dest_device], @context[:fs_type], @context[:label])
       mount_fs(dest_dir, @context[:dest_device])
       FileSystemsReady.new(@context)
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: CloudyScripts
 version: !ruby/object:Gem::Version 
-  hash: 125
+  hash: 123
   prerelease: false
   segments: 
   - 1
   - 8
-  - 37
-  version: 1.8.37
+  - 38
+  version: 1.8.38
 platform: ruby
 authors: 
 - Matthias Jung
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-10 00:00:00 +00:00
+date: 2011-08-19 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency