- Projects

[LrdeTools] 244: Adapt the whole Vcs to the new switches passing way.
by Nicolas Pouillard 29 Sep '05

29 Sep '05

https://svn.lrde.epita.fr/svn/lrdetools/trunk Index: ChangeLog from Nicolas Pouillard <ertai(a)lrde.epita.fr> Adapt the whole Vcs to the new switches passing way. * vcs/lib/vcs/mail.rb, * vcs/lib/vcs/message.rb, * vcs/lib/vcs/edit.rb, * vcs/lib/vcs/changelog.rb, * vcs/lib/vcs/script.rb, * vcs/lib/vcs/diff.rb, * vcs/lib/vcs/form.rb, * vcs/lib/vcs/conflict.rb, * vcs/lib/vcs/common_commit.rb: Adapt to the new way for passing switches/options. * vcs/lib/vcs/vcs.rb: Add VcsCmdData#to_s, Fix OptionController#to_strings and Vcs#run_argv. * vcs/lib/vcs/svn.rb: Change quotations. changelog.rb | 4 ++++ common_commit.rb | 14 ++++++-------- conflict.rb | 6 +++--- diff.rb | 8 ++++---- edit.rb | 5 ++--- form.rb | 10 +++++----- mail.rb | 13 ++++++++----- message.rb | 8 ++++---- script.rb | 8 ++++++-- svn.rb | 4 ++-- vcs.rb | 49 +++++++++++++++++++++++++++---------------------- 11 files changed, 71 insertions(+), 58 deletions(-) Index: vcs/lib/vcs/script.rb --- vcs/lib/vcs/script.rb (revision 243) +++ vcs/lib/vcs/script.rb (working copy) @@ -7,9 +7,13 @@ class Vcs - def script! ( code, *args ) + def script ( files=[], options={} ) + puts script!(files, options) + end + + def script! ( files=[], options={} ) begin - eval(code) + eval(files.join(' ')) rescue Exception => ex logger.error { 'Vcs#script: during the client execution' } logger.error { ex.long_pp } Index: vcs/lib/vcs/form.rb --- vcs/lib/vcs/form.rb (revision 243) +++ vcs/lib/vcs/form.rb (working copy) @@ -6,7 +6,7 @@ class Vcs def edit_form! ( *args ) - mk_from(*args) + mk_form(*args) edit! Form if Form.read =~ /\A---/ if Form.read =~ /\A---/ raise Failure, "You must fill this file: `#{Form}' (and remove the first line)" @@ -19,7 +19,7 @@ def instanciate_form! ( *args ) with_cache! IForm, 'instanciated form (title, subject, ChangeLog entry, diff)' do - cl = mk_from(*args).read + cl = mk_form(*args).read ls = [] YAML.each_document("--- |\n" + cl) { |x| (ls.size == 2)? break : ls << x } title_subject, input = ls @@ -42,7 +42,7 @@ @@subject_format ||= '<%= rev %>: <%= title %>' - def mk_from! ( *args ) + def mk_form! ( files=[], options={} ) with_cache! Form, 'complete form (title, subject, ChangeLog entry, diff)' do puts " @@ -55,7 +55,7 @@ | |".head_cut! - mk_log_entry!(*args) + mk_log_entry!(files) puts "| |--- | ########### This line, and those below, will be ignored #### 80c| # | --- @@ -73,7 +73,7 @@ | |".head_cut! - diffw!(*args) + diffw!(files) end end alias_command :mkf, :mk_form Index: vcs/lib/vcs/mail.rb --- vcs/lib/vcs/mail.rb (revision 243) +++ vcs/lib/vcs/mail.rb (working copy) @@ -10,17 +10,20 @@ MAIL = Sendmail::MAIL_FILE MAILER = Sendmail.new - DEFAULT_OPTIONS = %w[ --confirm --mime ] + DEFAULT_OPTIONS = { :confirm => true, :mime => true } # # Mail. # - def mail! ( *args ) + # FIXME handle options properly. + # Delegata the option parsing to Sendmail. + def mail! ( files=[], options={} ) + raise unless files.empty? error_handling :mail_failed unless MAIL.exist? - options = DEFAULT_OPTIONS + args - options << '--sign' if Vcs.user_conf.sign - print_body(MAIL, MAILER.parse_mail_options(*options)) + options = DEFAULT_OPTIONS.merge(options) + options[:signed => true] if Vcs.user_conf.sign + print_body(MAIL, MAILER.parse_mail_options(options)) end MAILER.sendmail MAIL.delete Index: vcs/lib/vcs/common_commit.rb --- vcs/lib/vcs/common_commit.rb (revision 243) +++ vcs/lib/vcs/common_commit.rb (working copy) @@ -5,21 +5,19 @@ class Vcs - def common_commit! ( subject_format, *args, &block ) + def common_commit! ( subject_format, files=[], opts={}, &block ) unless CL.exist? raise Failure, "No `#{CL}', you are probably not in a valid directory." end - opts, args = args.partition { |a| a =~ /^-/ } - @@subject_format = subject_format update! - Vcs.commited = edit_form!(*args) + Vcs.commited = edit_form!(files) - message(*args) + message(files) edit! Message iform = nil @@ -32,12 +30,12 @@ commit_failed end - concat_changelog!(*args) + concat_changelog!(files) - args << 'ChangeLog' unless args.grep(/^[^-]/).empty? + files << 'ChangeLog' unless files.empty? begin - commit_!('--message', mk_log_entry(*args).read, *(opts + args)) + commit_!(files, opts.merge(:message => mk_log_entry(files).read)) iform = YAML.load(IForm.read).merge('commited' => true) IForm.open('w') { |f| f.print iform.to_yaml } TMP_CL.delete if TMP_CL.exist? Index: vcs/lib/vcs/changelog.rb --- vcs/lib/vcs/changelog.rb (revision 243) +++ vcs/lib/vcs/changelog.rb (working copy) @@ -35,6 +35,7 @@ private :mk_log_entry_contents + # Same switches as status def mk_log_entry! ( *args ) with_cache! LogEntry, 'Log entry' do mk_log_entry_contents(*args).each do |file, comments| @@ -56,6 +57,7 @@ end private :log_to_changelog + # Same switches as mk_log_entry def mk_changelog_entry! ( *args ) puts Time.now.strftime("%Y-%m-%d #{Vcs.full_email}") puts @@ -64,6 +66,7 @@ alias_command :mkcl, :mk_changelog_entry + # Same switches as mk_log_entry def mk_message_entry! ( *args ) puts 'Index: ChangeLog' puts "from #{Vcs.full_email}" @@ -74,6 +77,7 @@ + # Same switches as mk_changelog_entry def concat_changelog! ( *args ) error_handling :concat_changelog_failed Index: vcs/lib/vcs/edit.rb --- vcs/lib/vcs/edit.rb (revision 243) +++ vcs/lib/vcs/edit.rb (working copy) @@ -7,9 +7,8 @@ class Vcs - def edit! ( *files ) - # stringify - cmd = Vcs.editor + files.flatten.map { |x| x.to_s } > [STDOUT, STDERR] + def edit! ( files=[], options={} ) + cmd = Vcs.editor + files > [STDOUT, STDERR] cmd.run(@runner) end Index: vcs/lib/vcs/diff.rb --- vcs/lib/vcs/diff.rb (revision 243) +++ vcs/lib/vcs/diff.rb (working copy) @@ -22,16 +22,16 @@ class Svn < Vcs # A diff only for your eyes - def diffw! ( *args ) + def diffw! ( files_orig=[], options={} ) files = Set.new - from_status(*args) do |line, file_st, prop_st, cpy, file| + from_status(files_orig) do |line, file_st, prop_st, cpy, file| next if file_st.chr =~ /[?X\\,+D]/ next if file.to_s == 'ChangeLog' next if file.directory? files << file end - return if files.empty? and not args.empty? - diff_! '--diff-cmd', 'diff', '-x', '-NPbuw', *files + return if files.empty? and not files_orig.empty? + diff_! files.to_a, options.merge(:diff_cmd => 'diff', :extensions => '-NPbuw') end end # class Svn Index: vcs/lib/vcs/conflict.rb --- vcs/lib/vcs/conflict.rb (revision 243) +++ vcs/lib/vcs/conflict.rb (working copy) @@ -5,18 +5,18 @@ class Vcs - def mk_conflicts_list + def mk_conflicts_list ( files, options={} ) ls = status.output.readlines.grep(/^C/).map! { |s| s[/^C\s+(.*)/, 1] } raise "no conflicts" if ls.empty? ls end protected :mk_conflicts_list - def edit_conflicts! + def edit_conflicts! ( files, options={} ) edit! mk_conflicts_list end - def resolve_conflicts! + def resolve_conflicts! ( files, options={} ) conflicts = mk_conflicts_list question = "Resolve these conflicts?: \n - #{conflicts.join("\n - ")}\n(y/n)" if @h.agree question, true Index: vcs/lib/vcs/svn.rb --- vcs/lib/vcs/svn.rb (revision 243) +++ vcs/lib/vcs/svn.rb (working copy) @@ -17,7 +17,7 @@ add_basic_method(m) end - self.option_controller = OptionController.new Svn, %q[ + self.option_controller = OptionController.new Svn, " --auto-props --config-dir DIR --diff-cmd CMD @@ -60,6 +60,6 @@ --verbose (-v) --version --xml - ] + " end # class Svn Index: vcs/lib/vcs/vcs.rb --- vcs/lib/vcs/vcs.rb (revision 243) +++ vcs/lib/vcs/vcs.rb (working copy) @@ -105,6 +105,15 @@ @out_io = @output.to_io_for_commands end + def to_s + begin + @output.read + rescue IOError => ex + Vcs.logger.debug { ex.long_pp } + super + end + end + end # class VcsCmdData class VcsCmdDataFactory < Commands::Datas::Factory @@ -206,9 +215,14 @@ @shortcuts[short_option] end - def to_strings ( name, value ) - option = '--' + name.gsub('_', '-') - [option, value.to_s] + def to_strings ( options ) + result = [] + options.each do |k, v| + raise if v == false + result << '--' + k.to_s.gsub('_', '-') + result << v.to_s if v != true + end + result end end # class OptionController @@ -301,19 +315,10 @@ @@checkers = Set.new - def run! ( *args ) + def run! ( command, files=[], options={} ) flush - cmd_args = [] - args.flatten.map do |arg| - if arg.is_a? Hash - arg.each do |k, v| - cmd_args += option_controller.to_strings(k, v) - end - else - cmd_args << arg - end - end - (@cmd + args).run(@runner) + cmd_options = option_controller.to_strings(options) + (@cmd + command + cmd_options + files).run(@runner) end def sub_vcs ( out, err, &block ) @@ -348,7 +353,6 @@ end def run_missing! ( name, orig, *args ) - return help!(*args) if name == '--help' if name =~ /^(.*)_$/ run!($1, *args) else @@ -358,14 +362,15 @@ end def run_argv ( argv ) - options, new_argv = option_controller.parse(argv) - logger.debug { "options: #{options.inspect}, argv: #{new_argv}" } - if new_argv.empty? + options, files = option_controller.parse(argv) + if files.empty? or options[:help] meth = :help! else - meth = new_argv.shift.sub(/([^!])$/, '\1!') + meth = files.shift.dup + meth.sub!(/([^!])$/, '\1!') if meth != 'script' end - send(meth, *new_argv) + logger.debug { "meth: #{meth}, files: #{files.inspect}, options: #{options.inspect}" } + result = send(meth, files, options) end %w[ checkout delete diff status log add update commit ].each do |m| @@ -383,7 +388,7 @@ end else with_bang = meth + '!' - return run_missing!(meth, meth, *args) unless respond_to? with_bang + return run_missing!(meth, *args) unless respond_to? with_bang copy = sub_vcs_with_name(meth) copy.send(with_bang, *args) out = copy.cmd_data Index: vcs/lib/vcs/message.rb --- vcs/lib/vcs/message.rb (revision 243) +++ vcs/lib/vcs/message.rb (working copy) @@ -18,7 +18,7 @@ private :print_body - def message! ( *args ) + def message! ( files=[], options={} ) with_cache! Message, 'generated message (ChangeLog, diffstat, diff)' do url! if defined? COLLABOA @@ -31,13 +31,13 @@ end puts flush - mk_message_entry!(*args) + mk_message_entry!(files) puts flush - diffstat!(*args) + diffstat!(files) puts flush - diffw(*args).each_line do |line| + diffw(files).each_line do |line| print line if line !~ /^=+$/ end end

1 0

[LrdeTools] 243: Properly handle switches.
by Nicolas Pouillard 29 Sep '05

29 Sep '05

https://svn.lrde.epita.fr/svn/lrdetools/trunk Index: ChangeLog from Nicolas Pouillard <ertai(a)lrde.epita.fr> Properly handle switches. * vcs/lib/vcs/vcs.rb: Add `run_argv', and to classes for options `Switch' and `OptionController'. * vcs/lib/vcs/app.rb: Simplify using `run_argv'. * vcs/lib/vcs/svn.rb: Add a specification of the Svn switches list. app.rb | 10 ----- svn.rb | 45 +++++++++++++++++++++++++ vcs.rb | 114 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 160 insertions(+), 9 deletions(-) Index: vcs/lib/vcs/app.rb --- vcs/lib/vcs/app.rb (revision 242) +++ vcs/lib/vcs/app.rb (working copy) @@ -106,15 +106,7 @@ ".head_cut! exit end - vcs = @@all_vcs[Vcs.default.to_s.downcase.to_sym].new - - if ARGV.empty? - meth = :help! - else - meth = ARGV.shift.sub(/([^!])$/, '\1!') - end - - vcs.send(meth, *ARGV) + vcs = @@all_vcs[Vcs.default.to_s.downcase.to_sym].new.run_argv(ARGV) rescue SystemExit => ex raise ex Index: vcs/lib/vcs/svn.rb --- vcs/lib/vcs/svn.rb (revision 242) +++ vcs/lib/vcs/svn.rb (working copy) @@ -17,4 +17,49 @@ add_basic_method(m) end + self.option_controller = OptionController.new Svn, %q[ + --auto-props + --config-dir DIR + --diff-cmd CMD + --diff3-cmd CMD + --dry-run + --editor-cmd CMD + --encoding ENC + --extensions (-x) ARGS + --file (-F) FILENAME + --force + --force-log + --help (-h or -?) + --ignore-ancestry + --ignore-externals + --incremental + --limit NUM {Integer} + --message (-m) MESSAGE + --new ARG + --no-auth-cache + --no-auto-props + --no-diff-added + --no-diff-deleted + --no-ignore + --no-unlock + --non-interactive + --non-recursive (-N) + --notice-ancestry + --old ARG + --password PASS + --quiet (-q) + --recursive (-R) + --relocate FROM TO [PATH...] + --revision (-r) REV {Integer} + --revprop + --show-updates (-u) + --stop-on-copy + --strict + --targets FILENAME + --username NAME + --verbose (-v) + --version + --xml + ] + end # class Svn Index: vcs/lib/vcs/vcs.rb --- vcs/lib/vcs/vcs.rb (revision 242) +++ vcs/lib/vcs/vcs.rb (working copy) @@ -45,6 +45,7 @@ cattr_accessor :user_conf cattr_accessor :output_io_methods cattr_accessor :logger + class_inheritable_accessor :option_controller class Logger < ::Logger @@ -121,6 +122,98 @@ end # class VcsCmdDataFactory + + + class Switch + cattr_reader :shortcuts + attr_reader :name, :shortcuts, :argument + + @@re ||= + /^ + \s* + --([\w-]+) # The option (--foo) + \s* + (?: $ + (-\w) # A shortcut (-f) + (?:\sor\s(-(?:\?|\w)))? # Another one (-f or -o) + $ + )? + (.*?) # An argument (--foo NUM) + \s* + (?:\{(.*)\})? # A type (--foo NUM {Integer}) + $/x + + def initialize ( aString ) + match = @@re.match(aString) + raise "Cannot parse switch: `#{aString}'" if match.nil? + @name, @argument, @type = match[1], match[4], match[5] + @type = eval(@type) unless @type.nil? + @shortcuts = match[2..3].compact + end + + def to_s + '--' + @name + end + + def to_a_for_option_parser + @shortcuts + ["--#@name#@argument", @type].compact + end + + def to_sym + @name.gsub('-', '_').to_sym + end + + end # class Switch + + + + class OptionController + + attr_reader :switches, :shortcuts, :vcs_name, :option_parser, :options + protected :options + + def initialize ( aVcsClass, aString ) + Vcs.logger.debug { "Creating an option_controller for #{aVcsClass}..." } + @switches = [] + @shortcuts = {} + aString.each_line do |line| + next if line.blank? + switch = Switch.new(line) + @switches << switch + switch.shortcuts.each do |shortcut| + @shortcuts[shortcut] = switch.name + end + end + @option_parser = OptionParser.new do |o| + o.banner = "Type '#{$0} help' for usage." + o.separator '' + @switches.each do |switch| + o.on(*switch.to_a_for_option_parser) do |a, *b| + raise unless b.empty? + options[switch.to_sym] = a + end + end + end + Vcs.logger.debug { @option_parser.to_s } + end + + def parse ( argv ) + @options = {} + [@options, @option_parser.parse(argv)] + end + + def short_to_long ( short_option ) + @shortcuts[short_option] + end + + def to_strings ( name, value ) + option = '--' + name.gsub('_', '-') + [option, value.to_s] + end + + end # class OptionController + + def initialize ( aCmd ) @cmd = aCmd.to_cmd @handlers = Set.new @@ -210,6 +303,16 @@ def run! ( *args ) flush + cmd_args = [] + args.flatten.map do |arg| + if arg.is_a? Hash + arg.each do |k, v| + cmd_args += option_controller.to_strings(k, v) + end + else + cmd_args << arg + end + end (@cmd + args).run(@runner) end @@ -254,6 +357,17 @@ end end + def run_argv ( argv ) + options, new_argv = option_controller.parse(argv) + logger.debug { "options: #{options.inspect}, argv: #{new_argv}" } + if new_argv.empty? + meth = :help! + else + meth = new_argv.shift.sub(/([^!])$/, '\1!') + end + send(meth, *new_argv) + end + %w[ checkout delete diff status log add update commit ].each do |m| add_basic_method(m) end

1 0

[LrdeTools][Vcs] 242: Clean up the logger, and add colors.
by Nicolas Pouillard 28 Sep '05

28 Sep '05

https://svn.lrde.epita.fr/svn/lrdetools/trunk Index: ChangeLog from Nicolas Pouillard <ertai(a)lrde.epita.fr> Clean up the logger, and add colors. * vcs/lib/vcs/app.rb: Remove this ugly LOG constant and now use Vcs.logger. * vcs/lib/vcs/vcs.rb: Add a subclass of Logger in Vcs, and make it support the color. * vcs/lib/vcs/mail.rb, * vcs/lib/vcs/message.rb, * vcs/lib/vcs/changelog.rb, * vcs/lib/vcs/opt_parse.rb, * vcs/lib/vcs/common_commit.rb, * vcs/lib/vcs/script.rb, * vcs/lib/vcs/environment.rb, * vcs/lib/vcs/news.rb: Replace LOG by logger. * vcs/NEWS: . NEWS | 2 + lib/vcs/app.rb | 25 ++++----------- lib/vcs/changelog.rb | 8 ++-- lib/vcs/common_commit.rb | 8 ++-- lib/vcs/environment.rb | 4 +- lib/vcs/mail.rb | 6 +-- lib/vcs/message.rb | 2 - lib/vcs/news.rb | 12 +++---- lib/vcs/opt_parse.rb | 2 - lib/vcs/script.rb | 4 +- lib/vcs/vcs.rb | 77 +++++++++++++++++++++++++++++++++++++++-------- 11 files changed, 96 insertions(+), 54 deletions(-) Index: vcs/lib/vcs/script.rb --- vcs/lib/vcs/script.rb (revision 241) +++ vcs/lib/vcs/script.rb (working copy) @@ -11,8 +11,8 @@ begin eval(code) rescue Exception => ex - LOG.error { 'Vcs#script: during the client execution' } - LOG.error { ex.long_pp } + logger.error { 'Vcs#script: during the client execution' } + logger.error { ex.long_pp } end end Index: vcs/lib/vcs/app.rb --- vcs/lib/vcs/app.rb (revision 241) +++ vcs/lib/vcs/app.rb (working copy) @@ -4,19 +4,6 @@ # Revision:: $Id$ require 'pathname' -require 'logger' - -LOG = Logger.new(STDERR) -if severity = ENV['VCS_SEVERITY'] - LOG.level = Logger.const_get(severity.upcase) -else - LOG.level = Logger::INFO -end -def LOG.format_message(severity, timestamp, msg, progname) - progname += ': ' unless progname.nil? or progname.empty? - "vcs: #{progname}#{severity.downcase}: #{msg}\n" -end - # vcs: The version control system wrapper. # @@ -35,14 +22,15 @@ cattr_accessor :dir cattr_accessor :extension_dirs cattr_accessor :path + cattr_accessor :logger + self.logger = Vcs.logger class << self def requirements Pathname.glob("{#{vcs_dir},#{extension_dirs.join(',')}}/*.rb") do |file| next if file.to_s =~ /\/(app|opt_parse|vcs)\.rb$/ - LOG.debug { file.basename.to_s } - require file.to_s + logger.debug { file.basename.to_s } if require file.to_s end grab_all_vcs() end @@ -105,8 +93,9 @@ def run vcs = nil begin - vcs_extensions_setup() user_configuration_setup() + Vcs.logger.color = Vcs.color? { STDERR.tty? } + vcs_extensions_setup() @@parser.parse! ARGV if Vcs.default.nil? if Vcs.default.nil? STDERR.puts @@parser @@ -131,10 +120,10 @@ raise ex rescue Exception => ex vcs.call_handlers unless vcs.nil? - LOG.debug { raise ex } + logger.debug { raise ex } err = ex.to_s.sub(/\.$/, '') err = ex.inspect if err.empty? - LOG.error err + logger.error err end end Index: vcs/lib/vcs/news.rb --- vcs/lib/vcs/news.rb (revision 241) +++ vcs/lib/vcs/news.rb (working copy) @@ -47,9 +47,9 @@ def check_line ( anIO, aRegex ) line = anIO.readline.chomp! - LOG.debug('news') { "Server: #{line}" } + logger.debug('news') { "Server: #{line}" } unless line =~ aRegex - LOG.error('news') { "Bad answer: #{line}" } + logger.error('news') { "Bad answer: #{line}" } @news_status = 'Error.' end end @@ -68,11 +68,11 @@ opt = YAML::chop_header(file) server, port = opt[:server].split(/:/) port ||= 119 - LOG.info('news') { "Nntp Server: #{server}:#{port}" } + logger.info('news') { "Nntp Server: #{server}:#{port}" } unless @h.agree("Post a news, with this subject: #{opt[:subject]}\n" + " to #{opt[:groups].join(', ')}\n from #{opt[:from]}\n" + 'Are you sure? (y/n)', true) - LOG.error('news') { 'Aborting' } + logger.error('news') { 'Aborting' } exit end require 'socket' @@ -99,7 +99,7 @@ def news_failed if defined? NEWS and NEWS.exist? - LOG.info "#{NEWS}: Contains the generated news" + + logger.info "#{NEWS}: Contains the generated news" + "(generated from #{@@message})" end end @@ -107,7 +107,7 @@ def news_conf_checker %w[ NNTPSERVER ].each do |var| if ENV[var].nil? or ENV[var].empty? - LOG.error "environment variable `#{var}' not set" + logger.error "environment variable `#{var}' not set" end end end Index: vcs/lib/vcs/mail.rb --- vcs/lib/vcs/mail.rb (revision 241) +++ vcs/lib/vcs/mail.rb (working copy) @@ -29,7 +29,7 @@ def mail_failed if defined? MAIL and MAIL.exist? - LOG.info "#{MAIL}: Contains the generated mail " + + logger.info "#{MAIL}: Contains the generated mail " + "(generated from #{Message})" end end @@ -37,10 +37,10 @@ def mail_conf_checker if Vcs.user_conf.sign unless `gpg --version` =~ /^gpg $GnuPG$/ - LOG.error 'mail: gunpg is required' + logger.error 'mail: gunpg is required' end unless File.exist?("#{ENV['HOME']}/.gnupg/secring.gpg") - LOG.error 'no private key: in your ~/.gnupg' + logger.error 'no private key: in your ~/.gnupg' end end end Index: vcs/lib/vcs/common_commit.rb --- vcs/lib/vcs/common_commit.rb (revision 241) +++ vcs/lib/vcs/common_commit.rb (working copy) @@ -51,14 +51,14 @@ block[iform['subject']] if block_given? - LOG.info 'Deleting junk files...' + logger.info 'Deleting junk files...' TMP_CL.delete if TMP_CL.exist? destdir = '+commited'.to_path/iform['revision'].to_s destdir.mkpath unless destdir.directory? [LogEntry, Form, IForm, Message, MAIL, NEWS].each do |path| next unless path.exist? dest = destdir/path - LOG.info "Moving `#{path}' to `#{dest}'..." + logger.info "Moving `#{path}' to `#{dest}'..." path.rename(dest) end @@ -66,8 +66,8 @@ protected :common_commit! def commit_failed ( ex=nil ) - LOG.error "Aborting #{ex}" - LOG.info 'You can rerun the same command to resume the commit' + logger.error "Aborting #{ex}" + logger.info 'You can rerun the same command to resume the commit' raise 'Commit failed' end Index: vcs/lib/vcs/changelog.rb --- vcs/lib/vcs/changelog.rb (revision 241) +++ vcs/lib/vcs/changelog.rb (working copy) @@ -78,15 +78,15 @@ error_handling :concat_changelog_failed unless TMP_CL.exist? - LOG.info "Backup your `#{CL}' to `#{TMP_CL}' ..." + logger.info "Backup your `#{CL}' to `#{TMP_CL}' ..." CL.rename(TMP_CL) end CL.open('w') do |file| - LOG.info "#{CL}: Writing your new entry ..." + logger.info "#{CL}: Writing your new entry ..." with(file).mk_changelog_entry!(*args) file.puts - LOG.info "#{CL}: Writing the others ..." + logger.info "#{CL}: Writing the others ..." file.print TMP_CL.read end end @@ -94,7 +94,7 @@ def concat_changelog_failed if TMP_CL.exist? - LOG.info "Restoring `#{CL}' from `#{TMP_CL}' ..." + logger.info "Restoring `#{CL}' from `#{TMP_CL}' ..." TMP_CL.rename(CL) end end Index: vcs/NEWS --- vcs/NEWS (revision 241) +++ vcs/NEWS (working copy) @@ -35,6 +35,8 @@ - Status: the status output is now colored depending of the meaning of the status. The color activation can be choose in your configuration file (auto, never, always). + - Logger: messages displayed by the Vcs logger are new colored. + cyan (info), yellow (warnings), red (errors), blinking red (fatal). * ,messages is now +commited: You can rename your ,messages and keep just one directory for commited meta information. Index: vcs/lib/vcs/environment.rb --- vcs/lib/vcs/environment.rb (revision 241) +++ vcs/lib/vcs/environment.rb (working copy) @@ -36,12 +36,12 @@ if var = ENV[name] var elsif block.nil? - LOG.error "Need #{name} in the environement" + logger.error "Need #{name} in the environement" @@env_status = false "!!! #{name} not set !!!" else default = block[] - LOG.warn "Need #{name} in the environement (default: #{default})" + logger.warn "Need #{name} in the environement (default: #{default})" ENV[name] = default default end Index: vcs/lib/vcs/vcs.rb --- vcs/lib/vcs/vcs.rb (revision 241) +++ vcs/lib/vcs/vcs.rb (working copy) @@ -44,6 +44,53 @@ cattr_accessor :default cattr_accessor :user_conf cattr_accessor :output_io_methods + cattr_accessor :logger + + + class Logger < ::Logger + + attr_accessor :color + + def initialize ( *a, &b ) + super + @high_line = HighLine.new + @color = false + end + + def format_message(severity, timestamp, msg, progname) + progname += ': ' unless progname.nil? or progname.empty? + "#{stylize('[')}#{stylize('vcs')}#{stylize(']')} " + + "#{progname}#{stylize(severity)}#{stylize(':')} #{msg}\n" + end + + @@style = + { + :vcs => [:cyan], + :debug => [:magenta], + :info => [:green], + :warn => [:yellow], + :error => [:red], + :fatal => [:red, :blink], + :'[' => [:blue], + :']' => [:blue], + :':' => [:red], + } + + def stylize ( aString ) + aString = aString.downcase + if @color + @high_line.color(aString, *@@style[aString.to_sym]) + else + aString + end + end + + end # class Logger + + self.logger = Logger.new(STDERR) + ENV['VCS_SEVERITY'] ||= 'info' + logger.level = Logger.const_get(ENV['VCS_SEVERITY'].upcase) + logger.color = STDERR.tty? class Failure < Exception end @@ -83,14 +130,14 @@ @runner.subscribe_hook(:failure) do |data| if data.output == STDOUT - LOG.debug { raise data.to_yaml } + logger.debug { raise data.to_yaml } exit((data.status)? data.status.exitstatus : 1) else raise data.to_yaml end end @runner.subscribe_hook(:display_command) do |cmd| - LOG.debug { "running: #{cmd.to_sh}" } + logger.debug { "running: #{cmd.to_sh}" } end @runner.subscribe_hook(:before_exec) do STDOUT.flush @@ -202,7 +249,7 @@ if name =~ /^(.*)_$/ run!($1, *args) else - LOG.warn { "unknown method #{orig}" } + logger.warn { "unknown method #{orig}" } run!(name, *args) end end @@ -237,7 +284,7 @@ loc = block.source_location # FIXME verify that this type of cache is working return @@cache[loc].dup if @@cache.has_key? loc if path.exist? - LOG.info "#{path} already exists" + logger.info "#{path} already exists" return path.read end unless path.nil? @@ -245,14 +292,14 @@ raise ArgumentError, "need a description for #{path}" end error_handling do - LOG.info "#{path}: Contains your #{description}" if path.exist? + logger.info "#{path}: Contains your #{description}" if path.exist? end end begin - LOG.info "Creating a new `#{path}' file ..." + logger.info "Creating a new `#{path}' file ..." path.open('w') { |f| result = with(f, &block) } rescue Exception => ex - LOG.error "Removing `#{path}' ..." + logger.error "Removing `#{path}' ..." path.unlink raise ex end @@ -294,12 +341,7 @@ end def color? - case Vcs.user_conf.color - when :never then return false - when :auto then return output.tty? - when :always then return true - else raise ArgumentError, "Bad value for Vcs.color: #{Vcs.color}" - end + Vcs.color? { output.tty? } end def color ( aString, *someStyles ) @@ -392,6 +434,15 @@ return :unrecognize end + def color? ( &auto_block ) + case color = Vcs.user_conf.color + when :never then return false + when :auto then return (auto_block.nil?)? false : auto_block[] + when :always then return true + else raise ArgumentError, "Bad value for `color' (#{color})" + end + end + def merge_user_conf ( conf ) conf = YAML.load(conf.read) if conf.is_a? Pathname conf.each do |k, v| Index: vcs/lib/vcs/opt_parse.rb --- vcs/lib/vcs/opt_parse.rb (revision 241) +++ vcs/lib/vcs/opt_parse.rb (working copy) @@ -61,7 +61,7 @@ end o.on('-d', '--debug LEVEL', 'Set debug level') do |severity| - LOG.level = Logger.const_get(severity.upcase) + logger.level = Logger.const_get(severity.upcase) end o.on_tail('-h', '--help', 'Show this message') do |test| Index: vcs/lib/vcs/message.rb --- vcs/lib/vcs/message.rb (revision 241) +++ vcs/lib/vcs/message.rb (working copy) @@ -6,7 +6,7 @@ class Vcs def print_body ( file, options ) - LOG.info "Creating a new `#{file}' file" + logger.info "Creating a new `#{file}' file" file.open('w') do |f| #FIXME add --- f.puts options.to_yaml

1 0

[LrdeTools] 241: Generalize the color usage.
by Nicolas Pouillard 28 Sep '05

28 Sep '05

https://svn.lrde.epita.fr/svn/lrdetools/trunk Index: ChangeLog from Nicolas Pouillard <ertai(a)lrde.epita.fr> Generalize the color usage. * vcs/lib/vcs/vcs.rb: Add Vcs#color? and Vcs#color, remove Vcs.color. * vcs/lib/vcs/status.rb: Simplify using the generalized version. status.rb | 10 ++++------ vcs.rb | 21 +++++++++++++++++---- 2 files changed, 21 insertions(+), 10 deletions(-) Index: vcs/lib/vcs/vcs.rb --- vcs/lib/vcs/vcs.rb (revision 240) +++ vcs/lib/vcs/vcs.rb (working copy) @@ -293,6 +293,23 @@ end end + def color? + case Vcs.user_conf.color + when :never then return false + when :auto then return output.tty? + when :always then return true + else raise ArgumentError, "Bad value for Vcs.color: #{Vcs.color}" + end + end + + def color ( aString, *someStyles ) + if color? + @h.color(aString, *someStyles) + else + aString + end + end + CL = Pathname.new('ChangeLog') unless defined? CL TMP_CL = Pathname.new(',,ChangeLog') unless defined? TMP_CL @@ -383,10 +400,6 @@ end end - def color - user_conf.color - end - # Here we can handle version conflicts with vcs extensions def protocol_version ( aVersion ) if aVersion != '0.1' Index: vcs/lib/vcs/status.rb --- vcs/lib/vcs/status.rb (revision 240) +++ vcs/lib/vcs/status.rb (working copy) @@ -40,16 +40,14 @@ end def status! ( *args ) - case Vcs.color - when :never - when :auto then return color_status!(*args) if output.tty? - when :always then return color_status!(*args) - else raise ArgumentError, "Bad value for Vcs.color: #{Vcs.color}" - end + if color? + color_status!(*args) + else from_status(*args) do |line, file_st, prop_st, cpy, file| puts line end end + end @@style ||= {

1 0

[LrdeTools] 240: Fix a bug with user configuration.
by Nicolas Pouillard 27 Sep '05

27 Sep '05

https://svn.lrde.epita.fr/svn/lrdetools/trunk Index: ChangeLog from Nicolas Pouillard <ertai(a)lrde.epita.fr> Fix a bug with user configuration. * vcs/lib/vcs/vcs.rb: No more convert non-string values. vcs.rb | 3 ++- 1 files changed, 2 insertions(+), 1 deletion(-) Index: vcs/lib/vcs/vcs.rb --- vcs/lib/vcs/vcs.rb (revision 239) +++ vcs/lib/vcs/vcs.rb (working copy) @@ -378,7 +378,8 @@ def merge_user_conf ( conf ) conf = YAML.load(conf.read) if conf.is_a? Pathname conf.each do |k, v| - user_conf.send("#{k}=", (v.is_a? Array)? ((user_conf.send(k) || []) + v) : v.to_s.to_sym) + v = v.to_sym if v.is_a? String + user_conf.send("#{k}=", (v.is_a? Array)? ((user_conf.send(k) || []) + v) : v) end end

1 0

[LrdeTools] 239: GPG signature in now optional.
by Nicolas Pouillard 27 Sep '05

27 Sep '05

https://svn.lrde.epita.fr/svn/lrdetools/trunk Index: ChangeLog from Nicolas Pouillard <ertai(a)lrde.epita.fr> GPG signature in now optional. * vcs/lib/vcs/mail.rb: Handle the 'sign' option of the user configuration. * vcs/lib/vcs/vcs.rb: Set a the default value to true. * vcs/NEWS: Explain this feature. NEWS | 5 +++++ lib/vcs/mail.rb | 8 ++++++-- lib/vcs/vcs.rb | 3 ++- 3 files changed, 13 insertions(+), 3 deletions(-) Index: vcs/lib/vcs/mail.rb --- vcs/lib/vcs/mail.rb (revision 238) +++ vcs/lib/vcs/mail.rb (working copy) @@ -10,7 +10,7 @@ MAIL = Sendmail::MAIL_FILE MAILER = Sendmail.new - DEFAULT_OPTIONS = %w[ --confirm --sign --mime ] + DEFAULT_OPTIONS = %w[ --confirm --mime ] # # Mail. @@ -18,7 +18,9 @@ def mail! ( *args ) error_handling :mail_failed unless MAIL.exist? - print_body(MAIL, MAILER.parse_mail_options(*(DEFAULT_OPTIONS + args))) + options = DEFAULT_OPTIONS + args + options << '--sign' if Vcs.user_conf.sign + print_body(MAIL, MAILER.parse_mail_options(*options)) end MAILER.sendmail MAIL.delete @@ -33,6 +35,7 @@ end def mail_conf_checker + if Vcs.user_conf.sign unless `gpg --version` =~ /^gpg $GnuPG$/ LOG.error 'mail: gunpg is required' end @@ -40,6 +43,7 @@ LOG.error 'no private key: in your ~/.gnupg' end end + end add_conf_checker :mail_conf_checker Index: vcs/NEWS --- vcs/NEWS (revision 238) +++ vcs/NEWS (working copy) @@ -39,6 +39,11 @@ * ,messages is now +commited: You can rename your ,messages and keep just one directory for commited meta information. + * GnuPG signature is now optional: + In a .vcs configuration file you can disable the signature option. + For this just add this "sign: false" to .vcs configuration file. + However it's better to keep this option set. + New in 0.3 2005-09-16: * The help command now show all commands including vcs ones. Index: vcs/lib/vcs/vcs.rb --- vcs/lib/vcs/vcs.rb (revision 238) +++ vcs/lib/vcs/vcs.rb (working copy) @@ -35,7 +35,8 @@ :unmask => [/^\\/], :junk => [/^,/], :precious => [/^(\+|\.vcs)/], - :color => :auto + :color => :auto, + :sign => true ) @@output_io_methods ||= %w[ print puts putc ] # FIXME and so ...

1 0

[LrdeTools][Vcs] 238: Rename ,messages to +commited.
by Nicolas Pouillard 27 Sep '05

27 Sep '05

https://svn.lrde.epita.fr/svn/lrdetools/trunk Index: ChangeLog from Nicolas Pouillard <ertai(a)lrde.epita.fr> Rename ,messages to +commited. * vcs/lib/vcs/common_commit.rb: Update. * vcs/NEWS: Add an entry for this change. * vcs/lib/vcs/vcs.rb: Match the complete path *or* the basename. NEWS | 3 +++ lib/vcs/common_commit.rb | 2 +- lib/vcs/vcs.rb | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) Index: vcs/lib/vcs/common_commit.rb --- vcs/lib/vcs/common_commit.rb (revision 237) +++ vcs/lib/vcs/common_commit.rb (working copy) @@ -53,7 +53,7 @@ LOG.info 'Deleting junk files...' TMP_CL.delete if TMP_CL.exist? - destdir = ',messages'.to_path/iform['revision'].to_s + destdir = '+commited'.to_path/iform['revision'].to_s destdir.mkpath unless destdir.directory? [LogEntry, Form, IForm, Message, MAIL, NEWS].each do |path| next unless path.exist? Index: vcs/NEWS --- vcs/NEWS (revision 237) +++ vcs/NEWS (working copy) @@ -36,6 +36,9 @@ the status. The color activation can be choose in your configuration file (auto, never, always). + * ,messages is now +commited: You can rename your ,messages and keep just + one directory for commited meta information. + New in 0.3 2005-09-16: * The help command now show all commands including vcs ones. Index: vcs/lib/vcs/vcs.rb --- vcs/lib/vcs/vcs.rb (revision 237) +++ vcs/lib/vcs/vcs.rb (working copy) @@ -362,7 +362,7 @@ return false end regexps.each do |re| - return true if re.match(file) + return true if re.match(file) or re.match(file.basename) end return false end

1 0

[LrdeTools] 237: Files categories: closer to GNU Arch.
by Nicolas Pouillard 27 Sep '05

27 Sep '05

https://svn.lrde.epita.fr/svn/lrdetools/trunk Index: ChangeLog from Nicolas Pouillard <ertai(a)lrde.epita.fr> Files categories: closer to GNU Arch. * vcs/lib/vcs/app.rb: Add grab_dirs, factor user_configuration_setup and vcs_extensions_setup. * vcs/lib/vcs/vcs.rb: Add Vcs.classify, Vcs.merge_user_conf, and a default configuration. * vcs/lib/vcs/status.rb: Handle precious files, and factor with Vcs.classify. * vcs/lib/vcs/form.rb: Typo. * vcs/lib/vcs/diff.rb, vcs/lib/vcs/changelog.rb: Adapt to the new version of from_status. * vcs/NEWS: Adapt. NEWS | 27 ++++++++++++++++----------- lib/vcs/app.rb | 25 ++++++++++++++++--------- lib/vcs/changelog.rb | 4 ++-- lib/vcs/diff.rb | 2 +- lib/vcs/form.rb | 2 +- lib/vcs/status.rb | 26 +++++++++++++++----------- lib/vcs/vcs.rb | 35 +++++++++++++++++++++++++---------- 7 files changed, 76 insertions(+), 45 deletions(-) Index: vcs/lib/vcs/form.rb --- vcs/lib/vcs/form.rb (revision 236) +++ vcs/lib/vcs/form.rb (working copy) @@ -50,7 +50,7 @@ |title: |subject: #{@@subject_format}. | - |--- | ###################### Your ChangeLog entrie ############## 80c| # | --- + |--- | ###################### Your ChangeLog entry ############### 80c| # | --- |<%= title %>. | |".head_cut! Index: vcs/lib/vcs/app.rb --- vcs/lib/vcs/app.rb (revision 236) +++ vcs/lib/vcs/app.rb (working copy) @@ -75,23 +75,30 @@ Vcs.default ||= vcs_type end - def vcs_extensions_setup - dir = Pathname.pwd - while not dir.root? and not (vcs_dir = dir + 'vcs').exist? - dir = dir + '..' + def grab_dirs ( basename, dir=Pathname.pwd ) + results = [] + while not dir.root? + path = dir + basename + results << path if path.exist? + dir = dir.parent + end + path = ENV['HOME'].to_path/basename + results << path if path.exist? and not results.include? path + results end + + def vcs_extensions_setup + grab_dirs('vcs').each do |vcs_dir| vcs_dir = vcs_dir.expand_path vcs_dir.load_path! extension_dirs << vcs_dir + end VcsApp.requirements() end def user_configuration_setup - home = ENV['HOME'].to_path - vcs_user_conf = home/'.vcsrc' - if vcs_user_conf.exist? - Vcs.user_conf = OpenStruct.new(YAML.load(vcs_user_conf.read)) - Vcs.color = Vcs.user_conf.color.to_sym unless Vcs.user_conf.color.nil? + grab_dirs('.vcs').each do |vcs_user_conf| + Vcs.merge_user_conf(vcs_user_conf) end end Index: vcs/lib/vcs/changelog.rb --- vcs/lib/vcs/changelog.rb (revision 236) +++ vcs/lib/vcs/changelog.rb (working copy) @@ -23,9 +23,9 @@ return @@entries[args] if @@entries.has_key? args @@entries[args] = result = [] from_status(*args) do |line, file_st, prop_st, copy_st, file| - next if file_st =~ /[?X\\,]/ + next if file_st.chr =~ /[?X\\,+]/ next if file.to_s == 'ChangeLog' - ls = [@@file_st[file_st[0]], @@prop_st[prop_st[0]]].compact! + ls = [@@file_st[file_st], @@prop_st[prop_st]].compact! ls.first.capitalize! unless ls.empty? result << [file, ls.join(', ')] end Index: vcs/lib/vcs/diff.rb --- vcs/lib/vcs/diff.rb (revision 236) +++ vcs/lib/vcs/diff.rb (working copy) @@ -25,7 +25,7 @@ def diffw! ( *args ) files = Set.new from_status(*args) do |line, file_st, prop_st, cpy, file| - next if file_st =~ /[?X\\,D]/ + next if file_st.chr =~ /[?X\\,+D]/ next if file.to_s == 'ChangeLog' next if file.directory? files << file Index: vcs/NEWS --- vcs/NEWS (revision 236) +++ vcs/NEWS (working copy) @@ -12,19 +12,24 @@ with `commit_' or `ci_'. * Status & User Configuration File: - >>>> ~/.vcsrc <<<< + All .vcs files between your current path and root will be honored. + Example of configuration file. + >>>> ~/.vcs <<<< --- - global_ignore: - - !re ,messages - - !re .*\.(diff|patch)$ - global_unmask: - - !re \bdoc - >>>> ~/.vcsrc <<<< + exclude: # Excluded Files: + - !re ,messages # not displayed (default ^-.*$) + + unmask: # Unmasked Files: + - !re \bdoc # displayed with a `\' (default ^\\.*$) - - During a status files which match global_ignore regexps will not be - printed. - - Files which match global_unmask are prepend by 'U' - - Files which begins by `,' (vcs internal use) are prepend by ',' + precious: # Precious Files: + - !re .*\.(diff|patch)$ # displayed with a `+' (default ^\+.*$) + # .vcs files are also treat as precious + + junk: # Junk Files: + - !re ... # displayed with a `,' (default ^,.*$) + + >>>> ~/.vcsrc <<<< * Color: - Status: the status output is now colored depending of the meaning of Index: vcs/lib/vcs/vcs.rb --- vcs/lib/vcs/vcs.rb (revision 236) +++ vcs/lib/vcs/vcs.rb (working copy) @@ -30,14 +30,18 @@ # class Vcs @@version ||= '0.3.0' - @@user_conf ||= OpenStruct.new - @@color ||= :auto + @@user_conf ||= OpenStruct.new( + :exclude => [/^-/], + :unmask => [/^\\/], + :junk => [/^,/], + :precious => [/^(\+|\.vcs)/], + :color => :auto + ) @@output_io_methods ||= %w[ print puts putc ] # FIXME and so ... cattr_accessor :version cattr_accessor :default cattr_accessor :user_conf - cattr_accessor :color cattr_accessor :output_io_methods class Failure < Exception @@ -353,21 +357,32 @@ @@checkers << (block.nil?)? meth : block end - def match ( regexps, file ) + def user_conf_match ( sym, file ) + if user_conf.nil? or (regexps = user_conf.send(sym)).nil? + return false + end regexps.each do |re| return true if re.match(file) end return false end - def user_conf_global_ignore ( file ) - return false if user_conf.nil? or user_conf.global_ignore.nil? - match(user_conf.global_ignore, file) + def classify ( file ) + [:precious, :unmask, :exclude, :junk].each do |category| + return category if Vcs.user_conf_match(category, file) + end + return :unrecognize + end + + def merge_user_conf ( conf ) + conf = YAML.load(conf.read) if conf.is_a? Pathname + conf.each do |k, v| + user_conf.send("#{k}=", (v.is_a? Array)? ((user_conf.send(k) || []) + v) : v.to_s.to_sym) + end end - def user_conf_global_unmask ( file ) - return false if user_conf.nil? or user_conf.global_unmask.nil? - match(user_conf.global_unmask, file) + def color + user_conf.color end # Here we can handle version conflicts with vcs extensions Index: vcs/lib/vcs/status.rb --- vcs/lib/vcs/status.rb (revision 236) +++ vcs/lib/vcs/status.rb (working copy) @@ -7,23 +7,26 @@ class Svn + @@category_symbol = + { + :precious => ?+, + :unmask => ?\\, + :junk => ?, + } + def from_status ( *args, &block ) status_(*args).each_line do |line| next unless line =~ /^.{5} / m = /^(.)(.)(.)(.)(.\s*)(.*)$/.match(line) line, file_st, bl1, prop_st, cpy, bl2, file = m.to_a file = file.to_path - if file_st == '?' - if Vcs.user_conf_global_ignore(file) - # nothing ... - next - elsif Vcs.user_conf_global_unmask(file) - file_st = '\\' - elsif file.basename.to_s =~ /^,/ - file_st = ',' - end + file_st, prop_st, cpy = file_st[0], prop_st[0], cpy[0] + if file_st == ?? + category = Vcs.classify(file) + next if category == :exclude + file_st = @@category_symbol[category] || file_st end - line = "#{file_st}#{bl1}#{prop_st}#{cpy}#{bl2}#{file}" + line = "#{file_st.chr}#{bl1}#{prop_st.chr}#{cpy.chr}#{bl2}#{file}" block[line, file_st, prop_st, cpy, file] end end @@ -31,7 +34,7 @@ def color_status! ( *args ) from_status(*args) do |line, file_st, prop_st, cpy, file| - line[0] = @h.color(file_st, *@@style[file_st[0]]) + line[0] = @h.color(file_st.chr, *@@style[file_st]) puts line end end @@ -54,6 +57,7 @@ ?M => [:GREEN], ?\\ => [:YELLOW], ?, => [:YELLOW], + ?+ => [:YELLOW], ?G => [:BLUE], ?D => [:MAGENTA], ?R => [:MAGENTA],

1 0

Re: [LrdeTools][Vcs] 232: Add protocol version and default commit supprt.
by Akim Demaille 26 Sep '05

26 Sep '05

>>> "Nicolas" == Nicolas Pouillard <ertai(a)lrde.epita.fr> writes: > Index: vcs/NEWS > --- vcs/NEWS (revision 231) > +++ vcs/NEWS (working copy) > @@ -1,5 +1,15 @@ > New in 0.4 ...: > + * Vcs extensions files: > + - Protocol version: > + You can now add `protocol_version "0.1"' in your extensions. Thus > + you will be alert when the format will changes. s/alert/warned/ s/will// > + - Default commit: > + By adding `default_commit :your_commit_method' you override the > + default commit method with yours. So you can call `commit' and `ci', > + but also your old aliases. Of course you can call the real commit > + with `commit_' or `ci_'. I'm not sure that's the real feature one wants. What is desirable is to built on top of the current method. This is very similar to using the "super" method (or "Precursor" in Eiffel parlance). This should be possible for all the commands.

2 5

[LrdeTools] 236: Adapt the remaining files.
by Nicolas Pouillard 26 Sep '05

26 Sep '05

https://svn.lrde.epita.fr/svn/lrdetools/trunk Index: ChangeLog from Nicolas Pouillard <ertai(a)lrde.epita.fr> Adapt the remaining files. * vcs/lib/vcs/app.rb: Log to STDERR, improve the exception handling. * vcs/lib/vcs/mail.rb, vcs/lib/vcs/status.rb, vcs/lib/vcs/revision.rb, * vcs/lib/vcs/url.rb, vcs/lib/vcs/diffstat.rb, vcs/lib/vcs/svn.rb, * vcs/lib/vcs/diff.rb, vcs/lib/vcs/last_changed_date.rb: Update headers, and displayed message. * vcs/lib/vcs/common_commit.rb: Fix a bug with the commit log. * vcs/NEWS: Return to ceasar what belongs to him. NEWS | 3 ++- lib/vcs/app.rb | 6 ++++-- lib/vcs/common_commit.rb | 2 +- lib/vcs/diff.rb | 4 ++-- lib/vcs/diffstat.rb | 2 +- lib/vcs/last_changed_date.rb | 8 +++----- lib/vcs/mail.rb | 4 ++-- lib/vcs/revision.rb | 2 +- lib/vcs/status.rb | 2 ++ lib/vcs/svn.rb | 13 ++----------- lib/vcs/url.rb | 10 +++------- 11 files changed, 23 insertions(+), 33 deletions(-) Index: vcs/lib/vcs/diffstat.rb --- vcs/lib/vcs/diffstat.rb (revision 235) +++ vcs/lib/vcs/diffstat.rb (working copy) @@ -18,7 +18,7 @@ def check_diffstat unless `diffstat -V` =~ /diffstat version/ - raise ArgumentError, 'The `diffstat\' tool is needed by Vcs#diffstat' + raise ArgumentError, 'diffstat: diffstat is required' end end Index: vcs/lib/vcs/url.rb --- vcs/lib/vcs/url.rb (revision 235) +++ vcs/lib/vcs/url.rb (working copy) @@ -3,14 +3,10 @@ # License:: GNU General Public License (GPL). # Revision:: $Id$ -require 'vcs/svn' - -class Svn +class Vcs def url! ( *args ) - puts info.read[/^URL:\s+(.*)$/, 1] + puts info(*args).read[/^URL:\s+(.*)$/, 1] end - alias_command :date, :last_changed_date - -end # class Svn +end # class Vcs Index: vcs/lib/vcs/app.rb --- vcs/lib/vcs/app.rb (revision 235) +++ vcs/lib/vcs/app.rb (working copy) @@ -6,7 +6,7 @@ require 'pathname' require 'logger' -LOG = Logger.new(STDOUT) +LOG = Logger.new(STDERR) if severity = ENV['VCS_SEVERITY'] LOG.level = Logger.const_get(severity.upcase) else @@ -125,7 +125,9 @@ rescue Exception => ex vcs.call_handlers unless vcs.nil? LOG.debug { raise ex } - LOG.error ex.to_s.sub(/\.$/, '') + err = ex.to_s.sub(/\.$/, '') + err = ex.inspect if err.empty? + LOG.error err end end Index: vcs/lib/vcs/last_changed_date.rb --- vcs/lib/vcs/last_changed_date.rb (revision 235) +++ vcs/lib/vcs/last_changed_date.rb (working copy) @@ -3,14 +3,12 @@ # License:: GNU General Public License (GPL). # Revision:: $Id$ -require 'vcs/svn' - -class Svn +class Vcs def last_changed_date! ( *args ) - puts info.read[/^Last Changed Date:.*?$([^)]*)$.*$/, 1] + puts info(*args).read[/^Last Changed Date:.*?$([^)]*)$.*$/, 1] end alias_command :date, :last_changed_date -end # class Svn +end # class Vcs Index: vcs/lib/vcs/mail.rb --- vcs/lib/vcs/mail.rb (revision 235) +++ vcs/lib/vcs/mail.rb (working copy) @@ -28,13 +28,13 @@ def mail_failed if defined? MAIL and MAIL.exist? LOG.info "#{MAIL}: Contains the generated mail " + - "(generated from #{@@message})" + "(generated from #{Message})" end end def mail_conf_checker unless `gpg --version` =~ /^gpg $GnuPG$/ - LOG.error 'command not found: gpg' + LOG.error 'mail: gunpg is required' end unless File.exist?("#{ENV['HOME']}/.gnupg/secring.gpg") LOG.error 'no private key: in your ~/.gnupg' Index: vcs/lib/vcs/common_commit.rb --- vcs/lib/vcs/common_commit.rb (revision 235) +++ vcs/lib/vcs/common_commit.rb (working copy) @@ -37,7 +37,7 @@ args << 'ChangeLog' unless args.grep(/^[^-]/).empty? begin - commit_!('--message', mk_log_entry(*args), *(opts + args)) + commit_!('--message', mk_log_entry(*args).read, *(opts + args)) iform = YAML.load(IForm.read).merge('commited' => true) IForm.open('w') { |f| f.print iform.to_yaml } TMP_CL.delete if TMP_CL.exist? Index: vcs/lib/vcs/diff.rb --- vcs/lib/vcs/diff.rb (revision 235) +++ vcs/lib/vcs/diff.rb (working copy) @@ -11,7 +11,7 @@ def check_gnu_diff unless `diff --version` =~ /GNU/ - raise ArgumentError, 'Gnu diff is needed by Vcs#diffw' + raise ArgumentError, 'diffw: Gnu diff is required' end end add_conf_checker :check_gnu_diff @@ -19,7 +19,7 @@ end # class Vcs -class Svn +class Svn < Vcs # A diff only for your eyes def diffw! ( *args ) Index: vcs/NEWS --- vcs/NEWS (revision 235) +++ vcs/NEWS (working copy) @@ -3,7 +3,8 @@ * Vcs extensions files: - Protocol version: You can now add `protocol_version "0.1"' in your extensions. Thus - you will be alert when the format will changes. + you will be warned when the format changes. Thanks to Akim Demaille + for this idea. - Default commit: By adding `default_commit :your_commit_method' you override the default commit method with yours. So you can call `commit' and `ci', Index: vcs/lib/vcs/svn.rb --- vcs/lib/vcs/svn.rb (revision 235) +++ vcs/lib/vcs/svn.rb (working copy) @@ -1,16 +1,7 @@ # Author:: Nicolas Pouillard <ertai(a)lrde.epita.fr>. -# Copyright:: Copyright (c) 2004 LRDE. All rights reserved. +# Copyright:: Copyright (c) 2004, 2005 LRDE. All rights reserved. # License:: GNU General Public License (GPL). - -# $LastChangedBy: ertai $ -# $Id: header 98 2004-09-29 12:07:43Z ertai $ - -require 'vcs/vcs' - -CL = Pathname.new('ChangeLog') -ADD_CL = Pathname.new(',ChangeLog') -TMP_CL = Pathname.new(',,ChangeLog') -META = Pathname.new(',meta') +# Revision:: $Id: header 98 2004-09-29 12:07:43Z ertai $ class Svn < Vcs Index: vcs/lib/vcs/revision.rb --- vcs/lib/vcs/revision.rb (revision 235) +++ vcs/lib/vcs/revision.rb (working copy) @@ -10,7 +10,7 @@ class Svn def revision! ( *args ) - puts info.read[/^Revision:\s+(\d+)/, 1] + puts info(*args).read[/^Revision:\s+(\d+)/, 1] end alias_command :rev, :revision Index: vcs/lib/vcs/status.rb --- vcs/lib/vcs/status.rb (revision 235) +++ vcs/lib/vcs/status.rb (working copy) @@ -3,6 +3,8 @@ # License:: GNU General Public License (GPL). # Revision:: $Id$ +require 'vcs/svn' + class Svn def from_status ( *args, &block )

1 0