lib/modulesync/cli.rb in modulesync-0.10.0 vs lib/modulesync/cli.rb in modulesync-1.0.0

- old
+ new

@@ -41,31 +41,34 @@ class_option :git_base, :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. Defaults to puppetlabs', + :desc => 'Remote github namespace (user or organization) to clone from and push to.' \ + ' Defaults to puppetlabs', :default => CLI.defaults[:namespace] || 'puppetlabs' class_option :filter, :aliases => '-f', :desc => 'A regular expression to select repositories to update.' class_option :negative_filter, :aliases => '-x', :desc => 'A regular expression to skip repositories.' class_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".', + :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] 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] 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.' + :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 :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, @@ -112,21 +115,24 @@ :desc => 'Git tag with the current module version', :default => false option :tag_pattern, :desc => 'The pattern to use when tagging releases.' option :pre_commit_script, - :desc => 'A script to be run before commiting', + :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)', + :desc => 'Produce a failure exit code when there are warnings' \ + ' (only has effect when --skip_broken is enabled)', :default => false def update config = { :command => 'update' }.merge(options) config = Util.symbolize_keys(config) - raise Thor::Error, 'No value provided for required option "--message"' unless config[:noop] || config[:message] || config[:offline] + raise Thor::Error, 'No value provided for required option "--message"' unless config[:noop] \ + || config[:message] \ + || config[:offline] config[:git_opts] = { 'amend' => config[:amend], 'force' => config[:force] } ModuleSync.update(config) end desc 'hook', 'Activate or deactivate a git hook.'