terraform_inventory 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: addf70e58b84f3afc0d7c0a4000ad09d47b2ebb7
-  data.tar.gz: b6878fde290b9ac59c422366a16a2d65facb7c12
+  metadata.gz: abd25bd20c539da7650fafbb91f7a1ba6a03c8ad
+  data.tar.gz: dcb41b0e396f7568f352dcae2dc13e1db7ad3ba0
 SHA512:
-  metadata.gz: 484381d390f1045796da3181b34cfb75c40fc37675c54b90ef3a3f70e70b1901a5126debf911e2d6535982cd812dedf016cecce63a2798d0a5e3783f05618788
-  data.tar.gz: b6800eff49984c58ac1ca565218a6ab54ac277bdff8f451a889aca4d5b4d4e936eb63b1117cf2317713e8ccab8ca5db5d7b9a0a404d510084a4156c5549c2860
+  metadata.gz: 814b0808c1f272484791dc51e14dea04504543c6d512591c5301a356d5a7d4e54fba7d45746efc06548356b250eab5bba752b1f54bcb1b027c3df4ba4952f0a7
+  data.tar.gz: 12ccc784403af83cee86f4d5821e2b8c2cd1e633750c1ca8e6c04fff9ba46eeee1f075136844b37029fdcc970c5ccbbbbaa294efcc67e444cbb0bc754816808e

data/lib/terraform_inventory/cli.rb

@@ -24,8 +24,8 @@ module TerraformInventory
 
       begin
         @groups = state.group_by_host(options[:map])
-      rescue Exception => e  
-        $stderr.puts e.message
+      rescue Exception::InvalidResourceSelectorException, Exception::ResourceNotFoundException => ex
+        say ex.message, :red
         exit(1)
       else
         @ungrouped_resources = @groups[:none] || []

data/lib/terraform_inventory/terraform_state.rb

@@ -20,7 +20,7 @@ module TerraformInventory
     def find_resources(resource_selector)
       resource_type, resource_name, resource_number = parse_resource_selector(resource_selector)
 
-      if @state[resource_type][resource_name].nil?
+      if @state[resource_type].nil? || @state[resource_type][resource_name].nil?
         []
       elsif resource_number
         [@state[resource_type][resource_name][resource_number]]
@@ -34,9 +34,7 @@ module TerraformInventory
         data[host_group.to_sym] ||= []
         resources = find_resources(resource_selector)
 
-        if resources.nil? || resources.empty? || resources.first.nil?
-          raise "Resources matching resource_selector '#{resource_selector}' not found."
-        end
+        raise Exception::ResourceNotFoundException, resource_selector if resources.empty?
 
         data[host_group.to_sym].concat resources
         data

data/lib/terraform_inventory/version.rb

@@ -1,3 +1,3 @@
 module TerraformInventory
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/spec/terraform_inventory/terraform_state_spec.rb

@@ -1,4 +1,5 @@
 require "spec_helper"
+require "terraform_inventory/exception"
 
 # rubocop:disable Style/TrailingWhitespace
 terraform_show_output = %(
@@ -48,6 +49,18 @@ describe TerraformInventory::TerraformState do
   let(:state) { TerraformInventory::TerraformState.new terraform_show_output }
 
   describe "#find_resource" do
+    context "using an invalid resource_selector" do
+      it "throws a TerraformInventory::Exception::InvalidResourceSelectorException" do
+        begin
+          state.find_resources("aws_instance_invalid!!!!web")
+        rescue TerraformInventory::Exception::InvalidResourceSelectorException
+          next
+        else
+          raise "This should have raised a TerraformInventory::Exception::InvalidResourceSelectorException"
+        end
+      end
+    end
+
     context "using a resource_selector without resource_number" do
       let(:resources) { state.find_resources("aws_instance.web") }
 
@@ -89,13 +102,13 @@ describe TerraformInventory::TerraformState do
     end
 
     context "when a resource_selector isn't found" do
-      it "throws an exception" do
+      it "throws a TerraformInventory::Exception::ResourceNotFoundException" do
         begin
           state.group_by_host Hash["aws_instance.freeswitch", "freeswitch"]
-        rescue
+        rescue TerraformInventory::Exception::ResourceNotFoundException
           next
         else
-          raise "This should have raised an exception"
+          raise "This should have raised a TerraformInventory::Exception::ResourceNotFoundException"
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraform_inventory
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Tyler Cross
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-21 00:00:00.000000000 Z
+date: 2014-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor