@@ -23,7 +23,9 @@ spec = Gem::Specification.new do |s| s.homepage = HOMEPAGE s.require_path = 'lib' 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| Rakefile @@ -51,7 +51,7 @@ module NewRelic end end else - # parse command line args + # parse command line args. Throw an exception on a bad arg. @description = options.parse(command_line_args).join " " end config.env = @environment if @environment lib/new_relic/commands/deployments.rb @@ -54,7 +54,7 @@ module NewRelic end def settings - @settings ||= @yaml[env] || {} + @settings ||= (@yaml && @yaml[env]) || {} end def []=(key, value) @@ -170,7 +170,7 @@ module NewRelic # This will NOT print anything if the environment is unknown because this is # probably not an environment the agent will be running in. def log!(msg, level=:info) - return if settings && !tracers_enabled? + return if !tracers_enabled? to_stderr msg log.send level, msg if log end @@ -238,6 +238,7 @@ 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 lib/new_relic/config.rb @@ -6,12 +6,16 @@ module NewRelic 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-XXXXX version 2.8.1 + +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 2008-12-18 version 2.8.0 lib/new_relic/version.rb @@ -6,9 +6,11 @@ Gem::Specification.new do |s| s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Bill Kayser"] - s.date = %q{2009-01-23} + s.date = %q{2009-01-27} + s.default_executable = %q{newrelic_cmd} s.description = %q{New Relic Ruby Performance Monitoring Agent} s.email = %q{bkayser@newrelic.com} + s.executables = ["newrelic_cmd"] s.extra_rdoc_files = ["README", "LICENSE"] s.files = ["install.rb", "LICENSE", "README", "newrelic.yml", "Rakefile", "lib/new_relic", "lib/new_relic/agent", "lib/new_relic/agent/agent.rb", "lib/new_relic/agent/chained_call.rb", "lib/new_relic/agent/collection_helper.rb", "lib/new_relic/agent/error_collector.rb", "lib/new_relic/agent/instrumentation", "lib/new_relic/agent/instrumentation/active_record_instrumentation.rb", "lib/new_relic/agent/instrumentation/controller_instrumentation.rb", "lib/new_relic/agent/instrumentation/data_mapper.rb", "lib/new_relic/agent/instrumentation/dispatcher_instrumentation.rb", "lib/new_relic/agent/instrumentation/memcache.rb", "lib/new_relic/agent/instrumentation/merb", "lib/new_relic/agent/instrumentation/merb/controller.rb", "lib/new_relic/agent/instrumentation/merb/dispatcher.rb", "lib/new_relic/agent/instrumentation/merb/errors.rb", "lib/new_relic/agent/instrumentation/rails", "lib/new_relic/agent/instrumentation/rails/action_controller.rb", "lib/new_relic/agent/instrumentation/rails/action_web_service.rb", "lib/new_relic/agent/instrumentation/rails/dispatcher.rb", "lib/new_relic/agent/instrumentation/rails/errors.rb", "lib/new_relic/agent/instrumentation/rails/rails.rb", "lib/new_relic/agent/method_tracer.rb", "lib/new_relic/agent/patch_const_missing.rb", "lib/new_relic/agent/samplers", "lib/new_relic/agent/samplers/cpu.rb", "lib/new_relic/agent/samplers/memory.rb", "lib/new_relic/agent/samplers/mongrel.rb", "lib/new_relic/agent/stats_engine.rb", "lib/new_relic/agent/synchronize.rb", "lib/new_relic/agent/transaction_sampler.rb", "lib/new_relic/agent/worker_loop.rb", "lib/new_relic/agent.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", "lib/new_relic/config/ruby.rb", "lib/new_relic/config.rb", "lib/new_relic/local_environment.rb", "lib/new_relic/merbtasks.rb", "lib/new_relic/metric_data.rb", "lib/new_relic/metric_spec.rb", "lib/new_relic/metrics.rb", "lib/new_relic/noticed_error.rb", "lib/new_relic/shim_agent.rb", "lib/new_relic/stats.rb", "lib/new_relic/transaction_analysis.rb", "lib/new_relic/transaction_sample.rb", "lib/new_relic/version.rb", "lib/new_relic_api.rb", "lib/newrelic_rpm.rb", "lib/tasks", "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", "test/config/test_config.rb", "test/new_relic", "test/new_relic/agent", "test/new_relic/agent/mock_ar_connection.rb", "test/new_relic/agent/mock_scope_listener.rb", "test/new_relic/agent/model_fixture.rb", "test/new_relic/agent/tc_active_record.rb", "test/new_relic/agent/tc_agent.rb", "test/new_relic/agent/tc_collection_helper.rb", "test/new_relic/agent/tc_controller.rb", "test/new_relic/agent/tc_dispatcher_instrumentation.rb", "test/new_relic/agent/tc_error_collector.rb", "test/new_relic/agent/tc_method_tracer.rb", "test/new_relic/agent/tc_stats_engine.rb", "test/new_relic/agent/tc_synchronize.rb", "test/new_relic/agent/tc_transaction_sample.rb", "test/new_relic/agent/tc_transaction_sample_builder.rb", "test/new_relic/agent/tc_transaction_sampler.rb", "test/new_relic/agent/tc_worker_loop.rb", "test/new_relic/agent/testable_agent.rb", "test/new_relic/tc_config.rb", "test/new_relic/tc_deployments_api.rb", "test/new_relic/tc_environment.rb", "test/new_relic/tc_metric_spec.rb", "test/new_relic/tc_shim_agent.rb", "test/new_relic/tc_stats.rb", "test/test_helper.rb", "test/ui", "test/ui/tc_newrelic_helper.rb", "ui/controllers", "ui/controllers/newrelic_controller.rb", "ui/helpers", "ui/helpers/google_pie_chart.rb", "ui/helpers/newrelic_helper.rb", "ui/views", "ui/views/layouts", "ui/views/layouts/newrelic_default.rhtml", "ui/views/newrelic", "ui/views/newrelic/_explain_plans.rhtml", "ui/views/newrelic/_sample.rhtml", "ui/views/newrelic/_segment.rhtml", "ui/views/newrelic/_segment_row.rhtml", "ui/views/newrelic/_show_sample_detail.rhtml", "ui/views/newrelic/_show_sample_sql.rhtml", "ui/views/newrelic/_show_sample_summary.rhtml", "ui/views/newrelic/_sql_row.rhtml", "ui/views/newrelic/_stack_trace.rhtml", "ui/views/newrelic/_table.rhtml", "ui/views/newrelic/explain_sql.rhtml", "ui/views/newrelic/images", "ui/views/newrelic/images/arrow-close.png", "ui/views/newrelic/images/arrow-open.png", "ui/views/newrelic/images/blue_bar.gif", "ui/views/newrelic/images/gray_bar.gif", "ui/views/newrelic/index.rhtml", "ui/views/newrelic/javascript", "ui/views/newrelic/javascript/transaction_sample.js", "ui/views/newrelic/sample_not_found.rhtml", "ui/views/newrelic/show_sample.rhtml", "ui/views/newrelic/show_source.rhtml", "ui/views/newrelic/stylesheets", "ui/views/newrelic/stylesheets/style.css"] s.has_rdoc = true newrelic_rpm.gemspec d70d626a2b4954be653883cf2b6cafc01637b1f0 Bill Kayser bkayser@newrelic.com http://github.com/mislav/newrelic_rpm/commit/44ce28a0bd373ec7df1c408376db4f6b8b073c6f 44ce28a0bd373ec7df1c408376db4f6b8b073c6f 2009-01-27T12:23:07-08:00 2009-01-27T12:23:07-08:00 sync agent beta 2.8.1-6274 7221a4d1d6924eb062d764010f6df41dd6504d34 Bill Kayser bkayser@newrelic.com