dogapi 1.9.0 → 1.9.1

data/CHANGELOG.md

@@ -1,6 +1,9 @@
 Changes
 =======
 
+# 1.9.1 / 2014-01-06
+* Log a warning instead of crashing when trying to integration with capistrano v3
+
 # 1.9.0 / 2013-09-06
 * When emitting a metric without an explicit host, default to local hostname.
 

data/lib/capistrano/datadog.rb

@@ -119,32 +119,38 @@ module Capistrano
     end
   end
 
-  Configuration.instance(:must_exist).load do
-    # Wrap the existing logging target with the Datadog capture class
-    logger.device = Datadog::LogCapture.new logger.device
-
-    # Trigger the Datadog submission once all the tasks have run
-    on :exit, "datadog:submit"
-    namespace :datadog do
-      desc "Submit the tasks that have run to Datadog as events"
-      task :submit do |ns|
-        begin
-          api_key = variables[:datadog_api_key]
-          if api_key
-            dog = Dogapi::Client.new(api_key)
-            Datadog::reporter.report.each do |event|
-              dog.emit_event event
+  if Configuration.respond_to? :instance then
+    # Capistrano v2
+    Configuration.instance(:must_exist).load do
+      # Wrap the existing logging target with the Datadog capture class
+      logger.device = Datadog::LogCapture.new logger.device
+
+      # Trigger the Datadog submission once all the tasks have run
+      on :exit, "datadog:submit"
+      namespace :datadog do
+        desc "Submit the tasks that have run to Datadog as events"
+        task :submit do |ns|
+          begin
+            api_key = variables[:datadog_api_key]
+            if api_key
+              dog = Dogapi::Client.new(api_key)
+              Datadog::reporter.report.each do |event|
+                dog.emit_event event
+              end
+            else
+              puts "No api key set, not submitting to Datadog"
             end
-          else
-            puts "No api key set, not submitting to Datadog"
+          rescue Timeout::Error => e
+            puts "Could not submit to Datadog, request timed out."
+          rescue => e
+            puts "Could not submit to Datadog: #{e.inspect}\n#{e.backtrace.join("\n")}"
           end
-        rescue Timeout::Error => e
-          puts "Could not submit to Datadog, request timed out."
-        rescue => e
-          puts "Could not submit to Datadog: #{e.inspect}\n#{e.backtrace.join("\n")}"
         end
       end
     end
+  else
+    # No support yet for Capistrano v3
+    puts "No Datadog events will be sent since Datadog currently only supports Capistrano v2. For more info, see https://github.com/DataDog/dogapi-rb/issues/40."
   end
 
 end

data/lib/dogapi/version.rb

@@ -1,3 +1,3 @@
 module Dogapi
-  VERSION = "1.9.0"
+  VERSION = "1.9.1"
 end

metadata

@@ -1,91 +1,88 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: dogapi
-version: !ruby/object:Gem::Version 
-  hash: 51
+version: !ruby/object:Gem::Version
+  version: 1.9.1
   prerelease: 
-  segments: 
-  - 1
-  - 9
-  - 0
-  version: 1.9.0
 platform: ruby
-authors: 
+authors:
 - Datadog, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-09-06 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-01-06 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: json
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 1
-        - 5
-        - 1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.5.1
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.1
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 1
-        - 3
-        version: "1.3"
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 10
-        version: "10"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '10'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rdoc
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '10'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ruby bindings for Datadog's API
-email: 
+email:
 - packages@datadoghq.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - .gitignore
 - .rspec
 - .tailor
@@ -142,44 +139,37 @@ files:
 - tests/test_snapshot.rb
 - tests/test_users.rb
 homepage: http://datadoghq.com/
-licenses: 
+licenses:
 - BSD
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --title
 - DogAPI -- Datadog Client
 - --main
 - README.rdoc
 - --line-numbers
 - --inline-source
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Ruby bindings for Datadog's API
-test_files: 
+test_files:
 - spec/alerts_spec.rb
 - spec/common_spec.rb
 - spec/facade_spec.rb