rookout 0.1.53 → 0.1.54

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc61fe37a93f9e71f499fce1d5edfc2de6b2eb1203b9885c5b4cdbcc0b0af6f2
-  data.tar.gz: 5d48b072987c67593ecc81a68d3d96dd217aca001a3a49fd581a97ae72ae6903
+  metadata.gz: e96a2d7b2fdc74a8731a9c547940f6c03a1bf2ee103ed433a65fdac6bff90e40
+  data.tar.gz: 21bdac9616f7b5f7bcbcf781fdb2df81ff8ad7bfb0413ed96dea91565df61652
 SHA512:
-  metadata.gz: 6afa9d0c7fa12fba84e4bd679ac752eecf6463bf0bc82fef67f80dbd6fa1df576f7a0095f7f246116ed5bc0d4a5418a7afc078ffcba40fe1fc8804501422e83d
-  data.tar.gz: 605af10354982b51166cce1382572be5f816d90512a2506ce23acb61ea175b155b1b9b435488cafe47269b5b119e9a7c6e4df4449a7c227b647185c97bbad65d
+  metadata.gz: 9886ef4e56f478fa227a5a50281179df07b2dc3aa28573d815969b2a57e0935b8b783ebe2738dee480de5eb559b28f5ab8f51357af3d21a50b3e3a2a95fcb7f6
+  data.tar.gz: 65e7aa8a863b61994278f58540b95c27166543141145545f463cf2f0bd9a2cc989de3cdd6449353110659cca7558dd892214901008f862fcf3716d2da1c0af3f

data/lib/rookout/com_ws/agent_com_ws.rb

@@ -130,6 +130,11 @@ module Rookout
               @ready_event.set
             end
 
+            if e.message.include? "400"
+              @connection_error = Exceptions::RookWebSocketError.new 400
+              @ready_event.set
+            end
+
             Logger.instance.warning "Connection failed; reason = #{e.message}"
           end
 

data/lib/rookout/com_ws/information.rb

@@ -85,10 +85,40 @@ module Rookout
         return_value
       end
 
+      def parse_raw_git_sources
+        git_sources_raw = ENV["ROOKOUT_SOURCES"]
+        if git_sources_raw.nil?
+          return nil
+        end
+
+        git_sources = git_sources_raw.split ";"
+        user_git_sources = {}
+        git_sources.each do |url|
+          url_parts = url.split "#"
+          if url_parts.length != 2
+            next
+          end
+
+          remote_url = url_parts[0]
+          commit = url_parts[1]
+          user_git_sources[remote_url] = commit
+        end
+
+        user_git_sources
+      end
+
       def create_scm_information
         user_git_origin = Config.user_git_origin || ENV["ROOKOUT_REMOTE_ORIGIN"]
         user_git_commit = Config.user_git_commit || ENV["ROOKOUT_COMMIT"]
 
+        user_git_sources = Config.user_git_sources || parse_raw_git_sources
+
+        if !user_git_sources.nil? && !user_git_sources.empty?
+          user_git_sources = user_git_sources.map do |remote_url, commit|
+            Com::Rookout::SCMInformation::SourceInfo.new remoteOriginUrl: remote_url, commit: commit
+          end
+        end
+
         if user_git_origin.nil? && user_git_commit.nil?
           search_path = File.dirname File.absolute_path($PROGRAM_NAME)
           git_root = find_root search_path
@@ -98,7 +128,7 @@ module Rookout
           end
         end
 
-        Com::Rookout::SCMInformation.new origin: user_git_origin, commit: user_git_commit
+        Com::Rookout::SCMInformation.new origin: user_git_origin, commit: user_git_commit, sources: user_git_sources
       end
 
       def aws_lambda?

data/lib/rookout/commit.rb

@@ -1,3 +1,3 @@
 module Rookout
-  COMMIT = "24373c28244fc83259758e74b7fd12d5a6964eb5".freeze
+  COMMIT = "9db1dfad4593de7df40d98fba0722f8778ef7528".freeze
 end

data/lib/rookout/config.rb

@@ -60,9 +60,11 @@ module Rookout
 
       attr_accessor :user_git_commit
       attr_accessor :user_git_origin
+      attr_accessor :user_git_sources
 
       Rookout::Config.user_git_commit = nil
       Rookout::Config.user_git_origin = nil
+      Rookout::Config.user_git_sources = nil
 
       attr_accessor :rookout_version
       attr_accessor :rookout_commit

data/lib/rookout/exceptions.rb

@@ -132,6 +132,13 @@ module Rookout
       end
     end
 
+    class RookWebSocketError < ToolException
+      def initialize http_status
+        super "Received HTTP status #{http_status} from the controller," \
+              "Please make sure WebSocket is enabled on the load balancer."
+      end
+    end
+
     class RookSourceFilePathSuggestion < ToolException
       def initialize wanted_path, matching_path
         super "Rookout found alternative file path: #{matching_path}",

data/lib/rookout/interface.rb

@@ -39,7 +39,8 @@ module Rookout
         raise if throw_errors
         $stderr.puts "[Rookout] Failed to load Rookout. Please make sure to force build native extensions by setting" \
                      "'bundle config force_ruby_platform true'"
-      rescue RookMissingToken, RookInvalidToken, RookInvalidOptions, RookVersionNotSupported, RookBadProtobuf => e
+      rescue RookMissingToken, RookInvalidToken, RookInvalidOptions,
+             RookVersionNotSupported, RookBadProtobuf, RookWebSocketError => e
         raise if throw_errors
         $stderr.puts "[Rookout] Failed to start Rookout: #{e.message}"
       rescue RookCommunicationException => e
@@ -92,6 +93,12 @@ module Rookout
       $stderr.puts error.message
     end
 
+    def configure_scm options
+      Config.user_git_origin = options[:git_origin] if options[:git_origin]
+      Config.user_git_commit = options[:git_commit] if options[:git_commit]
+      Config.user_git_sources = options[:git_sources] if options[:git_sources] && options[:git_sources].is_a?(Hash)
+    end
+
     def configure_globals options
       if Config.debug
         log_to_stderr = true
@@ -107,8 +114,7 @@ module Rookout
       Config.logger_filename = log_file unless log_file.nil?
       Config.logger_log_level = log_level unless log_level.nil?
 
-      Config.user_git_origin = options[:git_origin] if options[:git_origin]
-      Config.user_git_commit = options[:git_commit] if options[:git_commit]
+      configure_scm options
     end
 
     def configure_start_options options

data/lib/rookout/sanitizer.rb

@@ -14,7 +14,7 @@ module Rookout
     def self.sanitize_properties!
       ENV.each do |key, val|
         if key.start_with?("ROOKOUT_") && !@@blacklisted_properties.include?(key.to_s)
-          ENV[key] = val.strip
+          ENV[key] = val.strip.delete_suffix("/")
         end
       end
     end

data/lib/rookout/version.rb

@@ -1,3 +1,3 @@
 module Rookout
-  VERSION = "0.1.53".freeze
+  VERSION = "0.1.54".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rookout
 version: !ruby/object:Gem::Version
-  version: 0.1.53
+  version: 0.1.54
 platform: ruby
 authors:
 - Liran Haimovitch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-28 00:00:00.000000000 Z
+date: 2023-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby