deep-cover 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b1f81b23d211ad08949890b4bc4267613e18b566b5e8129aa2ec575cc1cf28e
-  data.tar.gz: 3f80f743ba78813f2218aeed63bc9a8ba889447f446367f1df34a9054b59bb8b
+  metadata.gz: f31d42c2a220b9de98c530372bf1990b2ac17080b58e1c8c22a68018b9e77c49
+  data.tar.gz: 75959af396239daf95c3efd80e1f3b5fc75a0361baaa6fd0e66caea8eda6a768
 SHA512:
-  metadata.gz: e0763b964b08399a871dc36b4da0bd0b227a58eabf15c98b0144abae98222d0fb44a67ed4ea11cf91c64350bef1072d539c5f45f6075043f2b6a559a4cc6a24d
-  data.tar.gz: 342d74b8ffbc0c56c062635c66b799ae9926fecf060d3d62188adcb6aea09a957ae3a3d97b4662c1538ef407bbdc60888675930f3db4f2fc20b75c35eca3da82
+  metadata.gz: 15f6425a117f94fd89998e6977b1a7095775ffd7762b640620d8e82f1cca9f1a62c9370fe7bb93f96822653023f25a1e3e81782a0e9de6e12af1b9c28ce01513
+  data.tar.gz: 64dc5b3714f9504817f8eb344cbdbf1cd46504655c2a4ee4f9d35ff29d191699ba64783d066236908fff1d3eb40b7a98b51eccaa68d36a29116267191aaeadaa

data/.rubocop.yml

@@ -7,8 +7,23 @@ AllCops:
     - '**/spec/specs_tools.rb'
     - 'bin/**/*'
     - '_*/**/*'
-  TargetRubyVersion: 2.1
+  TargetRubyVersion: 2.2
 
+Gemspec/RequiredRubyVersion:
+  # Yes, we still support ruby 2.1...
+  Enabled: false
+
+Layout/AlignHash:
+  Enabled: false
+
+Layout/ClosingParenthesisIndentation:
+  # It seems to want to indent things more than they should be...
+  # Not sure I like where the discussion is going...
+  # https://github.com/rubocop-hq/rubocop/issues/5975
+  Enabled: false
+
+Layout/EmptyLineAfterGuardClause:
+  Enabled: false
 
 Layout/EmptyLines:
   Enabled: false
@@ -34,6 +49,9 @@ Layout/MultilineArrayBraceLayout:
 Layout/MultilineHashBraceLayout:
   EnforcedStyle: new_line
 
+Layout/RescueEnsureAlignment:
+  Enabled: false
+
 # Annoying when used with some api that have blocks with sometimes useful parameters
 Lint/UnusedBlockArgument:
   Enabled: false
@@ -80,6 +98,9 @@ Performance/RedundantBlockCall:
 Rails/FilePath:
   Enabled: false
 
+Style/AccessModifierDeclarations:
+  Enabled: false
+
 Style/AsciiComments:
   Enabled: false
 

data/.travis.yml

@@ -2,21 +2,20 @@ sudo: false
 language: ruby
 rvm:
   - ruby-head
+  - 2.6.0
   - 2.5.0
   - 2.4.1
   - 2.3.4
   - 2.2.7
   - 2.1.10
+  - jruby-head
   - jruby-9.1.9.0
-before_install:
-  - gem update --system
+
+install:
   - gem install bundler
+  - rake dev:install
   - npm install -g nyc
-before_script:
-  - bundle exec rake dev:install
 script:
   - bundle exec rake test:all
 matrix:
   allow_failures:
-  - rvm: jruby-9.1.9.0
-  - rvm: ruby-head

data/CHANGELOG.md

@@ -1,5 +1,7 @@
 # Changelog
 
+* We now officially support JRuby. Our test-suite passes with it.
+
 ## 0.7.0
 
 * Switched CLI to rely on Thor instead of Slop

data/Rakefile

@@ -19,12 +19,17 @@ task release: ['core:sass', 'core:release', 'global:release']
 
 ### Tests tasks
 begin
-  require 'rspec/core/rake_task'
   require 'rubocop/rake_task'
 
   RuboCop::RakeTask.new(:rubocop) do |t|
     t.options = ['-a'] unless ENV['TRAVIS']
   end
+rescue LoadError
+  puts 'Note: rubocop not installed'
+end
+
+begin
+  require 'rspec/core/rake_task'
 
   spec_path = 'spec/*_spec.rb, core_gem/spec/**/*_spec.rb'
   RSpec::Core::RakeTask.new(:spec).tap { |task| task.pattern = spec_path }
@@ -34,13 +39,13 @@ begin
     task.pattern = spec_path
     task.rspec_opts = '-O .rspec_all'
   end
-
-  multitask default: RUBY_VERSION > '2.1' ? [:rubocop, :spec] : :spec
-  multitask 'test:all' => RUBY_VERSION > '2.1' ? [:rubocop, 'spec:all'] : 'spec:all'
 rescue LoadError
-  puts 'Note: rspec or rubocop not installed'
+  puts 'Note: rspec not installed'
 end
 
+multitask default: RUBY_VERSION > '2.2' ? [:rubocop, :spec] : :spec
+multitask 'test:all' => RUBY_VERSION > '2.2' ? [:rubocop, 'spec:all'] : 'spec:all'
+
 #### Utilities
 namespace :dev do
   desc 'Self cover'
@@ -54,13 +59,14 @@ namespace :dev do
   task :install do
     commands = []
 
-    if RUBY_VERSION >= '2.2.2' && (!defined?(RUBY_ENGINE) || RUBY_ENGINE != 'jruby')
-      commands << 'bundle install --gemfile=core_gem/spec/code_fixtures/rails51_project/Gemfile'
-    end
-    commands << 'bundle install --gemfile=spec/code_fixtures/simple_rails42_app/Gemfile'
-    commands << 'bundle install --gemfile=spec/code_fixtures/rails_like_gem/Gemfile'
-    commands << 'bundle install --gemfile=core_gem/Gemfile'
-    commands << 'bundle install'
+    gemfiles = ['',
+                'core_gem/Gemfile',
+                'spec/code_fixtures/simple_rails42_app/Gemfile',
+                'spec/code_fixtures/rails_like_gem/Gemfile',
+               ]
+    gemfiles << 'core_gem/spec/code_fixtures/rails51_project/Gemfile' if RUBY_VERSION >= '2.2.2' && RUBY_PLATFORM != 'java'
+
+    commands += gemfiles.map { |gemfile| "bundle install --gemfile=#{gemfile} --jobs=3 --retry=3" }
 
     commands.each do |command|
       puts "Running: #{command}"

data/deep_cover.gemspec

@@ -27,16 +27,17 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'deep-cover-core', DeepCover::VERSION
 
   # CLI
-  spec.add_runtime_dependency 'bundler'
   spec.add_runtime_dependency 'highline'
   spec.add_runtime_dependency 'thor', '>= 0.20.3'
   spec.add_runtime_dependency 'with_progress'
 
   ### Dev dependencies
   spec.add_development_dependency 'bundler', '~> 1.15'
-  spec.add_development_dependency 'psych', '>= 2.0'
   spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rubocop', '0.53.0' # About every single release breaks something
   spec.add_development_dependency 'sass'
+
+  # About every single release breaks something
+  # Ruby 2.1 is no longer supported
+  spec.add_development_dependency 'rubocop', '0.61.1' if RUBY_VERSION >= '2.2.0'
 end

data/lib/deep_cover/cli.rb

@@ -66,7 +66,7 @@ module DeepCover
           root_path = File.expand_path(options[:change_directory])
           unless File.exist?(root_path)
             warn set_color(DeepCover::Tools.strip_heredoc(<<-MSG), :red)
-              bad value for option --change_directory: #{root_path.inspect} is not a valid directory
+              bad value for option --change-directory: #{root_path.inspect} is not a valid directory
             MSG
             exit(1)
           end

data/lib/deep_cover/cli/commands/exec.rb

@@ -27,8 +27,7 @@ module DeepCover
       }
 
       DeepCover.delete_trackers
-      system(env_var, *command_parts)
-      exit_code = $?.exitstatus
+      exit_code = Tools.run_command_or_exit(shell, env_var, *command_parts)
       coverage = Coverage.load
       puts coverage.report(**processed_options)
       exit(exit_code)

data/lib/deep_cover/cli/commands/gather.rb

@@ -20,17 +20,8 @@ module DeepCover
                  'DEEP_COVER_OPTIONS' => YAML.dump(processed_options.slice(*DEFAULTS.keys)),
       }
 
-      # Clear inspiration from Bundler's kernel_exec
-      # https://github.com/bundler/bundler/blob/d44d803357506895555ff97f73e60d593820a0de/lib/bundler/cli/exec.rb#L50
-      begin
-        Kernel.exec(env_var, *command_parts)
-      rescue Errno::EACCES, Errno::ENOEXEC
-        warn set_color("not executable: #{command_parts.first}", :red)
-        exit 126 # Default exit code for that
-      rescue Errno::ENOENT
-        warn set_color("command not found: #{command_parts.first}", :red)
-        exit 127 # Default exit code for that
-      end
+      exit_code = Tools.run_command_or_exit(shell, env_var, *command_parts)
+      exit(exit_code)
     end
   end
 end

data/lib/deep_cover/cli/tools.rb

@@ -13,6 +13,25 @@ module DeepCover
         remains = commands - matching
         [matching, remains]
       end
+
+      # Basically does the same as Kernel.system, but:
+      # * exits with an error message when unable to start the command
+      # * returns the error code instead of just true/false
+      def self.run_command_or_exit(shell, env_var, *command_parts)
+        # Clear inspiration from Bundler's kernel_exec
+        # https://github.com/bundler/bundler/blob/d44d803357506895555ff97f73e60d593820a0de/lib/bundler/cli/exec.rb#L50
+        begin
+          pid = Kernel.spawn(env_var, *command_parts)
+        rescue Errno::EACCES, Errno::ENOEXEC
+          warn shell.set_color("not executable: #{command_parts.first}", :red)
+          exit 126 # Default exit code for that
+        rescue Errno::ENOENT
+          warn shell.set_color("command not found: #{command_parts.first}", :red)
+          exit 127 # Default exit code for that
+        end
+        Process.wait pid
+        $?.exitstatus
+      end
     end
   end
 end

data/lib/deep_cover/instrumented_clone_reporter.rb

@@ -42,7 +42,15 @@ module DeepCover
 
     def create_entry_point_file
       require 'tempfile'
-      file = Tempfile.new(['deep_cover_entry_point', '.rb'])
+
+      file = nil
+      # Basically creating a Tempfile, but we don't want it to be automatically removed...
+      # We can't use `ObjectSpace.undefine_finalizer` because it doesn't appear to work on JRuby.
+      # Simplified code straight from `Tempfile#initialize`
+      ::Dir::Tmpname.create(['deep_cover_entry_point', '.rb']) do |tmpname|
+        file = File.open(tmpname, File::RDWR | File::CREAT | File::EXCL, perm: 0o600)
+      end
+
       template = File.read(DeepCover::CORE_GEM_LIB_DIRECTORY + '/deep_cover/setup/clone_mode_entry_template.rb')
 
       cache_directory = DeepCover.config.cache_directory.to_s
@@ -56,9 +64,6 @@ module DeepCover
       file.write(template)
       file.close
 
-      # We dont want the file to be removed, this way it stays as long as the clones directory does.
-      ObjectSpace.undefine_finalizer(file)
-
       file.path
     end
 
@@ -104,8 +109,12 @@ module DeepCover
 
     def process
       DeepCover.delete_trackers
-      system({'DISABLE_SPRING' => 'true', 'DEEP_COVER_OPTIONS' => nil}, *@options[:command], chdir: @main_path)
-      $?.exitstatus
+      # JRuby has a weird behavior with chdir. You can't use it with system if you already did a Dir.chdir (which
+      # we may have done to handle the --change-directory option)...
+      Dir.chdir(@main_path) do
+        system({'DISABLE_SPRING' => 'true', 'DEEP_COVER_OPTIONS' => nil}, *@options[:command])
+        $?.exitstatus
+      end
     end
 
     def report

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deep-cover
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Marc-André Lafortune
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-20 00:00:00.000000000 Z
+date: 2018-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deep-cover-core
@@ -17,28 +17,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.0
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -95,20 +81,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.15'
-- !ruby/object:Gem::Dependency
-  name: psych
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -138,33 +110,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.53.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.53.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: sass
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.61.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.61.1
 description: expression and branch coverage for Ruby.
 email:
 - github@marc-andre.ca
@@ -224,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: In depth coverage of your Ruby code.