bashcov 1.4.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 846ded19c1d2718bb704f9d34c0485a54d5c351f
-  data.tar.gz: 7d7df456bc41ca13253315e104d233879483b9da
+  metadata.gz: fe65b22751f9abd147d520a9c5a86b4d238c62c7
+  data.tar.gz: f4973b9bdccdac58cea260f8508c049245fe1e3b
 SHA512:
-  metadata.gz: 85f015eb2308cfe698de95a59ce6f4decc37f81ba78a4de40fc617d7c0f156d9074f6072fd0b5cf8dac327c90f3660aa0c9cedc4a1475753211fe853d23e8a55
-  data.tar.gz: 9bded014137b9d94f5583b4921a77b22530c7f65a8e492b2fe0c8f922c265e2d4aac5c2bbbbe2ba03b92628b097558f65914fb2cf5a6177fde2fbe9d78122cca
+  metadata.gz: a2d1fa149b244242bf16b69cd589682be79b8f02f60a3b70273dea1699ae778040c73c905a6fad3e41b718fe5a33690214894c798ac15c72ca231a3844830290
+  data.tar.gz: ab1f4721a06e67efb2147072dce2e328652eb3ef1f9e79be9e4aba3671792584406e9355c92f67a30d1a8f8873ffd1e3a468b469d6a158225ac3a55ab84e5d89

data/CHANGELOG.md

@@ -1,7 +1,12 @@
-## Unreleased ([changes](https://github.com/infertux/bashcov/compare/v1.4.1...master))
+## Unreleased ([changes](https://github.com/infertux/bashcov/compare/v1.5.0...master))
 
   * TBD
 
+## v1.5.0, 2017-02-08 ([changes](https://github.com/infertux/bashcov/compare/v1.4.1...v1.5.0))
+
+  * [BUGFIX]  Fix incorrect coverage for some multiline strings (#23)
+  * [FEATURE] Add support for Ruby 2.4
+
 ## v1.4.1, 2016-10-11 ([changes](https://github.com/infertux/bashcov/compare/v1.4.0...v1.4.1))
 
   * [BUGFIX]  Fix incorrect coverage for some multiline strings (#22)

data/Guardfile

@@ -2,7 +2,7 @@
 
 # More info at https://github.com/guard/guard#readme
 
-guard "rspec", cli: "--tag ~speed:slow" do
+guard "rspec", cli: "--tag ~slow" do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})        { |m| "spec/#{m[1]}_spec.rb" }
   watch(%r{^lib/(.+)/(.+)\.rb$})   { |m| "spec/#{m[1]}/#{m[2]}_spec.rb" }

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2012-2016 Cédric Félizard
+Copyright (c) 2012-2017 Cédric Félizard
 
 MIT License
 

data/bashcov.gemspec

@@ -14,19 +14,22 @@ Gem::Specification.new do |gem|
   gem.homepage      = "https://github.com/infertux/bashcov"
   gem.license       = "MIT"
 
-  gem.files         = `git ls-files -z`.split("\x0").reject { |f| f.start_with?(".") || f.match(%r{\A(test|spec|features)/}) }
+  gem.files         = `git ls-files -z`.split("\x0").reject do |file|
+    file.start_with?(".") || file.match(%r{\A(test|spec|features)/})
+  end
+
   gem.executables   = gem.files.grep(%r{\Abin/}).map { |f| File.basename(f) }
   gem.require_paths = ["lib"]
 
-  gem.required_ruby_version = ">= 2.2.5"
+  gem.required_ruby_version = ">= 2.2.6"
 
   gem.add_dependency "simplecov", "~> 0.11"
 
   gem.add_development_dependency "rake"
   gem.add_development_dependency "rspec"
-  gem.add_development_dependency "guard-rspec"
-  gem.add_development_dependency "rb-inotify"
-  gem.add_development_dependency "cane"
+  gem.add_development_dependency "mutant-rspec"
+  # TODO: forcing version for Ruby 2.4 compat, remove when mutant Gem is fixed
+  gem.add_development_dependency "regexp_parser", ">= 0.4.2"
   gem.add_development_dependency "rubocop"
   gem.add_development_dependency "yard"
   gem.add_development_dependency "coveralls"

data/lib/bashcov/lexer.rb

@@ -33,9 +33,26 @@ module Bashcov
       lines = File.read(@filename).lines
 
       lines.each_with_index do |line, lineno|
-        mark_multiline(lines, lineno, /\A[^\n]+<<-?'?(\w+)'?\s*$.*\1/m) # heredoc
-        mark_multiline(lines, lineno, /\A[^\n]+\\$(\s*['"][^'"]*['"]\s*\\$){1,}\s*['"][^'"]*['"]\s*$/) # multiline string concatenated with backslashes
-        mark_multiline(lines, lineno, /\A[^\n]+\s+(['"])[^'"]*\1/m, forward: false) # multiline string concatenated with newlines
+        # heredoc
+        mark_multiline(
+          lines, lineno,
+          /\A[^\n]+<<-?'?(\w+)'?\s*$.*\1/m
+        )
+
+        # multiline string concatenated with backslashes
+        mark_multiline(
+          lines, lineno,
+          /\A[^\n]+\\$(\s*['"][^'"]*['"]\s*\\$){1,}\s*['"][^'"]*['"]\s*$/
+        )
+
+        # multiline string concatenated with newlines
+        %w(' ").each do |char|
+          mark_multiline(
+            lines, lineno,
+            /\A[^\n]+\s+#{char}[^#{char}]*#{char}/m,
+            forward: false
+          )
+        end
 
         mark_line(line, lineno)
       end
@@ -54,7 +71,7 @@ module Bashcov
 
       range.each do |sub_lineno|
         # mark related lines with the same coverage as the reference line
-        @coverage[sub_lineno] = @coverage[reference_lineno]
+        @coverage[sub_lineno] ||= @coverage[reference_lineno]
       end
     end
 
@@ -64,7 +81,7 @@ module Bashcov
       @coverage[lineno] = Bashcov::Line::UNCOVERED if relevant?(line)
     end
 
-    def relevant?(line)
+    def relevant?(line) # rubocop:disable Metrics/CyclomaticComplexity
       line.sub!(/ #.*\Z/, "") # remove comments
       line.strip!
 

data/lib/bashcov/runner.rb

@@ -16,7 +16,7 @@ module Bashcov
     # Runs the command with appropriate xtrace settings.
     # @note Binds Bashcov +stdin+ to the program being executed.
     # @return [Process::Status] Status of the executed command
-    def run
+    def run # rubocop:disable Metrics/MethodLength
       # Clear out previous run
       @result = nil
 

data/lib/bashcov/version.rb

@@ -3,5 +3,5 @@
 # :nodoc:
 module Bashcov
   # Current Bashcov version
-  VERSION = "1.4.1".freeze
+  VERSION = "1.5.0".freeze
 end

data/lib/bashcov.rb

@@ -85,8 +85,8 @@ module Bashcov
       HELP
     end
 
-    def option_parser
-      OptionParser.new do |opts|
+    def option_parser # rubocop:disable Metrics/MethodLength
+      OptionParser.new do |opts| # rubocop:disable Metrics/BlockLength
         opts.program_name = program_name
         opts.version = Bashcov::VERSION
         opts.banner = help

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bashcov
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Cédric Félizard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-11 00:00:00.000000000 Z
+date: 2017-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard-rspec
+  name: mutant-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,33 +67,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rb-inotify
+  name: regexp_parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: cane
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -174,7 +160,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.5
+      version: 2.2.6
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -182,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Code coverage tool for Bash