scout 5.6.11 → 5.7.0.pre

data/CHANGELOG.markdown

@@ -1,3 +1,7 @@
+# 5.7.0
+
+* Added support for environments
+
 # 5.6.11
 
 * Remove the scout_streamer.pid file after the realtime processes has expired.

data/Gemfile

@@ -8,4 +8,6 @@ group :test do
   gem "activerecord", "2.2.2"
   gem "mysql"
   gem "mocha", :require => false
+  gem "json"
+  gem 'pry'
 end

data/lib/scout/command.rb

@@ -57,7 +57,6 @@ module Scout
           options[:roles] = roles
         end
 
-
         opts.on( "-s", "--server SERVER", String,
                  "The URL for the server to report to." ) do |url|
           options[:server] = url
@@ -92,6 +91,10 @@ module Scout
           options[:hostname] = hostname
         end
 
+        opts.on( "-e", "--environment ENVIRONMENT", String, "Environment for this server. Environments are defined through scoutapp.com's web UI" ) do |environment|
+          options[:environment] = environment
+        end
+
         opts.separator " "
         opts.separator "Common Options:"
         opts.separator "--------------------------------------------------------------------------"
@@ -178,6 +181,7 @@ module Scout
       @http_proxy     = options[:http_proxy] || ""
       @https_proxy    = options[:https_proxy] || ""
       @hostname       = options[:hostname] || Socket.gethostname
+      @environment    = options[:environment] || ""
       @options = options
       @args    = args
 

data/lib/scout/command/install.rb

@@ -104,7 +104,7 @@ module Scout
         end
 
         def test_server_connection(key)
-          Scout::Server.new(server, key, history, log, server_name, @http_proxy, @https_proxy, @roles, @hostname) do |scout|
+          Scout::Server.new(server, key, history, log, server_name, @http_proxy, @https_proxy, @roles, @hostname, @environment) 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 #{@hostname}") 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, @roles, @hostname)
+        @scout = Scout::Server.new(server, key, history, log, server_name, @http_proxy, @https_proxy, @roles, @hostname, @environment)
         @scout.load_history
         
         unless $stdin.tty?

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='', roles='', hostname = nil)
+    def initialize(server, client_key, history_file, logger=nil, server_name=nil, http_proxy='', https_proxy='', roles='', hostname=nil, environment='')
       @server       = server
       @client_key   = client_key
       @history_file = history_file
@@ -38,6 +38,7 @@ module Scout
       @https_proxy  = https_proxy
       @roles        = roles || ''
       @hostname     = hostname
+      @environment  = environment
       @plugin_plan  = []
       @plugins_with_signature_errors = []
       @directives   = {} # take_snapshots, interval, sleep_interval
@@ -60,7 +61,7 @@ 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?roles=#{@roles}&hostname=#{URI.encode(@hostname)}")
+      url=URI.join( @server.sub("https://","http://"), "/clients/#{ping_key}/ping.scout?roles=#{@roles}&hostname=#{URI.encode(@hostname)}&env=#{URI.encode(@environment)}")
 
       headers = {"x-scout-tty" => ($stdin.tty? ? 'true' : 'false')}
       if @history["plan_last_modified"] and @history["old_plugins"]

data/lib/scout/server_base.rb

@@ -28,7 +28,7 @@ module Scout
                "/clients/CLIENT_KEY/#{url_name}.scout".
                    gsub(/\bCLIENT_KEY\b/, @client_key).
                    gsub(/\b[A-Z_]+\b/) { |k| options[k.downcase.to_sym] || k })
-      uri.query = ["roles=#{@roles}","hostname=#{URI.encode(@hostname)}","tty=#{$stdin.tty? ? 'y' : 'n'}"].join('&')
+      uri.query = ["roles=#{@roles}","hostname=#{URI.encode(@hostname)}","env=#{URI.encode(@environment)}","tty=#{$stdin.tty? ? 'y' : 'n'}"].join('&')
       uri
     end
 

data/lib/scout/version.rb

@@ -1,3 +1,3 @@
 module Scout
-  VERSION = "5.6.11"
+  VERSION = "5.7.0.pre"
 end

data/test/scout_test.rb

@@ -15,6 +15,11 @@ require 'newrelic_rpm'
 require "pty"
 require "expect"
 require 'test/unit'
+begin
+  require 'pry'
+rescue LoadError
+  # not using pry
+end
 # must be loaded after 
 $LOAD_PATH << File.expand_path( File.dirname(__FILE__) + '/../lib' )
 $LOAD_PATH << File.expand_path( File.dirname(__FILE__) + '/..' )
@@ -41,7 +46,7 @@ end
 
 class ScoutTest < Test::Unit::TestCase
   def setup
-    load_fixtures :clients, :accounts, :plugins, :subscriptions, :plugin_metas, :roles, :plugin_templates, :notification_groups
+    load_fixtures :accounts, :notification_groups, :environments, :clients, :plugins, :subscriptions, :plugin_metas, :roles, :plugin_templates
     clear_tables :plugin_activities, :ar_descriptors, :summaries, :clients_roles
     clear_working_dir
     
@@ -603,6 +608,22 @@ myurl=http://foo.com?foo=bar
     assert_equal hostname_override, client.hostname
   end
 
+  def test_environment_argument_with_new_client
+    staging = @roles_account.environments.find_by_name("staging")
+    scout(@roles_account.key, "--environment", staging.name)
+    @client = @roles_account.clients.last
+    assert_equal staging, @client.environment
+  end
+
+  def test_environment_argument_with_existing_client
+    test_environment_argument_with_new_client
+    File.unlink(File.join(AGENT_DIR,"scout_client_pid.txt")) # needed because the "scout" test method leaves the PID file around
+    production = @roles_account.environments.find_by_name("production")
+    scout(@roles_account.key, "--environment", production.name, "--force")
+    @client.reload
+    assert_equal production, @client.environment
+  end
+
   def test_create_cron_script
     Scout::Environment.stubs(:rvm?).returns(true)
     Scout::Environment.stubs(:bundler?).returns(true)

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: scout
 version: !ruby/object:Gem::Version
-  version: 5.6.11
-  prerelease: 
+  version: 5.7.0.pre
+  prerelease: 6
 platform: ruby
 authors:
 - Andre Lewis
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-09 00:00:00.000000000 Z
+date: 2013-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elif
@@ -230,9 +230,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