CloudyScripts 0.0.3 → 0.0.4

data/README.rdoc

@@ -19,4 +19,6 @@
 # =Scripts
 # Here are the scripts implemented so far:
 # * #DmEncrypt (encrypt Amazon EBS Storage using dm-encrypt)
-#
+#
+# =Questions and Suggestions
+# matthias.jung@gmail.com

data/Rakefile

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

data/lib/help/remote_command_handler.rb

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'net/ssh'
+require 'help/dm_crypt_helper'
 
 # Provides methods to be executed via ssh to remote instances.
 class RemoteCommandHandler
@@ -27,6 +28,16 @@ class RemoteCommandHandler
     @crypto.set_ssh(@ssh_session)
   end
 
+  # Connect to the machine as root using keydata from a keyfile.
+  # Params:
+  # * ip: ip address of the machine to connect to
+  # * user: user name
+  # * key_data: key_data to be used for authentication
+  def connect(ip, user, key_data)
+    @ssh_session = Net::SSH.start(ip, user, :key_data => [key_data])
+    @crypto.set_ssh(@ssh_session)
+  end
+
   # Disconnect the current handler
   def disconnect
     @ssh_session.close
@@ -67,7 +78,7 @@ class RemoteCommandHandler
       end
     end
     if drive_found
-      return SshApi.file_exists?(@ssh_session, path)
+      return RemoteCommandHandler.file_exists?(@ssh_session, path)
     else
       puts "not mounted (since #{path} non-existing)"
       false

data/lib/help/script_execution_state.rb

@@ -8,6 +8,13 @@ class ScriptExecutionState
 
   def initialize(context)
     @context = context
+    @state_change_listeners = []
+  end
+
+  # Listener should extend #StateChangeListener (or implement a 
+  # state_changed(state) method). Note: calls are synchronous.
+  def register_state_change_listener(listener)
+    @state_change_listeners << listener
   end
 
   # Start the state machine using this state as initial state.
@@ -17,8 +24,10 @@ class ScriptExecutionState
     while !@current_state.done? && !@current_state.failed?
       begin
         @current_state = @current_state.enter()
+        notify_state_change_listeners(@current_state)
       rescue Exception => e
         @current_state = FailedState.new(@context, e.to_s, @current_state)
+        notify_state_change_listeners(@current_state)
         puts "Exception: #{e}"
         puts "#{e.backtrace.join("\n")}"
       end
@@ -67,4 +76,13 @@ class ScriptExecutionState
     end
   end
 
+  private
+
+  # Notifies all listeners of state changes
+  def notify_state_change_listeners(state)
+    @state_change_listeners.each() {|listener|
+      listener.state_changed(state)
+    }
+  end
+
 end

data/lib/help/state_change_listener.rb

@@ -0,0 +1,13 @@
+# Defines a template for a class that allows to be notified
+# on state-changes in #ScriptExecutionState. A listener must be
+# registered via #ScriptExecutionState::register_state_change_listener.
+# When a state changes the method #state_changed is called.
+
+class StateChangeListener
+  # Method called when a state changes. Note: calls are synchronous, the
+  # listener should return quickly and handle more complicated routines
+  # in a different thread.
+  def state_changed(state)
+    raise Exception.new("StateChangeListener: state change notification not implemented")
+  end
+end

data/lib/scripts/ec2/dm_encrypt.rb

@@ -7,15 +7,12 @@ require "AWS"
 # Script to Encrypt an EC2 Storage (aka Elastic Block Storage)
 # 
 class DmEncrypt < Ec2Script
-  def initialize(input_params)
-    super(input_params)
-  end
-
   # Input parameters
   # * aws_access_key => the Amazon AWS Access Key (see Your Account -> Security Credentials)
   # * aws_secret_key => the Amazon AWS Secret Key
   # * ip_address => IP Address of the machine to connect to
-  # * ssh_key_file => Path of the keyfile used to connect to the machine
+  # * ssh_key_file => Path of the keyfile used to connect to the machine (optional, otherwise: ssh_key_data)
+  # * ssh_key_data => Key information (optional, otherwise: ssh_key_file)
   # * device => Path of the device to encrypt
   # * device_name => Name of the Device to encrypt
   # * storage_path => Path on which the encrypted device is mounted
@@ -45,6 +42,9 @@ class DmEncrypt < Ec2Script
       end
       # start state machine
       current_state = DmEncryptState.load_state(@input_params)
+      @state_change_listeners.each() {|listener|
+        current_state.register_state_change_listener(listener)
+      }
       end_state = current_state.start_state_machine()
       if end_state.failed?
         @result[:failed] = true
@@ -100,7 +100,13 @@ class DmEncrypt < Ec2Script
 
     def connect()
       puts "InitialState.connect"
-      @context[:remote_command_handler].connect(@context[:ip_address], @context[:ssh_key_file])
+      if @context[:ssh_key_file] != nil
+        @context[:remote_command_handler].connect(@context[:ip_address], @context[:ssh_key_file])
+      elsif @context[:ssh_key_data] != nil
+        @context[:remote_command_handler].connect(@context[:ip_address], "root", @context[:ssh_key_data])
+      else
+        raise Exception.new("no key information specified")
+      end
       ConnectedState.new(@context)
     end
   end

data/lib/scripts/ec2/ec2_script.rb

@@ -3,11 +3,18 @@ class Ec2Script
   # Initialization. Common Input parameters:
   # * aws_access_key => the Amazon AWS Access Key (see Your Account -> Security Credentials)
   # * aws_secret_key => the Amazon AWS Secret Key
+  # * ec2_api_server => the API Server to connect to (optional, default is us-east-1 (=> <ec2_api_server>.ec2.amazonaws.com)
   # Scripts may add specific key/value pairs.
   def initialize(input_params)
     @input_params = input_params
+    @state_change_listeners = []
   end
 
+  def register_state_change_listener(listener)
+    @state_change_listeners << listener
+  end
+
+
   # Return a hash of results. Common values are:
   # * :done => is true when the script has terminated, otherwise false
   # * :failed => is false when the script succeeded

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: CloudyScripts
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Matthias Jung
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-18 00:00:00 +01:00
+date: 2010-01-05 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,6 +49,7 @@ files:
 - lib/help/dm_crypt_helper.rb
 - lib/help/remote_command_handler.rb
 - lib/help/script_execution_state.rb
+- lib/help/state_change_listener.rb
 - lib/scripts/ec2/dm_encrypt.rb
 - lib/scripts/ec2/ec2_script.rb
 has_rdoc: true