gouteur 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 001d0213cebc3a146615388dff657d573cc671395e2e8d62995e11b3b3a84f6e
-  data.tar.gz: 45ed7d535d16effa0c9ad2bd6044e973257d08a111e606beb6b65dd2e7483b83
+  metadata.gz: 9cced511802f382d5ebaf4035fd7b06e98f0eca07e72e29c08ddae2b8de01d2f
+  data.tar.gz: 2854883c107ac874febb0e1aeb1c939d5c621bffed23feb38f22a63e1aaa0d0d
 SHA512:
-  metadata.gz: 2664a0c872fbd8da4b638841454904ae43015652c10e3d2fabbd52f7c5f15fb2f5541eb677954952228e48153ca4ef6f6d85cac5ca3b7ca5abbbac07c11a67a2
-  data.tar.gz: 1befe751c803a11255163d29ef64b37ce143381c11b197c9826ee1f020e249bace18fb597a318840293c7b2d72fac78e3a42b86a99be059db7d8eb5628270a02
+  metadata.gz: 34a5301cfb9d2c421079334b0426763c70aeeffcd9e1f270385979403e0506d7753d7e1eba9db1a3741b636154861fb0833c3945a6c1fe60c0bf0ecf3d5410c6
+  data.tar.gz: 066d049552256df89bede60548f584e5806cfbe4f6d0a470f23ed40d5fb8c0c1554c7f9ef6cf75c6360e7c77d21adc2ac2d4c22e15df71c94d82cb9a8811ce95

data/.github/workflows/build.yml

@@ -8,7 +8,7 @@ jobs:
 
     strategy:
       matrix:
-        ruby: [ '2.5', '3.0', 'ruby-head' ]
+        ruby: [ '2.6', '3.0', 'ruby-head' ]
 
     steps:
       - uses: actions/checkout@v2

data/.rubocop.yml

@@ -6,11 +6,20 @@ AllCops:
   SuggestExtensions: false
   TargetRubyVersion: 2.5
 
+Gemspec/RequireMFA:
+  Enabled: false
+
 Layout/LineLength:
   Max: 80
 
 Lint/AmbiguousBlockAssociation:
   Enabled: false
 
+Lint/AmbiguousOperatorPrecedence:
+  Enabled: false
+
+Style/FetchEnvVar:
+  Enabled: false
+
 Style/FrozenStringLiteralComment:
   Enabled: false

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 ## [Unreleased]
 
+## [1.0.2] - 2022-09-24
+
+### Fixed
+
+- Fixed error message when a repo's `before` task fails
+- Fixed dependency version mismatch detection for recent bundler versions
+
+## [1.0.1] - 2021-03-09
+
+### Fixed
+
+- Fixed error when a task failed with the old code
+
 ## [1.0.0] - 2021-02-08
 
 - Initial release

data/Gemfile

@@ -13,4 +13,4 @@ gem 'relaxed-rubocop'
 
 gem 'example_repo', '0.1.0', path: './spec/gouteur/example_repo'
 
-gem 'byebug'
+gem 'debug'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gouteur (1.0.0)
+    gouteur (1.0.2)
 
 PATH
   remote: spec/gouteur/example_repo
@@ -12,48 +12,57 @@ GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
-    byebug (11.1.3)
-    diff-lcs (1.4.4)
-    parallel (1.20.1)
-    parser (3.0.0.0)
+    debug (1.6.2)
+      irb (>= 1.3.6)
+      reline (>= 0.3.1)
+    diff-lcs (1.5.0)
+    io-console (0.5.11)
+    irb (1.4.1)
+      reline (>= 0.3.0)
+    json (2.6.2)
+    parallel (1.22.1)
+    parser (3.1.2.1)
       ast (~> 2.4.1)
-    rainbow (3.0.0)
-    rake (13.0.3)
-    regexp_parser (2.0.3)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    regexp_parser (2.5.0)
     relaxed-rubocop (2.5)
-    rexml (3.2.4)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    reline (0.3.1)
+      io-console (~> 0.5)
+    rexml (3.2.5)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-    rubocop (1.9.1)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.1)
+    rubocop (1.36.0)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.2.0, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.20.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.4.1)
-      parser (>= 2.7.1.5)
+    rubocop-ast (1.21.0)
+      parser (>= 3.1.1.0)
     ruby-progressbar (1.11.0)
-    unicode-display_width (2.0.0)
+    unicode-display_width (2.3.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  byebug
+  debug
   example_repo (= 0.1.0)!
   gouteur!
   rake (~> 13.0)

data/README.md

@@ -17,7 +17,7 @@ When you release a new version of your gem, these projects might break.
 
 [Semantic versioning](https://semver.org) obviously helps. People make mistakes, though. The boundary between public and private APIs can also be fuzzy, particularly in an open language like Ruby.
 
-Thus, when you update your gem, you might feel as if you should check whether things that depend on it will keep working.
+Thus, when you update your gem, you might feel as if you should check whether things that depend on it will keep working before you release the new version.
 
 Gouteur automates this step.
 

data/lib/gouteur/checker.rb

@@ -22,9 +22,7 @@ module Gouteur
       run_tasks(adapted: false)
 
       create_adapted_gemfile
-      install_adapted_bundle or return [
-        true, Message.skipped_incompatible(repo: repo)
-      ]
+      install_adapted_bundle or return handle_incompatible_semver
 
       run_tasks(adapted: true)
 
@@ -52,7 +50,8 @@ module Gouteur
 
     def run_task(task, adapted: false)
       puts("Running `#{task}` with #{adapted ? :new : :old} `#{Host.name}`...")
-      result = repo.bundle.exec(task, env: adapted ? adaptation_env : {})
+      env = adapted ? adaptation_env : {}
+      result = repo.bundle.exec(task, env: env)
       result.success? or raise Error, Message.send(
         adapted ? :broken_after_update : :broken,
         repo: repo, task: task, output: result.stdout, error: result.stderr
@@ -89,28 +88,32 @@ module Gouteur
       "#{repo.bundle.gemfile_path}.gouteur"
     end
 
-    BUNDLER_INCOMPATIBLE_VERSION_CODE = 6
-    BUNDLER_GEM_NOT_FOUND_CODE        = 7 # includes some incompatibility cases
-
     def install_adapted_bundle
       result = repo.bundle.install(env: adaptation_env)
-
       if result.success?
         true
-      elsif result.exitstatus == BUNDLER_INCOMPATIBLE_VERSION_CODE ||
-            result.exitstatus == BUNDLER_GEM_NOT_FOUND_CODE &&
-            result.stderr =~ /following version/
-        if repo.locked?
-          raise Error,
-                Message.incompatible_failure(repo: repo, error: result.stderr)
-        else
-          false
-        end
+      elsif indicates_incompatible_semver?(result)
+        false
       else
         raise Error, result.full_error
       end
     end
 
+    BUNDLER_INCOMPATIBLE_VERSION_CODE = 6
+    BUNDLER_GEM_NOT_FOUND_CODE = 7 # includes some incompatibility cases
+
+    def indicates_incompatible_semver?(result)
+      result.exitstatus == BUNDLER_INCOMPATIBLE_VERSION_CODE ||
+        result.exitstatus == BUNDLER_GEM_NOT_FOUND_CODE &&
+          result.stderr =~ /following gems matching|following version/
+    end
+
+    def handle_incompatible_semver
+      raise Error, Message.incompatible_failure(repo: repo) if repo.locked?
+
+      [true, Message.skipped_incompatible(repo: repo)]
+    end
+
     def adaptation_env
       {
         'BUNDLE_GEMFILE' => adapted_gemfile_path,

data/lib/gouteur/message.rb

@@ -14,7 +14,7 @@ module Gouteur
 
     def success(repo:)
       <<~MSG
-        👨‍🍳 Délicieux!
+        👨‍🍳 #{random_word_for_tasty.capitalize}!
 
         Your changes to `#{Host.name}` are fine for `#{repo}`. All tasks succeeded.
       MSG
@@ -44,20 +44,21 @@ module Gouteur
       MSG
     end
 
-    def broken(repo:, task:, error:)
+    def broken(repo:, task:, output:, error:)
       <<~MSG
         👨‍🍳 Zut alors!
 
         Task `#{task}` failed for `#{repo}` even before inserting the new code of `#{Host.name}`.
 
         This likely means the task is broken or does not exist.
+        #{original_output_part(output)}
         #{original_error_part(error)}
       MSG
     end
 
     def broken_after_update(repo:, task:, output:, error:)
       <<~MSG
-        👨‍🍳 Répugnant!
+        👨‍🍳 #{random_word_for_disgusting.capitalize}!
 
         Task `#{task}` failed for `#{repo}` after inserting the new code of `#{Host.name}`.
 
@@ -77,14 +78,13 @@ module Gouteur
       MSG
     end
 
-    def incompatible_failure(repo:, error:)
+    def incompatible_failure(repo:)
       <<~MSG
         👨‍🍳 Zut alors!
 
         The new version number of `#{Host.name}` is incompatible with the version requirements specified by `#{repo}`.
 
         Incompatible version numbers can be allowed by removing the `locked` flag. This will make gouteur SKIP the tasks in this case.
-        #{original_error_part(error)}
       MSG
     end
 
@@ -101,5 +101,13 @@ module Gouteur
     def strip(string)
       string.to_s.gsub(/\A\s+|\s+\z/, '')
     end
+
+    def random_word_for_tasty
+      %w[délectable délicieux savoureux succulent].sample
+    end
+
+    def random_word_for_disgusting
+      %w[dégoûtant immangeable répugnant].sample
+    end
   end
 end

data/lib/gouteur/shell.rb

@@ -29,7 +29,7 @@ module Gouteur
       attr_reader :stdout, :stderr, :exitstatus
 
       def initialize(args:, pwd:, stdout:, stderr:, status:)
-        @args = args
+        @args = Array(args)
         @pwd = pwd
         @stdout = stdout
         @stderr = stderr

data/lib/gouteur/version.rb

@@ -1,3 +1,3 @@
 module Gouteur
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.0.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gouteur
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Janosch Müller
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-02-22 00:00:00.000000000 Z
+date: 2022-09-24 00:00:00.000000000 Z
 dependencies: []
 description: Run tests of dependent gems against your changes.
 email:
@@ -67,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.4.0.dev
 signing_key:
 specification_version: 4
 summary: See if your lib is still digestible.