aws-cleaner 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80481ad1bbad492ed7a78e64b32ed31e8f8d76e3
-  data.tar.gz: d4925c9b50c0d2cb1380fae10d7be3d5f1bfd552
+  metadata.gz: a88504d1196ccc539ecd4ad7c76bb900a760b8f2
+  data.tar.gz: e775a96820ae0656d0d112755cf88f33c62accde
 SHA512:
-  metadata.gz: 97bacc126598670d7884803c370d58cc2629c534d51090e9a7b580bb7196f05de14daf767c10e077015bb97e07ab5d52c949b8b8559f82762b0501e0edf6841d
-  data.tar.gz: ee53322b71a5d4a0c28f3323479f3fa0ab452ee59175ecbfd24c56b332a75c1026cc4e2667147118440467ba239aa37b2ba6a11aafd828db62949a94bcb14068
+  metadata.gz: 73b82755cd2b6243c6de3e42f3d4a5555770284dcd8ec1da9633ae86580d201ab1cb86a5925152bbb7567a42cd278fb83e795796c0ea0a3646d6e1476ef673e1
+  data.tar.gz: 54bf287440defe954ef1a6927185fad067decfeb99feaf101905ff3b88ce03694dc8b556ceb6741209c4de54bb14a9a70e1179b4b7726724537bd2b28330290c

data/lib/aws-cleaner.rb

@@ -150,12 +150,12 @@ class AwsCleaner
       else
         raise 'Unknown templating method'
       end
-      item.gsub!(/{#{template_variable}}/, replacement)
+      replaced_item = item.gsub(/{#{template_variable}}/, replacement)
     rescue StandardError => e
       puts "Error generating template: #{e.message}"
       return false
     else
-      item
+      replaced_item
     end
 
     # call an HTTP endpoint
@@ -175,21 +175,21 @@ class AwsCleaner
       end
 
       hook = { method: hook_config[:method].to_sym, url: url }
-      r = RestClient::Request.execute(hook)
-      if r.code != 200
+      begin
+        RestClient::Request.execute(hook)
+      rescue RestClient::ExceptionWithResponse => e
         return false
-      else
-        # notify chat when webhook is successful
-        if hook_config[:chat][:enable]
-          msg = AwsCleaner::Webhooks.generate_template(
-            hook_config[:chat][:message],
-            hook_config[:chat][:method],
-            hook_config[:chat][:variable],
-            config,
-            instance_id
-          )
-          AwsCleaner::Notify.notify_chat(msg, config)
-        end
+      end
+      # notify chat when webhook is successful
+      if hook_config[:chat][:enable]
+        msg = AwsCleaner::Webhooks.generate_template(
+          hook_config[:chat][:message],
+          hook_config[:chat][:method],
+          hook_config[:chat][:variable],
+          config,
+          instance_id
+        )
+        AwsCleaner::Notify.notify_chat(msg, config)
         return true
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-cleaner
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Eric Heydrick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-21 00:00:00.000000000 Z
+date: 2018-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler