capistrano-newrelic 0.0.2 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 723fc95d6a7cec329f472b25d96d8fa9b03edb1d
-  data.tar.gz: d39fd429989885c87d2c5da4a5e6e0413f1bc2f8
+  metadata.gz: f671e500e6119b40f92a3c5b45716302689adff7
+  data.tar.gz: c4b606d0ce5165b24064326d4f9a93e0022827d6
 SHA512:
-  metadata.gz: c9deae636da50d44bc443149282fa749506edb4679680bf991f7779d459ce5f3cc332bef7ae443da03db07c12e13527a6c19bc2684ed1c19b4e69bef684d4377
-  data.tar.gz: c8a452f129c452957af276c30061023c6885dfcddd7e710d95573d835939e9540c2b42209ea35097e938f7e07139ac96a887c50bcefd07fe7a55245d13aac68a
+  metadata.gz: 924deae3e2ca372a5d973ffe721c5172b623760711f0e90692806994f0f80907f3fd50cc744e60d131f4fdf4c7246968174090e1b6bd19332da0f9a768407bf4
+  data.tar.gz: 5bb08a867a597af16b91d9227eaf46028ebeb3342089fa591a632ec5b4a96e3eb2cab44b3ebc18fd7020a0ba09268e7f69657a0bf3e23680da5467c4928faa47

data/README.md

@@ -20,13 +20,18 @@ Or install it yourself as:
 
         require 'capistrano/newrelic'
 
+License key and application name are retrieved from newrelic.yml.
 
 Configurable options, shown here with defaults:
-      set :newrelic_env, fetch(:rack_env, fetch(:rails_env, 'production'))
-      set :newrelic_appname, fetch(:application)
 
-Mandatory options:
-      :newrelic_license_key
+      # New Relic environment to deploy to. Sets config based on section of newrelic.yml
+      set :newrelic_env, fetch(:stage, fetch(:rack_env, fetch(:rails_env, 'production')))
+      # Deployment changelog
+      set :newrelic_changelog, ""
+      # Deployment description
+      set :newrelic_desc, ""
+      # Deploy user if set will be used instead of the VCS user.
+      set :newrelic_deploy_user
 
 ## Contributing
 

data/capistrano-newrelic.gemspec

@@ -6,8 +6,8 @@ require 'capistrano/newrelic/version'
 Gem::Specification.new do |spec|
   spec.name          = 'capistrano-newrelic'
   spec.version       = Capistrano::NewRelic::VERSION
-  spec.authors       = ['Abdelkader Boudih']
-  spec.email         = ['terminale@gmail.com']
+  spec.authors       = ['Abdelkader Boudih', 'Jay Chung', 'James Kahn']
+  spec.email         = ['terminale@gmail.com', 'woosubc@gmail.com', 'james@liet.net']
   spec.description   = %q{New Relic integration for Capistrano 3}
   spec.summary       = %q{New Relic integration for Capistrano}
   spec.homepage      = 'https://github.com/seuros/capistrano-newrelic'
@@ -16,6 +16,6 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files`.split($/)
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'capistrano', '~> 3.0.0'
+  spec.add_dependency 'capistrano', '~> 3.0'
   spec.add_dependency 'newrelic_rpm'
 end

data/lib/capistrano/newrelic/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module NewRelic
-    VERSION = '0.0.2'
+    VERSION = '0.0.6'
   end
 end

data/lib/capistrano/tasks/newrelic.cap

@@ -4,8 +4,7 @@ end
 
 namespace :load do
   task :defaults do
-    set :newrelic_env, fetch(:rack_env, fetch(:rails_env, 'production'))
-    set :newrelic_appname, fetch(:application)
+    set :newrelic_env, fetch(:stage, fetch(:rack_env, fetch(:rails_env, 'production')))
   end
 end
 
@@ -14,25 +13,28 @@ namespace :newrelic do
   task :notice_deployment do
     set :newrelic_appname, fetch(:application)
     run_locally do
-
       deploy_options = {
           :environment => fetch(:newrelic_env),
           :revision => release_timestamp.strip,
           :changelog => fetch(:newrelic_changelog),
           :description => fetch(:newrelic_desc),
-          :appname => fetch(:newrelic_appname),
-          :user => capture ('git config user.name').strip,
-          :license_key => fetch(:newrelic_license_key)
+          :user => fetch(:newrelic_deploy_user)
       }
 
+      if deploy_options[:user].nil?
+        case fetch(:scm)
+          when :git
+            git_user = capture('git config user.name', raise_on_non_zero_exit: false).strip
+            deploy_options[:user] = git_user unless git_user.empty?
+          else
+            debug '[Capistrano-newrelic] : Unsupported SCM , user not set. Please set :newrelic_deploy_user'
+        end
+      end
 
       debug "Uploading deployment to New Relic"
       deployment = NewRelic::Cli::Deployments.new deploy_options
       deployment.run
       info "Uploaded deployment information to New Relic"
     end
-
   end
-
-
-end
+end

metadata

@@ -1,14 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-newrelic
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.6
 platform: ruby
 authors:
 - Abdelkader Boudih
+- Jay Chung
+- James Kahn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-28 00:00:00.000000000 Z
+date: 2014-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -16,14 +18,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: newrelic_rpm
   requirement: !ruby/object:Gem::Requirement
@@ -41,6 +43,8 @@ dependencies:
 description: New Relic integration for Capistrano 3
 email:
 - terminale@gmail.com
+- woosubc@gmail.com
+- james@liet.net
 executables: []
 extensions: []
 extra_rdoc_files: []