scout 5.5.10 → 5.6.0.alpha

data/CHANGELOG.markdown

@@ -1,3 +1,7 @@
+# 5.6.0
+
+* added roles
+
 # 5.5.10
 
 * fixed SSL error on scout troubleshoot --post

data/lib/scout/command.rb

@@ -30,8 +30,8 @@ module Scout
         opts.separator "--------------------------------------------------------------------------"
         opts.separator "  Normal checkin with server:"
         opts.separator "    #{program_name} [OPTIONS] CLIENT_KEY"
-        opts.separator "    ... OR ..."
-        opts.separator "    #{program_name} [OPTIONS] run CLIENT_KEY"
+        opts.separator "    ... or, specifying roles:"
+        opts.separator "    #{program_name} --roles app,db [ADDITIONAL OPTIONS] CLIENT_KEY"
         opts.separator "  Install:"
         opts.separator "    #{program_name}"
         opts.separator "    ... OR ..."
@@ -52,6 +52,12 @@ module Scout
         opts.separator " "
         opts.separator "Specific Options:"
         opts.separator "--------------------------------------------------------------------------"
+        opts.on( "-r", "--roles role1,role2", String,
+                 "Roles for this server. Roles are defined through scoutapp.com's web UI" ) do |roles|
+          options[:roles] = roles
+        end
+
+
         opts.on( "-s", "--server SERVER", String,
                  "The URL for the server to report to." ) do |url|
           options[:server] = url
@@ -155,6 +161,7 @@ module Scout
     end
 
     def initialize(options, args)
+      @roles   = options[:roles]
       @server  = options[:server]  || "https://scoutapp.com/"
       @history = options[:history] ||
                  File.join( File.join( (File.expand_path("~") rescue "/"),

data/lib/scout/command/install.rb

@@ -22,7 +22,7 @@ module Scout
 
         puts "\nAttempting to contact the server..."
         begin
-          Scout::Server.new(server, key, history, log, server_name, @http_proxy, @https_proxy) do |scout|
+          Scout::Server.new(server, key, history, log, server_name, @http_proxy, @https_proxy, @roles) do |scout|
             scout.fetch_plan
             scout.run_plugins_by_plan
           end

data/lib/scout/command/run.rb

@@ -10,7 +10,7 @@ module Scout
         log.debug("Running Scout [#{Scout::VERSION}] on #{Socket.gethostname}") if log
         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, server_name, @http_proxy, @https_proxy)
+        @scout = Scout::Server.new(server, key, history, log, server_name, @http_proxy, @https_proxy, @roles)
         @scout.load_history
         
         unless $stdin.tty?

data/lib/scout/command/test.rb

@@ -45,7 +45,7 @@ module Scout
           puts "== You haven't provided any options for running this plugin."
         end
 
-        Scout::Server.new(nil, nil, history, log, server_name, @http_proxy, @https_proxy) do |scout|
+        Scout::Server.new(nil, nil, history, log, server_name, @http_proxy, @https_proxy, nil) do |scout|
           scout.prepare_checkin
           scout.process_plugin( 'interval'  => 0,
                                 'plugin_id' => 1,

data/lib/scout/server.rb

@@ -27,7 +27,7 @@ module Scout
     attr_reader :client_key
 
     # Creates a new Scout Server connection.
-    def initialize(server, client_key, history_file, logger = nil, server_name=nil, http_proxy='', https_proxy='')
+    def initialize(server, client_key, history_file, logger = nil, server_name=nil, http_proxy='', https_proxy='', roles='')
       @server       = server
       @client_key   = client_key
       @history_file = history_file
@@ -35,7 +35,8 @@ module Scout
       @logger       = logger
       @server_name  = server_name
       @http_proxy   = http_proxy
-      @https_proxy   = https_proxy
+      @https_proxy  = https_proxy
+      @roles        = roles
       @plugin_plan  = []
       @plugins_with_signature_errors = []
       @directives   = {} # take_snapshots, interval, sleep_interval
@@ -90,6 +91,7 @@ module Scout
         url = urlify(:plan)
         info "Fetching plan from server at #{url}..."
         headers = {"x-scout-tty" => ($stdin.tty? ? 'true' : 'false')}
+        headers["x-scout-roles"] = @roles
 
         get(url, "Could not retrieve plan from server.", headers) do |res|
           begin

data/lib/scout/version.rb

@@ -1,3 +1,3 @@
 module Scout
-  VERSION = "5.5.10"
+  VERSION = "5.6.0.alpha"
 end

data/test/scout_test.rb

@@ -30,7 +30,7 @@ PLUGINS_PROPERTIES = File.join AGENT_DIR, 'plugins.properties'
 PATH_TO_TEST_PLUGIN = File.expand_path( File.dirname(__FILE__) ) + '/plugins/temp_plugin.rb'
 
 class ScoutTest < Test::Unit::TestCase
-  def setup    
+  def setup
     load_fixtures :clients, :accounts, :plugins, :subscriptions, :plugin_metas
     clear_tables :plugin_activities, :ar_descriptors, :summaries
     clear_working_dir
@@ -591,7 +591,7 @@ mybar=100
       ActiveRecord::Base.store_full_sti_class = true
       ActiveRecord::Base.establish_connection(db_hash)
       # scout models and local models
-
+      require SCOUT_PATH + '/lib/enum.rb'
       require SINATRA_PATH + '/app/models/ar_models.rb'
 
       ActiveRecord::Base.default_timezone = :utc

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: scout
 version: !ruby/object:Gem::Version
-  version: 5.5.10
-  prerelease: 
+  version: 5.6.0.alpha
+  prerelease: 6
 platform: ruby
 authors:
 - Andre Lewis
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-02 00:00:00.000000000 Z
+date: 2012-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elif
@@ -238,9 +238,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: scout
 rubygems_version: 1.8.24