newrelic_rpm 3.7.3.199 → 3.7.3.204

data/CHANGELOG

@@ -24,6 +24,17 @@
   Fixed an issue where an exception raised from a user-specified on_complete
   block would cause our Typhoeus instrumentation to fail to record the request.
 
+  * Fix for Puma 2.8.0 cluster mode (3.7.3.204)
+
+  Puma's 2.8.0 release renamed a hook New Relic used to support Puma's cluster
+  mode.  This resulted in missing data for users running Puma. Thanks Benjamin
+  Kudria for the fix!
+
+  * Fix for deployment command bug (3.7.3.204)
+
+  Problems with file loading order could result in `newrelic deployments`
+  failing with an unrecognized command error. This has been fixed.
+
 ## v3.7.2 ##
 
   * Mongo instrumentation improvements

data/lib/new_relic/agent/instrumentation/puma.rb

@@ -17,7 +17,8 @@ DependencyDetection.defer do
   end
 
   executes do
-    Puma.cli_config.options[:worker_boot] << Proc.new do
+    option_name = [:worker_boot, :before_worker_boot].detect {|option| Puma.cli_config.options.has_key? option }
+    Puma.cli_config.options[option_name] << Proc.new do
       ::NewRelic::Agent.after_fork(:force_reconnect => true)
     end
   end

data/lib/new_relic/cli/command.rb

@@ -51,8 +51,8 @@ module NewRelic
         @commands << subclass
       end
 
-      cmds = File.expand_path(File.join(File.dirname(__FILE__), '*.rb'))
-      Dir[cmds].each{|command| require command }
+      cmds = File.expand_path(File.join(File.dirname(__FILE__), 'commands', '*.rb'))
+      Dir[cmds].each { |command| require command }
 
       def self.run
 

data/lib/new_relic/cli/{install.rb → commands/install.rb}

@@ -63,7 +63,7 @@ Visit support.newrelic.com if you are experiencing installation issues.
   end
 
   def content
-    @src_file ||= File.expand_path(File.join(File.dirname(__FILE__),"..","..","..","newrelic.yml"))
+    @src_file ||= File.expand_path(File.join(File.dirname(__FILE__),"..","..","..","..","newrelic.yml"))
     template = File.read(@src_file)
     ERB.new(template).result(binding)
   end

data/test/new_relic/cli/{deployments_test.rb → commands/deployments_test.rb}

@@ -2,9 +2,9 @@
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
-require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper'))
+require File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','test_helper'))
 require 'new_relic/cli/command'
-require 'new_relic/cli/deployments'
+require 'new_relic/cli/commands/deployments'
 
 class NewRelic::Cli::DeploymentsTest < Minitest::Test
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 3.7.3.199
+  version: 3.7.3.204
   prerelease: 
 platform: ruby
 authors:
@@ -41,7 +41,7 @@ cert_chain:
   K0ZZTXduQWIrVm1OT2h2MVMrc0poYmpaMzBQS2d6NnZMaFQ2dW5pZUNqTGs5
   d0dHbWxTSwpZamJudkE5cXJhTExhalNqCi0tLS0tRU5EIENFUlRJRklDQVRF
   LS0tLS0K
-date: 2014-03-04 00:00:00.000000000 Z
+date: 2014-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -428,8 +428,8 @@ files:
 - lib/new_relic/agent/vm/snapshot.rb
 - lib/new_relic/agent/worker_loop.rb
 - lib/new_relic/cli/command.rb
-- lib/new_relic/cli/deployments.rb
-- lib/new_relic/cli/install.rb
+- lib/new_relic/cli/commands/deployments.rb
+- lib/new_relic/cli/commands/install.rb
 - lib/new_relic/coerce.rb
 - lib/new_relic/collection_helper.rb
 - lib/new_relic/control.rb
@@ -936,7 +936,7 @@ files:
 - test/new_relic/agent/vm_test.rb
 - test/new_relic/agent/worker_loop_test.rb
 - test/new_relic/agent_test.rb
-- test/new_relic/cli/deployments_test.rb
+- test/new_relic/cli/commands/deployments_test.rb
 - test/new_relic/coerce_test.rb
 - test/new_relic/collection_helper_test.rb
 - test/new_relic/control/class_methods_test.rb
@@ -1148,7 +1148,12 @@ post_install_message: ! "# New Relic Ruby Agent Release Notes #\n\n## v3.7.3 ##\
   tagged as 'SQL - SELECT'. This\n  particularly affected ActiveRecord users using
   PostgreSQL.\n\n* More reliable Typhoeus instrumentation\n\n  Fixed an issue where
   an exception raised from a user-specified on_complete\n  block would cause our Typhoeus
-  instrumentation to fail to record the request.\n\n    See https://github.com/newrelic/rpm/blob/master/CHANGELOG
+  instrumentation to fail to record the request.\n\n* Fix for Puma 2.8.0 cluster mode
+  (3.7.3.204)\n\n  Puma's 2.8.0 release renamed a hook New Relic used to support Puma's
+  cluster\n  mode.  This resulted in missing data for users running Puma. Thanks Benjamin\n
+  \ Kudria for the fix!\n\n* Fix for deployment command bug (3.7.3.204)\n\n  Problems
+  with file loading order could result in `newrelic deployments`\n  failing with an
+  unrecognized command error. This has been fixed.\n\n    See https://github.com/newrelic/rpm/blob/master/CHANGELOG
   for a full list of\n    changes.\n"
 rdoc_options:
 - --line-numbers