swa 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b8542e93e6b8679b57d7d15aa193605e3ac4a42
-  data.tar.gz: 999743b0934388671489d25c6c3af62621427a20
+  metadata.gz: 6aaa1176986a7480f4aeba71a8864ce133083c20
+  data.tar.gz: 03b8bd838b24a235a1c1bb499b06ce0e761b6fad
 SHA512:
-  metadata.gz: 5ef747f274c1bfa947d6aa534ef380df524cd860f1dfafe1625c3589b0d0b0d247977945a059dedcd3c2bc07db6de1e1fba88b5886c49d643b7c258b9e5e61f5
-  data.tar.gz: 967358b2a172465734d695a5ffa8d5207980d59385bcf390870caa24641eae7943c212e489c357a10c054e74910e3325e4e88658ba79c28c538f1825edbbedd4
+  metadata.gz: f4d039e776472e25cdf8028ea81e420957ecc97416ee0e2ac571d4f5a3261c2bce52196cec049874e9a04a6d3d5afd4d58f9a6ddf554899d4d4a4e1aad2efe89
+  data.tar.gz: da52ab84256340a1b71b287831f3b5cb9153e7ff301c942a3c43ebd556a41cc0260b2e305a67a71f8546f4943160d2ed0804ccb88dbf3fc8be7d140caaf56c50

data/lib/swa/cli/ec2_command.rb

@@ -23,10 +23,24 @@ module Swa
 
         include ItemBehaviour
 
+        subcommand ["delete"], "Delete image and snapshots" do
+          def execute
+            image.delete
+          end
+        end
+
+        subcommand ["deregister"], "Deregister image" do
+          def execute
+            image.deregister
+          end
+        end
+
         private
 
         def image
-          Swa::EC2::Image.new(ec2.image(image_id))
+          ec2_image = ec2.image(image_id)
+          signal_error "No such image '#{image_id}'" unless ec2_image.exists?
+          Swa::EC2::Image.new(ec2_image)
         end
 
         alias_method :item, :image
@@ -191,6 +205,12 @@ module Swa
 
         include ItemBehaviour
 
+        subcommand "delete", "Delete the key-pair" do
+          def execute
+            key_pair.delete
+          end
+        end
+
         private
 
         def key_pair
@@ -256,6 +276,12 @@ module Swa
 
         include ItemBehaviour
 
+        subcommand ["delete"], "Delete the snapshot" do
+          def execute
+            snapshot.delete
+          end
+        end
+
         private
 
         def snapshot

data/lib/swa/cli/main_command.rb

@@ -12,6 +12,26 @@ module Swa
       subcommand "iam", "IAM stuff", IamCommand
       subcommand "kms", "KMS stuff", KmsCommand
 
+      protected
+
+      RESOURCE_PREFIXES_BY_SERVICE = {
+        "ec2" => %w(ami i sg subnet vpc)
+      }
+
+      def subcommand_for_prefix(prefix)
+        RESOURCE_PREFIXES_BY_SERVICE.each do |subcommand, prefixes|
+          return subcommand if prefixes.member?(prefix)
+        end
+      end
+
+      def parse(arguments)
+        if arguments.first =~ /^(\w+)-/
+          subcommand = subcommand_for_prefix($1)
+          arguments = [subcommand] + arguments if subcommand
+        end
+        super(arguments)
+      end
+
     end
 
   end

data/lib/swa/ec2/image.rb

@@ -21,6 +21,17 @@ module Swa
       end
 
       delegate :creation_date
+      delegate :deregister
+
+      def delete
+        ebs_snapshot_ids = ami.block_device_mappings.map do |mapping|
+          mapping.ebs.snapshot_id if mapping.ebs
+        end.compact
+        deregister
+        ebs_snapshot_ids.each do |snapshot_id|
+          ami.client.delete_snapshot(:snapshot_id => snapshot_id)
+        end
+      end
 
       private
 

data/lib/swa/ec2/key_pair.rb

@@ -16,6 +16,8 @@ module Swa
         aws_resource.name
       end
 
+      delegate :delete
+
     end
 
   end

data/lib/swa/version.rb

@@ -1,3 +1,3 @@
 module Swa
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: swa
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Mike Williams
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-20 00:00:00.000000000 Z
+date: 2016-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler