scout 5.6.0.alpha.3 → 5.6.0.alpha.4

data/lib/scout/server.rb

@@ -36,7 +36,7 @@ module Scout
       @server_name  = server_name
       @http_proxy   = http_proxy
       @https_proxy  = https_proxy
-      @roles        = roles || ''
+      @roles        = (roles || '').gsub(/[^a-zA-Z0-9,]/,'')
       @plugin_plan  = []
       @plugins_with_signature_errors = []
       @directives   = {} # take_snapshots, interval, sleep_interval
@@ -60,10 +60,9 @@ module Scout
     def refresh?
       return true if !ping_key or account_public_key_changed? # fetch the plan again if the account key is modified/created
 
-      url=URI.join( @server.sub("https://","http://"), "/clients/#{ping_key}/ping.scout")
+      url=URI.join( @server.sub("https://","http://"), "/clients/#{ping_key}/ping.scout?roles=#{@roles}&host=#{Socket.gethostname}")
 
       headers = {"x-scout-tty" => ($stdin.tty? ? 'true' : 'false')}
-      headers["x-scout-roles"] = @roles
       if @history["plan_last_modified"] and @history["old_plugins"]
         headers["If-Modified-Since"] = @history["plan_last_modified"]
       end

data/lib/scout/server_base.rb

@@ -28,7 +28,8 @@ module Scout
       URI.join(@server,
                "/clients/CLIENT_KEY/#{url_name}.scout".
                    gsub(/\bCLIENT_KEY\b/, @client_key).
-                   gsub(/\b[A-Z_]+\b/) { |k| options[k.downcase.to_sym] || k })
+                   gsub(/\b[A-Z_]+\b/) { |k| options[k.downcase.to_sym] || k },
+               "?roles=#{@roles}&host=#{Socket.gethostname}")
     end
 
     def post(url, error, body, headers = Hash.new, &response_handler)

data/lib/scout/version.rb

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

data/test/scout_test.rb

@@ -31,8 +31,8 @@ PATH_TO_TEST_PLUGIN = File.expand_path( File.dirname(__FILE__) ) + '/plugins/tem
 
 class ScoutTest < Test::Unit::TestCase
   def setup
-    load_fixtures :clients, :accounts, :plugins, :subscriptions, :plugin_metas
-    clear_tables :plugin_activities, :ar_descriptors, :summaries
+    load_fixtures :clients, :accounts, :plugins, :subscriptions, :plugin_metas, :roles, :plugin_definitions, :notification_groups
+    clear_tables :plugin_activities, :ar_descriptors, :summaries, :clients_roles
     clear_working_dir
     
 
@@ -45,6 +45,12 @@ class ScoutTest < Test::Unit::TestCase
     @plugin=@client.plugins.first
     # avoid client limit issues
     assert @client.account.subscription.update_attribute(:clients,100)
+
+    # roles-related
+    @roles_account = Account.find_by_name "beta"
+    @db_role=@roles_account.roles.find_by_name("db")
+    @app_role=@roles_account.roles.find_by_name("app")
+    @hostname = `hostname`.chomp
   end
 
   def test_should_checkin_during_interactive_install
@@ -503,6 +509,62 @@ mybar=100
     assert_not_equal streams.first[:plugins][0][:fields][:v], streams.last[:plugins][0][:fields][:v]
   end
 
+
+  # Roles related
+
+  def test_roles_enabled_account
+    scout(@roles_account.key)
+    client=@roles_account.clients.last
+    assert_equal @hostname, client.hostname
+    assert_equal 0, client.plugins.count, "the all servers role should have 0 plugins"
+    assert_equal 1, client.roles.count
+    assert_equal @roles_account.primary_role, client.roles.first
+  end
+
+  def test_specify_role
+    scout(@roles_account.key, "-rapp")
+    client=@roles_account.clients.last
+    assert_equal @hostname, client.hostname
+    assert_equal 2, client.plugins.count
+    assert_equal 2, client.roles.count
+  end
+
+  def test_change_roles_on_existing_server
+    # first checkin
+    exec_scout(@roles_account.key, "-rapp")
+    client=@roles_account.clients.last
+    assert_equal @hostname, client.hostname
+    assert_equal 2, client.roles.count
+    assert_equal 2, client.plugins.count
+
+    client.plugins.each do |plugin|
+      assert @app_role.plugin_definitions.include?(plugin.plugin_definition), "#{plugin} should be included in the app role"
+    end
+
+    # second checkin - add a role
+    exec_scout(@roles_account.key, "-rapp,db --force")
+    client=@roles_account.clients.last
+    assert_equal 3, client.roles.count
+    assert_equal 4, client.plugins.count
+
+    # 3rd checkin - remove a role
+    exec_scout(@roles_account.key, "-rdb --force")
+    client=@roles_account.clients.last
+    assert_equal 2, client.roles.count
+    assert_equal 2, client.plugins.count
+
+    client.plugins.each do |plugin|
+      assert @db_role.plugin_definitions.include?(plugin.plugin_definition), "#{plugin} should be included in the db role"
+    end
+
+    # 4th checking -- remove all roles
+    exec_scout(@roles_account.key, "--force")
+    client=@roles_account.clients.last
+    assert_equal 1, client.roles.count
+    assert_equal 0, client.plugins.count
+
+  end
+
   ######################
   ### Helper Methods ###
   ######################

metadata

@@ -1,44 +1,40 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: scout
-version: !ruby/object:Gem::Version
-  version: 5.6.0.alpha.3
-  prerelease: 6
+version: !ruby/object:Gem::Version 
+  version: 5.6.0.alpha.4
 platform: ruby
-authors:
+authors: 
 - Andre Lewis
 - Derek Haynes
 - James Edward Gray II
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-14 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-11-14 00:00:00 -08:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: elif
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-description: ! 'The scout gem reports metrics to scoutapp.com, an easy-to-use hosted
-  server monitoring service.
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+description: |
+  The scout gem reports metrics to scoutapp.com, an easy-to-use hosted server monitoring service.
 
-'
 email: support@scoutapp.com
-executables:
+executables: 
 - scout
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - CHANGELOG.markdown
 - Gemfile
@@ -223,32 +219,34 @@ files:
 - vendor/signature/spec/signature_spec.rb
 - vendor/signature/spec/spec_helper.rb
 - vendor/util/lib/core_extensions.rb
+has_rdoc: true
 homepage: http://scoutapp.com
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>'
-    - !ruby/object:Gem::Version
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
       version: 1.3.1
+  version: 
 requirements: []
+
 rubyforge_project: scout
-rubygems_version: 1.8.24
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: Scout is an easy-to-use hosted server monitoring service. The scout Ruby
-  gem reports metrics to our service. The agent runs plugins, configured via the Scout
-  web interface, to monitor a server.
-test_files:
+summary: Scout is an easy-to-use hosted server monitoring service. The scout Ruby gem reports metrics to our service. The agent runs plugins, configured via the Scout web interface, to monitor a server.
+test_files: 
 - test/plugins/disk_usage.rb
 - test/scout_test.rb