scout 5.7.2 → 5.7.3.pre

data/.gitignore

@@ -1,5 +1,6 @@
 doc/*
 pkg/*
+log/*
 .DS_Store
 **/.DS_Store
 .idea

data/CHANGELOG.markdown

@@ -1,3 +1,8 @@
+# 5.7.3
+
+* Fix for an issue with JRuby validating keys
+* More helpful output when installing on a version of RVM < 1.12.0
+
 # 5.7.2
 
 * updated pusher gem and associated vendored gems

data/lib/scout/command/install.rb

@@ -61,7 +61,7 @@ module Scout
 
             if Environment.rvm?
               file.puts '# Loading the RVM Environment files.'
-              file.puts "source #{Environment.rvm_path}\n"
+              file.puts "source #{Environment.rvm_path_instructions}\n"
             end
 
             if Environment.bundler?
@@ -79,7 +79,15 @@ module Scout
         end
 
         def special_cron_information
-          "It looks like you've installed Scout under RVM and/or Bundler. We've generated a shell script for you." if cron_script_required?
+          info = ""
+          info += "It looks like you've installed Scout under RVM and/or Bundler. We've generated a shell script for you." if cron_script_required?
+
+          if Environment.old_rvm_version?
+            info += "\n\n1. CONFIGURE THE SCOUT SHELL SCRIPT\n\n"
+            info += "Edit the shell script at #{File.join(config_dir, "scout_cron.sh")} and replace [PATH TO RVM ENVIRONMENT FILE] with the path to your RVM environment file. Usually this is located at #{(File.expand_path("~") rescue "/home/[USER]")}/.rvm/environments/[RUBY VERSION].\n\n"
+            info += "2. ADD A CRON JOB FOR SCOUT"
+          end
+          info
         end
 
         def cron_command(key)

data/lib/scout/environment.rb

@@ -1,5 +1,5 @@
 module Scout
-  class Environment
+  module Environment
     def self.bundler?
       ENV['BUNDLE_BIN_PATH'] && ENV['BUNDLE_GEMFILE']
     end
@@ -9,7 +9,16 @@ module Scout
     end
 
     def self.rvm_path
-      `rvm env --path`
+      rvm_path = `rvm env --path`
+      $?.exitstatus == 0 ? rvm_path : false
+    end
+
+    def self.rvm_path_instructions
+      self.rvm_path || "[PATH TO RVM ENVIRONMENT FILE]"
+    end
+
+    def self.old_rvm_version?
+      self.rvm? && !self.rvm_path
     end
   end
 end

data/lib/scout/server.rb

@@ -110,9 +110,9 @@ module Scout
               if signature
                 code=plugin['code'].gsub(/ +$/,'') # we strip trailing whitespace before calculating signatures. Same here.
                 decoded_signature=Base64.decode64(signature)
-                if !scout_public_key.verify(OpenSSL::Digest::SHA1.new, decoded_signature, code)
+                if !verify_public_key(scout_public_key, decoded_signature, code)
                   if account_public_key
-                    if !account_public_key.verify(OpenSSL::Digest::SHA1.new, decoded_signature, code)
+                    if !verify_public_key(account_public_key, decoded_signature, code)
                       info "#{id_and_name} signature verification failed for both the Scout and account public keys"
                       plugin['sig_error'] = "The code signature failed verification against both the Scout and account public key. Please ensure the public key installed at #{@account_public_key_path} was generated with the same private key used to sign the plugin."
                       @plugins_with_signature_errors << temp_plugins.delete_at(i)
@@ -616,5 +616,11 @@ module Scout
       end
       return temp_configs
     end
+
+    def verify_public_key(key, decoded_signature, code)
+      key.verify(OpenSSL::Digest::SHA1.new, decoded_signature, code)
+    rescue OpenSSL::PKey::RSAError
+      false
+    end
   end
 end

data/lib/scout/version.rb

@@ -1,3 +1,3 @@
 module Scout
-  VERSION = "5.7.2"
+  VERSION = "5.7.3.pre"
 end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: scout
 version: !ruby/object:Gem::Version 
-  hash: 47
-  prerelease: 
+  hash: -1512852423
+  prerelease: 6
   segments: 
   - 5
   - 7
-  - 2
-  version: 5.7.2
+  - 3
+  - pre
+  version: 5.7.3.pre
 platform: ruby
 authors: 
 - Andre Lewis
@@ -221,12 +222,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: scout