@@ -54,7 +54,7 @@ Main { mixin :argument_url, :option_type, :optional_path, :option_branch, :option_rails_plugin, :option_revision, :option_full, :option_verbose run { - Braid::Operations::VERBOSE = verbose + Braid.verbose = verbose Braid::Command.run(:add, url, { "type" => type, "path" => path, "branch" => branch, "rails_plugin" => rails_plugin, "revision" => revision, "full" => full }) } } @@ -78,7 +78,7 @@ Main { mixin :optional_path, :option_revision, :option_head, :option_safe, :option_verbose run { - Braid::Operations::VERBOSE = verbose + Braid.verbose = verbose Braid::Command.run(:update, path, { "revision" => revision, "head" => head , "safe" => safe }) } } @@ -99,7 +99,7 @@ Main { mixin :argument_path, :option_verbose run { - Braid::Operations::VERBOSE = verbose + Braid.verbose = verbose Braid::Command.run(:remove, path) } } @@ -116,7 +116,7 @@ Main { mixin :optional_path, :option_verbose run { - Braid::Operations::VERBOSE = verbose + Braid.verbose = verbose Braid::Command.run(:setup, path) } } @@ -133,7 +133,6 @@ Main { mixin :argument_path, :option_verbose run { - Braid::Operations::VERBOSE = verbose Braid::Command.run(:diff, path) } } bin/braid @@ -8,6 +8,9 @@ module Braid LOCAL_CACHE_DIR = ENV["BRAID_LOCAL_CACHE_DIR"] || "#{ENV["HOME"]}/.braid/cache/" REQUIRED_GIT_VERSION = "1.6" + def self.verbose; @verbose || false; end + def self.verbose=(new_value); @verbose = !!new_value; end + class BraidError < StandardError def message value = super lib/braid.rb @@ -49,7 +49,6 @@ module Braid include Singleton def self.command; name.split('::').last.downcase; end # hax! - def self.verbose; Braid::Operations::VERBOSE ; end def version status, out, err = exec!("#{self.class.command} --version") @@ -103,7 +102,7 @@ module Braid ENV['LANG'] = 'C' out, err = nil - puts "executing cmd(#{cmd})" if Proxy.verbose + log(cmd) status = Open4.popen4(cmd) do |pid, stdin, stdout, stderr| out = stdout.read err = stderr.read @@ -120,10 +119,25 @@ module Braid [status, out, err] end + def sh(cmd, message = nil) + message ||= "could not fetch" if cmd =~ /fetch/ + log(cmd) + system(cmd) + raise ShellExecutionError, message unless $? == 0 + true + end + def msg(str) puts str end + def log(cmd) + msg "Executing `#{cmd}`" if verbose? + end + + def verbose? + Braid.verbose + end end class Git < Proxy @@ -141,9 +155,7 @@ module Braid def fetch(remote) # open4 messes with the pipes of index-pack - system("git fetch -n #{remote} 2>&1 >/dev/null") - raise ShellExecutionError, "could not fetch" unless $? == 0 - true + sh("git fetch -n #{remote} 2>&1 >/dev/null") end def checkout(treeish) @@ -265,10 +277,7 @@ module Braid end def fetch(remote) - # open4 messes with the pipes of index-pack - system("git svn fetch #{remote} 2>&1 >/dev/null") - raise ShellExecutionError, "could not fetch" unless $? == 0 - true + sh("git svn fetch #{remote} 2>&1 >/dev/null") end def init(remote, path) lib/braid/operations.rb 7ef0cf37612e38b0b8db03383b6191663ddb8f8b Norbert Crombach norbert.crombach@primetheory.org http://github.com/norbert/braid/commit/08d9ae50c64bdfac85e40aa3ae57c4e25358a46a 08d9ae50c64bdfac85e40aa3ae57c4e25358a46a 2008-10-22T14:47:13-07:00 2008-09-30T08:09:18-07:00 Put verbose setting where it belongs 3d52a17932238f9d72ba883ab625db3f37798848 Norbert Crombach norbert.crombach@primetheory.org