sport_ngin_aws_auditor 3.8.3 → 3.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61c18acb4a0425eecc7d1c34475b6f9e4782a591
-  data.tar.gz: b64e797ac47c77b29c8572336f0a096e293f785d
+  metadata.gz: beef821f62dfeb8b9235d25a120b2faf8ddec09a
+  data.tar.gz: f0c504bfd3cbd9fbdd8f305c733f8eba50ce7ac9
 SHA512:
-  metadata.gz: 65a9c6b87a00aa2b941b40876a2e2ff96c42ad0a2719fc05e8ebe57a21aa576ef99f1640e99adf81f5e95d48c0414e6cc409e7727759cacefee2f69e30787c39
-  data.tar.gz: be320dedfbd0384a24f185067e8b870e11c1566cf4aeb21aa2245821cdd6835ef6d2bd308fc84420cb35bf3def5161f1da704ebf65674e28365f623e19ddc24d
+  metadata.gz: 62da765c56b2599a4817d1b585bd3844bec7397e4a1c2cd93ab7e1d409c0e255fa5123b2fecf56e0463cce87e497436620764a34c4caba67accba942f4317d5c
+  data.tar.gz: 71545feabd3057e6062725598b98b565cc31a99ed1c2847edc9867ae2ae721b8e78826395ad181657e4faa60277cbb12b7426eb7f47a74389db50484ddbc267a

data/.travis.yml

@@ -6,8 +6,6 @@ branches:
 
 language: ruby
 rvm:
-  - 2.0.0
-  - 2.1
   - 2.2
 cache: bundler
 script: bundle exec rspec

data/CHANGELOG.markdown

@@ -1,3 +1,8 @@
+#### v3.9.0
+* Add the ability to pass config data in as a flag
+
+  > Emma Sax: Andy Fleener, Unknown User: https://github.com/sportngin/sport_ngin_aws_auditor/pull/24
+
 #### v3.8.3
 * Fixing bugs with outputs and counts
 

data/lib/sport_ngin_aws_auditor/commands/audit.rb

@@ -7,6 +7,7 @@ command 'audit' do |c|
   c.switch [:r, :reserved], :desc => "Shows reserved instance counts"
   c.switch [:i, :instances], :desc => "Shows current instance counts"
   c.flag [:t, :tag], :default_value => "no-reserved-instance", :desc => "Read a tag and group separately during audit"
+  c.flag [:h, :config_json], :default_value => nil, :desc => "Print the audit according to this config json object instead of to config file"
   c.switch [:n, :no_tag], :desc => "Ignore all tags during audit"
   c.switch [:s, :slack], :desc => "Will print condensed version of audit to a Slack channel"
   c.action do |global_options, options, args|

data/lib/sport_ngin_aws_auditor/notify_slack.rb

@@ -1,24 +1,28 @@
 require 'httparty'
+require 'json'
 
 module SportNginAwsAuditor
   class NotifySlack
-    attr_accessor :text, :channel, :webhook, :username, :icon_url, :icon_emoji, :attachments
+    attr_accessor :text, :channel, :webhook, :username, :icon_url, :icon_emoji, :attachments, :config
 
-    def initialize(text)
+    def initialize(text, config_params)
       self.text = text
       self.attachments = []
-      if SportNginAwsAuditor::Config.slack
-        self.channel = SportNginAwsAuditor::Config.slack[:channel]
-        self.username = SportNginAwsAuditor::Config.slack[:username]
-        self.webhook = SportNginAwsAuditor::Config.slack[:webhook]
-        self.icon_url = SportNginAwsAuditor::Config.slack[:icon_url]
+      config_file = SportNginAwsAuditor::Config.slack.to_h || {}
+      self.config = config_params ? config_file.merge(JSON.parse(config_params)) : config_file
+      
+      if self.config
+        self.channel = self.config['channel']
+        self.username = self.config['username']
+        self.webhook = self.config['webhook']
+        self.icon_url = self.config['icon_url']
       else
-        puts "To use Slack, you must provide a separate config file. See the README for more information."
+        puts "To use Slack, you must provide either a separate config file or a hash of config data. See the README for more information."
       end
     end
 
     def perform
-      if SportNginAwsAuditor::Config.slack
+      if config
         options = {text: text,
                    webhook: webhook,
                    channel: channel,

data/lib/sport_ngin_aws_auditor/scripts/audit.rb

@@ -126,7 +126,7 @@ module SportNginAwsAuditor
 
       def self.print_discrepancies(discrepancy_array, audit_results, class_type, environment)
         title = "Some #{class_type} discrepancies for #{environment} exist:\n"
-        slack_instances = NotifySlack.new(title)
+        slack_instances = NotifySlack.new(title, options[:config_json])
 
         discrepancy_array.each do |discrepancy|
           type = discrepancy.type
@@ -144,7 +144,7 @@ module SportNginAwsAuditor
 
       def self.print_tagged(tagged_array, audit_results, class_type, environment)
         title = "There are currently some tagged #{class_type}s in #{environment}:\n"
-        slack_instances = NotifySlack.new(title)
+        slack_instances = NotifySlack.new(title, options[:config_json])
 
         tagged_array.each do |tagged|
           type = tagged.type
@@ -173,7 +173,7 @@ module SportNginAwsAuditor
           message << "*#{name}* (#{count}) on *#{expiration_date}*\n"
         end
           
-        slack_retired_ris = NotifySlack.new(message)
+        slack_retired_ris = NotifySlack.new(message, options[:config_json])
         slack_retired_ris.perform
       end
 
@@ -188,7 +188,7 @@ module SportNginAwsAuditor
           end
         end
 
-        slack_retired_tags = NotifySlack.new(message)
+        slack_retired_tags = NotifySlack.new(message, options[:config_json])
         slack_retired_tags.perform
       end
 

data/lib/sport_ngin_aws_auditor/version.rb

@@ -1,3 +1,3 @@
 module SportNginAwsAuditor
-  VERSION = "3.8.3"
+  VERSION = "3.9.0"
 end

data/spec/sport_ngin_aws_auditor/notify_slack_spec.rb

@@ -1,4 +1,5 @@
 require "sport_ngin_aws_auditor"
+require 'json'
 
 module SportNginAwsAuditor
   describe NotifySlack do
@@ -16,17 +17,29 @@ module SportNginAwsAuditor
     it 'should ping Slack Notifier' do
       notifier = double('notifier')
       expect(HTTParty).to receive(:post)
-      message = NotifySlack.new("Test message")
+      message = NotifySlack.new("Test message", nil)
       message.perform
     end
 
      it 'should define certain values' do
-      message = NotifySlack.new("Test message")
+      message = NotifySlack.new("Test message", nil)
       expect(message.text).to eq("Test message")
       expect(message.channel).to eq("#random-test-channel")
       expect(message.username).to eq("Random User")
       expect(message.webhook).to eq("https://hooks.slack.com/services/totallyrandom/fakewebhookurl")
       expect(message.icon_url).to eq("http://random-picture.jpg")
     end
+
+    it 'should ping Slack Notifier even when passing in config as a hash' do
+      notifier = double('notifier')
+      config_hash = {:username=>"AWS Auditor",
+                     :icon_url=>"http://i.imgur.com/86x8PSg.jpg",
+                     :channel=>"#test-webhook-channel",
+                     :webhook=>"https://hooks.slack.com/services/thisisafake"
+                    }.to_json
+      expect(HTTParty).to receive(:post)
+      message = NotifySlack.new("Test message", config_hash)
+      message.perform
+    end
   end
 end

data/sport_ngin_aws_auditor.gemspec

@@ -24,8 +24,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'highline', '~> 1.6'
   spec.add_dependency 'google_drive', '~> 1.0.0.pre2'
   spec.add_dependency 'google-api-client', '~> 0.8.6'
-  spec.add_dependency 'rack', '~> 1.3.0'
-  spec.add_dependency 'activesupport', '~> 3.2'
+  spec.add_dependency 'rack', '>= 1.3.0'
+  spec.add_dependency 'activesupport', '>= 3.2'
   spec.add_dependency 'httparty'
   spec.add_dependency 'colorize'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sport_ngin_aws_auditor
 version: !ruby/object:Gem::Version
-  version: 3.8.3
+  version: 3.9.0
 platform: ruby
 authors:
 - Elliot Hursh
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-10 00:00:00.000000000 Z
+date: 2016-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -100,28 +100,28 @@ dependencies:
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency