bin/braid in evilchelu-braid-0.4.11 vs bin/braid in evilchelu-braid-0.4.12

- old
+ new

@@ -49,13 +49,14 @@ . braid add http://remote/path.git local/dir . braid add http://remote/path --type git local/dir . braid add svn://remote/path --branch notmaster TXT - mixin :argument_url, :option_type, :optional_path, :option_branch, :option_rails_plugin, :option_revision, :option_full + mixin :argument_url, :option_type, :optional_path, :option_branch, :option_rails_plugin, :option_revision, :option_full, :option_verbose run { + Braid::Operations::VERBOSE = verbose Braid::Command.run(:add, url, { "type" => type, "path" => path, "branch" => branch, "rails_plugin" => rails_plugin, "revision" => revision, "full" => full }) } } mode(:update) { @@ -72,13 +73,14 @@ examples <<-TXT . braid update . braid update local/dir TXT - mixin :optional_path, :option_revision, :option_head, :option_safe + mixin :optional_path, :option_revision, :option_head, :option_safe, :option_verbose run { + Braid::Operations::VERBOSE = verbose Braid::Command.run(:update, path, { "revision" => revision, "head" => head , "safe" => safe }) } } mode(:remove) { @@ -92,13 +94,14 @@ examples <<-TXT . braid remove local/dir TXT - mixin :argument_path + mixin :argument_path, :option_verbose run { + Braid::Operations::VERBOSE = verbose Braid::Command.run(:remove, path) } } mode(:setup) { @@ -108,13 +111,14 @@ examples <<-TXT . braid setup local/dir TXT - mixin :optional_path + mixin :optional_path, :option_verbose run { + Braid::Operations::VERBOSE = verbose Braid::Command.run(:setup, path) } } mode(:diff) { @@ -124,13 +128,14 @@ examples <<-TXT . braid diff local/dir TXT - mixin :argument_path + mixin :argument_path, :option_verbose run { + Braid::Operations::VERBOSE = verbose Braid::Command.run(:diff, path) } } mode(:version) { @@ -213,9 +218,17 @@ mixin(:option_safe) { option(:safe) { optional desc 'safe on merge errors' + attr + } + } + + mixin(:option_verbose) { + option(:verbose, :v) { + optional + desc 'log shell commands' attr } } run { help! }