deep-cover-core 0.7.7 → 0.7.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20f623535ee291144feeb29666497801965317be56a583500bbd2c9cd5c8b576
-  data.tar.gz: cccf8236fd9e2ac023199cb0f62a1907f0cd847da503ae00d396612751f0209d
+  metadata.gz: 800f64be0c9af77333d7e68f729d8c3cb4bd8b35cb965fac10422da993d6553e
+  data.tar.gz: 8333ccb194250280995ae1078b48097f2516324f9a85beabddcbca1563735a48
 SHA512:
-  metadata.gz: 4285e13e7368c6910d7e9c9b9610423856714fdc457bec0b6cf156b160821a51174c1720d1f4d47f4e601a2901e205d196817985ba2fbae30e3aa0eda5e12e71
-  data.tar.gz: 91d4cef0eb7743f8882999a954ce46acb677b11f46b516dc4e98cb553b17078f3ce3f72c983b4843755fe3fb1a469070d5b6c977829fc456476987a3c6b4efcd
+  metadata.gz: 2bde03af4ab23daf437f6e37d834c0ca1565043f9395955ab9a110b9e54c7f251827d3a05c2145393cfb5cf8d2b519b2ee8fe2a8a349cf3f7ed844c1b450c5b3
+  data.tar.gz: 03e57609062505285c7828d28cad3859d62e4c77a0e5a98f8336743c9d8c21e507f43afbf4c8ee126dad7903a4e71891c6311154fe71cb65f1b53009f78c3627

data/lib/deep_cover/analyser/node.rb

@@ -8,10 +8,11 @@ module DeepCover
       'Nodes'
     end
 
-    def initialize(source, ignore_uncovered: [], **options)
+    def initialize(source, **options)
       @cache = {}.compare_by_identity
       super
-      @allow_filters = Array(ignore_uncovered).map { |kind| Node.filter_to_method_name(kind) }
+      @allow_filters = Config.options_to_ignored(**options)
+                             .map { |kind| Node.filter_to_method_name(kind) }
       @nocov_ranges = FlagCommentAssociator.new(covered_code)
     end
 

data/lib/deep_cover/backports.rb

@@ -21,3 +21,5 @@ require 'backports/2.5.0/hash/slice'
 require 'backports/2.5.0/hash/transform_keys'
 require 'backports/2.5.0/kernel/yield_self'
 require 'backports/2.6.0/hash/to_h'
+require 'backports/2.6.0/enumerable/to_h'
+require 'backports/2.6.0/array/to_h'

data/lib/deep_cover/basics.rb

@@ -2,14 +2,20 @@
 
 # Basic constants without any dependencies are here
 module DeepCover
+  OPTIONALLY_COVERED = %i[case_implicit_else default_argument raise trivial_if warn]
+
+  FILTER_NAME = Hash.new { |h, k| h[k] = :"ignore_#{k}" }
+
+  ignore_defaults = OPTIONALLY_COVERED.to_h { |opt| [FILTER_NAME[opt], false] }
+
   DEFAULTS = {
-               ignore_uncovered: [].freeze,
                paths: [:auto_detect].freeze,
                allow_partial: false,
                tracker_global: '$_cov',
                reporter: :html,
                output: './coverage',
                cache_directory: './deep_cover',
+               **ignore_defaults,
              }.freeze
 
   CLI_DEFAULTS = {
@@ -18,8 +24,6 @@ module DeepCover
                    open: false,
                  }.freeze
 
-  OPTIONALLY_COVERED = %i[case_implicit_else default_argument raise trivial_if warn]
-
   REQUIRABLE_EXTENSIONS = {
                             '.rb' => :ruby,
                             ".#{RbConfig::CONFIG['DLEXT']}" => :native_extension,

data/lib/deep_cover/config.rb

@@ -2,9 +2,11 @@
 
 module DeepCover
   class Config
+    NOT_SPECIFIED = Object.new
+
     def initialize(notify = nil)
       @notify = nil
-      @options = {ignore_uncovered: []}
+      @options = {}
       set(**DEFAULTS)
       @notify = notify
     end
@@ -36,71 +38,48 @@ module DeepCover
         raise ArgumentError, "wrong number of arguments (given #{keywords.size}, expected 0..1)" if keywords.size > 1
         keywords << Node.unique_filter if keywords.empty?
         Node.create_filter(keywords.first, &block)
+        AttributeAccessors.define_accessor(FILTER_NAME[keywords.first])
       end
-      if keywords.empty?
-        @options[:ignore_uncovered]
-      else
+      unless keywords.empty?
         keywords = check_uncovered(keywords)
-        change(:ignore_uncovered, @options[:ignore_uncovered] | keywords)
+        set(keywords.to_h { |kind| [FILTER_NAME[kind], true] })
       end
+      Config.options_to_ignored(**@options)
     end
 
     def detect_uncovered(*keywords)
       raise ArgumentError, 'No block is accepted' if block_given?
-      if keywords.empty?
-        OPTIONALLY_COVERED - @options[:ignore_uncovered]
-      else
+      unless keywords.empty?
         keywords = check_uncovered(keywords)
-        change(:ignore_uncovered, @options[:ignore_uncovered] - keywords)
+        set(keywords.to_h { |kind| [FILTER_NAME[kind], false] })
       end
+      OPTIONALLY_COVERED - Config.options_to_ignored(**@options)
     end
 
-    def paths(paths = nil)
-      if paths
-        change(:paths, Array(paths).dup)
-      else
-        @options[:paths]
-      end
-    end
+    module AttributeAccessors
+      def self.define_accessor(attr)
+        define_method(attr) do |arg = NOT_SPECIFIED|
+          return @options[attr] if arg == NOT_SPECIFIED
 
-    def tracker_global(tracker_global = nil)
-      if tracker_global
-        change(:tracker_global, tracker_global)
-      else
-        @options[:tracker_global]
+          change(attr, arg)
+        end
       end
-    end
 
-    def reporter(reporter = nil)
-      if reporter
-        change(:reporter, reporter)
-      else
-        @options[:reporter]
-      end
+      %i[paths tracker_global reporter output cache_directory allow_partial]
+        .concat(OPTIONALLY_COVERED.map { |filter| FILTER_NAME[filter] })
+        .each { |attr| define_accessor(attr) }
     end
 
-    def output(path_or_false = nil)
-      if path_or_false != nil
-        change(:output, path_or_false)
-      else
-        @options[:output]
-      end
-    end
+    include AttributeAccessors
 
-    def cache_directory(cache_directory = nil)
-      if cache_directory
-        change(:cache_directory, cache_directory)
-      else
-        File.expand_path(@options[:cache_directory])
-      end
+    def paths(paths = NOT_SPECIFIED)
+      paths = Array(paths).dup unless paths == NOT_SPECIFIED
+      super
     end
 
-    def allow_partial(allow_partial = nil)
-      if allow_partial != nil
-        change(:allow_partial, allow_partial)
-      else
-        @options[:allow_partial]
-      end
+    def cache_directory(cache_directory = NOT_SPECIFIED)
+      return File.expand_path(super) if cache_directory == NOT_SPECIFIED
+      super
     end
 
     def reset
@@ -110,14 +89,26 @@ module DeepCover
       self
     end
 
+    def [](opt)
+      public_send(opt)
+    end
+
+    def []=(opt, value)
+      public_send(opt, value)
+    end
+
     def set(**options)
-      @options[:ignore_uncovered] = [] if options.has_key?(:ignore_uncovered)
       options.each do |key, value|
-        public_send key, value
+        self[key] = value
       end
       self
     end
 
+    def self.options_to_ignored(**options)
+      OPTIONALLY_COVERED
+        .select { |filter| options[FILTER_NAME[filter]] }
+    end
+
     private
 
     def check_uncovered(keywords)

data/lib/deep_cover/load.rb

@@ -9,6 +9,7 @@ module DeepCover
                  ]
 
     def load_absolute_basics
+      require_relative 'backports'
       require_relative 'base'
       require_relative 'basics'
       require_relative 'config_setter'
@@ -44,7 +45,6 @@ module DeepCover
     def bootstrap
       @bootstrapped ||= false # Avoid warning
       return if @bootstrapped
-      require_relative 'backports'
       require_relative 'tools'
       @bootstrapped = true
     end

data/lib/deep_cover/version.rb

@@ -3,5 +3,5 @@
 top_level_module = Thread.current['_deep_cover_top_level_module'] || Object
 
 module top_level_module::DeepCover # rubocop:disable Naming/ClassAndModuleCamelCase
-  VERSION = '0.7.7'
+  VERSION = '0.7.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deep-cover-core
 version: !ruby/object:Gem::Version
-  version: 0.7.7
+  version: 0.7.8
 platform: ruby
 authors:
 - Marc-André Lafortune
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-15 00:00:00.000000000 Z
+date: 2020-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser