cloudfinder-ec2 0.1.0 → 0.1.2

data/lib/cloudfinder-ec2/command/list.rb

@@ -42,7 +42,10 @@ module Cloudfinder
         # @return void
         def execute(query = {})
           unless query[:region] && query[:cluster_name]
-            query = autodetect_cluster_or_throw.merge(query)
+            detected = autodetect_cluster_or_throw
+            [:region, :cluster_name].each do |key|
+              query[key] = detected[key] if query[key].nil?
+            end
           end
 
           cluster = @finder.find(query)

data/lib/cloudfinder-ec2/version.rb

@@ -1,5 +1,5 @@
 module Cloudfinder
   module EC2
-    VERSION = "0.1.0"
+    VERSION = "0.1.2"
   end
 end

data/spec/cloudfinder-ec2/command/list_spec.rb

@@ -1,4 +1,4 @@
-describe Cloudfinder::EC2::Command::List, focus: true do
+describe Cloudfinder::EC2::Command::List do
   let (:detector)         { spy(Cloudfinder::EC2::Detector) }
   let (:detector_result)  { { cluster_name: detected_cluster, cluster_role: 'db', region: detected_region } }
   let (:cluster_finder)   { spy(Cloudfinder::EC2::Clusterfinder) }
@@ -95,6 +95,17 @@ describe Cloudfinder::EC2::Command::List, focus: true do
       include_examples 'render cluster as JSON'
     end
 
+    context 'when specified region and cluster name are nil' do
+      before :each do
+        expect(detector).to receive(:detect_cluster).and_return detector_result
+        subject.execute(region: nil, cluster_name: nil)
+      end
+
+      include_examples 'find cluster by detected name'
+      include_examples 'find cluster in detected region'
+      include_examples 'render cluster as JSON'
+    end
+
     context 'when cluster detector throws exception' do
       before :each do
         expect(detector).to receive(:detect_cluster).and_raise Errno::ENETUNREACH

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudfinder-ec2
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2015-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
-  requirement: &5940440 !ruby/object:Gem::Requirement
+  requirement: &12881780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *5940440
+  version_requirements: *12881780
 - !ruby/object:Gem::Dependency
   name: slop
-  requirement: &5939460 !ruby/object:Gem::Requirement
+  requirement: &12880800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.6'
   type: :runtime
   prerelease: false
-  version_requirements: *5939460
+  version_requirements: *12880800
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &5938160 !ruby/object:Gem::Requirement
+  requirement: &12880260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *5938160
+  version_requirements: *12880260
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &5936980 !ruby/object:Gem::Requirement
+  requirement: &12868900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *5936980
+  version_requirements: *12868900
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &5935720 !ruby/object:Gem::Requirement
+  requirement: &12863300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *5935720
+  version_requirements: *12863300
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &5934760 !ruby/object:Gem::Requirement
+  requirement: &12845900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,13 +76,13 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *5934760
+  version_requirements: *12845900
 description: Uses EC2 instance tags to locate all the running instances in a given
   cluster, grouped by role.
 email:
 - andrew@ingenerator.com
 executables:
-- cloudfinder
+- cloudfinder-ec2
 extensions: []
 extra_rdoc_files: []
 files:
@@ -96,7 +96,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/cloudfinder
+- bin/cloudfinder-ec2
 - cloudfinder-ec2.gemspec
 - lib/cloudfinder-ec2.rb
 - lib/cloudfinder-ec2/cluster.rb