modulesync 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47b0ae966cafd00936f4a6cabe78a301ed07c28dec01fefe70bf4023c358d4b7
-  data.tar.gz: 7f1ef9ce1d648b9608653ba3ea5183acc45bfd86564691758bde8034b3095990
+  metadata.gz: e4914cfca898fe7b7183b87a1feaa7b4edbeb2a1d5b97d2d32f53ca7cde6adf1
+  data.tar.gz: 7b02e4e2a1a4b1d7108702f3c9108ef250b13ddace34f4946f11d11338de6f90
 SHA512:
-  metadata.gz: 3ff60c169408c9be476e0b6020c9d5685ed2e025b77faba9f1618b75b3486df2205ab39190cc6b26abf541e6f29cd73fdcd623f71a7d014f2eaaa118b83050e5
-  data.tar.gz: 3c17ac2c07fb222081266e46ba9b2be6e1fc2b61d481f2e32fe7bd5e1848cec718b5e620e8c136d5b7321d938157df81093a8a8c959ebd8f21e8089b9d17777e
+  metadata.gz: 93c282023d9f20729b4c8ed253e8a6b7c312433291fede9db35ee4b1250e00933b8bd751225521b6613709d41bef216f6a366115569710576253fb3473f5a408
+  data.tar.gz: 8019fac3cd951a7001986fbca62d50b4404e8c4008357a4724652a177a49d61ff4826d52767c67c074e0236f67723fea1df38fb583a1292d2f1ae5db8be39ccb

data/.github/workflows/ci.yml

@@ -8,7 +8,19 @@ env:
   BUNDLE_WITHOUT: release
 
 jobs:
+  rubocop:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.1'
+          bundler-cache: true
+      - name: Run linter
+        run: bundle exec rubocop --format github
   test:
+    needs: rubocop
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -18,9 +30,10 @@ jobs:
           - ruby: "2.6"
           - ruby: "2.7"
           - ruby: "3.0"
-            coverage: "yes"
+          - ruby: "3.1"
+            codecov: "yes"
     env:
-      COVERAGE: ${{ matrix.coverage }}
+      CODECOV: ${{ matrix.codecov }}
     steps:
       - uses: actions/checkout@v2
       - name: Install Ruby ${{ matrix.ruby }}
@@ -28,7 +41,9 @@ jobs:
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
-      - name: Run tests
+      - name: Run unit tests
         run: bundle exec rake spec
+      - name: Run behavior tests
+        run: bundle exec cucumber
       - name: Build gem
         run: gem build *.gemspec

data/.github/workflows/release.yml

@@ -9,14 +9,12 @@ jobs:
   release:
     runs-on: ubuntu-latest
     if: github.repository == 'voxpupuli/modulesync'
-    env:
-      BUNDLE_WITHOUT: release
     steps:
       - uses: actions/checkout@v2
-      - name: Install Ruby 3.0
+      - name: Install Ruby 3.1
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.0'
+          ruby-version: '3.1'
       - name: Build gem
         run: gem build *.gemspec
       - name: Publish gem to rubygems.org

data/.gitignore

@@ -5,6 +5,7 @@
 Gemfile.lock
 bin/bundle
 bin/rspec
+coverage/
 modules/
 tmp/
 vendor/

data/.rubocop.yml

@@ -1,7 +1,8 @@
 inherit_from: .rubocop_todo.yml
 
 AllCops:
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.5
+  NewCops: enable
   Exclude:
     - 'vendor/**/*'
     - 'tmp/**/*'
@@ -14,19 +15,24 @@ AllCops:
 Style/HashSyntax:
   Enabled: false
 
-# dealbreaker:
-Style/TrailingCommaInLiteral:
-  Enabled: false
+Style/TrailingCommaInArguments:
+  EnforcedStyleForMultiline: comma
 
-# would require external library
-Layout/IndentHeredoc:
-  Enabled: false
+Style/TrailingCommaInArrayLiteral:
+  EnforcedStyleForMultiline: comma
+
+Style/TrailingCommaInHashLiteral:
+  EnforcedStyleForMultiline: comma
 
 # sane line length
-Metrics/LineLength:
+Layout/LineLength:
   Max: 120
   Exclude:
     - 'features/**/*'
 
 Style/FrozenStringLiteralComment:
   Enabled: false
+
+# We explicitly prefer $stderr.puts over #warn
+Style/StderrPuts:
+  Enabled: false

data/.rubocop_todo.yml

@@ -1,39 +1,46 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2021-04-22 16:30:35 +0200 using RuboCop version 0.50.0.
+# on 2022-02-14 21:55:21 UTC using RuboCop version 1.24.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
 # Offense count: 1
-Lint/UselessAssignment:
+# Cop supports --auto-correct.
+# Configuration parameters: Include.
+# Include: **/*.gemspec
+Gemspec/RequireMFA:
   Exclude:
-    - 'lib/modulesync.rb'
+    - 'modulesync.gemspec'
 
-# Offense count: 10
+# Offense count: 9
+# Configuration parameters: IgnoredMethods, CountRepeatedAttributes.
 Metrics/AbcSize:
-  Max: 67
+  Max: 60
 
 # Offense count: 2
-# Configuration parameters: CountComments.
+# Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
-  Max: 128
+  Max: 186
 
-# Offense count: 3
+# Offense count: 5
+# Configuration parameters: IgnoredMethods.
 Metrics/CyclomaticComplexity:
-  Max: 12
+  Max: 15
 
-# Offense count: 13
-# Configuration parameters: CountComments.
+# Offense count: 17
+# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
 Metrics/MethodLength:
-  Max: 36
+  Max: 34
 
-# Offense count: 3
+# Offense count: 4
+# Configuration parameters: IgnoredMethods.
 Metrics/PerceivedComplexity:
-  Max: 13
+  Max: 16
 
 # Offense count: 8
+# Configuration parameters: AllowedConstants.
 Style/Documentation:
   Exclude:
     - 'spec/**/*'
@@ -45,7 +52,8 @@ Style/Documentation:
     - 'lib/modulesync/util.rb'
 
 # Offense count: 1
-# Cop supports --auto-correct.
-Style/EachWithObject:
+# Configuration parameters: AllowedMethods.
+# AllowedMethods: respond_to_missing?
+Style/OptionalBooleanParameter:
   Exclude:
-    - 'lib/modulesync/util.rb'
+    - 'lib/modulesync/puppet_module.rb'

data/.simplecov

@@ -0,0 +1,46 @@
+SimpleCov.start do
+  if ENV['SIMPLECOV_ROOT']
+    SimpleCov.root(ENV['SIMPLECOV_ROOT'])
+
+    filters.clear # This will remove the :root_filter and :bundler_filter that come via simplecov's defaults
+
+    # Because simplecov filters everything outside of the SimpleCov.root
+    # This should be added, cf.
+    # https://github.com/colszowka/simplecov#default-root-filter-and-coverage-for-things-outside-of-it
+    add_filter do |src|
+      src.filename !~ /^#{SimpleCov.root}/
+    end
+  end
+
+  add_group 'Source code', 'lib'
+
+  add_group 'Unit tests', 'spec'
+
+  add_group 'Behavior tests', 'features'
+  add_filter '/features/support/env.rb'
+
+  enable_coverage :branch
+
+  # do not track vendored files
+  add_filter '/vendor'
+  add_filter '/.vendor'
+
+  # exclude anything that is not in lib, spec or features directories
+  add_filter do |src|
+    src.filename !~ %r{^#{SimpleCov.root}/(lib|spec|features)}
+  end
+
+  track_files '**/*.rb'
+end
+
+if ENV['CODECOV'] == 'yes'
+  require 'simplecov-console'
+  require 'codecov'
+
+  SimpleCov.formatters = [
+    SimpleCov::Formatter::Console,
+    SimpleCov::Formatter::Codecov,
+  ]
+end
+
+# vim: filetype=ruby

data/CHANGELOG.md

@@ -2,6 +2,37 @@
 
 All notable changes to this project will be documented in this file.
 
+## [2.3.0](https://github.com/voxpupuli/modulesync/tree/2.3.0) (2022-03-07)
+
+[Full Changelog](https://github.com/voxpupuli/modulesync/compare/2.2.0...2.3.0)
+
+**Implemented enhancements:**
+
+- CLI: Show relevant help when using --help option on a subcommand [\#248](https://github.com/voxpupuli/modulesync/pull/248) ([neomilium](https://github.com/neomilium))
+- New CLI commands [\#244](https://github.com/voxpupuli/modulesync/pull/244) ([neomilium](https://github.com/neomilium))
+
+**Fixed bugs:**
+
+- Existing MR makes msync fail \(which leaves changes in target branch\) [\#195](https://github.com/voxpupuli/modulesync/issues/195)
+- Target branch `.sync.yml` not taken into account on branch update \(--force\) [\#192](https://github.com/voxpupuli/modulesync/issues/192)
+- Fix error when git upstream branch is deleted [\#240](https://github.com/voxpupuli/modulesync/pull/240) ([neomilium](https://github.com/neomilium))
+
+**Closed issues:**
+
+- Linter is missing in CI [\#237](https://github.com/voxpupuli/modulesync/issues/237)
+- Behavior tests are missing in CI [\#236](https://github.com/voxpupuli/modulesync/issues/236)
+
+**Merged pull requests:**
+
+- Properly ensure the parent directory exists [\#247](https://github.com/voxpupuli/modulesync/pull/247) ([ekohl](https://github.com/ekohl))
+- Add Ruby 3.1 to CI matrix [\#245](https://github.com/voxpupuli/modulesync/pull/245) ([bastelfreak](https://github.com/bastelfreak))
+- Fix rubocop offences and add linter to CI [\#243](https://github.com/voxpupuli/modulesync/pull/243) ([neomilium](https://github.com/neomilium))
+- Support `.sync.yml` changes between two runs [\#242](https://github.com/voxpupuli/modulesync/pull/242) ([neomilium](https://github.com/neomilium))
+- Fix gitlab merge request submission [\#241](https://github.com/voxpupuli/modulesync/pull/241) ([neomilium](https://github.com/neomilium))
+- Add behavior tests to CI [\#239](https://github.com/voxpupuli/modulesync/pull/239) ([neomilium](https://github.com/neomilium))
+- Rework PR/MR feature [\#219](https://github.com/voxpupuli/modulesync/pull/219) ([neomilium](https://github.com/neomilium))
+- Refactor code for maintainabilty [\#206](https://github.com/voxpupuli/modulesync/pull/206) ([neomilium](https://github.com/neomilium))
+
 ## [2.2.0](https://github.com/voxpupuli/modulesync/tree/2.2.0) (2021-07-24)
 
 [Full Changelog](https://github.com/voxpupuli/modulesync/compare/2.1.1...2.2.0)
@@ -52,6 +83,7 @@ The 2.1.0 release didn't make it to github packages. 2.1.1 is a new release with
 
 **Closed issues:**
 
+- PR/MR feature should honor the repository default branch name as target branch [\#207](https://github.com/voxpupuli/modulesync/issues/207)
 - Add linting \(rubocop\) to Travis CI configuration [\#153](https://github.com/voxpupuli/modulesync/issues/153)
 - Language sensitive GIT handling [\#85](https://github.com/voxpupuli/modulesync/issues/85)
 

data/Gemfile

@@ -6,7 +6,7 @@ group :release do
   gem 'github_changelog_generator', :require => false
 end
 
-group :coverage, optional: ENV['COVERAGE']!='yes' do
+group :coverage, optional: ENV['CODECOV']!='yes' do
   gem 'simplecov-console', :require => false
   gem 'codecov', :require => false
 end

data/bin/msync

@@ -1,6 +1,22 @@
 #!/usr/bin/env ruby
 
-lib = File.expand_path('../../lib', __FILE__)
+if ENV['COVERAGE']
+  # This block allow us to grab code coverage when running this script.
+  #
+  # Note: This environment variable (ie. COVERAGE) is set in Cucumber/Aruba configuration to collect reports
+  simplecov_root = File.expand_path File.join(File.dirname(__FILE__), '..')
+
+  # When running with aruba simplecov was using /tmp/aruba as the root folder.
+  # This is to force using the project folder
+  ENV['SIMPLECOV_ROOT'] = simplecov_root
+  require 'simplecov'
+
+  # https://github.com/simplecov-ruby/simplecov/issues/234
+  # As described in the issue, every process must have an unique name:
+  SimpleCov.command_name "#{File.basename $PROGRAM_NAME} (pid: #{Process.pid})"
+end
+
+lib = File.expand_path('../lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 require 'modulesync/cli'

data/features/cli.feature

@@ -17,9 +17,16 @@ Feature: CLI
     Then the exit status should be 1
 
   Scenario: When running the help command
-    When I run `msync help`
-    And the output should match /Commands:/
-    Then the exit status should be 0
+    When I successfully run `msync help`
+    Then the output should match /Commands:/
+
+  Scenario: Use --help options on subcommand should show subcommand help
+    When I successfully run `msync clone --help`
+    Then the output should contain:
+    """
+    Usage:
+      msync clone
+    """
 
   Scenario: When overriding a setting from the config file on the command line
     Given a puppet module "puppet-test" from "fakenamespace"
@@ -35,9 +42,8 @@ Feature: CLI
       """
     And a git_base option appended to "modulesync.yml" for local tests
     And a directory named "moduleroot"
-    When I run `msync update --noop --namespace fakenamespace --branch command-line-branch`
-    Then the exit status should be 0
-    And the output should contain:
+    When I successfully run `msync update --verbose --noop --namespace fakenamespace --branch command-line-branch`
+    Then the output should contain:
       """
       Creating new branch command-line-branch
       """

data/features/execute.feature

@@ -0,0 +1,51 @@
+Feature: execute
+  Use ModuleSync to execute a custom script on each repositories
+
+  Scenario: Cloning sourcecodes before running command when modules/ dir is empty
+    Given a basic setup with a puppet module "puppet-test" from "awesome"
+    Then the file "modules/awesome/puppet-test/metadata.json" should not exist
+    When I successfully run `msync exec --verbose -- /bin/true`
+    Then the stdout should contain "Cloning from 'file://"
+    And the file "modules/awesome/puppet-test/metadata.json" should exist
+
+  @no-clobber
+  Scenario: No clones before running command when sourcecode have already been cloned
+    Then the file "modules/awesome/puppet-test/metadata.json" should exist
+    When I successfully run `msync exec --verbose /bin/true`
+    Then the stdout should not contain "Cloning from 'file://"
+
+  @no-clobber
+  Scenario: When command run fails, fail fast if option defined
+    When I run `msync exec --verbose --fail-fast -- /bin/false`
+    Then the exit status should be 1
+    And the stderr should contain:
+    """
+    Command execution failed
+    """
+
+  @no-clobber
+  Scenario: When command run fails, run all and summarize errors if option fail-fast is not set
+    When I run `msync exec --verbose --no-fail-fast -- /bin/false`
+    Then the exit status should be 1
+    And the stderr should contain:
+    """
+    Error(s) during `execute` command:
+      *
+    """
+
+  Scenario: Show fail-fast default value in help
+    When I successfully run `msync help exec`
+    Then the stdout should contain:
+    """
+          [--fail-fast], [--no-fail-fast]                # Abort the run after a command execution failure
+                                                         # Default: true
+    """
+
+  Scenario: Override fail-fast default value using config file
+    Given the global option "fail_fast" sets to "false"
+    When I successfully run `msync help exec`
+    Then the stdout should contain:
+    """
+          [--fail-fast], [--no-fail-fast]                # Abort the run after a command execution failure
+    """
+    # NOTE: It seems there is a Thor bug here: default value is missing in help when sets to 'false'

data/features/hook.feature

@@ -3,24 +3,21 @@ Feature: hook
 
   Scenario: Activating a hook
     Given a directory named ".git/hooks"
-    When I run `msync hook activate`
-    Then the exit status should be 0
-    And the file named ".git/hooks/pre-push" should contain "bash"
+    When I successfully run `msync hook activate`
+    Then the file named ".git/hooks/pre-push" should contain "bash"
 
   Scenario: Deactivating a hook
     Given a file named ".git/hooks/pre-push" with:
       """
       git hook
       """
-    When I run `msync hook deactivate`
-    Then the exit status should be 0
+    When I successfully run `msync hook deactivate`
     Then the file ".git/hooks/pre-push" should not exist
 
   Scenario: Activating a hook with arguments
     Given a directory named ".git/hooks"
-    When I run `msync hook activate -a '--foo bar --baz quux' -b master`
-    Then the exit status should be 0
-    And the file named ".git/hooks/pre-push" should contain:
+    When I successfully run `msync hook activate -a '--foo bar --baz quux' -b master`
+    Then the file named ".git/hooks/pre-push" should contain:
       """
       "$message" -n puppetlabs -b master --foo bar --baz quux
       """

data/features/push.feature

@@ -0,0 +1,46 @@
+Feature: push
+  Push commits to remote
+
+  Scenario: Push available commits to remote
+    Given a mocked git configuration
+    And a puppet module "puppet-test" from "awesome"
+    And a file named "managed_modules.yml" with:
+    """
+    ---
+    puppet-test:
+      namespace: awesome
+    """
+    And a file named "modulesync.yml" with:
+    """
+    ---
+    branch: modulesync
+    """
+    And a git_base option appended to "modulesync.yml" for local tests
+    And I successfully run `msync reset`
+    And I cd to "modules/awesome/puppet-test"
+    And I run `touch hello`
+    And I run `git add hello`
+    And I run `git commit -m'Hello!'`
+    And I cd to "~"
+    Then the puppet module "puppet-test" from "awesome" should have no commits made by "Aruba"
+    When I successfully run `msync push --verbose`
+    Then the puppet module "puppet-test" from "awesome" should have 1 commit made by "Aruba" in branch "modulesync"
+
+  Scenario: Push command without a branch sets
+    Given a basic setup with a puppet module "puppet-test" from "awesome"
+    When I run `msync push --verbose`
+    Then the exit status should be 1
+    And the stderr should contain:
+    """
+    Error: 'branch' option is missing, please set it in configuration or in command line.
+    """
+
+  Scenario: Report the need to clone repositories if sourcecode was not cloned before
+    Given a basic setup with a puppet module "puppet-test" from "awesome"
+    And the global option "branch" sets to "modulesync"
+    When I run `msync push --verbose`
+    Then the exit status should be 1
+    And the stderr should contain:
+    """
+    puppet-test: Repository must be locally available before trying to push
+    """

data/features/reset.feature

@@ -0,0 +1,57 @@
+Feature: reset
+  Reset all repositories
+
+  Scenario: Running first reset to clone repositories
+    Given a basic setup with a puppet module "puppet-test" from "awesome"
+    And the global option "branch" sets to "modulesync"
+    When I successfully run `msync reset --verbose`
+    Then the output should contain "Cloning from 'file://"
+    And the output should not contain "Hard-resetting any local changes to repository in"
+
+  @no-clobber
+  Scenario: Reset when sourcecodes have already been cloned
+    Given the file "modules/awesome/puppet-test/metadata.json" should exist
+    And the global option "branch" sets to "modulesync"
+    When I successfully run `msync reset --verbose`
+    Then the output should not contain "Cloning from 'file://"
+    And the output should contain "Hard-resetting any local changes to repository in 'modules/awesome/puppet-test' from branch 'origin/master'"
+
+  Scenario: Reset after an upstream file addition
+    Given a basic setup with a puppet module "puppet-test" from "awesome"
+    And the global option "branch" sets to "modulesync"
+    And I successfully run `msync reset`
+    Then the file "modules/awesome/puppet-test/hello" should not exist
+    When the puppet module "puppet-test" from "awesome" has a file named "hello" with:
+    """
+    Hello
+    """
+    When I successfully run `msync reset --verbose`
+    Then the output should contain "Hard-resetting any local changes to repository in 'modules/awesome/puppet-test' from branch 'origin/master'"
+    And the file "modules/awesome/puppet-test/hello" should exist
+
+  Scenario: Reset after an upstream file addition in offline mode
+    Given a basic setup with a puppet module "puppet-test" from "awesome"
+    And the global option "branch" sets to "modulesync"
+    And I successfully run `msync reset`
+    Then the file "modules/awesome/puppet-test/hello" should not exist
+    When the puppet module "puppet-test" from "awesome" has a branch named "execute"
+    And the puppet module "puppet-test" from "awesome" has, in branch "execute", a file named "hello" with:
+    """
+    Hello
+    """
+    When I successfully run `msync reset --offline`
+    Then the file "modules/awesome/puppet-test/hello" should not exist
+
+  Scenario: Reset to a specified branch
+    Given a basic setup with a puppet module "puppet-test" from "awesome"
+    And the global option "branch" sets to "modulesync"
+    When the puppet module "puppet-test" from "awesome" has a branch named "other-branch"
+    And the puppet module "puppet-test" from "awesome" has, in branch "other-branch", a file named "hello" with:
+    """
+    Hello
+    """
+    And I successfully run `msync reset`
+    Then the file "modules/awesome/puppet-test/hello" should not exist
+    When I successfully run `msync reset --verbose --source-branch origin/other-branch`
+    And the output should contain "Hard-resetting any local changes to repository in 'modules/awesome/puppet-test' from branch 'origin/other-branch'"
+    Then the file "modules/awesome/puppet-test/hello" should exist

data/features/step_definitions/git_steps.rb

@@ -32,7 +32,20 @@ Given 'a puppet module {string} from {string}' do |name, namespace|
 end
 
 Given 'a git_base option appended to "modulesync.yml" for local tests' do
-  File.write "#{Aruba.config.working_directory}/modulesync.yml", "\ngit_base: #{ModuleSync::Faker::PuppetModuleRemoteRepo.git_base}", mode: 'a'
+  step "the global option 'git_base' sets to '#{ModuleSync::Faker::PuppetModuleRemoteRepo.git_base}'"
+end
+
+Given 'the file {string} appended with:' do |filename, content|
+  File.write filename, "\n#{content}", mode: 'a'
+end
+
+Given 'the global option {string} sets to {string}' do |key, value|
+  steps %(
+    Given the file "#{Aruba.config.working_directory}/modulesync.yml" appended with:
+    """
+    #{key}: #{value}
+    """
+  )
 end
 
 Given 'the puppet module {string} from {string} is read-only' do |name, namespace|
@@ -64,6 +77,16 @@ Given 'the puppet module {string} from {string} has a file named {string} with:'
   pmrr.add_file(filename, content)
 end
 
+Given 'the puppet module {string} from {string} has, in branch {string}, a file named {string} with:' do |name, namespace, branch, filename, content|
+  pmrr = ModuleSync::Faker::PuppetModuleRemoteRepo.new(name, namespace)
+  pmrr.add_file(filename, content, branch)
+end
+
+Given 'the puppet module {string} from {string} has a branch named {string}' do |name, namespace, branch|
+  pmrr = ModuleSync::Faker::PuppetModuleRemoteRepo.new(name, namespace)
+  pmrr.create_branch(branch)
+end
+
 Then 'the puppet module {string} from {string} should have a branch {string} with a file named {string} which contains:' do |name, namespace, branch, filename, content|
   pmrr = ModuleSync::Faker::PuppetModuleRemoteRepo.new(name, namespace)
   expect(pmrr.read_file(filename, branch)).to include(content)
@@ -83,3 +106,8 @@ Then('the puppet module {string} from {string} should not have a tag named {stri
   pmrr = ModuleSync::Faker::PuppetModuleRemoteRepo.new(name, namespace)
   expect(pmrr.tags).not_to include(tag)
 end
+
+Given 'the branch {string} of the puppet module {string} from {string} is deleted' do |branch, name, namespace|
+  pmrr = ModuleSync::Faker::PuppetModuleRemoteRepo.new(name, namespace)
+  pmrr.delete_branch(branch)
+end

data/features/support/env.rb

@@ -1,3 +1,7 @@
+require 'simplecov'
+
+SimpleCov.command_name 'Cucumber'
+
 require 'aruba/cucumber'
 
 require_relative '../../spec/helpers/faker'
@@ -6,4 +10,9 @@ ModuleSync::Faker.working_directory = File.expand_path('faker', Aruba.config.wor
 
 Before do
   @aruba_timeout_seconds = 5
+
+  # This enables coverage when aruba runs `msync` executable (cf. `bin/msync`)
+  set_environment_variable('COVERAGE', '1')
+
+  aruba.config.activate_announcer_on_command_failure = %i[stdout stderr]
 end

data/features/update/bump_version.feature

@@ -16,9 +16,8 @@ Feature: Bump a new version after an update
       """
       <%= @configs['content'] %>
       """
-    When I run `msync update --message "Add new-file" --bump --changelog --tag`
-    Then the exit status should be 0
-    And the file named "modules/fakenamespace/puppet-test/new-file" should contain "aruba"
+    When I successfully run `msync update --verbose --message "Add new-file" --bump --changelog --tag`
+    Then the file named "modules/fakenamespace/puppet-test/new-file" should contain "aruba"
     And the stdout should contain:
       """
       Bumped to version 0.4.3
@@ -44,9 +43,8 @@ Feature: Bump a new version after an update
       """
       <%= @configs['content'] %>
       """
-    When I run `msync update --message "Add new-file" --bump`
-    Then the exit status should be 0
-    And the file named "modules/fakenamespace/puppet-test/new-file" should contain "aruba"
+    When I successfully run `msync update --message "Add new-file" --bump`
+    Then the file named "modules/fakenamespace/puppet-test/new-file" should contain "aruba"
     And the stdout should contain:
       """
       Bumped to version 0.4.3
@@ -67,9 +65,8 @@ Feature: Bump a new version after an update
       """
       <%= @configs['content'] %>
       """
-    When I run `msync update --message "Add new-file" --bump --changelog`
-    Then the exit status should be 0
-    And the file named "modules/fakenamespace/puppet-test/new-file" should contain "aruba"
+    When I successfully run `msync update --message "Add new-file" --bump --changelog`
+    Then the file named "modules/fakenamespace/puppet-test/new-file" should contain "aruba"
     And the stdout should contain:
       """
       Bumped to version 0.4.3
@@ -81,7 +78,6 @@ Feature: Bump a new version after an update
   Scenario: Dont bump the module version after an update that produces no changes
     Given a basic setup with a puppet module "puppet-test" from "fakenamespace"
     And a directory named "moduleroot"
-    When I run `msync update --message "Add new-file" --bump --tag`
-    Then the exit status should be 0
-    And the puppet module "puppet-test" from "fakenamespace" should have no commits made by "Aruba"
+    When I successfully run `msync update --message "Add new-file" --bump --tag`
+    Then the puppet module "puppet-test" from "fakenamespace" should have no commits made by "Aruba"
     And the puppet module "puppet-test" from "fakenamespace" should not have a tag named "0.4.3"