modulesync 2.6.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16c0c39c9e9c25f2f153464a9b0eaaa32d84d2d0586620e479676d4900503ae9
-  data.tar.gz: 328deb34bae7f84f47969b289b121a0f241dbde49756d881963f21dac0842595
+  metadata.gz: 52c1ece84e9891163b6f6a8a54e4b867fbd473f785acfaf007e46d21338f5fa8
+  data.tar.gz: 86674966a7c373aa94678bc5efb62582e13baebd133ada527e9b002c40d48b98
 SHA512:
-  metadata.gz: 42ca23a6203c31ceab58cb653070763e309606255107fec64239ce4808744073975dee48d8a397a3eb5cdc458882e29c126413aae6fc36eafd64024cb4441243
-  data.tar.gz: 33543edf6757f1988c5fca4a382a3b939a53647764bf0fc4291f6076c188749f72f5036438cc93b91999b7268c65400b34059b050ba0b6857eb89e9758de11ad
+  metadata.gz: 02a4315090f93f8e3c7a3cdbccbd42bf5fb3f942a26df1793dcb917eeaf096dd8c8eba908eca806b6ffdaabd49c0a06d58912767bdb365823048d19f712e7da9
+  data.tar.gz: b8e6cd36e66c6f9f7c307ebe1093ae0a85130a48ca0f2de31f99044678feeaa8203dd3b07564ea9eace6ff2a882e004c78253f13a3df5f173fb66977fca1932f

data/.github/workflows/ci.yml

@@ -21,7 +21,7 @@ jobs:
           ruby-version: '3.1'
           bundler-cache: true
       - name: Run linter
-        run: bundle exec rubocop --format github
+        run: bundle exec rake rubocop
   test:
     needs: rubocop
     runs-on: ubuntu-latest
@@ -29,8 +29,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - ruby: "2.5"
-          - ruby: "2.6"
           - ruby: "2.7"
           - ruby: "3.0"
           - ruby: "3.1"
@@ -50,7 +48,7 @@ jobs:
       - name: Run behavior tests
         run: bundle exec cucumber
       - name: Build gem
-        run: gem build *.gemspec
+        run: gem build --verbose *.gemspec
   tests:
     needs:
       - rubocop

data/.github/workflows/release.yml

@@ -18,7 +18,7 @@ jobs:
         env:
           BUNDLE_WITHOUT: release
       - name: Build gem
-        run: gem build *.gemspec
+        run: gem build --verbose *.gemspec
       - name: Publish gem to rubygems.org
         run: gem push *.gem
         env:

data/.rubocop.yml

@@ -1,50 +1,5 @@
+---
 inherit_from: .rubocop_todo.yml
 
-require:
-  - rubocop-performance
-  - rubocop-rake
-  - rubocop-rspec
-
-AllCops:
-  TargetRubyVersion: 2.5
-  NewCops: enable
-  Exclude:
-    - 'vendor/**/*'
-    - 'tmp/**/*'
-    - 'pkg/**/*'
-    - 'lib/monkey_patches.rb'
-    - 'spec/**/*'
-    - 'Gemfile'
-    - 'Rakefile'
-
-Style/FetchEnvVar:
-  Enabled: false
-
-Style/HashSyntax:
-  Enabled: false
-
-Style/TrailingCommaInArguments:
-  EnforcedStyleForMultiline: comma
-
-Style/TrailingCommaInArrayLiteral:
-  EnforcedStyleForMultiline: comma
-
-Style/TrailingCommaInHashLiteral:
-  EnforcedStyleForMultiline: comma
-
-# sane line length
-Layout/LineLength:
-  Max: 120
-  Exclude:
-    - 'features/**/*'
-
-Style/FrozenStringLiteralComment:
-  Enabled: false
-
-# We explicitly prefer $stderr.puts over #warn
-Style/StderrPuts:
-  Enabled: false
-
-Gemspec/RequireMFA:
-  Exclude:
-    - 'modulesync.gemspec'
+inherit_gem:
+  voxpupuli-rubocop: rubocop.yml

data/.rubocop_todo.yml

@@ -1,37 +1,114 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2023-04-14 18:50:10 UTC using RuboCop version 1.28.2.
+# on 2023-06-16 18:17:35 UTC using RuboCop version 1.50.2.
 # 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: 10
-# Configuration parameters: IgnoredMethods, CountRepeatedAttributes.
-Metrics/AbcSize:
-  Max: 60
+# Offense count: 1
+# Configuration parameters: IgnoreLiteralBranches, IgnoreConstantBranches.
+Lint/DuplicateBranch:
+  Exclude:
+    - 'lib/modulesync/renderer.rb'
 
-# Offense count: 2
-# Configuration parameters: CountComments, CountAsOne.
-Metrics/ClassLength:
-  Max: 186
+# Offense count: 1
+# Configuration parameters: AllowComments, AllowNil.
+Lint/SuppressedException:
+  Exclude:
+    - 'Rakefile'
+
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Performance/StringInclude:
+  Exclude:
+    - 'Rakefile'
 
 # Offense count: 5
-# Configuration parameters: IgnoredMethods.
-Metrics/CyclomaticComplexity:
-  Max: 15
+# This cop supports unsafe autocorrection (--autocorrect-all).
+RSpec/BeEq:
+  Exclude:
+    - 'spec/unit/modulesync/settings_spec.rb'
+
+# Offense count: 3
+# Configuration parameters: Prefixes, AllowedPatterns.
+# Prefixes: when, with, without
+RSpec/ContextWording:
+  Exclude:
+    - 'spec/unit/modulesync/git_service/github_spec.rb'
+    - 'spec/unit/modulesync/git_service/gitlab_spec.rb'
+    - 'spec/unit/modulesync_spec.rb'
 
 # Offense count: 17
-# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
-Metrics/MethodLength:
-  Max: 34
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: SkipBlocks, EnforcedStyle.
+# SupportedStyles: described_class, explicit
+RSpec/DescribedClass:
+  Exclude:
+    - 'spec/unit/modulesync/git_service/factory_spec.rb'
+    - 'spec/unit/modulesync/git_service/github_spec.rb'
+    - 'spec/unit/modulesync/git_service/gitlab_spec.rb'
+    - 'spec/unit/modulesync/git_service_spec.rb'
+    - 'spec/unit/modulesync/settings_spec.rb'
+    - 'spec/unit/modulesync/source_code_spec.rb'
+    - 'spec/unit/modulesync_spec.rb'
 
-# Offense count: 4
-# Configuration parameters: IgnoredMethods.
-Metrics/PerceivedComplexity:
+# Offense count: 11
+# Configuration parameters: CountAsOne.
+RSpec/ExampleLength:
   Max: 16
 
-# Offense count: 8
+# Offense count: 7
+# Configuration parameters: Include, CustomTransform, IgnoreMethods, SpecSuffixOnly.
+# Include: **/*_spec*rb*, **/spec/**/*
+RSpec/FilePath:
+  Exclude:
+    - 'spec/unit/modulesync/git_service/factory_spec.rb'
+    - 'spec/unit/modulesync/git_service/github_spec.rb'
+    - 'spec/unit/modulesync/git_service/gitlab_spec.rb'
+    - 'spec/unit/modulesync/git_service_spec.rb'
+    - 'spec/unit/modulesync/settings_spec.rb'
+    - 'spec/unit/modulesync/source_code_spec.rb'
+    - 'spec/unit/modulesync_spec.rb'
+
+# Offense count: 19
+# Configuration parameters: AssignmentOnly.
+RSpec/InstanceVariable:
+  Exclude:
+    - 'spec/unit/modulesync/git_service/github_spec.rb'
+    - 'spec/unit/modulesync/git_service/gitlab_spec.rb'
+
+# Offense count: 7
+# Configuration parameters: .
+# SupportedStyles: have_received, receive
+RSpec/MessageSpies:
+  EnforcedStyle: receive
+
+# Offense count: 6
+RSpec/MultipleExpectations:
+  Max: 2
+
+# Offense count: 10
+# Configuration parameters: EnforcedStyle, IgnoreSharedExamples.
+# SupportedStyles: always, named_only
+RSpec/NamedSubject:
+  Exclude:
+    - 'spec/unit/modulesync/settings_spec.rb'
+    - 'spec/unit/modulesync/source_code_spec.rb'
+
+# Offense count: 9
+# Configuration parameters: AllowedGroups.
+RSpec/NestedGroups:
+  Max: 5
+
+# Offense count: 6
+RSpec/StubbedMock:
+  Exclude:
+    - 'spec/unit/modulesync/git_service/github_spec.rb'
+    - 'spec/unit/modulesync/git_service/gitlab_spec.rb'
+    - 'spec/unit/modulesync_spec.rb'
+
+# Offense count: 9
 # Configuration parameters: AllowedConstants.
 Style/Documentation:
   Exclude:
@@ -42,6 +119,27 @@ Style/Documentation:
     - 'lib/modulesync/hook.rb'
     - 'lib/modulesync/renderer.rb'
     - 'lib/modulesync/util.rb'
+    - 'lib/monkey_patches.rb'
+
+# Offense count: 4
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowedVars.
+Style/FetchEnvVar:
+  Exclude:
+    - 'lib/modulesync/git_service.rb'
+
+# Offense count: 34
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: always, always_true, never
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+# Offense count: 2
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Style/IdenticalConditionalBranches:
+  Exclude:
+    - 'lib/modulesync/renderer.rb'
 
 # Offense count: 1
 # Configuration parameters: AllowedMethods.
@@ -49,3 +147,10 @@ Style/Documentation:
 Style/OptionalBooleanParameter:
   Exclude:
     - 'lib/modulesync/puppet_module.rb'
+
+# Offense count: 6
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
+# URISchemes: http, https
+Layout/LineLength:
+  Max: 169

data/CHANGELOG.md

@@ -2,6 +2,31 @@
 
 All notable changes to this project will be documented in this file.
 
+## [3.1.0](https://github.com/voxpupuli/modulesync/tree/3.1.0) (2023-08-02)
+
+[Full Changelog](https://github.com/voxpupuli/modulesync/compare/3.0.0...3.1.0)
+
+Release 3.0.0 was broken. It was tagged as 3.0.0 but accidentally released as 2.7.0. The only breaking change was dropping support for EoL ruby versions.
+
+**Merged pull requests:**
+
+- rubocop: autofix [\#273](https://github.com/voxpupuli/modulesync/pull/273) ([bastelfreak](https://github.com/bastelfreak))
+- Update octokit requirement from \>= 4, \< 7 to \>= 4, \< 8 [\#272](https://github.com/voxpupuli/modulesync/pull/272) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Update voxpupuli-rubocop requirement from ~\> 1.3 to ~\> 2.0 [\#271](https://github.com/voxpupuli/modulesync/pull/271) ([dependabot[bot]](https://github.com/apps/dependabot))
+
+## [3.0.0](https://github.com/voxpupuli/modulesync/tree/3.0.0) (2023-06-16)
+
+[Full Changelog](https://github.com/voxpupuli/modulesync/compare/2.6.0...3.0.0)
+
+**Breaking changes:**
+
+- Drop EoL Ruby 2.5/2.6 support [\#270](https://github.com/voxpupuli/modulesync/pull/270) ([bastelfreak](https://github.com/bastelfreak))
+
+**Merged pull requests:**
+
+- Update puppet-blacksmith requirement from \>= 3.0, \< 7 to \>= 3.0, \< 8 [\#268](https://github.com/voxpupuli/modulesync/pull/268) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Update octokit requirement from ~\> 4.0 to \>= 4, \< 7 [\#263](https://github.com/voxpupuli/modulesync/pull/263) ([dependabot[bot]](https://github.com/apps/dependabot))
+
 ## [2.6.0](https://github.com/voxpupuli/modulesync/tree/2.6.0) (2023-04-14)
 
 [Full Changelog](https://github.com/voxpupuli/modulesync/compare/2.5.0...2.6.0)

data/Gemfile

@@ -2,11 +2,12 @@ source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
 gemspec
 
-group :release do
-  gem 'github_changelog_generator', :require => false
+group :release, optional: true do
+  gem 'faraday-retry', '~> 2.1', require: false
+  gem 'github_changelog_generator', '~> 1.16', require: false
 end
 
-group :coverage, optional: ENV['CODECOV']!='yes' do
-  gem 'simplecov-console', :require => false
-  gem 'codecov', :require => false
+group :coverage, optional: ENV['CODECOV'] != 'yes' do
+  gem 'codecov', require: false
+  gem 'simplecov-console', require: false
 end

data/Rakefile

@@ -10,16 +10,9 @@ rescue LoadError
 end
 
 begin
-  require 'rubocop/rake_task'
+  require 'voxpupuli/rubocop/rake'
 rescue LoadError
   # RuboCop is an optional group
-else
-  RuboCop::RakeTask.new(:rubocop) do |task|
-    # These make the rubocop experience maybe slightly less terrible
-    task.options = ['--display-cop-names', '--display-style-guide', '--extra-details']
-    # Use Rubocop's Github Actions formatter if possible
-    task.formatters << 'github' if ENV['GITHUB_ACTIONS'] == 'true'
-  end
 end
 
 CLEAN.include('pkg/', 'tmp/')
@@ -29,8 +22,8 @@ Cucumber::Rake::Task.new do |t|
   t.cucumber_opts << '--format pretty'
 end
 
-task :test => %i[clean spec cucumber rubocop]
-task :default => %i[test]
+task test: %i[clean spec cucumber rubocop]
+task default: %i[test]
 
 begin
   require 'github_changelog_generator/task'
@@ -44,12 +37,12 @@ begin
 
   # Workaround for https://github.com/github-changelog-generator/github-changelog-generator/issues/715
   require 'rbconfig'
-  if RbConfig::CONFIG['host_os'] =~ /linux/
+  if /linux/.match?(RbConfig::CONFIG['host_os'])
     task :changelog do
       puts 'Fixing line endings...'
       changelog_file = File.join(__dir__, 'CHANGELOG.md')
       changelog_txt = File.read(changelog_file)
-      new_contents = changelog_txt.gsub(/\r\n/, "\n")
+      new_contents = changelog_txt.gsub("\r\n", "\n")
       File.open(changelog_file, 'w') { |file| file.puts new_contents }
     end
   end

data/lib/modulesync/cli.rb

@@ -21,12 +21,12 @@ module ModuleSync
 
     class Hook < Thor
       option :hook_args,
-             :aliases => '-a',
-             :desc => 'Arguments to pass to msync in the git hook'
+             aliases: '-a',
+             desc: 'Arguments to pass to msync in the git hook'
       option :branch,
-             :aliases => '-b',
-             :desc => 'Branch name to pass to msync in the git hook',
-             :default => CLI.defaults[:branch]
+             aliases: '-b',
+             desc: 'Branch name to pass to msync in the git hook',
+             default: CLI.defaults[:branch]
       desc 'activate', 'Activate the git hook.'
       def activate
         ModuleSync.hook CLI.prepare_options(options, hook: 'activate')
@@ -40,106 +40,106 @@ module ModuleSync
 
     class Base < Thor
       class_option :project_root,
-                   :aliases => '-c',
-                   :desc => 'Path used by git to clone modules into.',
-                   :default => CLI.defaults[:project_root]
+                   aliases: '-c',
+                   desc: 'Path used by git to clone modules into.',
+                   default: CLI.defaults[:project_root]
       class_option :git_base,
-                   :desc => 'Specify the base part of a git URL to pull from',
-                   :default => CLI.defaults[:git_base] || 'git@github.com:'
+                   desc: 'Specify the base part of a git URL to pull from',
+                   default: CLI.defaults[:git_base] || 'git@github.com:'
       class_option :namespace,
-                   :aliases => '-n',
-                   :desc => 'Remote github namespace (user or organization) to clone from and push to.',
-                   :default => CLI.defaults[:namespace] || 'puppetlabs'
+                   aliases: '-n',
+                   desc: 'Remote github namespace (user or organization) to clone from and push to.',
+                   default: CLI.defaults[:namespace] || 'puppetlabs'
       class_option :filter,
-                   :aliases => '-f',
-                   :desc => 'A regular expression to select repositories to update.'
+                   aliases: '-f',
+                   desc: 'A regular expression to select repositories to update.'
       class_option :negative_filter,
-                   :aliases => '-x',
-                   :desc => 'A regular expression to skip repositories.'
+                   aliases: '-x',
+                   desc: 'A regular expression to skip repositories.'
       class_option :verbose,
-                   :aliases => '-v',
-                   :desc => 'Verbose mode',
-                   :type => :boolean,
-                   :default => false
+                   aliases: '-v',
+                   desc: 'Verbose mode',
+                   type: :boolean,
+                   default: false
 
       desc 'update', 'Update the modules in managed_modules.yml'
       option :message,
-             :aliases => '-m',
-             :desc => 'Commit message to apply to updated modules. Required unless running in noop mode.',
-             :default => CLI.defaults[:message]
+             aliases: '-m',
+             desc: 'Commit message to apply to updated modules. Required unless running in noop mode.',
+             default: CLI.defaults[:message]
       option :configs,
-             :aliases => '-c',
-             :desc => 'The local directory or remote repository to define the list of managed modules,' \
-                      ' the file templates, and the default values for template variables.'
+             aliases: '-c',
+             desc: 'The local directory or remote repository to define the list of managed modules, ' \
+                   'the file templates, and the default values for template variables.'
       option :managed_modules_conf,
-             :desc => 'The file name to define the list of managed modules'
+             desc: 'The file name to define the list of managed modules'
       option :remote_branch,
-             :aliases => '-r',
-             :desc => 'Remote branch name to push the changes to. Defaults to the branch name.',
-             :default => CLI.defaults[:remote_branch]
+             aliases: '-r',
+             desc: 'Remote branch name to push the changes to. Defaults to the branch name.',
+             default: CLI.defaults[:remote_branch]
       option :skip_broken,
-             :type => :boolean,
-             :aliases => '-s',
-             :desc => 'Process remaining modules if an error is found',
-             :default => false
+             type: :boolean,
+             aliases: '-s',
+             desc: 'Process remaining modules if an error is found',
+             default: false
       option :amend,
-             :type => :boolean,
-             :desc => 'Amend previous commit',
-             :default => false
+             type: :boolean,
+             desc: 'Amend previous commit',
+             default: false
       option :force,
-             :type => :boolean,
-             :desc => 'Force push amended commit',
-             :default => false
+             type: :boolean,
+             desc: 'Force push amended commit',
+             default: false
       option :noop,
-             :type => :boolean,
-             :desc => 'No-op mode',
-             :default => false
+             type: :boolean,
+             desc: 'No-op mode',
+             default: false
       option :pr,
-             :type => :boolean,
-             :desc => 'Submit pull/merge request',
-             :default => false
+             type: :boolean,
+             desc: 'Submit pull/merge request',
+             default: false
       option :pr_title,
-             :desc => 'Title of pull/merge request',
-             :default => CLI.defaults[:pr_title] || 'Update to module template files'
+             desc: 'Title of pull/merge request',
+             default: CLI.defaults[:pr_title] || 'Update to module template files'
       option :pr_labels,
-             :type => :array,
-             :desc => 'Labels to add to the pull/merge request',
-             :default => CLI.defaults[:pr_labels] || []
+             type: :array,
+             desc: 'Labels to add to the pull/merge request',
+             default: CLI.defaults[:pr_labels] || []
       option :pr_target_branch,
-             :desc => 'Target branch for the pull/merge request',
-             :default => CLI.defaults[:pr_target_branch]
+             desc: 'Target branch for the pull/merge request',
+             default: CLI.defaults[:pr_target_branch]
       option :offline,
-             :type => :boolean,
-             :desc => 'Do not run any Git commands. Allows the user to manage Git outside of ModuleSync.',
-             :default => false
+             type: :boolean,
+             desc: 'Do not run any Git commands. Allows the user to manage Git outside of ModuleSync.',
+             default: false
       option :bump,
-             :type => :boolean,
-             :desc => 'Bump module version to the next minor',
-             :default => false
+             type: :boolean,
+             desc: 'Bump module version to the next minor',
+             default: false
       option :changelog,
-             :type => :boolean,
-             :desc => 'Update CHANGELOG.md if version was bumped',
-             :default => false
+             type: :boolean,
+             desc: 'Update CHANGELOG.md if version was bumped',
+             default: false
       option :tag,
-             :type => :boolean,
-             :desc => 'Git tag with the current module version',
-             :default => false
+             type: :boolean,
+             desc: 'Git tag with the current module version',
+             default: false
       option :tag_pattern,
-             :desc => 'The pattern to use when tagging releases.'
+             desc: 'The pattern to use when tagging releases.'
       option :pre_commit_script,
-             :desc => 'A script to be run before committing',
-             :default => CLI.defaults[:pre_commit_script]
+             desc: 'A script to be run before committing',
+             default: CLI.defaults[:pre_commit_script]
       option :fail_on_warnings,
-             :type => :boolean,
-             :aliases => '-F',
-             :desc => 'Produce a failure exit code when there are warnings' \
-                      ' (only has effect when --skip_broken is enabled)',
-             :default => false
+             type: :boolean,
+             aliases: '-F',
+             desc: 'Produce a failure exit code when there are warnings ' \
+                   '(only has effect when --skip_broken is enabled)',
+             default: false
       option :branch,
-             :aliases => '-b',
-             :desc => 'Branch name to make the changes in.' \
-                      ' Defaults to the default branch of the upstream repository, but falls back to "master".',
-             :default => CLI.defaults[:branch]
+             aliases: '-b',
+             desc: 'Branch name to make the changes in. ' \
+                   'Defaults to the default branch of the upstream repository, but falls back to "master".',
+             default: CLI.defaults[:branch]
       def update
         config = CLI.prepare_options(options)
         raise Thor::Error, 'No value provided for required option "--message"' unless config[:noop] \
@@ -164,19 +164,19 @@ module ModuleSync
       DESC
 
       option :configs,
-             :aliases => '-c',
-             :desc => 'The local directory or remote repository to define the list of managed modules,' \
-                      ' the file templates, and the default values for template variables.'
+             aliases: '-c',
+             desc: 'The local directory or remote repository to define the list of managed modules, ' \
+                   'the file templates, and the default values for template variables.'
       option :managed_modules_conf,
-             :desc => 'The file name to define the list of managed modules'
+             desc: 'The file name to define the list of managed modules'
       option :branch,
-             :aliases => '-b',
-             :desc => 'Branch name to make the changes in.',
-             :default => CLI.defaults[:branch]
+             aliases: '-b',
+             desc: 'Branch name to make the changes in.',
+             default: CLI.defaults[:branch]
       option :fail_fast,
-             :type => :boolean,
-             :desc => 'Abort the run after a command execution failure',
-             :default => CLI.defaults[:fail_fast].nil? ? true : CLI.defaults[:fail_fast]
+             type: :boolean,
+             desc: 'Abort the run after a command execution failure',
+             default: CLI.defaults[:fail_fast].nil? ? true : CLI.defaults[:fail_fast]
       def execute(*command_args)
         raise Thor::Error, 'COMMAND is a required argument' if command_args.empty?
 
@@ -196,38 +196,38 @@ module ModuleSync
         \x5  * Switch to specified branch
       DESC
       option :configs,
-             :aliases => '-c',
-             :desc => 'The local directory or remote repository to define the list of managed modules,' \
-                      ' the file templates, and the default values for template variables.'
+             aliases: '-c',
+             desc: 'The local directory or remote repository to define the list of managed modules, ' \
+                   'the file templates, and the default values for template variables.'
       option :managed_modules_conf,
-             :desc => 'The file name to define the list of managed modules'
+             desc: 'The file name to define the list of managed modules'
       option :branch,
-             :aliases => '-b',
-             :desc => 'Branch name to make the changes in.',
-             :default => CLI.defaults[:branch]
+             aliases: '-b',
+             desc: 'Branch name to make the changes in.',
+             default: CLI.defaults[:branch]
       option :offline,
-             :type => :boolean,
-             :desc => 'Only proceed local operations',
-             :default => false
+             type: :boolean,
+             desc: 'Only proceed local operations',
+             default: false
       option :source_branch,
-             :desc => 'Branch to reset from (e.g. origin/wip)'
+             desc: 'Branch to reset from (e.g. origin/wip)'
       def reset
         ModuleSync.reset CLI.prepare_options(options)
       end
 
       desc 'push', 'Push all available commits from branch to remote'
       option :configs,
-             :aliases => '-c',
-             :desc => 'The local directory or remote repository to define the list of managed modules,' \
-                      ' the file templates, and the default values for template variables.'
+             aliases: '-c',
+             desc: 'The local directory or remote repository to define the list of managed modules, ' \
+                   'the file templates, and the default values for template variables.'
       option :managed_modules_conf,
-             :desc => 'The file name to define the list of managed modules'
+             desc: 'The file name to define the list of managed modules'
       option :branch,
-             :aliases => '-b',
-             :desc => 'Branch name to push',
-             :default => CLI.defaults[:branch]
+             aliases: '-b',
+             desc: 'Branch name to push',
+             default: CLI.defaults[:branch]
       option :remote_branch,
-             :desc => 'Remote branch to push to (e.g. maintenance)'
+             desc: 'Remote branch to push to (e.g. maintenance)'
       def push
         ModuleSync.push CLI.prepare_options(options)
       end