deep-cover 0.5.2 → 0.5.3

data/lib/deep_cover/tracker_storage_per_path.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module DeepCover
+  bootstrap
+
+  # Should be seen as a hash like {path => tracker_storage, ...}
+  # Make it easier to separate some concerns, as well as marshalling
+  #
+  class TrackerStoragePerPath
+    extend Forwardable
+    def_delegators :@index, :each, :each_key, :map, :transform_values
+
+    attr_reader :bucket
+
+    def initialize(bucket)
+      @bucket = bucket
+      @index = {}
+    end
+
+    def [](path)
+      @index[path] ||= @bucket.create_storage
+    end
+
+    def tracker_hits_per_path
+      TrackerHitsPerPath.new(@index.transform_values(&:tracker_hits))
+    end
+
+    def tracker_hits_per_path=(tracker_hits_per_path)
+      tracker_hits_per_path.each do |path, tracker_hits|
+        self[path].tracker_hits = tracker_hits
+      end
+    end
+  end
+end

data/lib/deep_cover/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DeepCover
-  VERSION = '0.5.2'
+  VERSION = '0.5.3'
 end

data/lib/deep_cover_entry.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+# This empty file is just a hack so we can self-cover our exe/deep-cover

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deep-cover
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Marc-André Lafortune
@@ -9,52 +9,52 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-15 00:00:00.000000000 Z
+date: 2018-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.5.0
 - !ruby/object:Gem::Dependency
-  name: parser_tree_rewriter
+  name: backports
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.11.0
 - !ruby/object:Gem::Dependency
-  name: backports
+  name: binding_of_caller
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.11.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.11.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: binding_of_caller
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,20 +151,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -227,14 +213,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.52.1
+        version: 0.53.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.52.1
+        version: 0.53.0
 description: expression and branch coverage for Ruby.
 email:
 - github@marc-andre.ca
@@ -244,6 +230,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".deep_cover.rb"
 - ".gitignore"
 - ".rspec"
 - ".rspec_all"
@@ -258,8 +245,6 @@ files:
 - Rakefile
 - bin/console
 - bin/cov
-- bin/gemcov
-- bin/selfcov
 - bin/setup
 - bin/test_gems
 - bin/testall
@@ -276,6 +261,7 @@ files:
 - lib/deep_cover/analyser/node.rb
 - lib/deep_cover/analyser/per_char.rb
 - lib/deep_cover/analyser/per_line.rb
+- lib/deep_cover/analyser/ruby25_like_branch.rb
 - lib/deep_cover/analyser/statement.rb
 - lib/deep_cover/analyser/stats.rb
 - lib/deep_cover/analyser/subset.rb
@@ -286,19 +272,18 @@ files:
 - lib/deep_cover/basics.rb
 - lib/deep_cover/builtin_takeover.rb
 - lib/deep_cover/cli/debugger.rb
-- lib/deep_cover/cli/deep_cover.rb
 - lib/deep_cover/cli/exec.rb
 - lib/deep_cover/cli/instrumented_clone_reporter.rb
+- lib/deep_cover/cli/runner.rb
 - lib/deep_cover/config.rb
 - lib/deep_cover/config_setter.rb
 - lib/deep_cover/core_ext/autoload_overrides.rb
 - lib/deep_cover/core_ext/coverage_replacement.rb
+- lib/deep_cover/core_ext/exec_callbacks.rb
 - lib/deep_cover/core_ext/load_overrides.rb
 - lib/deep_cover/core_ext/require_overrides.rb
 - lib/deep_cover/coverage.rb
 - lib/deep_cover/coverage/analysis.rb
-- lib/deep_cover/coverage/base.rb
-- lib/deep_cover/coverage/istanbul.rb
 - lib/deep_cover/coverage/persistence.rb
 - lib/deep_cover/covered_code.rb
 - lib/deep_cover/custom_requirer.rb
@@ -345,6 +330,7 @@ files:
 - lib/deep_cover/parser_ext/range.rb
 - lib/deep_cover/problem_with_diagnostic.rb
 - lib/deep_cover/reporter.rb
+- lib/deep_cover/reporter/base.rb
 - lib/deep_cover/reporter/html.rb
 - lib/deep_cover/reporter/html/base.rb
 - lib/deep_cover/reporter/html/index.rb
@@ -363,8 +349,9 @@ files:
 - lib/deep_cover/reporter/html/template/source.html.erb
 - lib/deep_cover/reporter/istanbul.rb
 - lib/deep_cover/reporter/text.rb
-- lib/deep_cover/reporter/util/tree.rb
+- lib/deep_cover/reporter/tree/util.rb
 - lib/deep_cover/tools.rb
+- lib/deep_cover/tools/blank.rb
 - lib/deep_cover/tools/builtin_coverage.rb
 - lib/deep_cover/tools/camelize.rb
 - lib/deep_cover/tools/content_tag.rb
@@ -374,6 +361,7 @@ files:
 - lib/deep_cover/tools/format.rb
 - lib/deep_cover/tools/format_char_cover.rb
 - lib/deep_cover/tools/format_generated_code.rb
+- lib/deep_cover/tools/indent_string.rb
 - lib/deep_cover/tools/merge.rb
 - lib/deep_cover/tools/number_lines.rb
 - lib/deep_cover/tools/our_coverage.rb
@@ -382,9 +370,14 @@ files:
 - lib/deep_cover/tools/require_relative_dir.rb
 - lib/deep_cover/tools/silence_warnings.rb
 - lib/deep_cover/tools/slice.rb
-- lib/deep_cover/tools/transform_keys.rb
+- lib/deep_cover/tools/strip_heredoc.rb
 - lib/deep_cover/tools/truncate_backtrace.rb
+- lib/deep_cover/tracker_bucket.rb
+- lib/deep_cover/tracker_hits_per_path.rb
+- lib/deep_cover/tracker_storage.rb
+- lib/deep_cover/tracker_storage_per_path.rb
 - lib/deep_cover/version.rb
+- lib/deep_cover_entry.rb
 homepage: https://github.com/deep-cover/deep-cover
 licenses:
 - MIT
@@ -405,7 +398,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: In depth coverage of your Ruby code.

data/bin/gemcov

@@ -1,8 +0,0 @@
-#!/usr/bin/env ruby
-module DeepCover
-  require 'bundler/setup'
-  require 'deep_cover'
-  require 'deep_cover/cli/instrumented_clone_reporter'
-
-  CLI::InstrumentedCloneReporter.new(ARGV[0] || '~/inky-rb').run
-end

data/bin/selfcov

@@ -1,21 +0,0 @@
-#!/usr/bin/env ruby
-require 'bundler/setup'
-require 'pry'
-
-covered_path = ARGV[0]
-if covered_path
-  $LOAD_PATH.unshift(covered_path)
-end
-require 'deep_cover'
-
-if covered_path.nil?
-  covered_path = DeepCover::Tools.dump_covered_code_and_save('./lib', dest_path: '../covered_deep_cover')
-  puts 'Covered code generation done. Output in', covered_path
-  exec 'bin/selfcov', covered_path
-else
-  coverage = DeepCover::Coverage.load(covered_path)
-  require 'rspec'
-  error = RSpec::Core::Runner::run(Dir.glob('./spec/*_spec.rb'))
-  puts 'Lines not covered:', coverage.report
-  binding.pry
-end

data/lib/deep_cover/cli/deep_cover.rb

@@ -1,126 +0,0 @@
-# frozen_string_literal: true
-
-module DeepCover
-  require 'slop'
-  require_relative '../basics'
-
-  module CLI
-  end
-
-  module CLI::SlopExtension
-    attr_accessor :stopped
-    attr_reader :ignored
-
-    def try_process(*)
-      @ignored ||= 0
-      return if stopped
-      o = super
-      @ignored += 1 unless o
-      o
-    end
-  end
-  Slop::Parser.prepend CLI::SlopExtension
-
-  module CLI::DeepCover
-    extend self
-
-    def show_version
-      require_relative '../version'
-      require 'parser'
-      puts "deep-cover v#{DeepCover::VERSION}; parser v#{Parser::VERSION}"
-    end
-
-    def show_help
-      puts menu
-    end
-
-    class OptionParser < Struct.new(:delegate)
-      def method_missing(method, *args, &block) # rubocop:disable Style/MethodMissing
-        options = args.last
-        if options.is_a?(Hash) && options.has_key?(:default)
-          args[-2] += " [#{options[:default]}]"
-        end
-        delegate.public_send(method, *args, &block)
-      end
-    end
-
-    def parse
-      Slop.parse do |o|
-        yield OptionParser.new(o)
-      end
-    end
-
-    def menu
-      @menu ||= parse do |o|
-        o.banner = ['usage: deep-cover [options] exec <command ...>',
-                    '   or  deep-cover [options] [path/to/app/or/gem]',
-                   ].join("\n")
-        o.separator ''
-        o.string '-o', '--output', 'output folder', default: DEFAULTS[:output]
-        o.string '--reporter', 'reporter', default: DEFAULTS[:reporter]
-        o.bool '--open', 'open the output coverage', default: CLI_DEFAULTS[:open]
-
-        o.separator 'Coverage options'
-        @ignore_uncovered_map = OPTIONALLY_COVERED.map do |option|
-          default = DEFAULTS[:ignore_uncovered].include?(option)
-          o.bool "--ignore-#{dasherize(option)}", '', default: default
-          [:"ignore_#{option}", option]
-        end.to_h
-
-        o.separator "\nWhen not using ’exec’:"
-        o.string '-c', '--command', 'command to run tests', default: CLI_DEFAULTS[:command]
-        o.bool '--bundle', 'run bundle before the tests', default: CLI_DEFAULTS[:bundle]
-        o.bool '--process', 'turn off to only redo the reporting', default: CLI_DEFAULTS[:process]
-
-        o.separator "\nFor testing purposes:"
-        o.bool '--profile', 'use profiler' unless RUBY_PLATFORM == 'java'
-        o.string '-e', '--expression', 'test ruby expression instead of a covering a path'
-        o.bool '-d', '--debug', 'enter debugging after cover'
-
-        o.separator "\nOther available commands:"
-        o.on('--version', 'print the version') do
-          show_version
-          exit
-        end
-        o.boolean('-h', '--help')
-
-        o.boolean('exec', '', help: false) do
-          o.parser.stopped = true if o.parser.ignored == 0
-        end
-      end
-    end
-
-    def convert_options(options)
-      iu = options[:ignore_uncovered] = []
-      @ignore_uncovered_map.each do |cli_option, option|
-        iu << option if options.delete(cli_option)
-      end
-      options[:output] = false if ['false', 'f', ''].include?(options[:output])
-      options
-    end
-
-    def go
-      options = convert_options(menu.to_h)
-      if options[:help]
-        show_help
-      elsif options[:expression]
-        require_relative 'debugger'
-        CLI::Debugger.new(options[:expression], **options).show
-      elsif menu.parser.stopped
-        require_relative 'exec'
-        CLI::Exec.new(menu.arguments, **options).run
-      else
-        require_relative 'instrumented_clone_reporter'
-        path = menu.arguments.first || '.'
-        CLI::InstrumentedCloneReporter.new(path, **options).run
-      end
-    end
-
-    private
-
-    # Poor man's dasherize. 'an_example' => 'an-example'
-    def dasherize(string)
-      string.to_s.tr('_', '-')
-    end
-  end
-end

data/lib/deep_cover/coverage/base.rb

@@ -1,81 +0,0 @@
-# frozen_string_literal: true
-
-module DeepCover
-  # A collection of CoveredCode
-  class Coverage
-    include Enumerable
-
-    def initialize(**options)
-      @covered_code_index = {}
-      @options = options
-    end
-
-    def covered_codes
-      @covered_code_index.values
-    end
-
-    def reset
-      @covered_code_index = {}
-    end
-
-    def line_coverage(filename, **options)
-      covered_code(filename).line_coverage(**options)
-    end
-
-    def covered_code(path, **options)
-      raise 'path must be an absolute path' unless Pathname.new(path).absolute?
-      @covered_code_index[path] ||= CoveredCode.new(path: path, **options, **@options)
-    end
-
-    def each
-      return to_enum unless block_given?
-      @covered_code_index.each_value { |covered_code| yield covered_code }
-      self
-    end
-
-    def report(**options)
-      case (reporter = options.fetch(:reporter, DEFAULTS[:reporter]).to_sym)
-      when :html
-        msg = if (output = options.fetch(:output, DEFAULTS[:output]))
-                Reporter::HTML.report(self, **options)
-                "HTML generated: open #{output}/index.html"
-              else
-                'No HTML generated'
-              end
-        Reporter::Text.report(self, **options) + "\n\n" + msg
-      when :istanbul
-        if Reporter::Istanbul.available?
-          report_istanbul(**options)
-        else
-          warn 'nyc not available. Please install `nyc` using `yarn global add nyc` or `npm i nyc -g`'
-        end
-      when :text
-        Reporter::Text.report(self, **options)
-      else
-        raise ArgumentError, "Unknown reporter: #{reporter}"
-      end
-    end
-
-    def self.load(dest_path, dirname = 'deep_cover', with_trackers: true)
-      Persistence.new(dest_path, dirname).load(with_trackers: with_trackers)
-    end
-
-    def self.saved?(dest_path, dirname = 'deep_cover')
-      Persistence.new(dest_path, dirname).saved?
-    end
-
-    def save(dest_path, dirname = 'deep_cover')
-      Persistence.new(dest_path, dirname).save(self)
-      self
-    end
-
-    def save_trackers(dest_path, dirname = 'deep_cover')
-      Persistence.new(dest_path, dirname).save_trackers(tracker_global)
-      self
-    end
-
-    def tracker_global
-      @options.fetch(:tracker_global, DEFAULTS[:tracker_global])
-    end
-  end
-end