deep-cover 0.1.1 → 0.1.2

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

@@ -13,19 +13,20 @@ module DeepCover
       def rewrite_child(child, name=nil)
       end
 
+      # Replaces all the '%{local}' or '%{some_tracker}' in rewriting rules
       def resolve_rewrite(rule, context)
-        rule ||= '%{node}'
+        return if rule == nil
         sources = context.tracker_sources
-        rule.split('%{node}').map{|s| s % {local: covered_code.local_var, **sources} }
+        rule % {local: covered_code.local_var, node: '%{node}', **sources}
       end
 
-      def rewrite_prefix_suffix
-        parent_prefix, parent_suffix = resolve_rewrite(parent.rewrite_child(self), parent)
-        prefix, suffix = resolve_rewrite(rewrite, self)
+      # Returns an array of [range, rule], where rule is a string containing '%{node}'
+      # Rules must be ordered inner-most first
+      def rewriting_rules
         [
-          "#{parent_prefix}#{prefix}",
-          "#{suffix}#{parent_suffix}"
-        ]
+          resolve_rewrite(rewrite, self),
+          resolve_rewrite(parent.rewrite_child(self), parent),
+        ].compact.map{|rule| [expression, rule]}
       end
     end
   end

data/lib/deep_cover/node/send.rb

@@ -1,75 +1,84 @@
 require_relative 'literals'
+require_relative 'branch'
 
 module DeepCover
   class Node
-    class MethodName < Node
-      has_child name: Symbol
-
-      def initialize(name, parent: raise, **kwargs)
-        super(parent, **kwargs, parent: parent, base_children: [name])
-      end
-
-      def loc_hash
-        # Expression is used in the rewriting
-        # if selector_end is present, then this won't be needed
-        {expression: parent.loc_hash[:selector_begin]}
-      end
-
-      def executable?
-        false
-      end
-    end
-
     class Send < Node
       check_completion
       has_child receiver: [Node, nil]
-      has_child method_name_wrapper: {Symbol => MethodName}, rewrite: :add_opening_parentheses
-      has_extra_children arguments: Node, rewrite: :add_closing_parentheses
+      has_child message: Symbol
+      has_extra_children arguments: Node
       executed_loc_keys :dot, :selector_begin, :selector_end, :operator
 
-      def method_name
-        method_name_wrapper.name
-      end
-
       def loc_hash
-        base = super
-        hash = { expression: base[:expression], begin: base[:begin], end: base[:end], dot: base[:dot]}
-        selector = base[:selector]
+        hash = super.dup
+        selector = hash.delete(:selector)
 
-        if [:[], :[]=].include?(method_name)
+        # Special case for foo[bar]=baz, but not for foo.[]= bar, baz: we split selector into begin and end
+        if base_node.location.dot == nil && [:[], :[]=].include?(message)
           hash[:selector_begin] = selector.resize(1)
           hash[:selector_end] = Parser::Source::Range.new(selector.source_buffer, selector.end_pos - 1, selector.end_pos)
         else
-          hash[:selector_begin] = base[:selector]
+          hash.delete(:dot) if type == :safe_send # Hack. API to get a Parser::AST::Send::Map without the dot is crappy.
+          hash[:selector_begin] = selector
         end
 
         hash
       end
 
+      # Rules must be ordered inner-most first
+      def rewriting_rules
+        rules = super
+        if need_parentheses?
+          range = arguments.last.expression.with(begin_pos: loc_hash[:selector_begin].end_pos)
+          rules.unshift [range, '(%{node})']
+        end
+        rules
+      end
+
+      private
+
       # Only need to add them to deal with ambiguous cases where a method is hidden by a local. Ex:
-      #   raise TypeError, 'hello'  #=> Works
-      #   raise (TypeError), 'hello'  #=> Simplification of what DeepCover generates, still works
-      #   raise = 1; raise TypeError, 'hello'  #=> works
-      #   raise = 1; raise (TypeError), 'hello'  #=> syntax error.
-      #   raise = 1; raise((TypeError), 'hello'0  #=> works
-      def add_parentheses?
-        return if arguments.empty?
-        # No ambiguity if there is a receiver
-        return if receiver
-        # Already has parentheses
-        return if self.loc_hash[:begin]
-        true
+      #   foo 42, 'hello'  #=> Works
+      #   foo (42), 'hello'  #=> Simplification of what DeepCover would generate, still works
+      #   foo = 1; foo 42, 'hello'  #=> works
+      #   foo = 1; foo (42), 'hello'  #=> syntax error.
+      #   foo = 1; foo((42), 'hello')  #=> works
+      def need_parentheses?
+        true unless
+          arguments.empty? || # No issue when no arguments
+          receiver || # No ambiguity if there is a receiver
+          loc_hash[:begin] # Ok if has parentheses
       end
+    end
+
+    class Csend < Node
+      include Branch
+      has_tracker :conditional
+      has_child receiver: Node,
+                rewrite: '(%{local}=%{node};%{conditional_tracker} if %{local} != nil;%{local})'
+
+      has_child actual_send: {safe_send: Send},
+                flow_entry_count: :conditional_tracker_hits
+
+      def initialize(base_node, base_children: base_node.children, **)
+        send_without_receiver = base_node.updated(:safe_send, [nil, *base_node.children.drop(1)])
+        base_children = [base_children.first, send_without_receiver]
+        super
+      end
+
+      executed_loc_keys :dot
+
+      alias_method :execution_count, :flow_entry_count
 
-      def add_opening_parentheses
-        return unless add_parentheses?
-        "%{node}("
+      def message
+        actual_send.message
       end
 
-      def add_closing_parentheses(child)
-        return unless add_parentheses?
-        return unless child.index == children.size - 1
-        "%{node})"
+      def branches
+        [ actual_send,
+          TrivialBranch.new(receiver, actual_send)
+        ]
       end
     end
 

data/lib/deep_cover/reporter/istanbul.rb

@@ -46,12 +46,11 @@ module DeepCover
 
         def convert_branch(node, branches = node.branches)
           # Currently, nyc seems to outputs the same location over and over...
-          loc = convert_range(node.expression)
           {
-            loc: loc,
+            loc: convert_range(node.expression),
             type: node.type,
             line: node.expression.line,
-            locations: branches.map{|n| loc}
+            locations: branches.map{|n| convert_range(n.expression || node.expression)}
           }
         end
 

data/lib/deep_cover/tools.rb

@@ -3,8 +3,9 @@ module DeepCover
 
   require_relative 'tools/require_relative_dir'
   extend Tools::RequireRelativeDir
-  require_relative_dir 'tools'
+  require_relative 'tools/silence_warnings'
   extend Tools::SilenceWarnings
+  require_relative_dir 'tools'
 
   # The functions defined in the submodules of Tools can be accessed
   # either by extending the desired module, or all of them by extending

data/lib/deep_cover/tools/dasherize.rb

@@ -0,0 +1,8 @@
+module DeepCover
+  module Tools::Dasherize
+    # Poor man's dasherize. 'an_example' => 'an-example'
+    def dasherize(string)
+      string.to_s.gsub('_', '-')
+    end
+  end
+end

data/lib/deep_cover/tools/dump_covered_code.rb

@@ -1,20 +1,27 @@
-require 'with_progress'
-
 module DeepCover
+  silence_warnings do
+    require 'with_progress'
+  end
   module Tools::DumpCoveredCode
-    def dump_covered_code(source_path, dest_path = Dir.mktmpdir)
+    def dump_covered_code_and_save(source_path, dest_path: Dir.mktmpdir)
       coverage = Coverage.new(tracker_global: '$_sc')
+      dump_covered_code(source_path, coverage: coverage, dest_path: dest_path)
+      coverage.save(dest_path)
+    end
+
+    def dump_covered_code(source_path, coverage: raise, dest_path: Dir.mktmpdir, root_path: source_path)
       source_path = File.join(File.expand_path(source_path), '')
       dest_path = File.join(File.expand_path(dest_path), '')
+      root_path = Pathname.new(root_path)
       skipped = []
       Dir.glob("#{source_path}**/*.rb").each.with_progress(title: 'Rewriting') do |path|
+        new_path = Pathname(path.gsub(source_path, dest_path))
         begin
-          covered_code = coverage.covered_code(path)
+          covered_code = coverage.covered_code(path, name: new_path.relative_path_from(root_path))
         rescue Parser::SyntaxError
           skipped << path
           next
         end
-        new_path = Pathname(path.gsub(source_path, dest_path))
         new_path.dirname.mkpath
         new_path.write(covered_code.covered_source)
       end
@@ -25,7 +32,6 @@ module DeepCover
           ('...' if skipped.size > 3),
         ].compact.join("\n")
       end
-      coverage.save(dest_path)
       dest_path
     end
   end

data/lib/deep_cover/tools/format_char_cover.rb

@@ -2,9 +2,8 @@ module DeepCover
   module Tools::FormatCharCover
     COLOR = {'x' => :red, ' ' => :green, '-' => :faint}
     WHITESPACE_MAP = Hash.new{|_, v| v}.merge!(' ' => '·', "\t" => '→ ')
-    def format_char_cover(covered_code, show_whitespace: false)
-      bc = covered_code.char_cover
-
+    def format_char_cover(covered_code, show_whitespace: false, **options)
+      bc = covered_code.char_cover(**options)
       covered_code.buffer.source_lines.map.with_index do |line, line_index|
         next line if line.strip =~ /^#[ >]/
         line.chars.map.with_index do |c, c_index|

data/lib/deep_cover/tools/slice.rb

@@ -0,0 +1,7 @@
+module DeepCover
+  module Tools::Slice
+    def slice(hash, *keys)
+      keys.each_with_object(Hash.new) { |k, h| h[k] = hash[k] if hash.has_key?(k) }
+    end
+  end
+end

data/lib/deep_cover/version.rb

@@ -1,3 +1,3 @@
 module DeepCover
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deep-cover
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Marc-André Lafortune
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-27 00:00:00.000000000 Z
+date: 2017-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -81,20 +81,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: ruby-progressbar
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.9.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.9.0
 - !ruby/object:Gem::Dependency
   name: with_progress
   requirement: !ruby/object:Gem::Requirement
@@ -228,6 +214,7 @@ files:
 - lib/deep_cover/analyser/function.rb
 - lib/deep_cover/analyser/ignore_uncovered.rb
 - lib/deep_cover/analyser/node.rb
+- lib/deep_cover/analyser/optionally_covered.rb
 - lib/deep_cover/analyser/per_char.rb
 - lib/deep_cover/analyser/per_line.rb
 - lib/deep_cover/analyser/statement.rb
@@ -254,7 +241,6 @@ files:
 - lib/deep_cover/node/base.rb
 - lib/deep_cover/node/begin.rb
 - lib/deep_cover/node/block.rb
-- lib/deep_cover/node/boolean.rb
 - lib/deep_cover/node/branch.rb
 - lib/deep_cover/node/case.rb
 - lib/deep_cover/node/collections.rb
@@ -281,6 +267,7 @@ files:
 - lib/deep_cover/node/module.rb
 - lib/deep_cover/node/root.rb
 - lib/deep_cover/node/send.rb
+- lib/deep_cover/node/short_circuit.rb
 - lib/deep_cover/node/splat.rb
 - lib/deep_cover/node/variables.rb
 - lib/deep_cover/parser_ext/range.rb
@@ -289,6 +276,7 @@ files:
 - lib/deep_cover/tools.rb
 - lib/deep_cover/tools/builtin_coverage.rb
 - lib/deep_cover/tools/camelize.rb
+- lib/deep_cover/tools/dasherize.rb
 - lib/deep_cover/tools/dump_covered_code.rb
 - lib/deep_cover/tools/execute_sample.rb
 - lib/deep_cover/tools/format.rb
@@ -298,6 +286,7 @@ files:
 - lib/deep_cover/tools/our_coverage.rb
 - lib/deep_cover/tools/require_relative_dir.rb
 - lib/deep_cover/tools/silence_warnings.rb
+- lib/deep_cover/tools/slice.rb
 - lib/deep_cover/version.rb
 homepage: http://github.com
 licenses:
@@ -311,7 +300,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="