scout 5.6.4 → 5.6.5.pre

data/lib/scout/command.rb

@@ -177,7 +177,7 @@ module Scout
       @server_name    = options[:server_name]
       @http_proxy     = options[:http_proxy] || ""
       @https_proxy    = options[:https_proxy] || ""
-      @fqdn           = options[:fqdn] || `hostname -f`
+      @fqdn           = (options[:fqdn] || `hostname -f`).chomp
 
       @options = options
       @args    = args

data/lib/scout/server.rb

@@ -61,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}&fqdn=#{@fqdn}")
+      url=URI.join( @server.sub("https://","http://"), "/clients/#{ping_key}/ping.scout?roles=#{@roles}&fqdn=#{URI.encode(@fqdn)}")
 
       headers = {"x-scout-tty" => ($stdin.tty? ? 'true' : 'false')}
       if @history["plan_last_modified"] and @history["old_plugins"]

data/lib/scout/server_base.rb

@@ -29,7 +29,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 },
-               "?roles=#{@roles}&fqdn=#{@fqdn}&tty=#{$stdin.tty? ? 'y' : 'n'}")
+               "?roles=#{@roles}&fqdn=#{URI.encode(@fqdn)}&tty=#{$stdin.tty? ? 'y' : 'n'}")
     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.4"
+  VERSION = "5.6.5.pre"
 end

data/test/scout_test.rb

@@ -582,6 +582,12 @@ mybar=100
     assert_equal fqdn_override, client.fqdn
   end
 
+  def test_fqdn_has_newline
+    scout(@roles_account.key, "--fqdn", "db-1.foobar.com\n")
+    client=@roles_account.clients.last
+    assert_equal "db-1.foobar.com", client.fqdn
+  end
+
 
   ######################
   ### Helper Methods ###

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: scout
 version: !ruby/object:Gem::Version 
-  version: 5.6.4
+  version: 5.6.5.pre
 platform: ruby
 authors: 
 - Andre Lewis
@@ -236,9 +236,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: 1.3.1
   version: 
 requirements: []