ec2-blackout 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29a1a8480263a9c3557fd5719059e878180bfa40
-  data.tar.gz: c57c8c15e4e9a2699346fb88c919561ec97f5d53
+  metadata.gz: 32705d8bf54ddb910f5d98659489ebf821f1168f
+  data.tar.gz: d53dc475da7f1c68e5743d1d3065b3ef3b72443f
 SHA512:
-  metadata.gz: 0b1b0c88a0f77aaf49e0e29c4949992892bd9f4e35353dd6fde4a1036b1e8891b7262d4d825864548a1242e94eb6bb7c36746a6de022161a285642e7875ae570
-  data.tar.gz: b2167e51383d000e4a125a78ac9257af0156c9b39ddd08d1d5f0c813482960ebbf6cfafecdbca29cf5d96dcf9ae7254b08aafb96fd6af7a3a018cec49c1b6b97
+  metadata.gz: cc1dadcca1a007aab1ff5550574ed9c6575b2f6dadfc0200497669ddb1b5f1ddef420ff8c10cb1ab275052c5c4d2a329bb4a8c5d7f960fc92f26c22714cc3d4b
+  data.tar.gz: a69ffc6ef40007c0da599488dcf4f8ab769ff8f83c21fef8a70ee78b312e5b9d47646e09cbc2ace46dcb34de0963ea6442c67a0b8114d899ff7cc5ec0bb5aaad

data/Gemfile

@@ -3,4 +3,4 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in ec2-sleeper.gemspec
 gemspec
 
-gem "rspec"
+gem "rspec", "2.14.1"

data/lib/ec2-blackout/commands.rb

@@ -29,6 +29,8 @@ command "off" do |c|
 
   c.option '-r', '--regions region1,region2', Array, 'Comma separated list of regions to search. Defaults to all regions'
   c.option '-f', '--force', 'Force start up regardless of who shut them dowm'
+  c.option '-x', '--exclude-by-tag tagname1=value,tagname2', Array, 'Comma separated list of name-value tags to exclude from the blackout off'
+  c.option '-i', '--include-by-tag tagname1=value,tagname2', Array, 'Comma separated list of name-value tags to include in the blackout off'
   c.option '-d', '--dry-run', 'Find instances without starting them'
 
   c.action do |args, options|

data/lib/ec2-blackout/ec2_instance.rb

@@ -55,6 +55,10 @@ class Ec2::Blackout::Ec2Instance
       true
     elsif !tags[TIMESTAMP_TAG_NAME]
       [false, "instance was not originally stopped by ec2-blackout"]
+    elsif @options.matches_exclude_tags?(tags)
+      [false, "matches exclude tags"]
+    elsif !@options.matches_include_tags?(tags)
+      [false, "does not match include tags"]
     else
       true
     end

data/lib/ec2-blackout/version.rb

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

data/spec/ec2-blackout/ec2_instance_spec.rb

@@ -172,6 +172,31 @@ module Ec2::Blackout
         startable, reason = instance.startable?
         expect(startable).to be_true
       end
+
+      it "returns false if the instance matches the exclude tags specified in the options" do
+        options = Ec2::Blackout::Options.new(:exclude_by_tag =>  ["foo=bar"])
+        instance = stubbed_startable_instance(aws_instance, options)
+        aws_instance.stub(:tags).and_return(ec2_tags("foo" => "bar", Ec2Instance::TIMESTAMP_TAG_NAME => '2014-02-13 02:35:52 UTC'))
+        startable, reason = instance.startable?
+        expect(startable).to be_false
+      end
+
+      it "returns true if the instance matches the include tags specified in the options" do
+        options = Ec2::Blackout::Options.new(:include_by_tag =>  ["foo=bar"])
+        instance = stubbed_startable_instance(aws_instance, options)
+        aws_instance.stub(:tags).and_return(ec2_tags("foo" => "bar", Ec2Instance::TIMESTAMP_TAG_NAME => '2014-02-13 02:35:52 UTC'))
+        startable, reason = instance.startable?
+        expect(startable).to be_true
+      end
+
+      it "returns false if the instance does not match the include tags specified in the options" do
+        options = Ec2::Blackout::Options.new(:include_by_tag =>  ["foo=bar"])
+        instance = stubbed_startable_instance(aws_instance, options)
+        aws_instance.stub(:tags).and_return(ec2_tags("bar" => "baz", Ec2Instance::TIMESTAMP_TAG_NAME => '2014-02-13 02:35:52 UTC'))
+        startable, reason = instance.startable?
+        expect(startable).to be_false
+      end
+
     end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ec2-blackout
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Stephen Bartlett
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-14 00:00:00.000000000 Z
+date: 2016-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A command-line tool to shutdown EC2 instances.