gauge-ruby 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ebee2ce6fc18711db236ce40d0d0020dfaad981
-  data.tar.gz: 84c36f79a8c0f8d34711e2838c4d1dcdfed1640b
+  metadata.gz: daa34f96744dfd879f22b0030d6cb911b37762cf
+  data.tar.gz: ea35374f79704c7438969ceb7a7551f53bd16261
 SHA512:
-  metadata.gz: 81b059a9480123961f7deb12b3751a55c8be48441159dedd0b88e49fd7a8ebcf21d21b77f674bc8cbe208a4a2d92c5d8b3e74057dc6dea865163185d9576c95f
-  data.tar.gz: 4b5d87b25a69456bd2659cc0406afc58b12f2cdad7f89f699fee1c0b508ae1ac4c3420b3c20f8da5aadcb1fd5374b5e501d6a0d25ee123455a79c45b19a82593
+  metadata.gz: c841ed91a33272610d2131242bba2cf426f32ed2c951e8fa94a46cb3668098767075b9d306779401996f194bf2590e987e7125d9fc500a632f3fa06a9f61449d
+  data.tar.gz: 58ebf3f372cb8b4162c32b4762e0ced44bd44bfb6bb768dd6fe0ddce7bbacbbdc88ca845bf3449b1bf8afbbc74bc27ae2be3eae4ade4089c6d8ce08b96ee8233

data/lib/code_parser.rb

@@ -21,6 +21,7 @@ require 'method_source'
 require 'fileutils'
 require 'tempfile'
 require 'util'
+require 'messages_pb'
 
 module Gauge
   # @api private
@@ -30,21 +31,18 @@ module Gauge
       arg_node.children
     end
 
-    def self.process_node(node, param_positions, new_param_values, new_step_text)
+    def self.process_node(node, param_positions, _new_param_values, new_step_text)
       new_params = []
       args = step_args_from_code node
-      param_positions.sort_by!(&:newPosition).each.with_index {|e, i|
+      old_params = args.map { |arg| Unparser.unparse arg }
+      param_positions.sort_by!(&:newPosition).each.with_index do |e, i|
         if e.oldPosition == -1
-          param = Util.remove_special_chars new_param_values[e.newPosition].downcase.split.join('_')
-          if param == ''
-            param = i
-          end
-          new_params[e.newPosition] = "arg_#{param}"
+          new_params[e.newPosition] = Util.get_param_name(old_params, i)
         else
           new_params[e.newPosition] = args[e.oldPosition].children[0]
         end
-      }
-      args = new_params.map {|v| Parser::AST::Node.new(:arg, [v])}
+      end
+      args = new_params.map { |v| Parser::AST::Node.new(:arg, [v]) }
       step = [node.children[0].children[0], node.children[0].children[1], Parser::AST::Node.new(:str, [new_step_text])]
       c1 = Parser::AST::Node.new(:send, step)
       c2 = Parser::AST::Node.new(:args, args)
@@ -56,9 +54,9 @@ module Gauge
       if ast && step_node?(ast)
         visitor.call(ast)
       else
-        children = ast.children.map {|node|
+        children = ast.children.map do |node|
           replace(node, &visitor)
-        }
+        end
         return ast.updated(nil, children, nil)
       end
     end
@@ -67,37 +65,62 @@ module Gauge
       node.type == :block && node.children[0].children.size > 2 && node.children[0].children[1] == :step
     end
 
+    def self.create_params_diff(old_node, new_node)
+      params_loc = old_node.children[1].loc
+      text = Unparser.unparse new_node.children[1]
+      if old_node.children[1].children.size > 1
+        span = Messages::Span.new(start: params_loc.begin.line, startChar: params_loc.begin.column + 1,
+                                  end: params_loc.end.line, endChar: params_loc.end.column)
+      else
+        span = Messages::Span.new(start: old_node.loc.begin.line, startChar: old_node.loc.begin.column,
+                                  end: old_node.children[2].loc.line, endChar: old_node.children[2].loc.column)
+        text = "do#{text.empty? ? text : " |#{text}|"}\n\t"
+      end
+      Messages::TextDiff.new(content: text, span: span)
+    end
+
+    def self.create_diffs(old_node, new_node)
+      step_loc = old_node.children[0].children[2].loc
+      step_text = new_node.children[0].children[2].children[0]
+      span = Messages::Span.new(start: step_loc.begin.line,
+                                end: step_loc.end.line,
+                                startChar: step_loc.begin.column + 1,
+                                endChar: step_loc.end.column)
+      [Messages::TextDiff.new(content: step_text, span: span), create_params_diff(old_node, new_node)]
+    end
+
     def self.refactor_args(step_text, ast, param_positions, new_param_values, new_step_text)
+      diffs = nil
       new_ast = replace ast do |node|
         if node.children[0].children[2].children[0] == step_text
-          process_node(node, param_positions, new_param_values, new_step_text)
-        else
+          old_node = node.clone
+          node = process_node(node, param_positions, new_param_values, new_step_text)
+          diffs = create_diffs(old_node, node)
+        end
           node
         end
+      code = Unparser.unparse new_ast
+      { content: code, diffs: diffs }
       end
-      Unparser.unparse new_ast
-    end
 
     def self.refactor(step_info, param_positions, new_step)
       ast = code_to_ast File.read(step_info[:locations][0][:file])
-      refactor_args(step_info[:step_text], ast, param_positions, new_step.parameters, new_step.parameterizedStepValue)
+      refactor_args(step_info[:step_text], ast, param_positions,
+                    new_step.parameters,
+                    new_step.parameterizedStepValue)
     end
 
-    private
+    private_class_method
 
     def self.code_to_ast(code)
       begin
         buffer = Parser::Source::Buffer.new '(string)'
         buffer.source = code
         parser = Parser::CurrentRuby.new
-        return parser.parse(buffer)
+      parser.parse(buffer)
       rescue Exception => e
         Gauge::Log.error e.message
       end
     end
-
-    def self.include_args(code_string, params)
-      code_string.gsub("do", "do #{params}")
-    end
   end
-end
+end

data/lib/configuration.rb

@@ -53,6 +53,7 @@ module Gauge
   class Configuration
     def initialize
       @includes=[]
+      @custom_screengrabber=false
       @screengrabber = -> {
           file = File.open("#{Dir.tmpdir}/screenshot.png", "w+")
           `gauge_screenshot #{file.path}`
@@ -62,6 +63,8 @@ module Gauge
       }
     end
 
+    attr_reader :custom_screengrabber
+
     def self.instance
       @configuration ||= Configuration.new
     end
@@ -79,6 +82,7 @@ module Gauge
     end
 
     def screengrabber=(block)
+      @custom_screengrabber=true
       @screengrabber=block
     end
 

data/lib/connector.rb

@@ -32,6 +32,7 @@ module Gauge
 
     def self.make_connection
       @@executionSocket = TCPSocket.open(HOST_NAME, Runtime.port_from_env_variable(GAUGE_PORT_ENV))
+      @@executionSocket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
     end
 
     def self.message_length(socket)

data/lib/gauge_messages.rb

@@ -39,6 +39,12 @@ module Gauge
       @gauge_messages ||= GaugeMessages.new
     end
 
+    def pending_messages()
+        pending_messages = @messages
+        @messages = []
+        pending_messages
+    end  
+
     def write(message)
       @messages.push(message)
     end

data/lib/messages_pb.rb

@@ -105,6 +105,7 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
   add_message "gauge.messages.FileChanges" do
     optional :fileName, :string, 1
     optional :fileContent, :string, 2
+    repeated :diffs, :message, 3, "gauge.messages.TextDiff"
   end
   add_message "gauge.messages.RefactorResponse" do
     optional :success, :bool, 1

data/lib/processors/execution_handler.rb

@@ -62,7 +62,7 @@ module Gauge
       end
 
       def screenshot_bytes
-        return nil if (ENV['screenshot_on_failure'] || "").downcase == "false" || which("gauge_screenshot").nil?
+        return nil if (ENV['screenshot_on_failure'] || "").downcase == "false" || (which("gauge_screenshot").nil? && !Configuration.instance.custom_screengrabber)
         begin
           Configuration.instance.screengrabber.call
         rescue Exception => e

data/lib/processors/execution_hook_processors.rb

@@ -27,37 +27,51 @@ module Gauge
     def process_execution_start_request(message)
       Gauge::MethodCache.clear
       Executor.load_steps(Util.get_step_implementation_dir)
-      handle_hooks_execution(MethodCache.get_before_suite_hooks, message, message.executionStartingRequest.currentExecutionInfo,false)
+      response = handle_hooks_execution(MethodCache.get_before_suite_hooks, message,message.executionStartingRequest.currentExecutionInfo,false)
+      response.executionStatusResponse.executionResult.message += Gauge::GaugeMessages.instance.pending_messages
+      return response
     end
 
     def process_execution_end_request(message)
-      handle_hooks_execution(MethodCache.get_after_suite_hooks, message, message.executionEndingRequest.currentExecutionInfo, false)
+      response = handle_hooks_execution(MethodCache.get_after_suite_hooks, message,message.executionEndingRequest.currentExecutionInfo, false)
+      response.executionStatusResponse.executionResult.message += Gauge::GaugeMessages.instance.pending_messages
+      return response
     end
 
     def process_spec_execution_start_request(message)
-      handle_hooks_execution(MethodCache.get_before_spec_hooks, message, message.specExecutionStartingRequest.currentExecutionInfo)
+      response = handle_hooks_execution(MethodCache.get_before_spec_hooks, message,message.specExecutionStartingRequest.currentExecutionInfo)
+      response.executionStatusResponse.executionResult.message += Gauge::GaugeMessages.instance.pending_messages
+      return response
     end
 
     def process_spec_execution_end_request(message)
-      handle_hooks_execution(MethodCache.get_after_spec_hooks, message, message.specExecutionEndingRequest.currentExecutionInfo)
+      response = handle_hooks_execution(MethodCache.get_after_spec_hooks, message,message.specExecutionEndingRequest.currentExecutionInfo)
+      response.executionStatusResponse.executionResult.message += Gauge::GaugeMessages.instance.pending_messages
+      return response
     end
 
     def process_scenario_execution_start_request(message)
-      handle_hooks_execution(MethodCache.get_before_scenario_hooks, message, message.scenarioExecutionStartingRequest.currentExecutionInfo)
+      response = handle_hooks_execution(MethodCache.get_before_scenario_hooks, message,message.scenarioExecutionStartingRequest.currentExecutionInfo)
+      response.executionStatusResponse.executionResult.message += Gauge::GaugeMessages.instance.pending_messages
+      return response
     end
 
+
     def process_scenario_execution_end_request(message)
-      handle_hooks_execution(MethodCache.get_after_scenario_hooks, message, message.scenarioExecutionEndingRequest.currentExecutionInfo)
+      response = handle_hooks_execution(MethodCache.get_after_scenario_hooks, message,message.scenarioExecutionEndingRequest.currentExecutionInfo)
+      response.executionStatusResponse.executionResult.message += Gauge::GaugeMessages.instance.pending_messages
+      return response
     end
 
     def process_step_execution_start_request(message)
-      Gauge::GaugeMessages.instance.clear
-      handle_hooks_execution(MethodCache.get_before_step_hooks, message, message.stepExecutionStartingRequest.currentExecutionInfo)
+      response = handle_hooks_execution(MethodCache.get_before_step_hooks, message,message.stepExecutionStartingRequest.currentExecutionInfo)
+      response.executionStatusResponse.executionResult.message += Gauge::GaugeMessages.instance.pending_messages
+      return response
     end
 
     def process_step_execution_end_request(message)
-      response = handle_hooks_execution(MethodCache.get_after_step_hooks, message, message.stepExecutionEndingRequest.currentExecutionInfo)
-      response.executionStatusResponse.executionResult.message = Google::Protobuf::RepeatedField.new(:string, Gauge::GaugeMessages.instance.get)
+      response = handle_hooks_execution(MethodCache.get_after_step_hooks, message,message.stepExecutionEndingRequest.currentExecutionInfo)
+      response.executionStatusResponse.executionResult.message += Gauge::GaugeMessages.instance.pending_messages
       return response
     end
   end

data/lib/processors/refactor_step_request_processor.rb

@@ -29,11 +29,11 @@ module Gauge
       response = Messages::RefactorResponse.new(success: true)
       begin
         step_info = get_step request.oldStepValue.stepValue
-        refactored_code = CodeParser.refactor step_info, request.paramPositions, request.newStepValue
+        refactored_info = CodeParser.refactor step_info, request.paramPositions, request.newStepValue
         file = step_info[:locations][0][:file]
-        File.write file, refactored_code if request.saveChanges
+        File.write file, refactored_info[:content] if request.saveChanges
         response.filesChanged.push(file)
-        changes = Messages::FileChanges.new(fileName: file, fileContent: refactored_code)
+        changes = Messages::FileChanges.new(fileName: file, fileContent: refactored_info[:content], diffs: refactored_info[:diffs])
         response.fileChanges.push(changes)
       rescue Exception => e
         response.success = false

data/lib/util.rb

@@ -17,21 +17,10 @@
 
 module Gauge
   class Util
-    def self.valid_variable_name?(var_name)
-      Object.new.instance_variable_set ('@' + var_name).to_sym, nil
-      true
-    rescue NameError
-      !!(var_name =~ /^[0-9]+$/)
-    end
-
-    def self.remove_special_chars(param)
-      new_param = ''
-      param.each_char {|c|
-        if valid_variable_name? c
-          new_param += c
-        end
-      }
-      return new_param
+    def self.get_param_name(params, index)
+      name = "arg_#{index}"
+      return name unless params.include? name
+      get_param_name(params, index + 1)
     end
 
     def self.get_step_implementation_dir

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gauge-ruby
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Gauge Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-02 00:00:00.000000000 Z
+date: 2018-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-protocol-buffers
@@ -113,6 +113,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.10'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.10.0
   type: :runtime
@@ -120,6 +123,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.10'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.10.0
 - !ruby/object:Gem::Dependency
@@ -127,6 +133,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.10'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.10.0
   type: :development
@@ -134,6 +143,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.10'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.10.0
 description: Adds Ruby support into Gauge tests