newrelic_rpm 2.8.0 → 2.8.1

data/Rakefile

@@ -22,8 +22,10 @@ spec = Gem::Specification.new do |s|
   s.email = EMAIL
   s.homepage = HOMEPAGE
   s.require_path = 'lib'
-  s.files = %w(install.rb LICENSE README newrelic.yml Rakefile) + Dir.glob("{lib,recipes,test,ui}/**/*") 
-  
+  s.files = %w(install.rb LICENSE README newrelic.yml Rakefile) + Dir.glob("{lib,bin,recipes,test,ui}/**/*") 
+  s.bindir = "bin" # Use these for applications.
+  s.executables = ["newrelic_cmd"]
+  s.default_executable = "newrelic_cmd"
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|

data/bin/newrelic_cmd

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+# executes one of the commands in the new_relic/commands directory
+# pass the name of the command as an argument
+require File.dirname(__FILE__) + '/../lib/new_relic/commands/new_relic_commands'

data/lib/new_relic/agent/agent.rb

@@ -149,8 +149,6 @@ module NewRelic::Agent
     attr_reader :error_collector
     attr_reader :worker_loop
     attr_reader :license_key
-    attr_reader :remote_host
-    attr_reader :remote_port
     attr_reader :record_sql
     attr_reader :identifier
     
@@ -415,7 +413,6 @@ module NewRelic::Agent
       
       @error_collector.ignore(ignore_errors)
       
-      
       @capture_params = config.fetch('capture_params', false)
       
       sampler_config = config.fetch('transaction_tracer', {})
@@ -430,17 +427,6 @@ module NewRelic::Agent
       log.info "Transaction tracing is enabled in agent config" if @use_transaction_sampler
       log.warn "Agent is configured to send raw SQL to RPM service" if @record_sql == :raw
       
-      @use_ssl = config.fetch('ssl', false)
-      default_port = @use_ssl ? 443 : 80
-      
-      @remote_host = config.fetch('host', 'collector.newrelic.com')
-      @remote_port = config.fetch('port', default_port)
-      
-      @proxy_host = config.fetch('proxy_host', nil)
-      @proxy_port = config.fetch('proxy_port', nil)
-      @proxy_user = config.fetch('proxy_user', nil)
-      @proxy_pass = config.fetch('proxy_pass', nil)
-      
       @prod_mode_enabled = force_enable || config['enabled']
       
       # Initialize transaction sampler
@@ -518,7 +504,7 @@ module NewRelic::Agent
             config.settings
         @report_period = invoke_remote :get_data_report_period, @agent_id
  
-        log! "Connected to NewRelic Service at #{@remote_host}:#{@remote_port}."
+        log! "Connected to NewRelic Service at #{config.server}"
         log.debug "Agent ID = #{@agent_id}."
         
         # Ask the server for permission to send transaction samples.  determined by subscription license.
@@ -539,7 +525,7 @@ module NewRelic::Agent
         return false
         
       rescue Timeout::Error, StandardError => e
-        log.info "Unable to establish connection with New Relic RPM Service at #{@remote_host}:#{@remote_port}"
+        log.info "Unable to establish connection with New Relic RPM Service at #{config.server}"
         unless e.instance_of? IgnoreSilentlyException
           log.error e.message
           log.debug e.backtrace.join("\n")
@@ -674,14 +660,7 @@ module NewRelic::Agent
       # to go for higher compression instead, we could use Zlib::BEST_COMPRESSION and 
       # pay a little more CPU.
       post_data = Zlib::Deflate.deflate(Marshal.dump(args), Zlib::BEST_SPEED)
-      
-      # Proxy returns regular HTTP if @proxy_host is nil (the default)
-      http = Net::HTTP::Proxy(@proxy_host, @proxy_port, @proxy_user, @proxy_pass).new(@remote_host, @remote_port.to_i)
-      if @use_ssl
-        http.use_ssl = true 
-        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-      end
-      
+      http = config.http_connection
       http.read_timeout = @request_timeout
       
       # params = {:method => method, :license_key => license_key, :protocol_version => PROTOCOL_VERSION }
@@ -740,9 +719,9 @@ module NewRelic::Agent
     end
     
     def graceful_disconnect
-      if @connected && !(remote_host == "localhost" && @identifier == '3000')
+      if @connected && !(config.server.host == "localhost" && @identifier == '3000')
         begin
-          log.debug "Sending graceful shutdown message to #{remote_host}:#{remote_port}"
+          log.debug "Sending graceful shutdown message to #{config.server}"
           
           @request_timeout = 5
           

data/lib/new_relic/commands/deployments.rb

@@ -0,0 +1,147 @@
+# This is a class for executing commands related to deployment 
+# events.  It runs without loading the rails environment
+
+$LOAD_PATH << File.expand_path(File.join(File.dirname(__FILE__),"..",".."))
+require 'yaml'
+require 'net/http'
+require 'rexml/document'
+
+# We need to use the Config object but we don't want to load 
+# the rails/merb environment.  The defined? clause is so that
+# it won't load it twice, something it does when run inside a test
+require 'new_relic/config' unless defined? NewRelic::Config
+
+module NewRelic
+  module Commands
+    # Capture a failure to execute the command.
+    # Ask it for a return status to exit the vm with,
+    # if appropriate.
+    class CommandFailure < StandardError
+      attr_reader :exit_code
+      def initialize message, return_status=nil
+        super message
+        @exit_code = return_status || 0
+      end
+    end
+    
+    class Deployments
+      
+      attr_reader :config
+      def self.command; "deployments"; end 
+      
+      # Initialize the deployment uploader with command line args.
+      # Use -h to see options.
+      # When command_line_args is a hash, we are invoking directly and
+      # it's treated as an options with optional sttring values for
+      # :user, :description, :appname, :revision, :environment,
+      # and :changes.
+      #
+      # Will throw CommandFailed exception if there's any error.
+      # 
+      def initialize command_line_args
+        @config = NewRelic::Config.instance
+        @user = ENV['USER']
+        if Hash === command_line_args
+          # command line args is an options hash
+          command_line_args.each do | key, value |
+            if %w[user environment description appname revision changelog].include? key.to_s
+              instance_variable_set "@#{key}", value.to_s if value
+            else
+              raise "Unrecognized option #{key}=#{value}"
+            end
+          end
+        else
+          # parse command line args.  Throw an exception on a bad arg.
+          @description = options.parse(command_line_args).join " "
+        end
+        config.env = @environment if @environment
+        @appname ||= config.app_name || config.env || 'development'
+      end
+      
+      # Run the Deployment upload in RPM via Active Resource.
+      # Will possibly print errors and exit the VM
+      def run
+        begin
+          @description = nil if @description && @description.strip.empty?
+          create_params = {}
+          {
+            :application_id => @appname, 
+            :host => Socket.gethostname, 
+            :description => @description,
+            :user => @user,
+            :revision => @revision,
+            :changelog => @changelog
+          }.each do |k, v|
+            create_params["deployment[#{k}]"] = v unless v.nil? || v == ''
+          end
+          http = config.http_connection(config.api_server)
+          
+          uri = "/deployments.xml"
+          
+          raise "license_key was not set in newrelic.yml for #{config.env}" if config['license_key'].nil?
+          request = Net::HTTP::Post.new(uri, {'x-license-key' => config['license_key']})
+          request.content_type = "application/octet-stream"
+          
+          request.set_form_data(create_params)
+          
+          response = http.request(request)
+          
+          if response.is_a? Net::HTTPSuccess
+            info "Recorded deployment to NewRelic RPM (#{@description || Time.now })"
+          else
+            err_string = [ "Unexpected response from server: #{response.code}: #{response.message}" ]
+            begin
+              doc = REXML::Document.new(response.body)
+              doc.elements.each('errors/error') do |error|
+                err_string << "Error: #{error.text}"
+              end
+            rescue
+            end
+            raise CommandFailure.new(err_string.join("\n"), -1)
+          end 
+        rescue SystemCallError, SocketError => e
+          # These include Errno connection errors 
+          err_string = "Transient error attempting to connect to #{config.api_server} (#{e})"
+          raise CommandFailure.new(err_string, -1)
+        rescue CommandFailure
+          raise
+        rescue Exception => e
+          err "Unexpected error attempting to connect to #{config.api_server}"
+          info e.backtrace.join("\n")
+          raise CommandFailure.new(e.to_s, -1)
+        end
+      end
+      
+      private
+      
+      def options
+        OptionParser.new "Usage: #{self.class.command} [OPTIONS] [description] ", 40 do |o|
+          o.separator "OPTIONS:"
+          o.on("-a", "--appname=DIR", String,
+             "Set the application name.",
+             "Default is app_name setting in newrelic.yml") { |@appname| }
+          o.on("-e", "--environment=name", String,
+               "Override the (RAILS|MERB|RUBY)_ENV setting",
+               "currently: #{config.env}") { | @environment| }
+          o.on("-u", "--user=USER", String,
+             "Specify the user deploying.",
+             "Default: #{@user}") { |@user| }
+          o.on("-r", "--revision=REV", String,
+             "Specify the revision being deployed") { |@revision | }
+          o.on("-c", "--changes", 
+             "Read in a change log from the standard input") { @changelog = STDIN.read }
+          o.on("-?", "Print this help") { raise CommandFailure.new(o.help, 0) }
+          o.separator ""
+          o.separator 'description = "short text"'
+        end
+      end
+      
+      def info message
+        STDOUT.puts message
+      end
+      def err message
+        STDERR.puts message
+      end  
+    end
+  end
+end

data/lib/new_relic/commands/new_relic_commands.rb

@@ -0,0 +1,30 @@
+require 'optparse'
+
+# Run the command given by the first argument.  Right
+# now all we have is deployments. We hope to have other
+# kinds of events here later.
+
+libdir = File.expand_path(File.join(File.dirname(__FILE__), '..','..'))
+command_list = Dir[File.join(libdir,'new_relic','commands','*.rb')].map{|command| command =~ /.*\/(.*)\.rb/ && $1}
+command_list.delete 'new_relic_commands'
+extra = []
+options = ARGV.options do |opts|
+  script_name = File.basename($0)
+  opts.banner = "Usage: #{__FILE__} #{ command_list.join(" | ")} [options]"
+  opts.separator "use -h to see detailed command options"
+  opts
+end
+extra = options.order!
+command = extra.shift
+if !command_list.include?(command)
+  STDERR.puts options
+else
+  require File.join(libdir, 'new_relic','commands', command + ".rb")
+  command_class = NewRelic::Commands.const_get(command.capitalize) 
+  begin
+    command_class.new(extra).run
+  rescue NewRelic::Commands::CommandFailure => failure
+    STDERR.puts failure.message
+    exit failure.exit_code
+  end
+end

data/lib/new_relic/config.rb

@@ -1,21 +1,28 @@
 require 'yaml'
 #require 'new_relic/version'
 require 'singleton'
-require 'new_relic/agent'
 require 'erb'
+require 'net/https'
 
 # Configuration supports the behavior of the agent which is dependent
 # on what environment is being monitored: rails, merb, ruby, etc
 # It is an abstract factory with concrete implementations under
 # the config folder.
 module NewRelic
+  
   class Config
     
+    # Structs holding info for the remote server and proxy server 
+    class Server < Struct.new :host, :port
+      def to_s; "#{host}:#{port}"; end
+    end
+    
+    ProxyServer = Struct.new :host, :port, :user, :password
+    
     def self.instance
       @instance ||= new_instance
     end
     
-    attr_reader :settings
     
     
     @settings = nil
@@ -40,9 +47,26 @@ module NewRelic
     def [](key)
       fetch(key)
     end
+    ####################################
+    def env=(env_name)
+      @env = env_name
+      @settings = @yaml[env_name]
+    end
+    
+    def settings
+      @settings ||= (@yaml && @yaml[env]) || {}
+    end
+    
+    def []=(key, value)
+      settings[key] = value
+    end
+
+    def set_config(key,value)
+      self[key]=value
+    end
     
     def fetch(key, default=nil)
-      @settings[key].nil? ? default : @settings[key]
+      settings[key].nil? ? default : settings[key]
     end
     
     ###################################
@@ -65,10 +89,44 @@ module NewRelic
       fetch('app_name', nil)
     end
     
+    def use_ssl?
+      @use_ssl ||= fetch('ssl', false)
+    end
+
+    def server
+      @remote_server ||= 
+      NewRelic::Config::Server.new fetch('host', 'collector.newrelic.com'), fetch('port', use_ssl? ? 443 : 80).to_i  
+    end
+    
+    def api_server
+      @api_server ||= 
+      NewRelic::Config::Server.new fetch('api_host', 'rpm.newrelic.com'), fetch('api_port', fetch('port', use_ssl? ? 443 : 80)).to_i
+    end
+    
+    def proxy_server
+      @proxy_server ||=
+      NewRelic::Config::ProxyServer.new fetch('proxy_host', nil), fetch('proxy_port', nil),
+      fetch('proxy_user', nil), fetch('proxy_pass', nil)
+    end      
+    
+    # Return the Net::HTTP with proxy configuration given the NewRelic::Config::Server object.
+    # Default is the collector but for api calls you need to pass api_server
+    def http_connection(host = server)
+      # Proxy returns regular HTTP if @proxy_host is nil (the default)
+      http = Net::HTTP::Proxy(proxy_server.host, proxy_server.port, 
+                              proxy_server.user, proxy_server.password).new(host.host, host.port)
+      if use_ssl?
+        http.use_ssl = true 
+        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      end
+      http
+    end
+    
     def to_s
       puts self.inspect
       "Config[#{self.app}]"
     end
+    
     def log
       # If we try to get a log before one has been set up, return a stdout log
       unless @log
@@ -103,7 +161,7 @@ module NewRelic
     end
     
     def local_env
-      @env ||= NewRelic::LocalEnvironment.new
+      @local_env ||= NewRelic::LocalEnvironment.new
     end
     
     # send the given message to STDERR so that it shows
@@ -145,6 +203,7 @@ module NewRelic
     end
     
     def log_file_name(identifier="")
+      identifier ||= ""
       "newrelic_agent.#{identifier.gsub(/[^-\w.]/, '_')}.log"
     end
     
@@ -179,12 +238,13 @@ module NewRelic
         yml_file = File.expand_path(File.join(__FILE__,"..","..","..","newrelic.yml"))
         yaml = ::ERB.new(File.read(yml_file)).result(binding)
         log! "Cannot find newrelic.yml file at #{config_file}."
+        log! "Be sure to run this from the app root dir."
         log! "Using #{yml_file} file."
         log! "Signup at rpm.newrelic.com to get a newrelic.yml file configured for a free Lite account."
       else
         yaml = ERB.new(File.read(config_file)).result(binding)
       end
-      @settings = YAML.load(yaml)[env] || {}
+      @yaml = YAML.load(yaml)
     rescue ScriptError, StandardError => e
       puts e
       puts e.backtrace.join("\n")

data/lib/new_relic/config/merb.rb

@@ -3,7 +3,7 @@ class NewRelic::Config::Merb < NewRelic::Config
   def app; :merb; end
   
   def env
-    ::Merb.env
+    @env ||= ::Merb.env
   end
   def root 
     ::Merb.root

data/lib/new_relic/config/rails.rb

@@ -3,7 +3,7 @@ class NewRelic::Config::Rails < NewRelic::Config
   def app; :rails; end
   
   def env
-    RAILS_ENV
+    @env ||= RAILS_ENV
   end
   def root
     RAILS_ROOT

data/lib/new_relic/config/ruby.rb

@@ -1,9 +1,22 @@
 class NewRelic::Config::Ruby < NewRelic::Config
   def app; :ruby; end
   def env
-    ENV['RUBY_ENV'] || 'development'
+    @env ||= ENV['RUBY_ENV'] || ENV['RAILS_ENV'] || 'development'
   end
   def root
     Dir['.']
   end
+  # Check a sequence of file locations for newrelic.yml
+  def config_file
+    files = []
+    files << File.join(root,"config","newrelic.yml")
+    files << File.join(root,"newrelic.yml")
+    files << File.join(ENV["HOME"], ".newrelic", "newrelic.yml")
+    files << File.join(ENV["HOME"], "newrelic.yml")
+    files.each do | file |
+      return File.expand_path(file) if File.exists? file
+    end
+    return File.expand_path(files.first)
+  end
+  
 end

data/lib/new_relic/recipes.rb

@@ -0,0 +1,71 @@
+# When installed as a plugin this is loaded automatically.
+#
+# When installed as a gem, you need to add 
+#  require 'new_relic/recipes'
+# to your deploy.rb
+#
+# Defined deploy:notify_rpm which will send information about the deploy to RPM.
+# The task will run on app servers except where no_release is true.
+# If it fails, it will not affect the task execution or do a rollback.
+#
+make_notify_task = lambda do
+  
+  namespace :newrelic do
+    
+    # on all deployments, notify RPM 
+    desc "Record a deployment in New Relic RPM (rpm.newrelic.com)"
+    task :notice_deployment, :roles => :app, :except => {:no_release => true } do
+      rails_env = fetch(:rails_env, "production")
+      begin
+        require File.join(File.dirname(__FILE__), 'commands', 'deployments.rb')
+        # Try getting the changelog from the server.  Then fall back to local changelog
+        # if it doesn't work.  Problem is that I don't know what directory the .git is
+        # in when using git.  I could possibly use the remote cache but i don't know
+        # if that's always there.
+=begin        
+        run "cd #{current_release}; #{log_command}" do | io, stream_id, output |
+          changelog = output
+        end
+=end
+        # allow overrides to be defined for revision, description, changelog and appname
+        rev = fetch(:newrelic_revision) if exists?(:newrelic_revision)
+        description = fetch(:newrelic_desc) if exists?(:newrelic_desc)
+        changelog = fetch(:newrelic_changelog) if exists?(:newrelic_changelog)
+        appname = fetch(:newrelic_appname) if exists?(:newrelic_appname)
+        if !changelog
+          logger.debug "Getting log of changes for New Relic Deployment details"
+          from_revision = source.next_revision(current_revision)
+          log_command = "#{source.log(from_revision)}"
+          changelog = `#{log_command}`
+        end
+        new_revision = rev || source.query_revision(source.head()) { |cmd| `#{cmd}` } 
+        deploy_options = { :environment => rails_env,
+                :revision => new_revision,
+                :changelog => changelog, 
+                :description => description,
+                :appname => appname }
+        logger.debug "Uploading deployment to New Relic"
+        deployment = NewRelic::Commands::Deployments.new deploy_options
+        deployment.run
+        logger.info "Uploaded deployment information to New Relic"
+      rescue ScriptError => e
+        logger.info "error creating New Relic deployment (#{e})\n#{e.backtrace.join("\n")}"
+      rescue NewRelic::Commands::CommandFailure => e
+        logger.info "unable to notify New Relic of the deployment (#{e})... skipping"
+      rescue CommandError
+        logger.info "unable to notify New Relic of the deployment... skipping"
+      end
+      # WIP: For rollbacks, let's update the deployment we created with an indication of the failure:
+      # on_rollback do
+      #   run(...)
+      # end
+    end
+  end
+end
+
+instance = Capistrano::Configuration.instance
+if instance
+  instance.load &make_notify_task
+else
+  make_notify_task.call
+end

data/lib/new_relic/shim_agent.rb

@@ -1,4 +1,4 @@
-#require 'new_relic/stats'
+require 'new_relic/stats'
 
 # This agent is loaded by the plug when the plug-in is disabled
 # It recreates just enough of the API to not break any clients that
@@ -28,7 +28,7 @@ module NewRelic
   module Agent
     
     class << self
-      @@dummy_stats = MethodTraceStats.new
+      @@dummy_stats = NewRelic::MethodTraceStats.new
       def agent
         NewRelic::Agent::Agent.instance
       end

data/lib/new_relic/version.rb

@@ -3,14 +3,22 @@ module NewRelic
   module VERSION #:nodoc:
   MAJOR = 2
   MINOR = 8
-  TINY  = 0
+  TINY  = 1
   STRING = [MAJOR, MINOR, TINY].join('.')
   def self.changes
-    puts "NewRelic RPM Plugin Version: #{NewRelic::VERSION}"
+    puts "NewRelic RPM Plugin Version: #{NewRelic::VERSION::STRING}"
     puts CHANGELOG
   end
 
   CHANGELOG = <<EOF
+
+2009-01-27 version 2.8.1
+  * Convert the deployment information upload script to an executable
+    and put in the bin directory.  When installed as a gem this command
+    is symlinked to /usr/bin.  Usage: newrelic_cmd deployments --help
+  * Fix issue invoking api when host is not set in newrelic.yml
+  * Fix deployments api so it will work from a gem
+  * Fix thin incompatibility in developer mode 
 2008-12-18 version 2.8.0
   * add beta of api in new_relic_api.rb
   * instrumented dynamic finders in ActiveRecord

data/lib/new_relic_api.rb

@@ -105,7 +105,9 @@ module NewRelicApi
       end
       
       def site_url
-        "http#{'s' if (NewRelicApi.ssl || NewRelic::Config.instance['ssl'])}://#{NewRelicApi.host || NewRelic::Config.instance['host']}:#{NewRelicApi.port || NewRelic::Config.instance['port']}"
+        host = NewRelicApi.host || NewRelic::Config.instance.api_server.host
+        port = NewRelicApi.port || NewRelic::Config.instance.api_server.port
+        "#{port == 443 ? 'https' : 'http'}://#{host}:#{port}"
       end
       
       def reset!
@@ -245,31 +247,4 @@ module NewRelicApi
   end
   
 end
-if (__FILE__ == $0) || ($0 =~ /script\/runner$/)
-  # Run the command given by the first argument.  Right
-  # now all we have is deployments. We hope to have other
-  # kinds of events here later
-  command = "(no command given)"
-  extra = [command]
-  ARGV.options do |opts|
-    script_name = File.basename($0)
-    opts.banner = "Usage: #{__FILE__} command [options]"
-    
-    opts.separator ""
-    
-    opts.on("-e", "--environment=name", String,
-          "Specifies the environment for the runner to operate under (test/development/production).",
-          "Default: development")
-    
-    extra = opts.order!
-  end
-  command = extra.shift
-  begin
-    require "new_relic/api/#{command}"
-    command_class = NewRelic::API.const_get(command.camelize) 
-  rescue
-    STDERR.puts "Unknown command: #{command}"
-    exit 1
-  end
-  command_class.new(extra).run
-end
+

data/recipes/newrelic.rb

@@ -1,46 +1,6 @@
-# To be included in Capistrano deploy.rb files
-#
-# Defined deploy:notify_rpm which will send information about the deploy to RPM.
-# The task will run on app servers except where no_release is true.
-# If it fails, it will not affect the task execution or do a rollback.
-#
+# The capistrano recipes in plugins are automatically
+# loaded from here.  From gems, they are available from
+# the lib directory.  We have to make them available from
+# both locations
 
-make_notify_task = lambda do
-  
-  namespace :newrelic do
-    
-    # on all deployments, notify RPM 
-    desc "Record a deployment in New Relic RPM (rpm.newrelic.com)"
-    task :notice_deployment, :roles => :app, :except => {:no_release => true } do
-      rails_env = fetch(:rails_env, "production")
-      from_revision = source.next_revision(current_revision)
-      log_command = source.log(from_revision)
-      # I don't believe this will work if rpm is installed as a gem, or 
-      # if they put the plugin elsewhere.  Need to revisit.
-      script = [ "vendor/plugins/newrelic_rpm/lib/new_relic_api.rb" ] <<
-                 "deployments" <<
-                 "-u" << ENV['USER'] <<
-                 "-r" << current_revision <<
-                 "-c" 
-      script = script.map { | arg | "'#{arg}'" }.join(" ")
-      begin
-        run "cd #{current_release}; #{log_command} | script/runner -e #{rails_env} #{script}" do | io, stream_id, output |
-          logger.trace(output)
-        end
-      rescue CommandError
-        logger.info "unable to notify New Relic of the deployment... skipping"
-      end
-      # For rollbacks, let's update the deployment we created with an indication of the failure:
-      #on_rollback do
-      #  run(command.gsub(/Subject:.*\\n/, "Subject: #{ENV['USER']} deployed a ROLLBACK\\n"))
-      #end
-    end
-  end
-end
-
-instance = Capistrano::Configuration.instance
-if instance
-  instance.load make_notify_task
-else
-  make_notify_task.call
-end
+require File.join(File.dirname(__FILE__),'..','lib','new_relic','recipes')

data/test/config/newrelic.yml

@@ -9,6 +9,8 @@ test:
   enabled: false
   developer: true
   monitor_daemons: false
+  api_host: 127.0.0.1
+  api_port: 443
   message: '<%= generated_for_user %>'
   license_key: '<%= license_key %>'
   transaction_tracer:

data/test/new_relic/tc_deployments_api.rb

@@ -1,9 +1,12 @@
-require File.expand_path(File.join(File.dirname(__FILE__),'/../test_helper'))
-require 'new_relic_api'
+#require File.expand_path(File.join(File.dirname(__FILE__),'/../test_helper'))
+require File.expand_path(File.join(File.dirname(__FILE__),'../../lib/new_relic/commands/deployments'))
+require 'rubygems'
+require 'mocha'
+
 class NewRelic::DeploymentsTests < Test::Unit::TestCase
   
   def setup
-    NewRelic::API::Deployments.class_eval do
+    NewRelic::Commands::Deployments.class_eval do
       attr_accessor :messages, :exit_status, :errors, :revision
       def err(message); @errors = @errors ? @errors + message : message; end
       def info(message); @messages = @messages ? @messages + message : message; end
@@ -17,21 +20,45 @@ class NewRelic::DeploymentsTests < Test::Unit::TestCase
     puts @deployment.exit_status
   end
   def test_help
-    @deployment = NewRelic::API::Deployments.new "-?"
-    assert_equal 0, @deployment.exit_status
-    assert_match /^Usage/, @deployment.messages
-    assert_nil @deployment.revision
+    begin
+      NewRelic::Commands::Deployments.new "-?"
+      fail "should have thrown"
+    rescue NewRelic::Commands::CommandFailure => c
+      assert_match /^Usage/, c.message
+    end
+  end
+  def test_interactive
+    mock_the_connection
+    @deployment = NewRelic::Commands::Deployments.new :appname => 'APP', :revision => 3838, :user => 'Bill', :description => "Some lengthy description"
+    assert_nil @deployment.exit_status
+    assert_nil @deployment.errors
+    assert_equal '3838', @deployment.revision
+    @deployment.run
     @deployment = nil
   end
-  def test_run
-    @deployment = NewRelic::API::Deployments.new(%w[-a APP -r 3838 --user=Bill] << "Some lengthy description")
+  
+  def test_command_line_run
+    mock_the_connection
+    #    @mock_response.expects(:body).returns("<xml>deployment</xml>")
+    @deployment = NewRelic::Commands::Deployments.new(%w[-a APP -r 3838 --user=Bill] << "Some lengthy description")
     assert_nil @deployment.exit_status
     assert_nil @deployment.errors
     assert_equal '3838', @deployment.revision
     @deployment.run
-    assert_equal 1, @deployment.exit_status
-    assert_match /Unable to upload/, @deployment.errors
+    
+    # This should pass because it's a bogus deployment
+    #assert_equal 1, @deployment.exit_status
+    #assert_match /Unable to upload/, @deployment.errors
+    
     @deployment = nil
   end
+  private
+  def mock_the_connection
+    mock_connection = mock()
+    @mock_response = mock()
+    @mock_response.expects(:is_a?).with(Net::HTTPSuccess).returns(true)
+    mock_connection.expects(:request).returns(@mock_response)
+    NewRelic::Config.instance.stubs(:http_connection).returns(mock_connection)
+  end
   
 end

data/ui/controllers/newrelic_controller.rb

@@ -150,7 +150,7 @@ class NewrelicController < ActionController::Base
       :last_modified => last_modified,
       :type => 'text/plain'
     else
-      response.headers['Last-Modified'] = last_modified
+      response.headers['Last-Modified'] = last_modified.to_formatted_s(:rfc822)
       expires_in 24.hours
       send_file file, :content_type => mime_type_from_extension(file), :disposition => 'inline' #, :filename => File.basename(file)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: newrelic_rpm
 version: !ruby/object:Gem::Version 
-  version: 2.8.0
+  version: 2.8.1
 platform: ruby
 authors: 
 - Bill Kayser
@@ -9,14 +9,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-13 00:00:00 -08:00
-default_executable: 
+date: 2009-01-29 00:00:00 -08:00
+default_executable: newrelic_cmd
 dependencies: []
 
 description: New Relic Ruby Performance Monitoring Agent
 email: bkayser@newrelic.com
-executables: []
-
+executables: 
+- newrelic_cmd
 extensions: []
 
 extra_rdoc_files: 
@@ -61,8 +61,9 @@ files:
 - lib/new_relic/agent/transaction_sampler.rb
 - lib/new_relic/agent/worker_loop.rb
 - lib/new_relic/agent.rb
-- lib/new_relic/api
-- lib/new_relic/api/deployments.rb
+- lib/new_relic/commands
+- lib/new_relic/commands/deployments.rb
+- lib/new_relic/commands/new_relic_commands.rb
 - lib/new_relic/config
 - lib/new_relic/config/merb.rb
 - lib/new_relic/config/rails.rb
@@ -74,6 +75,7 @@ files:
 - lib/new_relic/metric_spec.rb
 - lib/new_relic/metrics.rb
 - lib/new_relic/noticed_error.rb
+- lib/new_relic/recipes.rb
 - lib/new_relic/shim_agent.rb
 - lib/new_relic/stats.rb
 - lib/new_relic/transaction_analysis.rb
@@ -85,6 +87,7 @@ files:
 - lib/tasks/agent_tests.rake
 - lib/tasks/all.rb
 - lib/tasks/install.rake
+- bin/newrelic_cmd
 - recipes/newrelic.rb
 - test/config
 - test/config/newrelic.yml
@@ -172,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: newrelic
-rubygems_version: 1.3.1
+rubygems_version: 1.3.0
 signing_key: 
 specification_version: 2
 summary: New Relic Ruby Performance Monitoring Agent

data/lib/new_relic/api/deployments.rb

@@ -1,92 +0,0 @@
-# This is a class for executing commands related to deployment 
-# events
-
-require 'optparse'
-
-module NewRelic::API
-  
-  class Deployments
-    
-    def self.command; "deployments"; end 
-      
-    # Initialize the deployment uploader with command line args.
-    # Use -h to see options.  Will possibly exit the VM 
-    def initialize command_line_args
-      @application_id = NewRelic::Config.instance.app_name || RAILS_ENV
-      @user = ENV['USER']
-      @description = options.parse(command_line_args).join " "
-    end
-    
-    # Run the Deployment upload in RPM via Active Resource.
-    # Will possibly print errors and exit the VM
-    def run
-      begin
-        @description = nil if @description.blank?
-        create_params = {
-          :application_id => @application_id, 
-          :host => Socket.gethostname, 
-          :description => @description,
-          :user => @user,
-          :revision => @revision,
-          :changelog => @changelog
-        }
-        d = NewRelicApi::Deployment.create(create_params)
-      rescue Exception => e
-        err "Attempting to connect to #{NewRelicApi::BaseResource.site_url}\nUnable to upload deployment (#{e.message})"
-        info e.backtrace.join("\n")
-        just_exit 1
-      end
-      if d.nil?
-        err "No value returned from create!"
-        just_exit 1
-      elsif d.valid?
-        puts "Recorded deployment to NewRelic RPM (#{d.description})"
-      else
-        err "Could not record deployment to NewRelic RPM:"
-        err d.errors.full_messages.join("\n")
-        just_exit 1
-      end
-    end
-    
-    private
-    
-    def options
-      OptionParser.new "Usage: #{self.class.command} [OPTIONS] [description] ", 40 do |o|
-        o.separator "OPTIONS:"
-        o.on("-a", "--appname=DIR", String,
-             "Specify an application name.",
-             "Default: #{@application_id}") { |@application_id| }
-        o.on("-u", "--user=USER", String,
-             "Specify the user deploying.",
-             "Default: #{ENV['USER']}") { |@user| }
-        o.on("-r", "--revision=REV", String,
-             "Specify the revision being deployed") { |@revision | }
-        o.on("-c", "--changes", 
-             "Read in a change log from the standard input") { @changelog = STDIN.read }
-        o.on("-?", "Print this help") { info o.help; just_exit }
-        o.separator ""
-        o.separator 'description = "short text"'
-      end
-    end
-    
-    def help(message)
-      if message
-        err message
-        info options.help
-        just_exit 1
-      else
-        info options
-        just_exit 0
-      end
-    end
-    def info message
-      STDOUT.puts message
-    end
-    def err message
-      STDERR.puts message
-    end  
-    def just_exit status=0
-      exit status
-    end
-  end
-end