awsome 0.0.4 → 0.0.5

data/lib/awsome/ec2.rb

@@ -75,6 +75,32 @@ module Awsome
     end
 
     @@describe_volumes_fields = %w(
+      volume_identifier
+      volume_id
+      size_gb
+      type
+      iops
+      snapshot
+      availability_zone
+      state
+      timestamp
+      tags
+    )
+
+    def self.describe_volumes(filters={}, *volume_ids)
+      cmd = [Awsome::Ec2.command('ec2-describe-volumes')]
+      cmd += volume_ids
+      cmd += filters.collect { |k,v| "--filter \"#{k}=#{v}\"" }
+      Awsome.execute(cmd, columns: @@describe_volumes_fields, filter: /^VOLUME/)
+    end
+
+    def self.volume_available?(volume_id)
+      volumes = describe_volumes(volume_id)
+      raise "volume #{volume_id} not found" if volumes.empty?
+      volumes.first['state'] == 'available'
+    end
+
+    @@describe_attachments_fields = %w(
       attachment_identifier
       volume_id
       instance_id
@@ -83,15 +109,23 @@ module Awsome
       date
     )
 
-    def self.describe_volumes(filters={})
+    def self.describe_attachments(filters={})
       cmd = [Awsome::Ec2.command('ec2-describe-volumes')]
       cmd += filters.collect { |k,v| "--filter \"#{k}=#{v}\"" }
       Awsome.execute(cmd, columns: @@describe_volumes_fields, filter: /^ATTACHMENT/)
     end
 
-    def self.detach_volume(volume_id)
-      cmd = Awsome::Ec2.command('ec2-detach-volume', volume_id)
-      Awsome.execute(cmd)
+    def self.detach_volume(volume_id, device, preumount)
+      attachments = describe_attachments('volume-id' => volume_id)
+      if attachments.any?
+        instance_id = attachments.first['instance_id']
+        instance = describe_instances('instance-id' => instance_id).first
+        instance.ssh preumount if preumount
+        instance.ssh "sudo umount #{device}"
+
+        cmd = Awsome::Ec2.command('ec2-detach-volume', volume_id)
+        Awsome.execute(cmd)
+      end
     end
 
     def self.attach_volume(volume_id, instance_id, device)

data/lib/awsome/ec2/instance.rb

@@ -13,7 +13,7 @@ module Awsome
       end
 
       def volumes
-        Awsome::Ec2.describe_volumes('attachment.instance-id' => @properties['instance_id']).collect do |p| 
+        Awsome::Ec2.describe_attachments('attachment.instance-id' => @properties['instance_id']).collect do |p| 
           p['volume_id'] 
         end.to_set
       end
@@ -29,9 +29,14 @@ module Awsome
         Awsome.wait_until(interval: 10) { has_ssh? }
       end
 
+      def ssh(*args)
+        Awsome::Ssh.ssh(@properties['public_dns_name'], *args)
+      end
+
       def reattach_volumes(*volumes)
         volumes.each do |info| 
-          Awsome::Ec2.detach_volume(info['id'])
+          Awsome::Ec2.detach_volume(info['id'], info['device'], info['preumount'])
+          Awsome.wait_until(interval: 10) { Awsome::Ec2.volume_available?(info['id']) }
           Awsome::Ec2.attach_volume(info['id'], @properties['instance_id'], info['device']) 
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: awsome
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors: