ebs_conductor 0.0.1 → 0.0.2

data/Gemfile

@@ -4,7 +4,7 @@ source "http://rubygems.org"
 #   gem "activesupport", ">= 2.3.5"
 
 gem "fog", "~> 0.8.2"
-gem "skeme", ">= 0"
+gem "skeme", "~> 0.0.6"
 gem "rest_connection", ">= 0.0.21"
 
 # Add dependencies to develop your gem here.

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/ebs_conductor.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ebs_conductor}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ryan Geyer"]
-  s.date = %q{2011-06-02}
+  s.date = %q{2011-06-06}
   s.description = %q{= ebs_conductor
 
 The EBS Conductor is a library for managing Amazon Elastic Block Storage volumes and snapshots.  It is designed to persist a specific set of data (a "lineage") between different compute instances.
@@ -73,7 +73,7 @@ further details.
   s.homepage = %q{http://github.com/rgeyer/ebs_conductor}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.2}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{A RightScale/Amazon EC2 EBS library}
   s.test_files = [
     "test/helper.rb"
@@ -84,7 +84,7 @@ further details.
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<fog>, ["~> 0.8.2"])
-      s.add_runtime_dependency(%q<skeme>, [">= 0"])
+      s.add_runtime_dependency(%q<skeme>, ["~> 0.0.6"])
       s.add_runtime_dependency(%q<rest_connection>, [">= 0.0.21"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -92,7 +92,7 @@ further details.
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
       s.add_dependency(%q<fog>, ["~> 0.8.2"])
-      s.add_dependency(%q<skeme>, [">= 0"])
+      s.add_dependency(%q<skeme>, ["~> 0.0.6"])
       s.add_dependency(%q<rest_connection>, [">= 0.0.21"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -101,7 +101,7 @@ further details.
     end
   else
     s.add_dependency(%q<fog>, ["~> 0.8.2"])
-    s.add_dependency(%q<skeme>, [">= 0"])
+    s.add_dependency(%q<skeme>, ["~> 0.0.6"])
     s.add_dependency(%q<rest_connection>, [">= 0.0.21"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])

data/lib/ebs_conductor.rb

@@ -25,6 +25,7 @@ module Rgeyer
       @@logger = nil
       @@default_timeout = 5*60
       @@timeout_backoff = [2,5,10,15]
+      @@rs_region_hash = {'us-east-1' => 1, 'eu-west-1' => 2, 'us-west-1' => 3, 'ap-northeast-1' => 4, 'ap-southeast-1' => 5}
 
       # Instantiates a new EbsConductor
       #
@@ -67,11 +68,12 @@ module Rgeyer
         })
 
         if options[:rs_email] && options[:rs_pass] && options[:rs_acct_num]
+          pass = options[:rs_pass].gsub('"', '\\"')
           ::RightScale::Api::BaseExtend.class_eval <<-EOF
           @@connection ||= RestConnection::Connection.new
             @@connection.settings = {
               :user => "#{options[:rs_email]}",
-              :pass => "#{options[:rs_pass]}",
+              :pass => "#{pass}",
               :api_url => "https://my.rightscale.com/api/acct/#{options[:rs_acct_num]}",
               :common_headers => {
                 "X_API_VERSION" => "1.0"
@@ -82,7 +84,7 @@ module Rgeyer
           @@connection ||= RestConnection::Connection.new
             @@connection.settings = {
               :user => "#{options[:rs_email]}",
-              :pass => "#{options[:rs_pass]}",
+              :pass => "#{pass}",
               :api_url => "https://my.rightscale.com/api/acct/#{options[:rs_acct_num]}",
               :common_headers => {
                 "X_API_VERSION" => "1.0"
@@ -162,14 +164,18 @@ module Rgeyer
         timeout_message = "Timed out waiting for EBS volume to be created and attached to (#{server.id}).  Elapsed time was #{options[:timeout]} seconds"
         block_until_timeout(timeout_message, options[:timeout]) {
           keep_baking = false
-          server = @@fog_aws_computes[region].servers.get(instance_id)
-          # Check things out on AWS
-          check_vol = server.block_device_mapping.select { |dev| dev['volumeId'] == new_vol.id }.first
-          keep_baking = true if !check_vol || check_vol['status'] != "attached"
+          ec2_found = false
+          unless ec2_found
+            server = @@fog_aws_computes[region].servers.get(instance_id)
+            # Check things out on AWS
+            check_vol = server.block_device_mapping.select { |dev| dev['volumeId'] == new_vol.id }.first
+            keep_baking = true if !check_vol || check_vol['status'] != "attached"
+            ec2_found = !keep_baking
+          end
 
           # Check things out in RS if we've got RS credentials
           if @@have_rs
-            vol = Ec2EbsVolume.find(:first) { |vol| vol.aws_id == new_vol.id }
+            vol = Ec2EbsVolume.find_by_cloud_id(@@rs_region_hash[region]).select { |v| v.aws_id == new_vol.id }.first
             keep_baking = (vol == nil)
           end
 
@@ -223,7 +229,7 @@ module Rgeyer
         vol_hash.each do |region,vols|
           # TODO: warn about multiples in a region?
           vols.each do |vol|
-            if ["available", "in-use"].include? vol.status
+            if ["available", "in-use"].include? vol.state
               description = "Created by EBS Conductor for the (#{lineage}) lineage while the volume was #{vol.server_id ? "attached to #{vol.server_id}" : "detatched"}"
 
               excon_resp = @@fog_aws_computes[region].create_snapshot(vol.id, description)
@@ -231,7 +237,7 @@ module Rgeyer
 
               tags = options[:tags] || []
               tags << lineage_tag(lineage)
-              tag_hash[snapshot_id] = {:snapshot_tags => tags, :volume_tags => vol.tags.keys}
+              tag_hash[snapshot_id] = {:snapshot_tags => tags, :volume_tags => vol.tags.keys, :region => region}
             else
               @@logger.warn("Volume (#{vol.id}) had a status of (#{vol.status}).  A snapshot could not be created..")
             end
@@ -243,7 +249,12 @@ module Rgeyer
           keep_baking = false
 
           if @@have_rs
-            snaps = Ec2EbsSnapshot.find(:all) { |snap| tag_hash.keys.include? snap.aws_id }
+            snaps = []
+            tag_hash.each do |snapshot_id,val_hash|
+              snap = Ec2EbsSnapshot.find_by_cloud_id(@@rs_region_hash[val_hash[:region]]).select { |s| snapshot_id == s.aws_id }.first
+              snaps << snap if snap
+            end
+            #snaps = Ec2EbsSnapshot.find_by_cloud_id(:all) { |snap| tag_hash.keys.include? snap.aws_id }
             keep_baking = (snaps.count != tag_hash.keys.count)
           end
 
@@ -330,6 +341,7 @@ module Rgeyer
       end
 
       def block_until_timeout(timeout_message, timeout, &block)
+        @@logger.info("Entered block_until and timeout is (#{timeout})")
         begin
           idx=0
           Timeout::timeout(timeout) do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ebs_conductor
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Ryan Geyer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-02 00:00:00 -07:00
+date: 2011-06-06 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,12 +40,14 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 19
         segments: 
         - 0
-        version: "0"
+        - 0
+        - 6
+        version: 0.0.6
   name: skeme
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -216,7 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A RightScale/Amazon EC2 EBS library