Projects

Download

projects@lrde.epita.fr

October 2005

7 participants
42 discussions

[LrdeTools] 259: Some renaming.
by Nicolas Pouillard 02 Oct '05

02 Oct '05

https://svn.lrde.epita.fr/svn/lrdetools/trunk Index: ChangeLog from Nicolas Pouillard <ertai(a)lrde.epita.fr> Some renaming. * vcs/lib/vcs/form.rb: Rename instanciate_form to mk_iform. Handles better dots in title, subject and ChangeLog entry. * vcs/lib/vcs/common_commit.rb: Rename message to mk_message. * vcs/lib/vcs/mail.rb: More class variables. * vcs/lib/vcs/news.rb: Prevent for warnings on double loading. common_commit.rb | 2 +- form.rb | 10 +++++----- mail.rb | 21 ++++++++++----------- news.rb | 2 +- 4 files changed, 17 insertions(+), 18 deletions(-) Index: vcs/lib/vcs/mail.rb --- vcs/lib/vcs/mail.rb (revision 258) +++ vcs/lib/vcs/mail.rb (working copy) @@ -8,16 +8,16 @@ class Vcs - MAIL = Sendmail::MAIL_FILE - MAILER = Sendmail.new - DEFAULT_OPTIONS = { :confirm => true, :mime => true, + MAIL = Sendmail::MAIL_FILE unless defined? MAIL + @@mailer ||= Sendmail.new + @@default_options ||= { :confirm => true, :mime => true, :header => "X-Mailer: Vcs.mail (#{Vcs.version})" } # # Mail. # # FIXME handle options properly. - # Delegata the option parsing to Sendmail. + # Delegate the option parsing to Sendmail. def mail! ( files=[], options={} ) # Backward compatiblity @@ -25,19 +25,18 @@ error_handling :mail_failed unless MAIL.exist? - options = DEFAULT_OPTIONS.merge(options) + options = @@default_options.merge(options) options[:signed] = Vcs.user_conf.sign - print_body(MAIL, MAILER.parse_mail_options(options), files) + print_body(MAIL, @@mailer.parse_mail_options(options), files) end - MAILER.sendmail - MAIL.delete + @@mailer.sendmail puts 'Mail: Sent.' end def mail_failed - if defined? MAIL and MAIL.exist? - logger.info "#{MAIL}: Contains the generated mail " + - "(generated from #{Message})" + if defined? @@mail and @@mail.exist? + logger.info { "#{MAIL}: Contains the generated mail" } + logger.info { " AND information to send it (smtpserver, port...)" } end end Index: vcs/lib/vcs/news.rb --- vcs/lib/vcs/news.rb (revision 258) +++ vcs/lib/vcs/news.rb (working copy) @@ -9,7 +9,7 @@ class Vcs - NEWS = Pathname.new(',news') + NEWS = ',news'.to_path unless defined? NEWS def parse_news_options ( *args ) require 'optparse' Index: vcs/lib/vcs/form.rb --- vcs/lib/vcs/form.rb (revision 258) +++ vcs/lib/vcs/form.rb (working copy) @@ -11,13 +11,13 @@ if Form.read =~ /\A---/ raise Failure, "You must fill this file: `#{Form}' (and remove the first line)" else - instanciate_form(*args) + mk_iform(*args) return YAML.load(IForm.read)['commited'] end end - def instanciate_form! ( *args ) + def mk_iform! ( *args ) with_cache! IForm, 'instanciated form (title, subject, ChangeLog entry, diff)' do cl = mk_form(*args).read ls = [] @@ -30,7 +30,7 @@ if header['title'].nil? or header['title'].blank? raise Failure, "No title found. Reopen `#{Form}' and add it" end - header['title'].sub!(/\.$/, '') + header['title'] += '.' unless header['title'] =~ /[.?!]$/ b = getBinding(header.merge(:rev => rev)) input = ERB.new(input, nil, '<-%->', '$erbout_').result(b) LogEntry.open('w') { |f| f.print input } @@ -48,10 +48,10 @@ puts " |--- | ########## Fill this file correctly and remove this line ########## | --- |title: - |subject: #{@@subject_format}. + |subject: #{@@subject_format} | |--- | ###################### Your ChangeLog entry ############### 80c| # | --- - |<%= title %>. + |<%= title %> | |".head_cut! Index: vcs/lib/vcs/common_commit.rb --- vcs/lib/vcs/common_commit.rb (revision 258) +++ vcs/lib/vcs/common_commit.rb (working copy) @@ -50,7 +50,7 @@ Vcs.commited = edit_form!(files) - message(files) + mk_message(files) edit! Message iform = nil

1 0

[LrdeTools] 258: Vcs now support ruby 1.8.3.
by Nicolas Pouillard 02 Oct '05

02 Oct '05

https://svn.lrde.epita.fr/svn/lrdetools/trunk Index: ChangeLog from Nicolas Pouillard <ertai(a)lrde.epita.fr> Vcs now support ruby 1.8.3. * vcs/lib/vcs/vcs.rb: Adapt to Logger 1.2.6. Fix the help command. Make Vcs works with the vendor dir. * vcs/lib/vcs/message.rb: Make print_body works with YAML of ruby 1.8.3. message.rb | 10 +++++----- vcs.rb | 38 +++++++++++++++++++++++++++++++++----- 2 files changed, 38 insertions(+), 10 deletions(-) Index: vcs/lib/vcs/vcs.rb --- vcs/lib/vcs/vcs.rb (revision 257) +++ vcs/lib/vcs/vcs.rb (working copy) @@ -3,9 +3,23 @@ # License:: GNU General Public License (GPL). # Revision:: $Id: header 98 2004-09-29 12:07:43Z ertai $ +require 'pathname' +lib = Pathname.new(__FILE__).dirname.parent +vendor = lib.parent + 'vendor' +unless defined? RubyEx + $CORE_EX_VENDORS ||= [] + $CORE_EX_VENDORS << vendor + file = vendor + 'ruby_ex' + 'lib' + 'ruby_ex.rb' + if file.exist? + require file.to_s + else require 'rubygems' require_gem 'ruby_ex' require 'ruby_ex' + end +end +lib.load_path! +RubyEx.import! Commands.import! Yaml::ChopHeader.import! require 'logger' @@ -69,13 +83,23 @@ ].compact.map { |x| stylize x }.join end - def format_message(severity, timestamp, msg, progname) + def mk_message ( severity, progname, msg ) progname += ': ' unless progname.nil? or progname.empty? msg.inject([]) do |accu, line| accu << header(progname, severity) << line.chomp << "\n" end.join end + if ::Logger.const_defined? :VERSION and ::Logger::VERSION >= '1.2.6' + def format_message(severity, timestamp, progname, msg) + mk_message(severity, progname, msg) + end + else + def format_message(severity, timestamp, msg, progname) + mk_message(severity, progname, msg) + end + end + @@headers ||= {} @@style = @@ -376,10 +400,12 @@ run!(name, *args) end end + protected :run_missing! def run_argv ( argv ) options, files = option_controller.parse(argv) - if files.empty? or options[:help] + if files.empty? + options.delete(:help) meth = :help! else meth = files.shift.dup @@ -440,13 +466,15 @@ end path.read end + protected :with_cache def with_cache! ( *a, &b ) puts with_cache(*a, &b) end + protected :with_cache! - def help! ( *args ) - return help_!(*args) unless args.empty? + def help! ( files=[], options={} ) + return help_!(files, options) unless files.empty? and options.empty? puts "usage: #{(a)cmd.command} <subcommand> [options] [args] |Type '#{(a)cmd.command} help <subcommand>' for help on a specific subcommand. | @@ -456,7 +484,7 @@ | |Available subcommands:".head_cut! cmds = [] - methods.each do |meth| + public_methods.each do |meth| next if meth =~ /_!?$/ next unless meth =~ /^(.+)!$/ cmd = $1 Index: vcs/lib/vcs/message.rb --- vcs/lib/vcs/message.rb (revision 257) +++ vcs/lib/vcs/message.rb (working copy) @@ -8,17 +8,17 @@ def print_body ( file, options, files=[] ) logger.info "Creating a new `#{file}' file" file.open('w') do |f| - #FIXME add --- - f.puts options.to_yaml + f.puts '---' + f.puts options.to_yaml.gsub(/---\s*/, '') f.puts '---' f.puts - with(f).message!(files) + with(f).mk_message!(files) end end private :print_body - def message! ( files=[], options={} ) + def mk_message! ( files=[], options={} ) with_cache! Message, 'generated message (ChangeLog, diffstat, diff)' do url! if defined? COLLABOA @@ -42,7 +42,7 @@ end end end - alias_command :msg, :message + alias_command :msg, :mk_message Message = ',message'.to_path unless defined? Message

1 0