CloudyScripts 1.10.43 → 1.10.44

data/Rakefile

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

data/lib/audit/lib/benchmark/audit_benchmark.rb

@@ -151,7 +151,8 @@ class AuditBenchmark
 #  end
 
   def duration()
-    execution_order().flatten().each().inject(0) {|result, element| result + element.duration}
+    #execution_order().flatten().each().inject(0) {|result, element| result + element.duration}
+    execution_order().flatten().inject(0) {|result, element| result + element.duration}
   end
 
   def to_hash()

data/lib/help/remote_command_handler.rb

@@ -279,7 +279,7 @@ class RemoteCommandHandler
     exec_string = "sh -c 'echo #{push_data} >tmp.txt; #{exec_string} <tmp.txt; rm -f tmp.txt'" unless push_data == nil
     stdout = []
     stderr = []
-    result = remote_exec_helper(exec_string, stdout, stderr)
+    result = remote_exec_helper(exec_string, stdout, stderr, true)
     em = "RemoteCommandHandler: #{exec_string} lead to stderr message: #{stderr.join().strip}"
     @logger.info(em) unless stderr.size == 0
     raise Exception.new(em) unless result == true || raise_exception == false

data/lib/scripts/ec2/audit_via_ssh.rb

@@ -35,9 +35,9 @@ class AuditViaSsh < Ec2Script
     if @input_params[:sec_grp_name] == nil
       @input_params[:sec_grp_name] = "default"
     end
-    if @input_params[:audit_type] != nil && @input_params[:audit_type].casecmp("SSH")
+    if @input_params[:audit_type] != nil && @input_params[:audit_type].downcase.eql?("ssh")
       @input_params[:benchmark_file] = "./lib/audit/benchmark_ssh.zip"
-    elsif @input_params[:audit_type] != nil && @input_params[:audit_type].casecmp("APACHE")
+    elsif @input_params[:audit_type] != nil && @input_params[:audit_type].downcase.eql?("apache")
       @input_params[:benchmark_file] = "./lib/audit/benchmark_apache.zip"
     else
       raise Exception.new("Invalid Audit '#{@input_params[:audit_type]}' specified")

data/lib/scripts/ec2/copy_ami.rb

@@ -214,13 +214,8 @@ class CopyAmi < Ec2Script
     def enter()
       remote_region()
       # Get Amazon Kernel Image ID
-      #aki = get_aws_kernel_image_aki(@context[:ec2_api_handler].server.split('.')[0], @context[:kernel_id], 
-      #  @context[:target_ec2_handler].server.split('.')[0])
-      aki = get_aws_kernel_image_aki(@context[:ec2_api_handler].server, @context[:kernel_id], 
-        @context[:target_ec2_handler].server)
-      #@context[:result][:image_id] = register_snapshot(@context[:new_snapshot_id], @context[:name],
-      #  @context[:root_device_name], @context[:description], nil,
-      #  nil, @context[:architecture])
+      aki = get_aws_kernel_image_aki(@context[:source_availability_zone], @context[:kernel_id],
+        @context[:target_availability_zone])
       @context[:result][:image_id] = register_snapshot(@context[:new_snapshot_id], @context[:name],
         @context[:root_device_name], @context[:description], aki,
         nil, @context[:architecture])

data/lib/scripts/ec2/ec2_script.rb

@@ -19,7 +19,15 @@ class Ec2Script
     end
     @result = {:done => false, :failed => false}
     @input_params[:result] = @result
-    @logger.info("input parameters = #{@input_params.inspect}")
+    @input_params.each() do |param_key, param_value|
+      if [:logger, :ec2_api_handler, :target_ec2_handler, :remote_command_handler,
+        :source_ssh_keydata, :target_ssh_keydata
+        ].include?(param_key.to_s.to_sym)
+        @logger.debug("INPUT PARAM #{param_key} is set [but not logged]")
+      else
+        @logger.debug("INPUT PARAM #{param_key} = #{param_value.inspect}")
+      end
+    end
   end
 
   def register_state_change_listener(listener)

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: CloudyScripts
 version: !ruby/object:Gem::Version 
+  hash: 103
   prerelease: false
   segments: 
   - 1
   - 10
-  - 43
-  version: 1.10.43
+  - 44
+  version: 1.10.44
 platform: ruby
 authors: 
 - Matthias Jung
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-02 00:00:00 +02:00
+date: 2011-09-07 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: amazon-ec2
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -33,9 +36,11 @@ dependencies:
   name: net-ssh
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -45,9 +50,11 @@ dependencies:
   name: net-scp
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -271,23 +278,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: cloudyscripts
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Scripts to facilitate programming for infrastructure clouds.