modulesync 2.5.0 → 2.7.0

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

data/lib/modulesync/git_service/base.rb

@@ -2,7 +2,7 @@ module ModuleSync
   module GitService
     # Generic class for git services
     class Base
-      def open_pull_request(repo_path:, namespace:, title:, message:, source_branch:, target_branch:, labels:, noop:) # rubocop:disable Metrics/ParameterLists
+      def open_pull_request(repo_path:, namespace:, title:, message:, source_branch:, target_branch:, labels:, noop:)
         unless source_branch != target_branch
           raise ModuleSync::Error,
                 "Unable to open a pull request with the same source and target branch: '#{source_branch}'"
@@ -55,7 +55,7 @@ module ModuleSync
 
       protected
 
-      def _open_pull_request(repo_path:, namespace:, title:, message:, source_branch:, target_branch:, labels:, noop:) # rubocop:disable Metrics/ParameterLists
+      def _open_pull_request(repo_path:, namespace:, title:, message:, source_branch:, target_branch:, labels:, noop:)
         raise NotImplementedError
       end
     end

data/lib/modulesync/git_service/github.rb

@@ -13,25 +13,24 @@ module ModuleSync
         Octokit.configure do |c|
           c.api_endpoint = endpoint
         end
-        @api = Octokit::Client.new(:access_token => token)
+        @api = Octokit::Client.new(access_token: token)
       end
 
       private
 
-      def _open_pull_request(repo_path:, namespace:, title:, message:, source_branch:, target_branch:, labels:, noop:) # rubocop:disable Metrics/ParameterLists
+      def _open_pull_request(repo_path:, namespace:, title:, message:, source_branch:, target_branch:, labels:, noop:)
         head = "#{namespace}:#{source_branch}"
 
         if noop
-          $stdout.puts \
-            "Using no-op. Would submit PR '#{title}' to '#{repo_path}' " \
-            "- merges '#{source_branch}' into '#{target_branch}'"
+          $stdout.puts "Using no-op. Would submit PR '#{title}' to '#{repo_path}' " \
+                       "- merges '#{source_branch}' into '#{target_branch}'"
           return
         end
 
         pull_requests = @api.pull_requests(repo_path,
-                                           :state => 'open',
-                                           :base => target_branch,
-                                           :head => head)
+                                           state: 'open',
+                                           base: target_branch,
+                                           head: head)
         unless pull_requests.empty?
           # Skip creating the PR if it exists already.
           $stdout.puts "Skipped! #{pull_requests.length} PRs found for branch '#{source_branch}'"

data/lib/modulesync/git_service/gitlab.rb

@@ -11,8 +11,8 @@ module ModuleSync
         super()
 
         @api = Gitlab::Client.new(
-          :endpoint => endpoint,
-          :private_token => token,
+          endpoint: endpoint,
+          private_token: token,
         )
       end
 
@@ -26,18 +26,17 @@ module ModuleSync
 
       private
 
-      def _open_pull_request(repo_path:, namespace:, title:, message:, source_branch:, target_branch:, labels:, noop:) # rubocop:disable Metrics/ParameterLists, Lint/UnusedMethodArgument
+      def _open_pull_request(repo_path:, namespace:, title:, message:, source_branch:, target_branch:, labels:, noop:) # rubocop:disable Lint/UnusedMethodArgument
         if noop
-          $stdout.puts \
-            "Using no-op. Would submit MR '#{title}' to '#{repo_path}' " \
-            "- merges #{source_branch} into #{target_branch}"
+          $stdout.puts "Using no-op. Would submit MR '#{title}' to '#{repo_path}' " \
+                       "- merges #{source_branch} into #{target_branch}"
           return
         end
 
         merge_requests = @api.merge_requests(repo_path,
-                                             :state => 'opened',
-                                             :source_branch => source_branch,
-                                             :target_branch => target_branch)
+                                             state: 'opened',
+                                             source_branch: source_branch,
+                                             target_branch: target_branch)
         unless merge_requests.empty?
           # Skip creating the MR if it exists already.
           $stdout.puts "Skipped! #{merge_requests.length} MRs found for branch '#{source_branch}'"
@@ -46,9 +45,9 @@ module ModuleSync
 
         mr = @api.create_merge_request(repo_path,
                                        title,
-                                       :source_branch => source_branch,
-                                       :target_branch => target_branch,
-                                       :labels => labels)
+                                       source_branch: source_branch,
+                                       target_branch: target_branch,
+                                       labels: labels)
         $stdout.puts \
           "Submitted MR '#{title}' to '#{repo_path}' " \
           "- merges '#{source_branch}' into '#{target_branch}'"

data/lib/modulesync/hook.rb

@@ -15,10 +15,10 @@ module ModuleSync
       <<~CONTENT
         #!/usr/bin/env bash
 
-        current_branch=\`git symbolic-ref HEAD | sed -e 's,.*/\(.*\),\1,'\`
-        git_dir=\`git rev-parse --show-toplevel\`
-        message=\`git log -1 --format=%B\`
-        msync -m "\$message" #{arguments}
+        current_branch=`git symbolic-ref HEAD | sed -e 's,.*/(.*),\1,'`
+        git_dir=`git rev-parse --show-toplevel`
+        message=`git log -1 --format=%B`
+        msync -m "$message" #{arguments}
       CONTENT
     end
 

data/lib/modulesync/renderer.rb

@@ -15,7 +15,7 @@ module ModuleSync
       erb_obj = if RUBY_VERSION >= '2.7'
                   ERB.new(template, trim_mode: '-')
                 else
-                  ERB.new(template, nil, '-')
+                  ERB.new(template, trim_mode: '-')
                 end
       erb_obj.filename = template_file
       erb_obj.def_method(ForgeModuleFile, 'render()', template_file)

data/lib/modulesync/repository.rb

@@ -31,6 +31,9 @@ module ModuleSync
     end
 
     def default_branch
+      # `Git.default_branch` requires ruby-git >= 1.17.0
+      return Git.default_branch(repo.dir) if Git.respond_to? :default_branch
+
       symbolic_ref = repo.branches.find { |b| b.full.include?('remotes/origin/HEAD') }
       return unless symbolic_ref
 
@@ -137,8 +140,8 @@ module ModuleSync
       begin
         opts_commit = {}
         opts_push = {}
-        opts_commit = { :amend => true } if options[:amend]
-        opts_push = { :force => true } if options[:force]
+        opts_commit = { amend: true } if options[:amend]
+        opts_push = { force: true } if options[:force]
         if options[:pre_commit_script]
           script = "#{File.dirname(File.dirname(__FILE__))}/../contrib/#{options[:pre_commit_script]}"
           `#{script} #{@directory}`

data/lib/modulesync.rb

@@ -12,17 +12,17 @@ require 'modulesync/util'
 
 require 'monkey_patches'
 
-module ModuleSync # rubocop:disable Metrics/ModuleLength
+module ModuleSync
   class Error < StandardError; end
 
   include Constants
 
   def self.config_defaults
     {
-      :project_root => 'modules/',
-      :managed_modules_conf => 'managed_modules.yml',
-      :configs => '.',
-      :tag_pattern => '%s',
+      project_root: 'modules/',
+      managed_modules_conf: 'managed_modules.yml',
+      configs: '.',
+      tag_pattern: '%s',
     }
   end
 
@@ -33,7 +33,7 @@ module ModuleSync # rubocop:disable Metrics/ModuleLength
   def self.local_file(config_path, file)
     path = File.join(config_path, MODULE_FILES_DIR, file)
     if !File.exist?("#{path}.erb") && File.exist?(path)
-      $stderr.puts "Warning: using '#{path}' as template without '.erb' suffix"
+      warn "Warning: using '#{path}' as template without '.erb' suffix"
       path
     else
       "#{path}.erb"
@@ -50,9 +50,9 @@ module ModuleSync # rubocop:disable Metrics/ModuleLength
           .collect { |p| p.chomp('.erb') }
           .to_a
     else
-      $stderr.puts "#{local_template_dir} does not exist." \
-                   ' Check that you are working in your module configs directory or' \
-                   ' that you have passed in the correct directory with -c.'
+      warn "#{local_template_dir} does not exist. " \
+           'Check that you are working in your module configs directory or ' \
+           'that you have passed in the correct directory with -c.'
       exit 1
     end
   end
@@ -68,8 +68,8 @@ module ModuleSync # rubocop:disable Metrics/ModuleLength
 
     managed_modules = Util.parse_config(config_file)
     if managed_modules.empty?
-      $stderr.puts "No modules found in #{config_file}." \
-                   ' Check that you specified the right :configs directory and :managed_modules_conf file.'
+      warn "No modules found in #{config_file}. " \
+           'Check that you specified the right :configs directory and :managed_modules_conf file.'
       exit 1
     end
     managed_modules.select! { |m| m =~ Regexp.new(filter) } unless filter.nil?
@@ -99,16 +99,16 @@ module ModuleSync # rubocop:disable Metrics/ModuleLength
         erb = Renderer.build(template_file)
         # Meta data passed to the template as @metadata[:name]
         metadata = {
-          :module_name => settings.additional_settings[:puppet_module],
-          :namespace => settings.additional_settings[:namespace],
-          :workdir => puppet_module.working_directory,
-          :target_file => target_file,
+          module_name: settings.additional_settings[:puppet_module],
+          namespace: settings.additional_settings[:namespace],
+          workdir: puppet_module.working_directory,
+          target_file: target_file,
         }
         template = Renderer.render(erb, configs, metadata)
         mode = File.stat(template_file).mode
         Renderer.sync(template, target_file, mode)
       rescue StandardError
-        $stderr.puts "#{puppet_module.given_name}: Error while rendering file: '#{filename}'"
+        warn "#{puppet_module.given_name}: Error while rendering file: '#{filename}'"
         raise
       end
     end
@@ -128,9 +128,9 @@ module ModuleSync # rubocop:disable Metrics/ModuleLength
                             defaults,
                             module_configs[GLOBAL_DEFAULTS_KEY] || {},
                             module_configs,
-                            :puppet_module => puppet_module.repository_name,
-                            :git_base => options[:git_base],
-                            :namespace => puppet_module.repository_namespace)
+                            puppet_module: puppet_module.repository_name,
+                            git_base: options[:git_base],
+                            namespace: puppet_module.repository_namespace)
 
     settings.unmanaged_files(module_files).each do |filename|
       $stdout.puts "Not managing '#{filename}' in '#{puppet_module.given_name}'"
@@ -178,7 +178,7 @@ module ModuleSync # rubocop:disable Metrics/ModuleLength
       manage_module(puppet_module, module_files, defaults)
     rescue ModuleSync::Error, Git::GitExecuteError => e
       message = e.message || 'Error during `update`'
-      $stderr.puts "#{puppet_module.given_name}: #{message}"
+      warn "#{puppet_module.given_name}: #{message}"
       exit 1 unless options[:skip_broken]
       errors = true
       $stdout.puts "Skipping '#{puppet_module.given_name}' as update process failed"
@@ -222,7 +222,7 @@ module ModuleSync # rubocop:disable Metrics/ModuleLength
         raise Thor::Error, message if @options[:fail_fast]
 
         errors[puppet_module.given_name] = message
-        $stderr.puts message
+        warn message
       end
 
       $stdout.puts ''

data/modulesync.gemspec

@@ -3,33 +3,29 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name                  = 'modulesync'
-  spec.version               = '2.5.0'
+  spec.version               = '2.7.0'
   spec.authors               = ['Vox Pupuli']
   spec.email                 = ['voxpupuli@groups.io']
   spec.summary               = 'Puppet Module Synchronizer'
   spec.description           = 'Utility to synchronize common files across puppet modules in Github.'
   spec.homepage              = 'https://github.com/voxpupuli/modulesync'
   spec.license               = 'Apache-2.0'
-  spec.required_ruby_version = '>= 2.5.0'
+  spec.required_ruby_version = '>= 2.7.0'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'aruba', '>= 0.14', '< 2'
-  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'aruba', '~>2.0'
   spec.add_development_dependency 'cucumber'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'rubocop', '~> 1.2'
-  spec.add_development_dependency 'rubocop-performance'
-  spec.add_development_dependency 'rubocop-rake'
-  spec.add_development_dependency 'rubocop-rspec'
   spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'voxpupuli-rubocop', '~> 1.3'
 
   spec.add_runtime_dependency 'git', '~>1.7'
   spec.add_runtime_dependency 'gitlab', '~>4.0'
-  spec.add_runtime_dependency 'octokit', '~>4.0'
-  spec.add_runtime_dependency 'puppet-blacksmith', '>= 3.0', '< 7'
+  spec.add_runtime_dependency 'octokit', '>=4', '<7'
+  spec.add_runtime_dependency 'puppet-blacksmith', '>= 3.0', '< 8'
   spec.add_runtime_dependency 'thor'
 end

data/spec/helpers/faker/puppet_module_remote_repo.rb

@@ -102,21 +102,21 @@ module ModuleSync
 
       def tags
         FileUtils.chdir(bare_repo_dir) do
-          return run %w{git tag --list}
+          return run %w[git tag --list]
         end
       end
 
       def delete_branch(branch)
         FileUtils.chdir(bare_repo_dir) do
-          run %W{git branch -D #{branch}}
+          run %W[git branch -D #{branch}]
         end
       end
 
       def create_branch(branch, from = nil)
         from ||= default_branch
         FileUtils.chdir(tmp_repo_dir) do
-          run %W{git branch -c #{from} #{branch}}
-          run %W{git push --set-upstream origin #{branch}}
+          run %W[git branch -c #{from} #{branch}]
+          run %W[git push --set-upstream origin #{branch}]
         end
       end
 

data/spec/helpers/faker.rb

@@ -7,6 +7,7 @@ module ModuleSync
 
     def self.working_directory
       raise 'Working directory must be set' if @working_directory.nil?
+
       FileUtils.mkdir_p @working_directory
       @working_directory
     end