scout 5.3.1 → 5.3.2

data/CHANGELOG

@@ -1,3 +1,7 @@
+== 5.3.2
+
+* New --name="My Server" option to specify server name from the scout command.
+
 == 5.3.1
 
 * Write a log message if a full disk prevents Scout from creating a history file.

data/lib/scout.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby -wKU
 
 module Scout
-  VERSION = "5.3.1".freeze
+  VERSION = "5.3.2".freeze
 end
 
 require "scout/command"

data/lib/scout/command.rb

@@ -65,6 +65,11 @@ module Scout
           options[:level] = level
         end
 
+        opts.on( "-n", "--name NAME", String,
+                 "Optional name to display for this server." ) do |server_name|
+          options[:server_name] = server_name
+        end
+
         opts.separator " "
         opts.separator "Common Options:"
         opts.separator "--------------------------------------------------------------------------"
@@ -146,6 +151,7 @@ module Scout
       @verbose = options[:verbose] || false
       @level   = options[:level]   || "info"
       @force   = options[:force]   || false
+      @server_name    = options[:server_name]
 
       @args    = args
 
@@ -157,7 +163,7 @@ module Scout
 
     end
 
-    attr_reader :server, :history, :config_dir, :log_path
+    attr_reader :server, :history, :config_dir, :log_path, :server_name
 
 
     def verbose?

data/lib/scout/command/run.rb

@@ -9,7 +9,7 @@ module Scout
         configuration_directory = config_dir
         log.debug("Configuration directory is #{configuration_directory} ") if log
         # TODO: too much external logic of command doing things TO server. This should be moved into the server class.
-        @scout = Scout::Server.new(server, key, history, log)
+        @scout = Scout::Server.new(server, key, history, log, server_name)
         @scout.load_history
         
         unless $stdin.tty?

data/lib/scout/server.rb

@@ -41,12 +41,13 @@ module Scout
     attr_reader :plugin_config
 
     # Creates a new Scout Server connection.
-    def initialize(server, client_key, history_file, logger = nil)
+    def initialize(server, client_key, history_file, logger = nil, server_name=nil)
       @server       = server
       @client_key   = client_key
       @history_file = history_file
       @history      = Hash.new
       @logger       = logger
+      @server_name  = server_name
       @plugin_plan  = []
       @directives   = {} # take_snapshots, interval, sleep_interval
       @new_plan     = false
@@ -397,7 +398,8 @@ module Scout
                    :errors    => Array.new,
                    :summaries => Array.new,
                    :snapshot  => '',
-                   :config_path => File.expand_path(File.dirname(@history_file))}
+                   :config_path => File.expand_path(File.dirname(@history_file)),
+                   :server_name => @server_name}
     end
 
     def show_checkin(printer = :p)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: scout
 version: !ruby/object:Gem::Version 
-  hash: 57
+  hash: 63
   prerelease: false
   segments: 
   - 5
   - 3
-  - 1
-  version: 5.3.1
+  - 2
+  version: 5.3.2
 platform: ruby
 authors: 
 - Scout Monitoring
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-03 00:00:00 -07:00
+date: 2011-05-10 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency