deep-cover 0.1.14 → 0.1.15

data/lib/deep_cover/node/mixin/has_child_handler.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DeepCover
   module Node::Mixin
     module HasChildHandler
@@ -5,9 +7,9 @@ module DeepCover
         base.extend ClassMethods
       end
 
-      def call_child_handler template, child, child_name = nil
-        child_name ||= self.class.child_index_to_name(child.index, children.size) rescue binding.pry
-        method_name = template % {name: child_name}
+      def call_child_handler(template, child, child_name = nil)
+        child_name ||= self.class.child_index_to_name(child.index, children.size)
+        method_name = format(template, name: child_name)
         if respond_to?(method_name)
           args = [child, child_name]
           arity = method(method_name).arity
@@ -22,10 +24,10 @@ module DeepCover
 
       module ClassMethods
         def has_child_handler(template)
-          child_method_name = template % {name: 'child'}
+          child_method_name = format(template, name: 'child')
           action = template.gsub(/_%{name}/, '').gsub(/%{name}_/, '')
           const_name = "#{Tools.camelize(action)}Handler"
-          class_eval <<-end_eval, __FILE__, __LINE__
+          class_eval <<-EVAL, __FILE__, __LINE__ + 1
             module #{const_name}                                     # module RewriteHandler
               module ClassMethods                                    #   module ClassMethods
                 def has_child(#{action}: nil, **h)                   #     def has_child(rewrite: nil, **h)
@@ -43,11 +45,11 @@ module DeepCover
             end                                                      # end
             include #{const_name}                                    # include RewriteHandler
             singleton_class.prepend #{const_name}::ClassMethods      # singleton_class.prepend RewriteHandler::ClassMethods
-          end_eval
+          EVAL
         end
 
         def define_child_handler(template, name, action)
-          method_name = template % {name: name}
+          method_name = format(template, name: name)
           case action
           when nil
             # Nothing to do
@@ -63,7 +65,7 @@ module DeepCover
           when Proc
             define_method(method_name, &action)
           else
-            define_method(method_name) {|*| action }
+            define_method(method_name) { |*| action }
           end
         end
         private :define_child_handler

data/lib/deep_cover/node/mixin/has_tracker.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DeepCover
   module Node::Mixin
     module HasTracker
@@ -25,14 +27,14 @@ module DeepCover
 
         def has_tracker(name)
           i = self::TRACKERS[name] = self::TRACKERS.size
-          class_eval <<-end_eval, __FILE__, __LINE__ + 1
+          class_eval <<-EVAL, __FILE__, __LINE__ + 1
             def #{name}_tracker_source
               covered_code.tracker_source(@tracker_offset + #{i})
             end
             def #{name}_tracker_hits
               covered_code.tracker_hits(@tracker_offset + #{i})
             end
-          end_eval
+          EVAL
         end
       end
     end

data/lib/deep_cover/node/mixin/is_statement.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DeepCover
   module Node::Mixin
     module IsStatement
@@ -10,7 +12,7 @@ module DeepCover
       end
 
       # Default child rewriting rule
-      def is_child_statement(child, name=nil)
+      def is_child_statement(child, name = nil)
         :if_incompatible
       end
     end

data/lib/deep_cover/node/mixin/rewriting.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DeepCover
   module Node::Mixin
     module Rewriting
@@ -10,14 +12,14 @@ module DeepCover
       end
 
       # Default child rewriting rule
-      def rewrite_child(child, name=nil)
+      def rewrite_child(child, name = nil)
       end
 
       # Replaces all the '%{local}' or '%{some_tracker}' in rewriting rules
       def resolve_rewrite(rule, context)
         return if rule == nil
         sources = context.tracker_sources
-        rule % {local: covered_code.local_var, node: '%{node}', **sources}
+        format(rule, local: covered_code.local_var, node: '%{node}', **sources)
       end
 
       # Returns an array of [range, rule], where rule is a string containing '%{node}'
@@ -26,7 +28,7 @@ module DeepCover
         [
           resolve_rewrite(rewrite, self),
           resolve_rewrite(parent.rewrite_child(self), parent),
-        ].compact.map{|rule| [expression, rule]}
+        ].compact.map { |rule| [expression, rule] }
       end
     end
   end

data/lib/deep_cover/node/mixin/wrapper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DeepCover
   module Node::Mixin
     module Wrapper

data/lib/deep_cover/node/module.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'const'
 
 module DeepCover
@@ -24,10 +26,10 @@ module DeepCover
       has_tracker :body_entry
       has_child const: {const: ModuleName}
       has_child body: Node,
-        can_be_empty: -> { base_node.loc.end.begin },
-        rewrite: '%{body_entry_tracker};%{local}=nil;%{node}',
-        is_statement: true,
-        flow_entry_count: :body_entry_tracker_hits
+                can_be_empty: -> { base_node.loc.end.begin },
+                rewrite: '%{body_entry_tracker};%{local}=nil;%{node}',
+                is_statement: true,
+                flow_entry_count: :body_entry_tracker_hits
       executed_loc_keys :keyword
 
       def execution_count
@@ -39,12 +41,12 @@ module DeepCover
       check_completion
       has_tracker :body_entry
       has_child const: {const: ModuleName}
-      has_child inherit: [Node, nil]  # TODO
+      has_child inherit: [Node, nil] # TODO
       has_child body: Node,
-        can_be_empty: -> { base_node.loc.end.begin },
-        rewrite: '%{body_entry_tracker};%{node}',
-        is_statement: true,
-        flow_entry_count: :body_entry_tracker_hits
+                can_be_empty: -> { base_node.loc.end.begin },
+                rewrite: '%{body_entry_tracker};%{node}',
+                is_statement: true,
+                flow_entry_count: :body_entry_tracker_hits
       executed_loc_keys :keyword
 
       def execution_count

data/lib/deep_cover/node/root.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DeepCover
   class Node::Root < Node
     has_tracker :root

data/lib/deep_cover/node/send.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'literals'
 require_relative 'branch'
 
@@ -90,8 +92,8 @@ module DeepCover
       end
 
       def branches
-        [ actual_send,
-          TrivialBranch.new(condition: receiver, other_branch: actual_send)
+        [actual_send,
+         TrivialBranch.new(condition: receiver, other_branch: actual_send),
         ]
       end
     end

data/lib/deep_cover/node/short_circuit.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'branch'
 
 module DeepCover
@@ -7,12 +9,12 @@ module DeepCover
       has_tracker :conditional
       has_child lhs: Node
       has_child conditional: Node, flow_entry_count: :conditional_tracker_hits,
-        rewrite: '((%{conditional_tracker};%{node}))'
+                rewrite: '((%{conditional_tracker};%{node}))'
 
       def branches
         [
           conditional,
-          TrivialBranch.new(condition: lhs, other_branch: conditional)
+          TrivialBranch.new(condition: lhs, other_branch: conditional),
         ]
       end
     end

data/lib/deep_cover/node/splat.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DeepCover
   class Node
     class Splat < Node

data/lib/deep_cover/node/variables.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DeepCover
   class Node
     class Variable < Node

data/lib/deep_cover/parser_ext/range.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Parser::Source::Range
   def with(begin_pos: @begin_pos, end_pos: @end_pos)
     Parser::Source::Range.new(@source_buffer, begin_pos, end_pos)
@@ -9,7 +11,7 @@ class Parser::Source::Range
     inner_ranges.sort_by!(&:begin_pos)
     [self.begin, *inner_ranges, self.end]
       .each_cons(2)
-      .map{|i, j| with(begin_pos: i.end_pos, end_pos: j.begin_pos)}
+      .map { |i, j| with(begin_pos: i.end_pos, end_pos: j.begin_pos) }
       .reject(&:empty?)
   end
 

data/lib/deep_cover/problem_with_diagnostic.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module DeepCover
   class ProblemWithDiagnostic < StandardError
     attr_reader :covered_code, :line_range, :original_exception
 
-    def initialize(covered_code, line_range, original_exception=nil)
+    def initialize(covered_code, line_range, original_exception = nil)
       @covered_code = covered_code
       if line_range.is_a?(Parser::Source::Range)
         @line_range = line_range.line..line_range.last_line
@@ -14,11 +16,11 @@ module DeepCover
 
     def message
       msg = []
-      msg << "You found a problem with DeepCover!"
-      msg << "Please open an issue at https://github.com/deep-cover/deep-cover/issues"
-      msg << "and include the following diagnostic information:"
+      msg << 'You found a problem with DeepCover!'
+      msg << 'Please open an issue at https://github.com/deep-cover/deep-cover/issues'
+      msg << 'and include the following diagnostic information:'
       extra = begin
-        diagnostic_information_lines.map{|line| "| #{line}"}
+        diagnostic_information_lines.map { |line| "| #{line}" }
       rescue ProblemWithDiagnostic
         ["Oh no! We're in deep trouble!!!"]
       rescue Exception => e
@@ -32,13 +34,13 @@ module DeepCover
       lines = []
       lines << "Source file: #{covered_code.path}"
       lines << "Line numbers: #{line_range}"
-      lines << "Source lines around location:"
-      lines.concat source_lines.map{|line| "   #{line}" }
+      lines << 'Source lines around location:'
+      lines.concat(source_lines.map { |line| "   #{line}" })
       if original_exception
-        lines << "Original exception:"
+        lines << 'Original exception:'
         lines << "  #{original_exception.class.name}: #{original_exception.message}"
         backtrace = Tools.truncate_backtrace(original_exception)
-        lines.concat backtrace.map{|line| "    #{line}"}
+        lines.concat(backtrace.map { |line| "    #{line}" })
       end
       lines
     end

data/lib/deep_cover/reporter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DeepCover
   module Reporter
   end

data/lib/deep_cover/reporter/istanbul.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 
 module DeepCover
@@ -6,20 +8,20 @@ module DeepCover
       # Converters has no dependency on the including class.
       module Converters
         def convert_range(range)
-          { start: {
-              line: range.line,
-              column: range.column,
-            },
-            end: {
-              line: range.last_line,
-              column: range.last_column-1, # Our ranges are exclusive, Istanbul's are inclusive
-            },
+          {start: {
+                    line: range.line,
+                    column: range.column,
+                  },
+           end: {
+                  line: range.last_line,
+                  column: range.last_column - 1, # Our ranges are exclusive, Istanbul's are inclusive
+                },
           }
         end
 
         # [:a, :b, :c] => {'1': :a, '2': :b, '3': :c}
         def convert_list(list)
-          list.map.with_index{ |val, i| [i.succ.to_s, val] }.to_h
+          list.map.with_index { |val, i| [i.succ.to_s, val] }.to_h
         end
 
         def convert_def(node)
@@ -31,7 +33,7 @@ module DeepCover
         def convert_block(node)
           decl = node.loc_hash[:begin]
           if (args = node.args.expression)
-            decl = decl.join(args) rescue binding.pry
+            decl = decl.join(args)
           end
           _convert_function(node, '(block)', decl)
         end
@@ -50,11 +52,12 @@ module DeepCover
             loc: convert_range(node.expression),
             type: node.type,
             line: node.expression.line,
-            locations: branches.map{|n| convert_range(n.expression || node.expression)}
+            locations: branches.map { |n| convert_range(n.expression || node.expression) },
           }
         end
 
         private
+
         def _convert_function(node, name, decl)
           loc = node.body ? node.body.expression : decl.end
           {
@@ -95,15 +98,15 @@ module DeepCover
 
       # Istanbul doesn't understand how to ignore a branch...
       def zero_to_something(values)
-        values.map{|v| v || 1}
+        values.map { |v| v || 1 }
       end
 
       def branch_runs
-        branches.values.map{|r| zero_to_something(r.values) }
+        branches.values.map { |r| zero_to_something(r.values) }
       end
 
       def statement_map
-        statements.keys.map{ |range| convert_range(range) }
+        statements.keys.map { |range| convert_range(range) }
       end
 
       def statement_runs
@@ -111,7 +114,7 @@ module DeepCover
       end
 
       def function_map
-        functions.keys.map{|n| convert_function(n) }
+        functions.keys.map { |n| convert_function(n) }
       end
 
       def function_runs
@@ -120,20 +123,21 @@ module DeepCover
 
       def data
         {
-          statementMap: statement_map ,
+          statementMap: statement_map,
           s:            statement_runs,
-          fnMap:        function_map  ,
-          f:            function_runs ,
-          branchMap:    branch_map    ,
-          b:            branch_runs   ,
+          fnMap:        function_map,
+          f:            function_runs,
+          branchMap:    branch_map,
+          b:            branch_runs,
         }
       end
 
       def convert
-        { covered_code.name => {
-            path: covered_code.path,
-            **data.transform_values{|l| convert_list(l)},
-        } }
+        {covered_code.name => {
+                                path: covered_code.path,
+                                **data.transform_values { |l| convert_list(l) },
+                              },
+}
       end
 
       def report

data/lib/deep_cover/tools.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DeepCover
   Tools = Module.new
 

data/lib/deep_cover/tools/builtin_coverage.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DeepCover
   module Tools::BuiltinCoverage
     require 'coverage'
@@ -6,7 +8,7 @@ module DeepCover
       fn = File.absolute_path(File.expand_path(fn))
       ::Coverage.start
       Tools.silence_warnings do
-        execute_sample ->{ run_with_line_coverage(source, fn, lineno)}
+        execute_sample -> { run_with_line_coverage(source, fn, lineno) }
       end
       unshift_coverage(::Coverage.result.fetch(fn), lineno)
     end
@@ -14,7 +16,7 @@ module DeepCover
     if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
       # Executes the source as if it was in the specified file while
       # builtin coverage information is still captured
-      def run_with_line_coverage(source, fn=nil, lineno=1)
+      def run_with_line_coverage(source, fn = nil, lineno = 1)
         source = shift_source(source, lineno)
         Object.to_java.getRuntime.executeScript(source, fn)
       end
@@ -31,7 +33,7 @@ module DeepCover
 
       # Executes the source as if it was in the specified file while
       # builtin coverage information is still captured
-      def run_with_line_coverage(source, fn=nil, lineno=1)
+      def run_with_line_coverage(source, fn = nil, lineno = 1)
         source = shift_source(source, lineno)
         RubyVM::InstructionSequence.compile(source, fn).eval
       end
@@ -44,7 +46,7 @@ module DeepCover
     end
 
     def unshift_coverage(coverage, lineno)
-      coverage[(lineno-1)..-1]
+      coverage[(lineno - 1)..-1]
     end
   end
 end