- Projects

Re: [Projects] Re: [LrdeTools] 260: Add svn ignore, an helper for the svn:ignore property.
by Akim Demaille 03 Oct '05

03 Oct '05

>>> "Akim" == Akim Demaille <akim(a)lrde.epita.fr> writes: >>> "Nicolas" == Nicolas Pouillard <nicolas.pouillard(a)gmail.com> writes: >> Je me doûte que tu as plein d'idées de fonctionalitées... Mais je >> pense qu'il faut y aller progressivement sans trop compliquer les >> choses et risquer de noyer tous le monde. > Le plus gros danger des jeunes projets c'est l'extension horizontale à > tout crin sans en faire aucune parfaitement. > Tu devrais lister les actions par ordre d'importance et faire un truc s/truc/tour/ > de complétion de chacune d'elles dans cet ordre. Ça te permettra de > faire des releases avec une certaine idée de qualité de service pour > chaque action.

1 0

[LrdeTools] 263: Fix a bug in vcs list.
by Nicolas Pouillard 03 Oct '05

03 Oct '05

https://svn.lrde.epita.fr/svn/lrdetools/trunk Index: ChangeLog from Nicolas Pouillard <ertai(a)lrde.epita.fr> Fix a bug in vcs list. * vcs/lib/vcs/list.rb: Fix a bug with non versioned directories. * vcs/NEWS: More entries, more acknowldgments. * vcs/lib/vcs/vcs.rb: Update the example. NEWS | 10 ++++++++++ lib/vcs/list.rb | 12 ++++++++---- lib/vcs/vcs.rb | 2 +- 3 files changed, 19 insertions(+), 5 deletions(-) Index: vcs/NEWS --- vcs/NEWS (revision 262) +++ vcs/NEWS (working copy) @@ -1,5 +1,7 @@ New in 0.4 ...: + * Vcs now supports ruby 1.8.3. + * Vcs extensions files: - Protocol version: You can now add `protocol_version "0.1"' in your extensions. Thus @@ -56,9 +58,16 @@ - Action supports (--do switch): - svn list --junk --do rm - svn list --precious --do wc + - svn list --unrecognize --do 'vcs-svn add' + - svn list --missing --do 'vcs-svn remove' - svn junk: This command use `list' to remove all junk files. + - vcs back: find the youngest revision that passes a given test. + This feature is Based on prcs-back (LrdeTools) from Akim Demaille. + + - svn ignore: an helper for the svn:ignore property. + * Sorted outputs: - Vcs now supports sorting: In a .vcs configuration file you can add a `sorting' key which @@ -97,6 +106,7 @@ - diffstat - message - mk_form + - mk_iform New in 0.3 2005-09-16: Index: vcs/lib/vcs/vcs.rb --- vcs/lib/vcs/vcs.rb (revision 262) +++ vcs/lib/vcs/vcs.rb (working copy) @@ -35,7 +35,7 @@ # example: # svn checkout http://foo.bar/proj # alias # vcs-svn checkout http://foo.bar/proj # wrapper -# vcs --vcs Svn checkout http://foo.bar/proj # manual +# vcs --vcs svn checkout http://foo.bar/proj # manual # # checkout # checkout_ Index: vcs/lib/vcs/list.rb --- vcs/lib/vcs/list.rb (revision 262) +++ vcs/lib/vcs/list.rb (working copy) @@ -35,15 +35,19 @@ files << '.' if files.empty? files.each do |file| file.to_path.find do |path| - if path.to_s =~ /(\/|^)\.svn$/ - is_versioned << path.dirname + Find.prune if path.to_s =~ /(\/|^)\.svn$/ + if (path.dirname + '.svn').exist? + if path.directory? + if (path + '.svn').exist? + next + else Find.prune end - next if path.directory? - if (path.dirname + '.svn').exist? + end inside_versioned << path.to_s else outside_versioned << path + Find.prune end end end

1 0

Re: [LrdeTools] 261: Vcs back: it finds the younger revision where a command success.
by Akim Demaille 03 Oct '05

03 Oct '05

>>> "Nicolas" == Nicolas Pouillard <ertai(a)lrde.epita.fr> writes: > https://svn.lrde.epita.fr/svn/lrdetools/trunk > Index: ChangeLog > from Nicolas Pouillard <ertai(a)lrde.epita.fr> > Vcs back: it finds the younger revision where a command success. back: find the youngest revision that passes a given test Je ne sais pas si `back' était la meilleure idée de nom. C'est une excellente nouvelle ! Et merci encore pour acknoledgements.

2 1

Re: [LrdeTools] 258: Vcs now support ruby 1.8.3.
by Akim Demaille 03 Oct '05

03 Oct '05

>>> "Nicolas" == Nicolas Pouillard <ertai(a)lrde.epita.fr> writes: > 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. Supports. Et en fait j'étais pas sûr que tu parles de Vcs, c'est une bonne idée de le dire dans le titre du ChangeLog... :P

2 1

Re: [Projects] [LrdeTools] 260: Add svn ignore, an helper for the svn:ignore property.
by Akim Demaille 03 Oct '05

03 Oct '05

>>> "Nicolas" == Nicolas Pouillard <nicolas.pouillard(a)gmail.com> writes: > This command make svn-ignore of lrdetools useless can I remove it? If it's equivalent to the appended version, sure!

1 0

[LrdeTools] 262: More categories, improve status and list.
by Nicolas Pouillard 03 Oct '05

03 Oct '05

https://svn.lrde.epita.fr/svn/lrdetools/trunk Index: ChangeLog from Nicolas Pouillard <ertai(a)lrde.epita.fr> More categories, improve status and list. * vcs/lib/vcs/vcs.rb: More categories better classify. * vcs/lib/vcs/status.rb: Simplify. * vcs/lib/vcs/list.rb: Perform a status on the list of versioned files in order to classify them. list.rb | 25 ++++++++++++++++++++----- status.rb | 4 +--- vcs.rb | 30 ++++++++++++++++++++++++++---- 3 files changed, 47 insertions(+), 12 deletions(-) Index: vcs/lib/vcs/vcs.rb --- vcs/lib/vcs/vcs.rb (revision 261) +++ vcs/lib/vcs/vcs.rb (working copy) @@ -55,7 +55,24 @@ ) @@output_io_methods ||= %w[ print puts putc ] # FIXME and so ... @@specific_options ||= [] - @@categories ||= [:precious, :unmask, :exclude, :junk, :unrecognize, :normal] + + @@user_defined_categories ||= [:precious, :unmask, :exclude, :junk] + @@symbol_category ||= + { + ?A => :add, + ?C => :conflict, + ?D => :delete, + ?G => :merge, + ?I => :ignore, + ?M => :modify, + ?R => :replace, + ?X => :external, + ?? => :unrecognize, + ?! => :missing, + ?~ => :obstruct, + } + @@categories ||= @@user_defined_categories + @@symbol_category.values + cattr_accessor :version cattr_accessor :default @@ -63,6 +80,8 @@ cattr_accessor :output_io_methods cattr_accessor :logger cattr_accessor :specific_options + cattr_accessor :user_defined_categories + cattr_accessor :symbol_category cattr_accessor :categories class_inheritable_accessor :option_controller @@ -358,7 +377,7 @@ def run! ( command, files=[], options={} ) flush cmd_options = option_controller.to_strings(options) - (@cmd + command + cmd_options + files).run(@runner) + (@cmd + command + cmd_options + '--' + files).run(@runner) end def sub_vcs ( out, err, &block ) @@ -590,8 +609,11 @@ return false end - def classify ( file ) - Vcs.categories.each do |category| + def classify ( file, status=nil ) + if status and category = Vcs.symbol_category[status] + return category unless category == :unrecognize + end + Vcs.user_defined_categories.each do |category| return category if Vcs.user_conf_match(category, file) end return :unrecognize Index: vcs/lib/vcs/status.rb --- vcs/lib/vcs/status.rb (revision 261) +++ vcs/lib/vcs/status.rb (working copy) @@ -16,11 +16,9 @@ line, file_st, bl1, prop_st, cpy, bl2, file = m.to_a @file = file.to_path @file_st, @prop_st, @cpy = file_st[0], prop_st[0], cpy[0] + @category = Vcs.classify(@file, @file_st) if @file_st == ?? - @category = Vcs.classify(@file) @file_st = @@category_symbol[@category] || @file_st - else - @category = :normal end @line = "#{(a)file_st.chr}#{bl1}#{prop_st}#{cpy}#{bl2}#{file}" end Index: vcs/lib/vcs/list.rb --- vcs/lib/vcs/list.rb (revision 261) +++ vcs/lib/vcs/list.rb (working copy) @@ -25,21 +25,36 @@ options.delete(cat) end end - path_list = PathList.new + inside_versioned = [] + outside_versioned = [] if categories.empty? list_(files, options).output.read.each do |line| - path_list << line.chomp.to_path + inside_versioned << line.chomp end else files << '.' if files.empty? files.each do |file| file.to_path.find do |path| - Find.prune if path.to_s =~ /(\/|^)\.svn$/ - next if path.to_s == '.' - path_list << path if categories.include? Vcs.classify(path) + if path.to_s =~ /(\/|^)\.svn$/ + is_versioned << path.dirname + Find.prune + end + next if path.directory? + if (path.dirname + '.svn').exist? + inside_versioned << path.to_s + else + outside_versioned << path + end end end end + path_list = PathList.new + status(inside_versioned) do |se| + path_list << se.file if categories.include? se.category + end + outside_versioned.each do |path| + path_list << path if categories.include? Vcs.classify(path) + end if action system "#{action} #{path_list}" elsif block

1 0

[LrdeTools] 261: Vcs back: it finds the younger revision where a command success.
by Nicolas Pouillard 03 Oct '05

03 Oct '05

https://svn.lrde.epita.fr/svn/lrdetools/trunk Index: ChangeLog from Nicolas Pouillard <ertai(a)lrde.epita.fr> Vcs back: it finds the younger revision where a command success. * vcs/lib/vcs/back.rb: New. Based on prcs_back (LrdeTools). * vcs/lib/vcs/app.rb: Exit 1 if the app catch an exception. * vcs/lib/vcs/script.rb: Let the SystemExit exception go through this method. app.rb | 1 + back.rb | 36 ++++++++++++++++++++++++++++++++++++ script.rb | 2 ++ 3 files changed, 39 insertions(+) Index: vcs/lib/vcs/app.rb --- vcs/lib/vcs/app.rb (revision 260) +++ vcs/lib/vcs/app.rb (working copy) @@ -121,6 +121,7 @@ logger.debug { err = ex.long_pp ; "Backtrace enabled:" } err = ex.inspect if err.empty? logger.error { err } + exit 1 end end Index: vcs/lib/vcs/script.rb --- vcs/lib/vcs/script.rb (revision 260) +++ vcs/lib/vcs/script.rb (working copy) @@ -14,6 +14,8 @@ def script! ( files=[], options={} ) begin eval(files.join(' ')) + rescue SystemExit => ex + raise ex rescue Exception => ex logger.error { 'Vcs#script: during the client execution' } logger.error { ex.long_pp } Index: vcs/lib/vcs/back.rb --- vcs/lib/vcs/back.rb (revision 0) +++ vcs/lib/vcs/back.rb (revision 0) @@ -0,0 +1,36 @@ +# Copyright:: Copyright (c) 2005 Nicolas Pouillard. All rights reserved. +# Author:: Nicolas Pouillard <ertai(a)lrde.epita.fr>. +# License:: Gnu General Public License. +# Revision:: $Id$ + +class Vcs + # This command take a command as argument and search the last revision where + # this command success. + # + # Example: + # * this dummy example success only if the revision is equal to 0 modulo X + # * replace X by the success revision and Y by a greater revision + # vcs-svn back -r Y vcs-svn script 'exit(rev.read.to_i % X)' + def back! ( files=[], options={} ) + sub_vcs = sub_vcs_with_name('checkout-4-vcs-back') + dir = TempPath.new('checkout-dir-4-vcs-back') + cmd = files.to_cmd + cmd.dir = dir + rev = options[:revision] || revision.read.chomp + raise ArgumentError, "Just integers are supported for revisions" if rev !~ /^\d+$/ + rev = rev.to_i + target_url = url.read.chomp + while not rev.zero? + sub_vcs.checkout([target_url, dir], :quiet => true, :revision => rev) + data = cmd.system + data.display if options[:verbose] + if data.status.success? + logger.info { "Your command success on revision #{rev}"} + break + else + logger.warn { "Your command fail on revision #{rev}" } + end + rev -= 1 + end + end +end # class Vcs \ No newline at end of file Property changes on: vcs/lib/vcs/back.rb ___________________________________________________________________ Name: svn:keywords + Id

1 0

[LrdeTools] 260: Add svn ignore, an helper for the svn:ignore property.
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> Add svn ignore, an helper for the svn:ignore property. * vcs/lib/vcs/ignore.rb: New. ignore.rb | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+) Index: vcs/lib/vcs/ignore.rb --- vcs/lib/vcs/ignore.rb (revision 0) +++ vcs/lib/vcs/ignore.rb (revision 0) @@ -0,0 +1,26 @@ +# Author:: Nicolas Pouillard <ertai(a)lrde.epita.fr>. +# Copyright:: Copyright (c) 2005 LRDE. All rights reserved. +# License:: Gnu General Public License. +# Revision:: $Id$ + + +class Svn + + # Add an ignore entry in the given path. Automatically determine the rep + # concerned with svn:ignore. + # Examples: + # $ svn ignore my_subdir/'*.tex' + # $ svn ignore ./foo.generated my_subdir/another/a_wrong_file + def ignore! ( files=[], options={} ) + files.each do |file| + dir, base = file.to_path.split + logger.info { "Add `#{base}' to svn:ignore of `#{dir}'"} + data = propget(['svn:ignore', dir], :strict => true) + data.output.open('a') { |f| f.puts base } + propset!(['svn:ignore', dir], + options.merge(:quiet => true, :file => data.output)) + data.clean + end + end + +end # class Svn Property changes on: vcs/lib/vcs/ignore.rb ___________________________________________________________________ Name: svn:keywords + Id

2 1

[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