rookout 0.1.8 → 0.1.13

data/lib/rookout/processor/paths/canopy/markers.rb

@@ -154,6 +154,22 @@ module Rookout
 
           attr_reader :level
 
+          def check_result result, first_obj, second_obj
+            return unless [true, false].include? result
+            if result
+              return
+            end
+
+            unless first_obj.nil?
+              raise Exceptions::RookNonPrimitiveObjectType, first_obj.class.to_s unless
+                PRIMITIVES.include? first_obj.class
+            end
+
+            return if second_obj.nil?
+            raise Exceptions::RookNonPrimitiveObjectType, second_obj.class.to_s unless
+              PRIMITIVES.include? second_obj.class
+          end
+
           def execute_operation first, second
             # Remove  wrapping of objects as needed
             first_obj = decapsulate_item first
@@ -166,6 +182,8 @@ module Rookout
               raise Exceptions::RookExceptionEvaluationFailed.new "", e
             end
 
+            check_result result, first_obj, second_obj
+
             # If we don't have a result
             if result.nil?
               # Verify objects are primitives

data/lib/rookout/processor/rook_error.rb

@@ -24,13 +24,16 @@ module Rookout
         end
       end
 
-      attr_reader :message
+      attr_reader :message, :exception, :parameters
 
       def dumps
         parameters = NamespaceSerializer.dump Namespaces::RubyObjectNamespace.new(@parameters), false
         exception = NamespaceSerializer.dump Namespaces::RubyObjectNamespace.new(@exception), false
 
-        backtrace_string = @exception.backtrace.join "\n\t"
+        backtrace_string = ""
+        unless @exception.backtrace.nil?
+          backtrace_string = @exception.backtrace.join "\n\t"
+        end
         backtrace_object = Namespaces::RubyObjectNamespace.new(backtrace_string).tailor_limits!
         traceback = NamespaceSerializer.dump backtrace_object, false
 

data/lib/rookout/services/position.rb

@@ -102,13 +102,16 @@ module Rookout
         elsif suggested_match? location, filename
           warning = Exceptions::RookSourceFilePathSuggestion.new location.filename, filename
           location.notify_warning warning
+          # Must return nil in order to skip this script
+          nil
         end
       end
 
       #########################################################################################
       # Utils
       def exact_match? location_filename, script_filename
-        script_filename.end_with? location_filename
+        return unless script_filename.end_with? location_filename
+        File.basename(script_filename) == File.basename(location_filename)
       end
 
       def suggested_match? location, filename
@@ -122,6 +125,31 @@ module Rookout
         Digest::SHA2.new(256).hexdigest content
       end
 
+      def handle_unique_line lines, location, filename
+        first_line = nil
+        second_found = false
+
+        lines.each_with_index do |line, index|
+          if crc_line(line) == location.line_crc
+            if first_line.nil?
+              first_line = index
+            else
+              second_found = true
+              break
+            end
+          end
+        end
+
+        if first_line && !second_found
+          updated_line = first_line + 1
+          location.notify_warning Processor::RookError.new Exceptions::RookLineMoved.new(filename,
+                                                                                         location.lineno,
+                                                                                         updated_line)
+          return updated_line
+        end
+        nil
+      end
+
       def find_updated_line filename, location
         return location.lineno if location.line_crc.nil?
 
@@ -130,23 +158,8 @@ module Rookout
         return location.lineno if location.line_crc == line_crc32
 
         if location.line_unique
-          first_line = nil
-          second_found = false
-
-          lines.each_with_index do |line, index|
-            if crc_line(line) == location.line_crc
-              if first_line.nil?
-                first_line = index
-              else
-                second_found = true
-                break
-              end
-            end
-          end
-
-          if first_line && !second_found
-            updated_line = first_line + 1
-            location.notify_warning Exceptions::RookLineMoved.new(filename, location.lineno, updated_line)
+          updated_line = handle_unique_line lines, location, filename
+          unless updated_line.nil?
             return updated_line
           end
         end

data/lib/rookout/version.rb

@@ -1,3 +1,3 @@
 module Rookout
-  VERSION = "0.1.8".freeze
+  VERSION = "0.1.13".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rookout
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.13
 platform: ruby
 authors:
 - Liran Haimovitch
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-16 00:00:00.000000000 Z
+date: 2020-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: binding_of_caller
@@ -70,16 +70,16 @@ dependencies:
   name: google-protobuf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :development
+        version: 3.9.2
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.9.2
 - !ruby/object:Gem::Dependency
   name: google-style
   requirement: !ruby/object:Gem::Requirement
@@ -183,14 +183,11 @@ email:
 - support@rookout.com
 executables:
 - rookout
-extensions:
-- ext/mkrf_conf.rb
+extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE
-- Rakefile
 - bin/rookout
-- ext/mkrf_conf.rb
 - lib/rookout.rb
 - lib/rookout/atfork.rb
 - lib/rookout/augs/actions/action.rb
@@ -251,13 +248,12 @@ files:
 - lib/rookout/user_warnings.rb
 - lib/rookout/utils.rb
 - lib/rookout/version.rb
-- rookout.gemspec
 homepage: https://rookout.com
 licenses:
 - Proprietary
 metadata:
   homepage_uri: https://rookout.com
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -272,8 +268,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key:
+rubygems_version: 3.1.2
+signing_key: 
 specification_version: 4
 summary: rookout is the Ruby SDK for the Rookout Debugging Platform
 test_files: []

data/Rakefile

@@ -1,92 +0,0 @@
-require "bundler/setup"
-require "bundler/gem_tasks"
-
-spec = Gem::Specification.load("rookout.gemspec")
-
-require "rake/testtask"
-desc "Run tests."
-Rake::TestTask.new do |t|
-  t.pattern = "test/**/*_test.rb"
-  t.warning = false
-end
-
-desc "Run the CI build"
-task :ci do
-  header "BUILDING rookout", "#"
-  header "rookout rubocop", "*"
-  require "rubocop/rake_task"
-  RuboCop::RakeTask.new
-  Rake::Task[:rubocop].invoke
-  header "rookout test", "*"
-  Rake::Task[:test].invoke
-end
-
-desc "Set commit hash"
-task :set_commit do
-  header "Setting commit hash in file", "#"
-  write_commit_file read_commit
-  puts "Done!"
-end
-
-desc "Bump gem vesrion"
-task :bump_version do
-  header "Bumpding version", "#"
-
-  version = read_version
-  minor_version = version[0...version.rindex(".")]
-  patch_version = version[version.rindex(".") + 1...version.length]
-  new_patch_version = patch_version.to_i + 1
-  new_version = "#{minor_version}.#{new_patch_version}"
-
-  write_version_file new_version
-
-  puts "Done! New version is #{new_version}"
-end
-
-desc "Print version configuration"
-task :print_version do
-  puts "export ROOK_VERSION=#{read_version}"
-  puts "export ROOK_COMMIT=#{read_commit}"
-end
-
-task :default => :test
-
-def read_version
-  require_relative "lib/rookout/version"
-  Rookout::VERSION
-end
-
-def read_commit
-  `git rev-parse HEAD`.strip
-end
-
-def write_version_file new_version
-  contents = ""
-  contents += "module Rookout\n"
-  contents += "  VERSION = \"#{new_version}\".freeze\n"
-  contents += "end\n"
-
-  f = File.new "lib/rookout/version.rb", "wb"
-  f.write contents
-  f.close
-end
-
-def write_commit_file commit
-  contents = ""
-  contents += "module Rookout\n"
-  contents += "  COMMIT = \"#{commit}\".freeze\n"
-  contents += "end\n"
-
-  f = File.new "lib/rookout/commit.rb", "wb"
-  f.write contents
-  f.close
-end
-
-def header str, token
-  line_length = str.length + 8
-  puts ""
-  puts token * line_length
-  puts "#{token * 3} #{str} #{token * 3}"
-  puts token * line_length
-  puts ""
-end

data/ext/mkrf_conf.rb

@@ -1,23 +0,0 @@
-require "rubygems"
-require "rubygems/command.rb"
-require "rubygems/dependency_installer.rb"
-
-# We override platform comparison to only match source gems
-class Gem::Platform
-  def self.match platform
-    platform.nil? || platform == Gem::Platform::RUBY
-  end
-end
-
-inst = Gem::DependencyInstaller.new
-begin
-  puts "[Rookout] installing appropriate google-protobuf gem"
-  if File.exist? "/etc/alpine-release"
-    installed = inst.install "google-protobuf", [">= 3.0.0", "< 3.10.0"]
-  else
-    installed = inst.install "google-protobuf", ">= 3.0.0"
-  end
-  puts "[Rookout] Installed additional dependencies: #{installed}"
-rescue
-  exit 1
-end

data/rookout.gemspec

@@ -1,39 +0,0 @@
-# -*- encoding: utf-8 -*-
-require_relative "lib/rookout/version"
-
-Gem::Specification.new do |spec|
-  spec.name          = "rookout"
-  spec.version       = Rookout::VERSION
-
-  spec.authors       = ["Liran Haimovitch"]
-  spec.email         = ["support@rookout.com"]
-  spec.description   = "rookout is the Ruby SDK for the Rookout Debugging Platform"
-  spec.summary       = "rookout is the Ruby SDK for the Rookout Debugging Platform"
-  spec.homepage      = "https://rookout.com"
-  spec.license       = "Proprietary"
-
-  spec.metadata["homepage_uri"] = spec.homepage
-
-  spec.files         = `git ls-files -- ext/* lib/* bin/*`.split("\n") +
-                      ["lib/rookout/commit.rb", "LICENSE", "Rakefile", "rookout.gemspec"]
-  spec.extensions = ["ext/mkrf_conf.rb"]
-  spec.executables = ["rookout"]
-
-  spec.require_paths = ["lib"]
-
-  spec.required_ruby_version = ">= 2.6"
-
-  spec.add_dependency "binding_of_caller", ">= 0.7"
-  spec.add_dependency "concurrent-ruby", ">= 1.1"
-  spec.add_dependency "websocket-driver", ">= 0.5.0"
-  spec.add_dependency "event_emitter", ">= 0.2.6"
-
-  spec.add_development_dependency "google-protobuf", ">= 3.0.0"
-  spec.add_development_dependency "google-style", ">= 1.24.0"
-  spec.add_development_dependency "minitest", ">= 5.14"
-  spec.add_development_dependency "minitest-autotest", ">= 1.0"
-  spec.add_development_dependency "minitest-focus", ">= 1.1"
-  spec.add_development_dependency "minitest-rg", ">= 5.2"
-  spec.add_development_dependency "autotest-suffix", ">= 1.1"
-  spec.add_development_dependency "rake-compiler", ">= 1.0"
-end