capistrano-newrelic 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9bbe78f99bdc9faf872027cca29ed3cec82e03e3
-  data.tar.gz: 7cd3fa2c3c9d377cc474c1f2db5465e2fee68cb9
+  metadata.gz: 8a27d1d807e082fe33ef02638c99431933150802
+  data.tar.gz: d7a3aa958ea58f9ac31407b4b670089fa4988634
 SHA512:
-  metadata.gz: 3038303dd9645fa41b9b27fe4293aaa244252888c0533968ee110beb0cab7ca5a93bfcfd50e5fe5fe1fa3b7baa8620d0657f34521c2b61aaa073bdfd71aeed6d
-  data.tar.gz: 38c4e7c67bd6730bf4cb2f468131cc5a4abb18130beb804a2e4620c3edee0e705c3308637a419b0a52a86f4b8a9cfe1bc9c044405c50594a0a2ada1ee46667b9
+  metadata.gz: e1c60abc55b87c0a5a23567c1b513ac79e69dfe38efccfae88dbfca7a344bfc2ddcbbdd2203ae1fa9df4bf653bfcbb0c6d20bcd4cb1c8c9825610812d0dbb16d
+  data.tar.gz: 0bb3f4b9dfa3ea627d95a2b5085e7e349e5340c0070166162359c02c51086a017811f3cc7474adf9e27c6d2c5c2f2c38a84057606f4c97aaec8980516666b686

data/README.md

@@ -16,47 +16,68 @@ Or install it yourself as:
     $ gem install capistrano-newrelic
 
 ## Usage
-   # Capfile
 
-        require 'capistrano/newrelic'
+#### In Capfile
 
-License key and application name are retrieved from newrelic.yml.
+    require 'capistrano/newrelic'
+
+#### In stage files
+
+In your Capfile, or stage configuration files for multi-stage configuration add:
+
+```ruby
+    before 'deploy:finished', 'newrelic:notice_deployment'
+```
+License key and application name are retrieved from `config/newrelic.yml` based
+on the environment setting (defaults to value of `rails_env`,
+`rack_env` and can be overridden by setting `newrelic_env`).
+
+#### In deploy.rb
 
 Configurable options, shown here with defaults:
 
+```ruby
       # 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 changelog defaults to the git changelog, if using git
+      set :newrelic_changelog, "<git changelog if available>"
+
       # Deployment description
       set :newrelic_desc, ""
+
       # Deploy user if set will be used instead of the VCS user.
       set :newrelic_deploy_user
+```      
 
 ## Changelog
-0.0.8:
- - Hook was removed, please set it in your deploy.rb or deploy/'stage'.rb
 
+0.0.9:
+   * Added changelog capture for git
+   * Populate revision with `current_revision` from scm if available;
+     i.e., the git SHA
 
-        namespace :deploy do
-          before :finished, 'newrelic:notice_deployment'
-        end
-
- - Revision can be set with :
-
-
-        set :newrelic_revision, "Your text here"
-
-    or
-
-        $ NEWRELIC_REVISION='Your text here' bundle exe cap ....
-
+0.0.8:
+   * Hook was removed, please set it in your deploy.rb or deploy/'stage'.rb
+   ```ruby
+   before 'deploy:finished', 'newrelic:notice_deployment'
+   ```
+
+   * Revision can be set with :
+   ```ruby
+   set :newrelic_revision, "Your text here"
+   ```
+   or
+   ```ruby
+   $ NEWRELIC_REVISION='Your text here' bundle exe cap ....
+   ```
 
 ## Contributors
 
 - [Bryan Ricker] (https://github.com/bricker)
 - [James Kahn] (https://github.com/jisk)
 - [Wojciech Wnętrzak] (https://github.com/morgoth)
+- [Bill Kayser (New Relic)] (https://github.com/bkayser)
 
 ## Contributing
 

data/lib/capistrano/newrelic.rb

@@ -1,3 +1 @@
-require 'newrelic_rpm'
-require 'new_relic/cli/command'
-load File.expand_path('../tasks/newrelic.cap', __FILE__)
+load File.expand_path("../tasks/newrelic.rake", __FILE__)

data/lib/capistrano/newrelic/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module NewRelic
-    VERSION = '0.0.8'
+    VERSION = '0.0.9'
   end
 end

data/lib/capistrano/tasks/{newrelic.cap → newrelic.rake}

@@ -1,19 +1,24 @@
-namespace :load do
-  task :defaults do
-    set :newrelic_env, fetch(:stage, fetch(:rack_env, fetch(:rails_env, fetch(:stage))))
-    set :_newrelic_revision, -> { ENV['NEWRELIC_REVISION'] || fetch(:newrelic_revision, release_timestamp.strip) }
-  end
-end
+require 'newrelic_rpm'
+require 'new_relic/cli/command'
 
 namespace :newrelic do
   desc "Record a deployment in New Relic (newrelic.com)"
   task :notice_deployment do
     set :newrelic_appname, fetch(:application)
+    changelog = fetch :newrelic_changelog
+    if changelog.nil? && fetch(:scm) == :git
+      on primary(:app) do
+        within repo_path do
+          changelog = capture(:git, "log --no-color --pretty=format:'* %an: %s' --abbrev-commit --no-merges #{fetch(:previous_revision)[/^.*$/]}..#{fetch(:current_revision)}")
+        end
+      end
+    end
+
     run_locally do
       deploy_options = {
-          :environment => fetch(:newrelic_env),
-          :revision => fetch(:_newrelic_revision),
-          :changelog => fetch(:newrelic_changelog),
+          :environment => fetch(:newrelic_env, fetch(:stage, fetch(:rack_env, fetch(:rails_env, fetch(:stage))))),
+          :revision => ENV['NEWRELIC_REVISION'] || fetch(:newrelic_revision, fetch(:current_revision, release_timestamp.strip)),
+          :changelog => changelog,
           :description => fetch(:newrelic_desc),
           :user => fetch(:newrelic_deploy_user)
       }
@@ -24,7 +29,7 @@ namespace :newrelic do
             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'
+            deploy_options[:user] = ENV['USER']
         end
       end
 
@@ -40,3 +45,4 @@ namespace :newrelic do
     end
   end
 end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-newrelic
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Abdelkader Boudih
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-02 00:00:00.000000000 Z
+date: 2015-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -54,7 +54,7 @@ files:
 - lib/capistrano-newrelic.rb
 - lib/capistrano/newrelic.rb
 - lib/capistrano/newrelic/version.rb
-- lib/capistrano/tasks/newrelic.cap
+- lib/capistrano/tasks/newrelic.rake
 homepage: https://github.com/seuros/capistrano-newrelic
 licenses:
 - MIT
@@ -75,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: New Relic integration for Capistrano