ec2-blackout 0.0.7 → 0.0.8

data/lib/ec2-blackout/ec2_instance.rb

@@ -41,6 +41,8 @@ class Ec2::Blackout::Ec2Instance
       [false, "matches exclude tags"]
     elsif !@options.matches_include_tags?(tags)
       [false, "does not match include tags"]
+    elsif @instance.root_device_type != :ebs
+      [false, "is not ebs root device"]
     else
       true
     end
@@ -77,7 +79,11 @@ class Ec2::Blackout::Ec2Instance
   def tag
     @instance.add_tag(TIMESTAMP_TAG_NAME, :value => Time.now.utc)
     if @instance.has_elastic_ip?
-      @instance.add_tag(EIP_TAG_NAME, :value => @instance.elastic_ip.allocation_id)
+      if @instance.elastic_ip.vpc?
+        @instance.add_tag(EIP_TAG_NAME, :value => @instance.elastic_ip.allocation_id)
+      else
+        @instance.add_tag(EIP_TAG_NAME, :value => @instance.elastic_ip.public_ip)
+      end
     end
   end
 

data/lib/ec2-blackout/shutdown.rb

@@ -7,7 +7,7 @@ class Ec2::Blackout::Shutdown
   end
 
   def execute
-    @ui.say 'Dry run specified - no instances will be stopped'.bold
+    @ui.say 'Dry run specified - no instances will be stopped'.bold if @options.dry_run
     @ui.say "Stopping instances"
     @options.regions.each do |region|
       @ui.say "Checking region #{region}"

data/lib/ec2-blackout/startup.rb

@@ -7,7 +7,7 @@ class Ec2::Blackout::Startup
   end
 
   def execute
-    @ui.say 'Dry run specified - no instances will be started'.bold
+    @ui.say 'Dry run specified - no instances will be started'.bold if @options.dry_run
     @ui.say "Starting instances"
     @options.regions.each do |region|
       @ui.say "Checking region #{region}"

data/lib/ec2-blackout/version.rb

@@ -1,6 +1,6 @@
 module Ec2
   module Blackout
-    VERSION = "0.0.7"
+    VERSION = "0.0.8"
 
     def self.name
       'ec2-blackout'

data/spec/ec2-blackout/ec2_instance_spec.rb

@@ -36,12 +36,38 @@ module Ec2::Blackout
         instance.stop
       end
 
-      it "saves the associated elastic IP as a tag" do
-        aws_instance.stub(:has_elastic_ip?).and_return(true)
-        eip = double(:allocation_id => "eipalloc-eab23c0d")
-        aws_instance.stub(:elastic_ip).and_return(eip)
-        aws_instance.should_receive(:add_tag).with(Ec2Instance::EIP_TAG_NAME, :value => "eipalloc-eab23c0d")
-        instance.stop
+      context 'when the instance has an Elastic IP' do
+        let(:eip) { double(:eip) }
+
+        before do
+          aws_instance.stub(:has_elastic_ip?).and_return(true)
+          aws_instance.stub(:elastic_ip).and_return(eip)
+        end
+
+        context 'and it is running in a VPC' do
+
+          before do
+            eip.stub(:vpc?).and_return(true)
+          end
+
+          it "saves the associated elastic IP as a tag" do
+            eip.should_receive(:allocation_id).and_return("eipalloc-eab23c0d")
+            aws_instance.should_receive(:add_tag).with(Ec2Instance::EIP_TAG_NAME, :value => "eipalloc-eab23c0d")
+            instance.stop
+          end
+        end
+
+        context 'and it is running in EC2 classic' do
+          before do
+            eip.stub(:vpc?).and_return(false)
+          end
+
+          it "saves the elastic public IP as a tag" do
+            eip.should_receive(:public_ip).and_return("public-ip")
+            aws_instance.should_receive(:add_tag).with(Ec2Instance::EIP_TAG_NAME, :value => "public-ip")
+            instance.stop
+          end
+        end
       end
 
     end
@@ -116,6 +142,12 @@ module Ec2::Blackout
         stoppable, reason = instance.stoppable?
         expect(stoppable).to be_false
       end
+
+      it "returns false if the instance volume type is not EBS" do
+        aws_instance.stub(:root_device_type).and_return('not_ebs')
+        stoppable, reason = instance.stoppable?
+        expect(stoppable).to be_false
+      end
     end
 
     describe "#startable?" do
@@ -149,6 +181,7 @@ module Ec2::Blackout
       underlying_aws_stub.stub(:tags).and_return(ec2_tags({}))
       underlying_aws_stub.stub(:add_tag)
       underlying_aws_stub.stub(:stop)
+      underlying_aws_stub.stub(:root_device_type).and_return(:ebs)
       Ec2Instance.new(underlying_aws_stub, options)
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ec2-blackout
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-17 00:00:00.000000000 Z
+date: 2014-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander