pagerduty 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79dcf1ccf6b3223a64d07a152f55b8a0b6a99f26
-  data.tar.gz: bd86c131d6b99b475ffe82082a307defff905ec7
+  metadata.gz: 0164943fae7683d08ea5fad001e6ebea17af7524
+  data.tar.gz: 1d58093c6b70649b7877ed41425641d4330e065b
 SHA512:
-  metadata.gz: e2d66e8ea5d2d101c6d5c484c51b5bbc0d9f7b462f2ef2a449344f7e8dd8b0b0b411fb336f978f2e28bf1d42b0ef46d1801f7ff04b2b953e0e9b046a8d71891c
-  data.tar.gz: 0d6614d6104796bda5868fc529da1ac8b75de6688c67df41fda5aae39e3a386654ad49178304a375483465c9585935a41b33327ac2c6b48b92db15f378e30400
+  metadata.gz: 1ef62a628733a0cc02994789eb80ac7fbb7685c038c21595f82c897dafef17a53b5287af0ef52ad702104dd655aefd7a3517cab10f159fa401552e85c1eb610d
+  data.tar.gz: da5ae3770b892d4ce644d05b2c5a830b38007d19fcee3931dfc4f23454755afb3b1dde71b163a9c225b6ea606a9d33026d5c629a0e90b6ec70fbaed6ff1b320f

data/.rubocop.yml

@@ -0,0 +1,27 @@
+AllCops:
+  Exclude:
+    - .bundle/**/*
+    - bin/**/*
+    - vendor/**/*
+
+Style/AccessModifierIndentation:
+  EnforcedStyle: outdent
+
+Style/BlockDelimiters:
+  Exclude:
+    - spec/**/*
+
+Style/Documentation:
+  Enabled: false
+
+Style/GuardClause:
+  Enabled: false
+
+Style/SpecialGlobalVars:
+  Enabled: false
+
+Style/StringLiterals:
+  EnforcedStyle: double_quotes
+
+Style/TrailingComma:
+  EnforcedStyleForMultiline: comma

data/.travis.yml

@@ -1,6 +1,9 @@
 language: ruby
+sudo: false
+cache: bundler
 rvm:
-  - 2.2.0
-  - 2.1.5
+  - 2.3.0
+  - 2.2.4
+  - 2.1.8
   - 2.0.0
   - 1.9.3

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in pagerduty.gemspec
 gemspec

data/README.md

@@ -39,6 +39,11 @@ incident = pagerduty.trigger("incident description")
 # Acknowledge and/or resolve the incident
 incident.acknowledge
 incident.resolve
+
+# Acknowledge and/or resolve an existing incident
+incident = pagerduty.get_incident("<unique-incident-key>")
+incident.acknowledge
+incident.resolve
 ```
 
 There are a whole bunch of properties you can send to PagerDuty when triggering
@@ -49,16 +54,36 @@ for the specifics.
 ```ruby
 pagerduty.trigger(
   "incident description",
-  :incident_key => "my unique incident identifier",
-  :client       => "server in trouble",
-  :client_url   => "http://server.in.trouble",
-  :details      => { :my => "extra details" },
+  incident_key: "my unique incident identifier",
+  client:       "server in trouble",
+  client_url:   "http://server.in.trouble",
+  details:      { my: "extra details" }
 )
 ```
 
+### HTTP Proxy Support
+
+One can explicitly define an HTTP proxy like this:
+
+```ruby
+# Instantiate a Pagerduty with your specific service key and proxy details
+pagerduty = Pagerduty.new(
+  "<my-service-key>",
+  proxy_host: "my.http.proxy.local",
+  proxy_port: 3128,
+  proxy_username: "<my-proxy-username>",
+  proxy_password: "<my-proxy-password>",
+)
+
+# Then proceed to trigger your incident
+# (sends the request to PagerDuty via the HTTP proxy)
+incident = pagerduty.trigger("incident description")
+```
+
 ### Debugging Error Responses
 
-The gem doesn't encapsulate HTTP error responses from PagerDuty. Here's how to go about debugging these unhappy cases:
+The gem doesn't encapsulate HTTP error responses from PagerDuty. Here's how to
+go about debugging these unhappy cases:
 
 ```ruby
 begin
@@ -83,10 +108,10 @@ rather than just details.
     ```ruby
     # This no longer works post v2.0.0. If you're
     # providing details in this form, please migrate.
-    pagerduty.trigger("desc", :key => "value")
+    pagerduty.trigger("desc", key: "value")
 
     # Post v2.0.0 this is how to send details (migrate to this please).
-    pagerduty.trigger("desc", :details => { :key => "value" })
+    pagerduty.trigger("desc", details: { key: "value" })
     ```
 
 3. `PagerdutyException` now extends from `StandardError` rather than
@@ -96,7 +121,7 @@ before.
 
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/pagerduty/fork )
+1. Fork it ( https://github.com/envato/pagerduty/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/Rakefile

@@ -1,8 +1,12 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
+require "rubocop/rake_task"
 
-task :default => :spec
+task default: [:spec, :rubocop]
 
 RSpec::Core::RakeTask.new(:spec) do |t|
   t.verbose = false
+  t.ruby_opts = "-w"
 end
+
+RuboCop::RakeTask.new(:rubocop)

data/lib/pagerduty.rb

@@ -1,5 +1,5 @@
-require 'pagerduty/version'
-require 'pagerduty/http_transport'
+require "pagerduty/version"
+require "pagerduty/http_transport"
 
 class PagerdutyException < StandardError
   attr_reader :pagerduty_instance, :api_response
@@ -12,14 +12,25 @@ class PagerdutyException < StandardError
 end
 
 class Pagerduty
-
   attr_reader :service_key
 
   # @param [String] service_key The GUID of one of your "Generic API" services.
   #   This is the "service key" listed on a Generic API's service detail page.
   #
-  def initialize(service_key)
+  # @option options [String] :proxy_host The DNS name or IP address of the
+  #   proxy host. If nil or unprovided a proxy will not be used.
+  #
+  # @option options [String] :proxy_port The port to use to access the proxy.
+  #
+  # @option options [String] :proxy_username username if authorization is
+  #   required to use the proxy.
+  #
+  # @option options [String] :proxy_password password if authorization is
+  #   required to use the proxy.
+  #
+  def initialize(service_key, options = {})
     @service_key = service_key
+    @transport = transport_from_options(options)
   end
 
   # Send PagerDuty a trigger event to report a new or ongoing problem. When
@@ -56,36 +67,51 @@ class Pagerduty
   #   "success"
   #
   def trigger(description, options = {})
-    resp = api_call("trigger", options.merge(:description => description))
+    resp = api_call("trigger", options.merge(description: description))
     ensure_success(resp)
-    PagerdutyIncident.new service_key, resp["incident_key"]
+    PagerdutyIncident.new(
+      service_key,
+      resp["incident_key"],
+      transport: @transport,
+    )
   end
 
+  # @param [String] incident_key The unique identifier for the incident.
+  #
   # @return [PagerdutyIncident] The incident referenced by the key.
   #
+  # @raise [ArgumentError] If incident_key is nil
+  #
   def get_incident(incident_key)
-    PagerdutyIncident.new service_key, incident_key
+    fail ArgumentError, "incident_key is nil" if incident_key.nil?
+    PagerdutyIncident.new(
+      service_key,
+      incident_key,
+      transport: @transport,
+    )
   end
 
 protected
 
   def api_call(event_type, args)
     args = args.merge(
-      :service_key => service_key,
-      :event_type => event_type,
+      service_key: service_key,
+      event_type: event_type,
     )
-    Pagerduty.transport.send_payload(args)
+    @transport.send_payload(args)
   end
 
   def ensure_success(response)
     unless response["status"] == "success"
-      raise PagerdutyException.new(self, response, response["message"])
+      fail PagerdutyException.new(self, response, response["message"])
     end
   end
 
+private
+
   # @api private
-  def self.transport
-    Pagerduty::HttpTransport
+  def transport_from_options(options = {})
+    options[:transport] || Pagerduty::HttpTransport.new(options)
   end
 end
 
@@ -97,15 +123,15 @@ class PagerdutyIncident < Pagerduty
   #
   # @param [String] incident_key The unique identifier for the incident.
   #
-  def initialize(service_key, incident_key)
-    super service_key
+  def initialize(service_key, incident_key, options = {})
+    super service_key, options
     @incident_key = incident_key
   end
 
   # @param (see Pagerduty#trigger)
   # @option (see Pagerduty#trigger)
   def trigger(description, options = {})
-    super(description, { :incident_key => incident_key }.merge(options))
+    super(description, { incident_key: incident_key }.merge(options))
   end
 
   # Acknowledge the referenced incident. While an incident is acknowledged, it
@@ -152,12 +178,11 @@ class PagerdutyIncident < Pagerduty
 private
 
   def modify_incident(event_type, description, details)
-    options = { :incident_key => incident_key }
+    options = { incident_key: incident_key }
     options[:description] = description if description
     options[:details] = details if details
     resp = api_call(event_type, options)
     ensure_success(resp)
     self
   end
-
 end

data/lib/pagerduty/http_transport.rb

@@ -1,40 +1,52 @@
 # encoding: utf-8
-require 'json'
-require 'net/http'
-require 'net/https'
-
-# @api private
-module Pagerduty::HttpTransport
-  extend self
-
-  HOST = "events.pagerduty.com"
-  PORT = 443
-  PATH = "/generic/2010-04-15/create_event.json"
-
-  def send_payload(payload = {})
-    response = post payload.to_json
-    response.error! unless transported?(response)
-    JSON.parse(response.body)
-  end
+require "json"
+require "net/https"
 
-private
+class Pagerduty
+  # @api private
+  class HttpTransport
+    HOST = "events.pagerduty.com"
+    PORT = 443
+    PATH = "/generic/2010-04-15/create_event.json"
 
-  def post(payload)
-    post = Net::HTTP::Post.new(PATH)
-    post.body = payload
-    http.request(post)
-  end
+    def initialize(options = {})
+      @options = options
+    end
 
-  def http
-    http = Net::HTTP.new(HOST, PORT)
-    http.use_ssl = true
-    http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-    http.open_timeout = 60
-    http.read_timeout = 60
-    http
-  end
+    def send_payload(payload = {})
+      response = post payload.to_json
+      response.error! unless transported?(response)
+      JSON.parse(response.body)
+    end
+
+  private
+
+    def post(payload)
+      post = Net::HTTP::Post.new(PATH)
+      post.body = payload
+      http.request(post)
+    end
+
+    def http
+      http = http_proxy.new(HOST, PORT)
+      http.use_ssl = true
+      http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+      http.open_timeout = 60
+      http.read_timeout = 60
+      http
+    end
+
+    def http_proxy
+      Net::HTTP.Proxy(
+        @options[:proxy_host],
+        @options[:proxy_port],
+        @options[:proxy_username],
+        @options[:proxy_password],
+      )
+    end
 
-  def transported?(response)
-    response.kind_of? Net::HTTPSuccess or response.kind_of? Net::HTTPRedirection
+    def transported?(response)
+      response.is_a?(Net::HTTPSuccess) || response.is_a?(Net::HTTPRedirection)
+    end
   end
 end

data/lib/pagerduty/version.rb

@@ -1,3 +1,3 @@
 class Pagerduty
-  VERSION = "2.0.1"
+  VERSION = "2.1.0"
 end

data/pagerduty.gemspec

@@ -1,15 +1,16 @@
-# -*- encoding: utf-8 -*-
-lib = File.expand_path('../lib', __FILE__)
+# encoding: utf-8
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'pagerduty/version'
+require "pagerduty/version"
 
 Gem::Specification.new do |gem|
   gem.name          = "pagerduty"
   gem.version       = Pagerduty::VERSION
   gem.authors       = ["Charlie Somerville", "Orien Madgwick"]
   gem.email         = ["charlie@charliesomerville.com", "_@orien.io"]
-  gem.description   = %q{Provides a lightweight interface for calling the PagerDuty Integration API}
-  gem.summary       = %q{Pagerduty Integration API client library}
+  gem.description   =
+    "Provides a lightweight interface for calling the PagerDuty Integration API"
+  gem.summary       = "Pagerduty Integration API client library"
   gem.homepage      = "http://github.com/envato/pagerduty"
   gem.license       = "MIT"
 
@@ -19,13 +20,13 @@ https://github.com/envato/pagerduty#upgrading-to-version-200
   MSG
 
   gem.files         = `git ls-files`.split($/)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
   gem.add_runtime_dependency "json", ">= 1.7.7"
-  gem.add_development_dependency "bundler", "~> 1.7"
+  gem.add_development_dependency "bundler"
   gem.add_development_dependency "rake"
-  gem.add_development_dependency "rspec"
   gem.add_development_dependency "rspec-given"
+  gem.add_development_dependency "rubocop", "0.34.2"
 end

data/spec/pagerduty/http_transport_spec.rb

@@ -2,53 +2,70 @@
 require "spec_helper"
 
 describe Pagerduty::HttpTransport do
-  Given(:http_transport) { Pagerduty::HttpTransport }
+  Given(:http_transport) { Pagerduty::HttpTransport.new(options) }
 
-  Given(:http) { double.as_null_object }
+  Given(:options) { {} }
+  Given(:http) { spy }
+  Given(:http_proxy) { spy(new: http) }
   Given { allow(http).to receive(:request).and_return(standard_response) }
-  Given { allow(Net::HTTP).to receive(:new).and_return(http) }
-  Given(:post) { double.as_null_object }
+  Given { allow(Net::HTTP).to receive(:Proxy).and_return(http_proxy) }
+  Given(:post) { spy }
   Given { allow(Net::HTTP::Post).to receive(:new).and_return(post) }
 
   describe "::send_payload" do
-    Given(:payload) { {
-      event_type: "trigger",
-      service_key: "test-srvc-key",
-      description: "test-desc",
-      details: { key: "value" },
-    } }
+    Given(:payload) {
+      {
+        event_type: "trigger",
+        service_key: "test-srvc-key",
+        description: "test-desc",
+        details: { key: "value" },
+      }
+    }
 
     When(:response) { http_transport.send_payload(payload) }
 
     describe "provides the correct request" do
       Then {
         expect(post).to have_received(:body=).with(
-          '{"event_type":"trigger","service_key":"test-srvc-key","description":"test-desc","details":{"key":"value"}}'
+          '{"event_type":"trigger",'\
+          '"service_key":"test-srvc-key",'\
+          '"description":"test-desc",'\
+          '"details":{"key":"value"}}',
         )
       }
     end
 
     describe "handles all responses" do
-
       context "PagerDuty successfully creates the incident" do
-        Given { allow(http).to receive(:request).and_return(response_with_body(<<-JSON)) }
-          {
-            "status": "success",
-            "incident_key": "My Incident Key",
-            "message": "Event processed"
-          }
-        JSON
+        Given {
+          allow(http)
+            .to receive(:request)
+            .and_return(response_with_body(<<-JSON))
+              {
+                "status": "success",
+                "incident_key": "My Incident Key",
+                "message": "Event processed"
+              }
+            JSON
+        }
+
         Then { expect(response).to include("status" => "success") }
-        Then { expect(response).to include("incident_key" => "My Incident Key") }
+        Then {
+          expect(response).to include("incident_key" => "My Incident Key")
+        }
       end
 
       context "PagerDuty fails to create the incident" do
-        Given { allow(http).to receive(:request).and_return(response_with_body(<<-JSON)) }
-          {
-            "status": "failure",
-            "message": "Event not processed"
-          }
-        JSON
+        Given {
+          allow(http)
+            .to receive(:request)
+            .and_return(response_with_body(<<-JSON))
+              {
+                "status": "failure",
+                "message": "Event not processed"
+              }
+            JSON
+        }
         Then { expect(response).to include("status" => "failure") }
         Then { expect(response).to_not include("incident_key") }
       end
@@ -61,9 +78,34 @@ describe Pagerduty::HttpTransport do
 
     describe "HTTPS use" do
       Then { expect(http).to have_received(:use_ssl=).with(true) }
-      Then { expect(http).to have_received(:verify_mode=).with(OpenSSL::SSL::VERIFY_PEER) }
       Then { expect(http).to_not have_received(:ca_path=) }
       Then { expect(http).to_not have_received(:verify_depth=) }
+      Then {
+        expect(http)
+          .to have_received(:verify_mode=)
+          .with(OpenSSL::SSL::VERIFY_PEER)
+      }
+    end
+
+    describe "proxy use" do
+      Given(:options) {
+        {
+          proxy_host: "test-proxy-host",
+          proxy_port: "test-proxy-port",
+          proxy_username: "test-proxy-username",
+          proxy_password: "test-proxy-password",
+        }
+      }
+      Then {
+        expect(Net::HTTP)
+          .to have_received(:Proxy)
+          .with(
+            "test-proxy-host",
+            "test-proxy-port",
+            "test-proxy-username",
+            "test-proxy-password",
+          )
+      }
     end
 
     describe "timeouts" do
@@ -73,7 +115,9 @@ describe Pagerduty::HttpTransport do
   end
 
   def standard_response
-    response_with_body '{ "status": "success", "incident_key": "My Incident Key" }'
+    response_with_body(
+      '{ "status": "success", "incident_key": "My Incident Key" }',
+    )
   end
 
   def response_with_body(body)
@@ -85,5 +129,4 @@ describe Pagerduty::HttpTransport do
   def bad_request
     Net::HTTPBadRequest.new 1.1, "400", "Bad Request"
   end
-
 end

data/spec/pagerduty_spec.rb

@@ -2,16 +2,19 @@
 require "spec_helper"
 
 describe Pagerduty do
-  Given(:pagerduty) { Pagerduty.new(service_key) }
-  Given(:service_key) { "a-test-service-key" }
+  Given(:pagerduty) { Pagerduty.new(service_key, options) }
 
-  Given(:transport) { double.as_null_object }
-  Given { allow(Pagerduty).to receive(:transport).and_return(transport) }
+  Given(:service_key) { "a-test-service-key" }
+  Given(:options) { { transport: transport } }
+  Given(:transport) { spy }
 
   describe "#trigger" do
-
     describe "provides the correct request" do
-      Given { allow(transport).to receive(:send_payload).and_return(standard_response) }
+      Given {
+        allow(transport)
+          .to receive(:send_payload)
+          .and_return(standard_response)
+      }
 
       context "no options" do
         When(:incident) { pagerduty.trigger("a-test-description") }
@@ -46,12 +49,37 @@ describe Pagerduty do
           )
         }
       end
+
+      context "with proxy" do
+        Given(:options) {
+          {
+            proxy_host: "test-proxy-host",
+            proxy_port: "test-proxy-port",
+            proxy_username: "test-proxy-username",
+            proxy_password: "test-proxy-password",
+          }
+        }
+        Given {
+          allow(Pagerduty::HttpTransport)
+            .to receive(:new)
+            .and_return(transport)
+        }
+        When(:incident) { pagerduty.trigger("a-test-description") }
+        Then {
+          expect(Pagerduty::HttpTransport).to have_received(:new).with(
+            proxy_host: "test-proxy-host",
+            proxy_port: "test-proxy-port",
+            proxy_username: "test-proxy-username",
+            proxy_password: "test-proxy-password",
+          )
+        }
+      end
     end
 
     describe "handles all responses" do
-
       context "PagerDuty successfully creates the incident" do
-        Given { allow(transport).to receive(:send_payload).and_return(
+        Given {
+          allow(transport).to receive(:send_payload).and_return(
             "status" => "success",
             "incident_key" => "My Incident Key",
             "message" => "Event processed",
@@ -61,13 +89,14 @@ describe Pagerduty do
         Then { expect(incident).to be_a PagerdutyIncident }
         Then { incident.service_key == service_key }
         Then { incident.incident_key == "My Incident Key" }
+        Then { incident.instance_variable_get("@transport") == transport }
       end
 
       context "PagerDuty fails to create the incident" do
         Given {
           allow(transport).to receive(:send_payload).and_return(
             "status" => "failure",
-            "message" => "Event not processed"
+            "message" => "Event not processed",
           )
         }
         When(:incident) { pagerduty.trigger("description") }
@@ -75,7 +104,11 @@ describe Pagerduty do
       end
 
       context "PagerDuty responds with HTTP bad request" do
-        Given { allow(transport).to receive(:send_payload).and_raise(Net::HTTPServerException.new(nil, nil)) }
+        Given {
+          allow(transport)
+            .to receive(:send_payload)
+            .and_raise(Net::HTTPServerException.new(nil, nil))
+        }
         When(:incident) { pagerduty.trigger("description") }
         Then { expect(incident).to have_raised Net::HTTPServerException }
       end
@@ -83,21 +116,35 @@ describe Pagerduty do
   end
 
   describe "#get_incident" do
-    Given(:incident_key) { "a-test-incident-key" }
     When(:incident) { pagerduty.get_incident(incident_key) }
-    Then { expect(incident).to be_a PagerdutyIncident }
-    Then { incident.service_key == service_key }
-    Then { incident.incident_key == incident_key }
+
+    context "a valid incident_key" do
+      Given(:incident_key) { "a-test-incident-key" }
+      Then { expect(incident).to be_a PagerdutyIncident }
+      Then { incident.service_key == service_key }
+      Then { incident.incident_key == incident_key }
+      Then { incident.instance_variable_get("@transport") == transport }
+    end
+
+    context "a nil incident_key" do
+      Given(:incident_key) { nil }
+      Then { expect(incident).to have_failed ArgumentError }
+    end
   end
 
   describe PagerdutyIncident do
-    Given(:incident) { PagerdutyIncident.new(service_key, incident_key) }
+    Given(:incident) {
+      PagerdutyIncident.new(service_key, incident_key, options)
+    }
     Given(:incident_key) { "a-test-incident-key" }
 
     describe "#acknowledge" do
-
       describe "provides the correct request" do
-        Given { allow(transport).to receive(:send_payload).and_return(standard_response) }
+        Given {
+          allow(transport)
+            .to receive(:send_payload)
+            .and_return(standard_response)
+        }
 
         context "no args" do
           When(:acknowledge) { incident.acknowledge }
@@ -123,7 +170,9 @@ describe Pagerduty do
         end
 
         context "a description and details" do
-          When(:acknowledge) { incident.acknowledge("test-description", { my: "detail" }) }
+          When(:acknowledge) {
+            incident.acknowledge("test-description", my: "detail")
+          }
           Then {
             expect(transport).to have_received(:send_payload).with(
               event_type: "acknowledge",
@@ -137,17 +186,16 @@ describe Pagerduty do
       end
 
       describe "handles all responses" do
-
         context "PagerDuty successfully acknowledges the incident" do
           Given {
             allow(transport).to receive(:send_payload).and_return(
               "status" => "success",
               "incident_key" => "a-test-incident-key",
-              "message" => "Event acknowledged"
+              "message" => "Event acknowledged",
             )
           }
           When(:acknowledge) { incident.acknowledge }
-          Then { expect(acknowledge).to be incident}
+          Then { expect(acknowledge).to be incident }
         end
 
         context "PagerDuty fails to acknowledge the incident" do
@@ -163,7 +211,11 @@ describe Pagerduty do
         end
 
         context "PagerDuty responds with HTTP bad request" do
-          Given { allow(transport).to receive(:send_payload).and_raise(Net::HTTPServerException.new(nil, nil)) }
+          Given {
+            allow(transport)
+              .to receive(:send_payload)
+              .and_raise(Net::HTTPServerException.new(nil, nil))
+          }
           When(:acknowledge) { incident.acknowledge }
           Then { expect(acknowledge).to have_failed Net::HTTPServerException }
         end
@@ -171,9 +223,12 @@ describe Pagerduty do
     end
 
     describe "#resolve" do
-
       describe "provides the correct request" do
-        Given { allow(transport).to receive(:send_payload).and_return(standard_response) }
+        Given {
+          allow(transport)
+            .to receive(:send_payload)
+            .and_return(standard_response)
+        }
 
         context "no args" do
           When(:resolve) { incident.resolve }
@@ -199,7 +254,7 @@ describe Pagerduty do
         end
 
         context "a description and details" do
-          When(:resolve) { incident.resolve("test-description", { my: "detail" }) }
+          When(:resolve) { incident.resolve("test-description", my: "detail") }
           Then {
             expect(transport).to have_received(:send_payload).with(
               event_type: "resolve",
@@ -213,24 +268,23 @@ describe Pagerduty do
       end
 
       describe "handles all responses" do
-
         context "PagerDuty successfully resolves the incident" do
           Given {
             allow(transport).to receive(:send_payload).and_return(
               "status" => "success",
               "incident_key" => "a-test-incident-key",
-              "message" => "Event resolved"
+              "message" => "Event resolved",
             )
           }
           When(:resolve) { incident.resolve }
-          Then { expect(resolve).to be incident}
+          Then { expect(resolve).to be incident }
         end
 
         context "PagerDuty fails to create the incident" do
           Given {
             allow(transport).to receive(:send_payload).and_return(
               "status" => "failure",
-              "message" => "Event not resolved"
+              "message" => "Event not resolved",
             )
           }
           When(:resolve) { incident.resolve }
@@ -238,7 +292,11 @@ describe Pagerduty do
         end
 
         context "PagerDuty responds with HTTP bad request" do
-          Given { allow(transport).to receive(:send_payload).and_raise(Net::HTTPServerException.new(nil, nil)) }
+          Given {
+            allow(transport)
+              .to receive(:send_payload)
+              .and_raise(Net::HTTPServerException.new(nil, nil))
+          }
           When(:resolve) { incident.resolve }
           Then { expect(resolve).to have_failed Net::HTTPServerException }
         end
@@ -247,7 +305,11 @@ describe Pagerduty do
 
     describe "#trigger" do
       describe "provides the correct request" do
-        Given { allow(transport).to receive(:send_payload).and_return(standard_response) }
+        Given {
+          allow(transport)
+            .to receive(:send_payload)
+            .and_return(standard_response)
+        }
 
         context "no options" do
           Given(:incident_key) { "instance incident_key" }
@@ -263,7 +325,12 @@ describe Pagerduty do
         end
 
         context "with incident_key option" do
-          When(:trigger) { incident.trigger("description", incident_key: "method param incident_key") }
+          When(:trigger) {
+            incident.trigger(
+              "description",
+              incident_key: "method param incident_key",
+            )
+          }
           Then {
             expect(transport).to have_received(:send_payload).with(
               incident_key: "method param incident_key",
@@ -286,7 +353,9 @@ describe Pagerduty do
     Given(:api_response) { double }
     Given(:message) { "a test error message" }
 
-    When(:pagerduty_exception) { PagerdutyException.new(pagerduty_instance, api_response, message) }
+    When(:pagerduty_exception) {
+      PagerdutyException.new(pagerduty_instance, api_response, message)
+    }
 
     Then { pagerduty_exception.pagerduty_instance == pagerduty_instance }
     Then { pagerduty_exception.api_response == api_response }

data/spec/spec_helper.rb

@@ -1,9 +1,14 @@
 # encoding: utf-8
-require "pagerduty"
-require "rspec/given"
-
 Dir[File.expand_path("../support/**/*.rb", __FILE__)].each { |f| require f }
 
+Warnings.silenced do
+  require "rspec/given"
+  require "json"
+  require "net/https"
+end
+
+require "pagerduty"
+
 RSpec.configure do |config|
   config.color = true
 end

data/spec/support/warnings.rb

@@ -0,0 +1,12 @@
+module Warnings
+  def self.silenced(&block)
+    with_flag(nil, &block)
+  end
+
+  def self.with_flag(flag)
+    old_verbose, $VERBOSE = $VERBOSE, flag
+    yield
+  ensure
+    $VERBOSE = old_verbose
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pagerduty
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Charlie Somerville
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-29 00:00:00.000000000 Z
+date: 2016-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -29,16 +29,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -54,7 +54,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rspec-given
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -68,19 +68,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-given
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.34.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.34.2
 description: Provides a lightweight interface for calling the PagerDuty Integration
   API
 email:
@@ -91,6 +91,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
@@ -104,6 +105,7 @@ files:
 - spec/pagerduty/http_transport_spec.rb
 - spec/pagerduty_spec.rb
 - spec/spec_helper.rb
+- spec/support/warnings.rb
 homepage: http://github.com/envato/pagerduty
 licenses:
 - MIT
@@ -126,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Pagerduty Integration API client library
@@ -134,3 +136,4 @@ test_files:
 - spec/pagerduty/http_transport_spec.rb
 - spec/pagerduty_spec.rb
 - spec/spec_helper.rb
+- spec/support/warnings.rb