Projects

projects@lrde.epita.fr

1049 discussions

[LrdeTools] [Vcs] 231: No more use `U' but `\'.

by Nicolas Pouillard

https://svn.lrde.epita.fr/svn/lrdetools/trunk Index: ChangeLog from Nicolas Pouillard <ertai(a)lrde.epita.fr> No more use `U' but `\'. * vcs/lib/vcs/status.rb. vcs/lib/vcs/changelog.rb, vcs/lib/vcs/diff.rb: Replace `U' by `\'. changelog.rb | 2 +- diff.rb | 2 +- status.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) Index: vcs/lib/vcs/changelog.rb --- vcs/lib/vcs/changelog.rb (revision 230) +++ vcs/lib/vcs/changelog.rb (working copy) @@ -23,7 +23,7 @@ def mkchangelog_from_status ( *args ) result = [] from_status(*args) do |line, file_st, prop_st, copy_st, file| - next if file_st =~ /[?XU,]/ + next if file_st =~ /[?X\\,]/ next if file == 'ChangeLog' ls = [] ls << @@file_st[file_st] if @@file_st.has_key? file_st Index: vcs/lib/vcs/diff.rb --- vcs/lib/vcs/diff.rb (revision 230) +++ vcs/lib/vcs/diff.rb (working copy) @@ -8,7 +8,7 @@ def diffw_from_status! ( *args ) files = Set.new from_status(*args) do |line, file_st, prop_st, cpy, file| - next if file_st =~ /[?XU,]/ + next if file_st =~ /[?X\\,]/ next if file == 'ChangeLog' files << Pathname.new(file) end Index: vcs/lib/vcs/status.rb --- vcs/lib/vcs/status.rb (revision 230) +++ vcs/lib/vcs/status.rb (working copy) @@ -16,7 +16,7 @@ # nothing ... next elsif Vcs.user_conf_global_unmask(file) - file_st = 'U' + file_st = '\\' elsif file.basename.to_s =~ /^,/ file_st = ',' end

19 years, 3 months

[LrdeTools] 230: Status & User Configuration File.

by Nicolas Pouillard

https://svn.lrde.epita.fr/svn/lrdetools/trunk Index: ChangeLog from Nicolas Pouillard <ertai(a)lrde.epita.fr> Status & User Configuration File. * vcs/NEWS: Add this feature. * vcs/lib/vcs/status.rb: Override the default status to handle ignoring, and masking. * vcs/lib/vcs/changelog.rb, * vcs/lib/vcs/diff.rb: Do not treat files with 'U' and ',' status. * vcs/template/prj.rb: Adapt to common_commit v0.3. * vcs/template/HOWTO: Remove. Deprecated. * vcs/NEWS.FR: New. From an old news. NEWS | 19 ++++++++++ NEWS.FR | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++ lib/vcs/changelog.rb | 2 - lib/vcs/diff.rb | 2 - lib/vcs/status.rb | 25 ++++++++++++-- template/HOWTO | 49 --------------------------- template/prj.rb | 13 +++++-- 7 files changed, 142 insertions(+), 58 deletions(-) Index: vcs/lib/vcs/status.rb --- vcs/lib/vcs/status.rb (revision 229) +++ vcs/lib/vcs/status.rb (working copy) @@ -6,12 +6,31 @@ class Svn def from_status ( *args, &block ) - status(*args).each_line do |line| + status_(*args).each_line do |line| next unless line =~ /^.{5} / - m = /^(.)(.).(.).\s*(.*)$/.match(line) - block[*m.to_a] + 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 = 'U' + elsif file.basename.to_s =~ /^,/ + file_st = ',' + end + end + line = "#{file_st}#{bl1}#{prop_st}#{cpy}#{bl2}#{file}" + block[line, file_st, prop_st, cpy, file] end end protected :from_status + def status! ( *args ) + from_status(*args) do |line, file_st, prop_st, cpy, file| + puts line + end + end + end # class Svn Index: vcs/template/prj.rb --- vcs/template/prj.rb (revision 229) +++ vcs/template/prj.rb (working copy) @@ -1,4 +1,6 @@ class Vcs + # See http://rubyforge.org/projects/vcs + # and http://vcs.rubyforge.org <% # Just type `erb prj.rb > a_file' and answer questions. STDERR.puts 'project name: ' @@ -9,14 +11,17 @@ short = STDIN.readline.chomp STDERR.puts 'to (emails, newsgroups...): ' to = STDIN.readline.chomp.split(/\s*,\s*/) + def tag ( s ) + '<' + "%= #{s} %" + '>' + end %> - def <%= project %>_commit! ( s, *args ) + def <%= project %>_commit! ( *args ) - common_commit!(*args) do |rev| + common_commit!("<%= tag 'rev' %>: <%= project %>: <%= tag 'title' %>", *args) do |subject| <% if type == 'news' %> - news!(:groups => <%=to.inspect%>, :subject => "#{rev}: <%=short%>: #{s}") + news!(:groups => <%= to.inspect %>, :subject => subject) <% elsif type == 'mail' %> - mail!(:to => <%= to.inspect %>, :subject => "#{rev}: <%=short%>: #{s}") + mail!(:to => <%= to.inspect %>, :subject => subject) <% end %> end Index: vcs/lib/vcs/changelog.rb --- vcs/lib/vcs/changelog.rb (revision 229) +++ vcs/lib/vcs/changelog.rb (working copy) @@ -23,7 +23,7 @@ def mkchangelog_from_status ( *args ) result = [] from_status(*args) do |line, file_st, prop_st, copy_st, file| - next if file_st =~ /[?X]/ + next if file_st =~ /[?XU,]/ next if file == 'ChangeLog' ls = [] ls << @@file_st[file_st] if @@file_st.has_key? file_st Index: vcs/lib/vcs/diff.rb --- vcs/lib/vcs/diff.rb (revision 229) +++ vcs/lib/vcs/diff.rb (working copy) @@ -8,7 +8,7 @@ def diffw_from_status! ( *args ) files = Set.new from_status(*args) do |line, file_st, prop_st, cpy, file| - next if file_st =~ /[?X]/ + next if file_st =~ /[?XU,]/ next if file == 'ChangeLog' files << Pathname.new(file) end Index: vcs/template/HOWTO --- vcs/template/HOWTO (revision 229) +++ vcs/template/HOWTO (working copy) @@ -1,49 +0,0 @@ ---- - -<% -# Just type `erb HOWTO > a_file' and answer questions. -STDERR.puts 'project name: ' -project = STDIN.readline.chomp -STDERR.puts 'type (news|mail): ' -type = STDIN.readline.chomp -STDERR.puts 'shortcut (lt, hc, ttk...): ' -short = STDIN.readline.chomp -%> - -Mini Vcs HOWTO: - - - Install Vcs: - - - From a package: - - - Install rubygems: http://rubyforge.org/frs/?group_id=126 - - - Install Vcs (as root): gem install vcs - - - From the svn repository: - - - Find a place to install it: - cd ~/local - - - Checkout Vcs: - svn co https://svn.lrde.epita.fr/svn/lrdetools/trunk/vcs - - - Update your PATH: - export PATH=$PATH:~/local/vcs/bin - - - If your shell is zsh: rehash - - - Check Vcs: - vcs --help - - - Make aliases: - `vcs --mk-alias` # Don't forget backquotes ! - - - Check the transparent mode: - svn status! - - - Commit in <%=project%>: - svn <%=project.downcase%>_commit 'Your <%=type%> subject' - - or: - svn <%=short%>ci 'Your <%=type%> subject' - Index: vcs/NEWS --- vcs/NEWS (revision 229) +++ vcs/NEWS (working copy) @@ -1,3 +1,20 @@ +New in 0.4 ...: + + * Status & User Configuration File: + >>>> ~/.vcsrc <<<< + --- + global_ignore: + - !re ,messages + - !re .*\.(diff|patch)$ + global_unmask: + - !re \bdoc + >>>> ~/.vcsrc <<<< + + - 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 ',' + New in 0.3 2005-09-16: * The help command now show all commands including vcs ones. @@ -7,3 +24,5 @@ * Improve the command running handling, vcs calls are now full stream based. * Add two commands `url' and `script'. * Improve the error handling. + +New in 0.2 2005-06: See NEWS Index: vcs/NEWS.FR --- vcs/NEWS.FR (revision 0) +++ vcs/NEWS.FR (revision 0) @@ -0,0 +1,90 @@ +>= 0.3: See NEWS + +Vcs passe en version 0.2: + + - Beaucoup de bugs ont �t� corrig�s: + + - Quelques commandes de svn provoquaient un warning. + + - L'entr�e du ChangeLog se retrouvait parfois dans le diff. + + - Dans certains cas il fallait supprimer le ,message. + + - Et d'autres... + + + - La robustesse a �t� grandement am�lior�e. + + + - Nouvelles fonctionnalit�s: + + - On peut d�sormais envoyer des mails sign�s avec GPG: + - > + Cela fait m�me partie la s�quence par d�faut, donc pr�parer vos + cl�s GPG. + + - Deux formats support�s: + - PGP/MIME + - PGP inline + + - V�rification de la configuration: > + L'option --check de Vcs vous aidera � configurer Vcs sur votre + machine. + + - R�sum� explicatif du contenue de chaque fichier sp�cial (,*). + + - Reprise sur erreur plus intuitive: > + Si une erreur se produit (serveur news/mail indisponible, diffstat + non install�...), il vous suffit de corriger le probl�me puis de + relancer la m�me commande qui va recommencer ou elle en �tait. + + - Ajout de plusieurs nouvelles m�thodes pour la gestion des conflits. + + - Le diff utilis� lors du commit est insensible au espaces. + + - Et plein d'autres trucs sympa pour vous faciliter la vie. + + + - Installation / Mise � jour: + + - Installation: + + - Rubygems: + - > + Vcs est distribu� sous la forme d'un paquet GEM (le syst�me de + paquet de Ruby), vous devez donc l'installer (si ce n'est pas + d�j� fait). + + - url: http://docs.rubygems.org/ + + - en root: + ruby setup.rb + + - Vcs (en root): + gem install vcs + + - Mise � jour (en root): + gem update + + + - Configuration: + + - V�rifiez que Vcs est correctement install�: + vcs --help + + - Mettez des alias pour svn/cvs/prcs: + - Ajouter dans votre conf zsh le **r�sulat** de cette commande: + vcs --mk-alias + + - V�rifiez que l'alias fonctionne: + svn st! # doit produire la m�me chose que "svn st" + + - V�rifiez votre configuration et suivez les instructions: + vcs --check + + - Pour voir les commandes propos�es par svn + vcs: + svn --help + +--- +Si vous avez des difficult�s � utiliser Vcs n'h�sitez pas � poser des +questions.

19 years, 3 months

[LrdeTools] 229: More user conf, some bugs, and some cleanup.

by Nicolas Pouillard

https://svn.lrde.epita.fr/svn/lrdetools/trunk Index: ChangeLog from Nicolas Pouillard <ertai(a)lrde.epita.fr> More user conf, some bugs, and some cleanup. * vcs/lib/vcs/vcs.rb: Add some class attribute accessors. Adapt to Commands. Handle user configuration variables. * vcs/lib/vcs/changelog.rb: Use Vcs.full_email instead of FULL_EMAIL. * vcs/lib/vcs/edit.rb: Use Vcs.editor instead of EDITOR. * vcs/lib/vcs/news.rb: ... likewise with NNTPSERVER. * vcs/lib/vcs/environment.rb: Set the ENV with the default value. Check_env is now a instance method. * vcs/lib/vcs/mycommit.rb: Use commit_ and remove the useless alias. * vcs/lib/vcs/script.rb, * vcs/lib/vcs/opt_parse.rb, * vcs/lib/vcs/message.rb, * vcs/lib/vcs/last_changed_date.rb, * vcs/lib/vcs/cvs.rb, * vcs/lib/vcs/diffstat.rb, * vcs/lib/vcs/conflict.rb, * vcs/lib/vcs/mail.rb, * vcs/lib/vcs/app.rb: Update or add the license and remove some dead code. app.rb | 11 +---------- changelog.rb | 2 +- conflict.rb | 6 ++++++ cvs.rb | 11 ++++------- diffstat.rb | 2 +- edit.rb | 4 ++-- environment.rb | 9 +++++---- last_changed_date.rb | 8 ++++---- mail.rb | 7 +------ message.rb | 17 +++++++++-------- mycommit.rb | 15 ++++++--------- news.rb | 5 ++--- opt_parse.rb | 1 - script.rb | 2 +- vcs.rb | 46 +++++++++++++++++++++++++++++++++++----------- 15 files changed, 78 insertions(+), 68 deletions(-) Index: vcs/lib/vcs/diffstat.rb --- vcs/lib/vcs/diffstat.rb (revision 228) +++ vcs/lib/vcs/diffstat.rb (working copy) @@ -1,5 +1,5 @@ # 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). # Revision:: $Id$ Index: vcs/lib/vcs/script.rb --- vcs/lib/vcs/script.rb (revision 228) +++ vcs/lib/vcs/script.rb (working copy) @@ -16,4 +16,4 @@ end end -end # class Svn +end # class Vcs Index: vcs/lib/vcs/app.rb --- vcs/lib/vcs/app.rb (revision 228) +++ vcs/lib/vcs/app.rb (working copy) @@ -49,16 +49,7 @@ Pathname.glob("{#{@@vcs},#{vcs_dir}}/*.rb") do |file| next if file.to_s =~ /\/(app|opt_parse|vcs)\.rb$/ LOG.debug { file.basename.to_s } - # begin - # require "vcs/#{file.basename}" - # p "eheho" - # rescue LoadError - # begin require file.to_s - # rescue LoadError => ex - # raise ex - # end - # end end @@all_vcs ||= [] Index: vcs/lib/vcs/news.rb --- vcs/lib/vcs/news.rb (revision 228) +++ vcs/lib/vcs/news.rb (working copy) @@ -5,7 +5,6 @@ # $LastChangedBy: ertai $ # $Id: header 98 2004-09-29 12:07:43Z ertai $ -require 'vcs/tools' require 'vcs/message' class Vcs @@ -16,9 +15,9 @@ require 'optparse' result = { - :from => FULL_EMAIL, + :from => Vcs.full_email, :groups => [], - :server => ENV['NNTPSERVER'], + :server => Vcs.nntpserver, } if !args.nil? and !args.empty? and args[0].is_a?(Hash) return result.merge!(args[0]) Index: vcs/lib/vcs/mail.rb --- vcs/lib/vcs/mail.rb (revision 228) +++ vcs/lib/vcs/mail.rb (working copy) @@ -1,5 +1,5 @@ # 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). # Revision:: $Id: header 98 2004-09-29 12:07:43Z ertai $ @@ -33,11 +33,6 @@ end def mail_conf_checker - %w[ EMAIL FULLNAME SMTPSERVER ].each do |var| - if ENV[var].nil? or ENV[var].empty? - LOG.error "environment variable `#{var}' not set" - end - end unless `gpg --version` =~ /^gpg $GnuPG$/ LOG.error 'command not found: gpg' end Index: vcs/lib/vcs/last_changed_date.rb --- vcs/lib/vcs/last_changed_date.rb (revision 228) +++ vcs/lib/vcs/last_changed_date.rb (working copy) @@ -1,7 +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). -# $Id$ +# Revision:: $Id$ require 'vcs/svn' Index: vcs/lib/vcs/edit.rb --- vcs/lib/vcs/edit.rb (revision 228) +++ vcs/lib/vcs/edit.rb (working copy) @@ -1,5 +1,5 @@ # 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). # Revision:: $Id$ @@ -9,7 +9,7 @@ def edit! ( *files ) # stringify - cmd = EDITOR + files.flatten.map { |x| x.to_s } > [STDOUT, STDERR] + cmd = Vcs.editor + files.flatten.map { |x| x.to_s } > [STDOUT, STDERR] cmd.run(@runner) end Index: vcs/lib/vcs/changelog.rb --- vcs/lib/vcs/changelog.rb (revision 228) +++ vcs/lib/vcs/changelog.rb (working copy) @@ -82,7 +82,7 @@ cl_add = mkchangelog_from_status(*args) LOG.info "Creating a new `#{cl}' file" cl.open('w') do |f| - head = Time.now.strftime("%Y-%m-%d #{FULL_EMAIL}") + head = Time.now.strftime("%Y-%m-%d #{Vcs.full_email}") f.puts " |--- | ########## Fill this file correctly and remove this line ########## | --- |title: Index: vcs/lib/vcs/conflict.rb --- vcs/lib/vcs/conflict.rb (revision 228) +++ vcs/lib/vcs/conflict.rb (working copy) @@ -1,3 +1,8 @@ +# Copyright:: Copyright (c) 2004, 2005 LRDE. All rights reserved. +# Author:: Nicolas Pouillard <ertai(a)lrde.epita.fr>. +# License:: Gnu General Public License. +# Revision:: $Id$ + class Vcs def mk_conflicts_list @@ -5,6 +10,7 @@ raise "no conflicts" if ls.empty? ls end + protected :mk_conflicts_list def edit_conflicts! edit! mk_conflicts_list Index: vcs/lib/vcs/vcs.rb --- vcs/lib/vcs/vcs.rb (revision 228) +++ vcs/lib/vcs/vcs.rb (working copy) @@ -1,15 +1,18 @@ # 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 $ +# Revision:: $Id: header 98 2004-09-29 12:07:43Z ertai $ require 'rubygems' require_gem 'ruby_ex' require 'ruby_ex' Commands.import! Yaml::ChopHeader.import! +require 'logger' +require 'optparse' +require 'etc' +require 'ostruct' +ENV['LC_ALL'] = 'C' # The abstract class for a Vcs wrapper. # Conventions: @@ -25,6 +28,12 @@ # class Vcs + @@version ||= '0.3.0' + @@user_conf ||= OpenStruct.new + cattr_accessor :version + cattr_accessor :default + cattr_accessor :user_conf + class Failure < Exception end @@ -45,15 +54,13 @@ class VcsCmdDataFactory < Commands::Datas::Factory - alias :real_new_command_data :new_command_data - def initialize ( values ) super @command_data_class = VcsCmdData - @__instance = real_new_command_data end def new_command_data + @__instance ||= super @__instance.status = nil @__instance end @@ -276,4 +283,21 @@ @@checkers.each { |meth| send(meth) } end + def self.match ( regexps, file ) + regexps.each do |re| + return true if re.match(file) + end + return false + end + + def self.user_conf_global_ignore ( file ) + return false if user_conf.nil? or user_conf.global_ignore.nil? + match(user_conf.global_ignore, file) + end + + def self.user_conf_global_unmask ( file ) + return false if user_conf.nil? or user_conf.global_unmask.nil? + match(user_conf.global_unmask, file) + end + end # class Vcs Index: vcs/lib/vcs/mycommit.rb --- vcs/lib/vcs/mycommit.rb (revision 228) +++ vcs/lib/vcs/mycommit.rb (working copy) @@ -1,9 +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 $ +# Revision:: $Id: header 98 2004-09-29 12:07:43Z ertai $ require 'vcs/vcs' @@ -45,7 +43,7 @@ # FIXME simplify cl_entry contents begin - commit!('--message', cl_entry, *(opts + args)) + commit_!('--message', cl_entry, *(opts + args)) ADD_CL.rename(COMMITED) TMP_CL.delete if TMP_CL.exist? rescue @@ -78,7 +76,6 @@ LOG.info "You can remove `#{message_rev}' if everything is ok." end - alias_command :cci, :common_commit def commit_failed LOG.info "#{COMMITED}: Contains your ChangeLog entry" if COMMITED.exist? Index: vcs/lib/vcs/environment.rb --- vcs/lib/vcs/environment.rb (revision 228) +++ vcs/lib/vcs/environment.rb (working copy) @@ -42,16 +42,17 @@ else default = block[] LOG.warn "Need #{name} in the environement (default: #{default})" + ENV[name] = default default end end + end # class << self + def check_env - %w[ email fullname editor pager ].each { |m| send(m) } + %w[ email fullname editor pager ].each { |m| Vcs.send(m) } end - end # class << self - add_conf_checker :check_env end # class Vcs Index: vcs/lib/vcs/opt_parse.rb --- vcs/lib/vcs/opt_parse.rb (revision 228) +++ vcs/lib/vcs/opt_parse.rb (working copy) @@ -26,7 +26,6 @@ o.separator '' o.on('-c', '--vcs TYPE', VcsApp.all_vcs, 'Set your vcs') do |aVcs| - p aVcs Vcs.default = aVcs end Index: vcs/lib/vcs/message.rb --- vcs/lib/vcs/message.rb (revision 228) +++ vcs/lib/vcs/message.rb (working copy) @@ -1,9 +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 $ +# Revision:: $Id: header 98 2004-09-29 12:07:43Z ertai $ require 'vcs/vcs' require 'vcs/changelog' @@ -12,13 +10,15 @@ def diffw! ( *args ) diff!(*args) end -end +end # class Vcs + class Svn def diffw! ( *args ) diff! '--diff-cmd', 'diff', '-x', '-NPbuw', *args end -end +end # class Svn + class Vcs @@ -27,6 +27,7 @@ def print_body ( file, options ) LOG.info "Creating a new `#{file}' file" file.open('w') do |f| + #FIXME add --- f.puts options.to_yaml f.puts '---' f.puts Index: vcs/lib/vcs/cvs.rb --- vcs/lib/vcs/cvs.rb (revision 228) +++ vcs/lib/vcs/cvs.rb (working copy) @@ -1,9 +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 $ +# Revision:: $Id: header 98 2004-09-29 12:07:43Z ertai $ require 'vcs/vcs' @@ -18,4 +16,3 @@ end end # class Cvs -

19 years, 3 months

[LrdeTools] 228: Split the binary and adapt.

by Nicolas Pouillard

https://svn.lrde.epita.fr/svn/lrdetools/trunk Index: ChangeLog from Nicolas Pouillard <ertai(a)lrde.epita.fr> Split the binary and adapt. * vcs/bin/vcs: Split in three parts. * vcs/lib/vcs/app.rb: New. VcsApp is the class for the vcs binary. * vcs/lib/vcs/environment.rb: New. Handle environment variables. * vcs/lib/vcs/opt_parse.rb: New. The option parser. * vcs/bin/vcs-svn, vcs/bin/vcs-prcs, vcs/bin/vcs-cvs: Simplify: remove a useless `exec'. bin/vcs | 167 +------------------------------------------------ bin/vcs-cvs | 13 +-- bin/vcs-prcs | 13 +-- bin/vcs-svn | 13 +-- lib/vcs/app.rb | 114 +++++++++++++++++++++++++++++++++ lib/vcs/environment.rb | 58 +++++++++++++++++ lib/vcs/opt_parse.rb | 77 ++++++++++++++++++++++ 7 files changed, 273 insertions(+), 182 deletions(-) Index: vcs/bin/vcs --- vcs/bin/vcs (revision 227) +++ vcs/bin/vcs (working copy) @@ -1,164 +1,9 @@ #!/usr/bin/env ruby # 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). +# Revision:: $Id: header 98 2004-09-29 12:07:43Z ertai $ -# $LastChangedBy: ertai $ -# $Id: header 98 2004-09-29 12:07:43Z ertai $ +require File.join(File.dirname(__FILE__), '..', 'lib', 'vcs', 'app') unless defined? VcsApp - -# vcs: The version control system wrapper. -# -# Vcs is a wrapper over any version control system. - -require 'pathname' -require 'logger' -require 'optparse' -require 'set' - -VCS_VERSION = '0.3.0' -VCS_PATH = Pathname.new(__FILE__).expand_path -VCS_DIR, VCS = VCS_PATH.split -LIB = VCS_DIR + '..' + 'lib' -$: << LIB.to_s - -dir = Pathname.pwd -while not dir.root? and not (vcs_dir = dir + 'vcs').exist? - dir = dir + '..' -end -$: << vcs_dir - -LOG = Logger.new(STDOUT) -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 - -Pathname.glob("{#{LIB}/**,#{vcs_dir}}/*.rb") do |file| - LOG.debug { file.basename.to_s } - begin - require "vcs/#{file.basename}" - rescue LoadError - begin - require file.to_s - rescue LoadError => ex - raise ex - end - end -end - -ALL_VCS_NAMES = [] -ALL_VCS_BY_NAME = {} -ObjectSpace.each_object(Class) do |aClass| - if aClass != Vcs and aClass.ancestors.include? Vcs - name = aClass.to_s.to_sym - ALL_VCS_NAMES << name - ALL_VCS_BY_NAME[name] = aClass - end -end - -OPTIONS = {} - -OPTS = OptionParser.new do |opts| - - opts.banner = "Usage: #{VCS} [options] <file>*" - opts.separator '' - - opts.on('-c', '--vcs TYPE', ALL_VCS_NAMES, 'Set your vcs') do |aVcs| - OPTIONS[:vcs_type] = aVcs - end - - opts.on('-l', '--vcs-list', 'List all vcs') do |aVcs| - STDERR.puts 'Vcs list:' - ALL_VCS_NAMES.each { |n| STDERR.puts " - #{n}" } - exit - end - - opts.on('--mk-alias', 'Put the result of this command in your .zshrc or .bashrc') do - ALL_VCS_NAMES.each do |n| - n = n.to_s.downcase - if VCS_PATH.executable? - puts "alias #{n}=#{VCS_PATH}-#{n} ;" - else - puts "alias #{n}=vcs-#{n} ;" - end - end - exit - end - - opts.on('-C', '--[no-]check', 'Check your vcs configuration') do |check| - if check - Vcs.new('vcs').call_conf_checkers - exit - end - end - - opts.on('-d', '--debug LEVEL', 'Set debug level') do |severity| - LOG.level = Logger.const_get(severity.upcase) - end - - opts.on_tail('-h', '--help', 'Show this message') do |test| - STDERR.puts OPTS - STDERR.puts "\n\nReport bugs to <ertai(a)lrde.epita.fr>." - exit - end - - opts.on_tail('--version', 'Show version') do - STDOUT.puts "Vcs version: #{VCS_VERSION}" - exit - end - -end - -ENV['LC_ALL'] = 'C' -if ENV.has_key? 'FULLNAME' - FULLNAME = ENV['FULLNAME'] -else - require 'etc' - ENV['FULLNAME'] = (Etc.getpwnam ENV['USER']).gecos - LOG.warn "Need FULLNAME in the environement (default: #{ENV['FULLNAME']})" -end -env = %w[ EMAIL FULLNAME EDITOR PAGER ] -if env.all? { |s| ENV[s] } - EDITOR = ENV['EDITOR'].to_cmd - PAGER = ENV['PAGER'].to_cmd - EMAIL = ENV['EMAIL'] -else - env.each { |s| LOG.error "Need #{s} in the environement" unless ENV[s] } - exit -end -FULL_EMAIL = "#{FULLNAME} <#{EMAIL}>" - -def main - vcs = nil - begin - OPTS.parse!(ARGV) - unless OPTIONS.has_key? :vcs_type - STDERR.puts OPTS - STDERR.puts "\nSpecify at least a Vcs type, or use a wrapped command\n" + - 'like svn, cvs, prcs in the vcs bin directory.' - exit - end - vcs = ALL_VCS_BY_NAME[OPTIONS[:vcs_type]].new - - if ARGV.empty? - meth = :help! - else - meth = ARGV.shift.sub(/([^!])$/, '\1!') - end - - vcs.send(meth, *ARGV) - - rescue Exception - vcs.call_handlers unless vcs.nil? - LOG.debug { raise } - LOG.error $!.to_s.sub(/\.$/, '') unless $!.to_s == 'exit' - end -end - -main() +VcsApp.new(__FILE__).run Index: vcs/lib/vcs/app.rb --- vcs/lib/vcs/app.rb (revision 0) +++ vcs/lib/vcs/app.rb (revision 0) @@ -0,0 +1,114 @@ +# Copyright:: Copyright (c) 2005 LRDE. All rights reserved. +# Author:: Nicolas Pouillard <ertai(a)lrde.epita.fr>. +# License:: Gnu General Public License. +# Revision:: $Id$ + +require 'pathname' +require 'logger' + +LOG = Logger.new(STDOUT) +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. +# +# Vcs is a wrapper over any version control system. +class VcsApp + + @@vcs = Pathname.new(__FILE__).expand_path.dirname + @@dir = @@vcs.parent + require @@vcs + 'vcs' unless defined? Vcs + @@dir.load_path! + + cattr_accessor :all_vcs + cattr_accessor :by_name + cattr_accessor :dir + cattr_accessor :path + + dir = Pathname.pwd + while not dir.root? and not (vcs_dir = dir + 'vcs').exist? + dir = dir + '..' + end + vcs_dir = vcs_dir.expand_path + vcs_dir.load_path! + + 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)) + end + + Pathname.glob("{#{@@vcs},#{vcs_dir}}/*.rb") do |file| + next if file.to_s =~ /\/(app|opt_parse|vcs)\.rb$/ + LOG.debug { file.basename.to_s } + # begin + # require "vcs/#{file.basename}" + # p "eheho" + # rescue LoadError + # begin + require file.to_s + # rescue LoadError => ex + # raise ex + # end + # end + end + + @@all_vcs ||= [] + @@by_name ||= {} + + if @@all_vcs.empty? + ObjectSpace.each_object(Class) do |aClass| + if aClass != Vcs and aClass.ancestors.include? Vcs + name = aClass.to_s.to_sym + @@all_vcs << name + @@by_name[name.to_s.downcase] = aClass + end + end + end + + require 'vcs/opt_parse' + + @@parser = Vcs::OptParse.new + + def initialize ( __file__, vcs_type=nil ) + @@path = __file__ + Vcs.default ||= vcs_type + end + + def run + vcs = nil + begin + @@parser.parse! ARGV + if Vcs.default.nil? + STDERR.puts @@parser + STDERR.puts "\nSpecify at least a Vcs type, or use a wrapped command\n" + + 'like svn, cvs, prcs in the vcs bin directory.' + exit + end + vcs = @@by_name[Vcs.default.to_s.downcase].new + + if ARGV.empty? + meth = :help! + else + meth = ARGV.shift.sub(/([^!])$/, '\1!') + end + + vcs.send(meth, *ARGV) + + rescue Exception + vcs.call_handlers unless vcs.nil? + LOG.debug { raise } + LOG.error $!.to_s.sub(/\.$/, '') unless $!.to_s == 'exit' + end + end + +end # class VcsApp + Property changes on: vcs/lib/vcs/app.rb ___________________________________________________________________ Name: svn:keywords + Id Index: vcs/lib/vcs/environment.rb --- vcs/lib/vcs/environment.rb (revision 0) +++ vcs/lib/vcs/environment.rb (revision 0) @@ -0,0 +1,58 @@ +# Copyright:: Copyright (c) 2005 LRDE. All rights reserved. +# Author:: Nicolas Pouillard <ertai(a)lrde.epita.fr>. +# License:: Gnu General Public License. +# Revision:: $Id$ + +class Vcs + + class << self + + def fullname + env('FULLNAME') { Etc.getpwnam(user).gecos } + end + + def editor + env('EDITOR').to_cmd + end + + def pager + env('PAGER').to_cmd + end + + def full_email + "#{fullname} <#{email}>" + end + + def method_missing ( meth ) + env meth.to_s.upcase + end + + @@vars ||= {} + @@env_status ||= true + + def env ( name, &block ) + return @@vars[name] if @@vars.has_key? name + @@vars[name] = + if var = ENV[name] + var + elsif block.nil? + LOG.error "Need #{name} in the environement" + @@env_status = false + "!!! #{name} not set !!!" + else + default = block[] + LOG.warn "Need #{name} in the environement (default: #{default})" + default + end + end + + def check_env + %w[ email fullname editor pager ].each { |m| send(m) } + end + + end # class << self + + add_conf_checker :check_env + +end # class Vcs + Property changes on: vcs/lib/vcs/environment.rb ___________________________________________________________________ Name: svn:keywords + Id Index: vcs/bin/vcs-cvs --- vcs/bin/vcs-cvs (revision 227) +++ vcs/bin/vcs-cvs (working copy) @@ -1,10 +1,9 @@ #!/usr/bin/env ruby -# Author: Nicolas Pouillard <ertai(a)lrde.epita.fr>. -# Copyright: Copyright (c) 2004 LRDE. All rights reserved. -# License: GNU General Public License (GPL). +# Author:: Nicolas Pouillard <ertai(a)lrde.epita.fr>. +# Copyright:: Copyright (c) 2004 LRDE. All rights reserved. +# License:: GNU General Public License (GPL). +# Revision:: $Id: header 98 2004-09-29 12:07:43Z ertai $ -# $LastChangedBy: ertai $ -# $Id: header 98 2004-09-29 12:07:43Z ertai $ +require File.join(File.dirname(__FILE__), '..', 'lib', 'vcs', 'app') unless defined? VcsApp -VCS='Cvs' -exec("vcs --vcs #{VCS} -- '#{ARGV.join(%q[' '])}'") +VcsApp.new(__FILE__, :cvs).run Index: vcs/bin/vcs-prcs --- vcs/bin/vcs-prcs (revision 227) +++ vcs/bin/vcs-prcs (working copy) @@ -1,10 +1,9 @@ #!/usr/bin/env ruby -# Author: Nicolas Pouillard <ertai(a)lrde.epita.fr>. -# Copyright: Copyright (c) 2004 LRDE. All rights reserved. -# License: GNU General Public License (GPL). +# Author:: Nicolas Pouillard <ertai(a)lrde.epita.fr>. +# Copyright:: Copyright (c) 2004 LRDE. All rights reserved. +# License:: GNU General Public License (GPL). +# Revision:: $Id$ -# $LastChangedBy: ertai $ -# $Id: header 98 2004-09-29 12:07:43Z ertai $ +require File.join(File.dirname(__FILE__), '..', 'lib', 'vcs', 'app') unless defined? VcsApp -VCS='Prcs' -exec('vcs', '--vcs', VCS, '--', *ARGV) +VcsApp.new(__FILE__, :prcs).run Index: vcs/bin/vcs-svn --- vcs/bin/vcs-svn (revision 227) +++ vcs/bin/vcs-svn (working copy) @@ -1,10 +1,9 @@ #!/usr/bin/env ruby -# Author: Nicolas Pouillard <ertai(a)lrde.epita.fr>. -# Copyright: Copyright (c) 2004 LRDE. All rights reserved. -# License: GNU General Public License (GPL). +# Author:: Nicolas Pouillard <ertai(a)lrde.epita.fr>. +# Copyright:: Copyright (c) 2004 LRDE. All rights reserved. +# License:: GNU General Public License (GPL). +# Revision:: $Id$ -# $LastChangedBy: ertai $ -# $Id: header 98 2004-09-29 12:07:43Z ertai $ +require File.join(File.dirname(__FILE__), '..', 'lib', 'vcs', 'app') unless defined? VcsApp -VCS='Svn' -exec('vcs', '--vcs', VCS, '--', *ARGV) +VcsApp.new(__FILE__, :svn).run Index: vcs/lib/vcs/opt_parse.rb --- vcs/lib/vcs/opt_parse.rb (revision 0) +++ vcs/lib/vcs/opt_parse.rb (revision 0) @@ -0,0 +1,77 @@ +# Author:: Nicolas Pouillard <ertai(a)lrde.epita.fr>. +# Copyright:: Copyright (c) 2005 LRDE. All rights reserved. +# License:: GNU General Public License (GPL). +# Revision:: $Id$ + + +class Vcs + + class OptParse + + def initialize + @option_parser = @@option_parser.dup + end + + def parse! ( argv ) + @option_parser.parse! argv + end + + def parse ( argv ) + @option_parser.parse argv + end + + @@option_parser = OptionParser.new do |o| + + o.banner = "Usage: vcs [options] <file>*" + o.separator '' + + o.on('-c', '--vcs TYPE', VcsApp.all_vcs, 'Set your vcs') do |aVcs| + p aVcs + Vcs.default = aVcs + end + + o.on('-l', '--vcs-list', 'List all vcs') do |aVcs| + STDERR.puts 'Vcs list:' + VcsApp.all_vcs.each { |n| STDERR.puts " - #{n}" } + exit + end + + o.on('--mk-alias', 'Put the result of this command in your .zshrc or .bashrc') do + VcsApp.all_vcs.each do |n| + n = n.to_s.downcase + if VcsApp.path.executable? + puts "alias #{n}=#{VcsApp.path}-#{n} ;" + else + puts "alias #{n}=vcs-#{n} ;" + end + end + exit + end + + o.on('-C', '--[no-]check', 'Check your vcs configuration') do |check| + if check + Vcs.new('vcs').call_conf_checkers + exit + end + end + + o.on('-d', '--debug LEVEL', 'Set debug level') do |severity| + LOG.level = Logger.const_get(severity.upcase) + end + + o.on_tail('-h', '--help', 'Show this message') do |test| + STDERR.puts o + STDERR.puts "\n\nReport bugs to <ertai(a)lrde.epita.fr>." + exit + end + + o.on_tail('--version', 'Show version') do + STDOUT.puts "Vcs version: #{Vcs.version}" + exit + end + + end + + end # class OptParse + +end # class Vcs Property changes on: vcs/lib/vcs/opt_parse.rb ___________________________________________________________________ Name: svn:keywords + Id

19 years, 3 months

[lrde-deb: 55] ccache

by Johan Oudinet

https://svn/svn/lrde-deb ChangeLog | 4 ++++ pkg/i386.pkg | 1 + 2 files changed, 5 insertions(+) Index: ChangeLog from Johan Oudinet <johan(a)lrde.org> * pkg/i386.pkg: add ccache Index: pkg/i386.pkg --- pkg/i386.pkg (revision 54) +++ pkg/i386.pkg (working copy) @@ -1,2 +1,3 @@ # from lrde-tiger valgrind +ccache -- Johan Oudinet <johan(a)lrde.org> Auto posted by lrde-deb/build.sh

19 years, 3 months

[nolimips: 193] --argument-registers

by Noe

https://svn.lrde.epita.fr/svn/nolimips/trunk Index: ChangeLog from Benoît Perrot <benoit(a)lrde.epita.fr> --argument-registers * src/inst-tasks.hh: Rename `args' option to `--argument-registers'. Suggested by Akim Demaille. 2005-09-17 Benoît Perrot <benoit(a)lrde.epita.fr> Index: src/inst-tasks.hh --- src/inst-tasks.hh (revision 192) +++ src/inst-tasks.hh (revision 193) @@ -45,7 +45,7 @@ "Set max number of caller-save registers", max_caller_save, 10, 0, 10, ""); - INT_TASK_DECLARE ("args", + INT_TASK_DECLARE ("argument-registers", "Set max number of argument registers", max_args, 4, 0, 4, "");

19 years, 3 months

[nolimips: 192] Fix from-scratch build

by Noe

https://svn.lrde.epita.fr/svn/nolimips/trunk ChangeLog | 7 +++++++ bootstrap | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) Index: ChangeLog from Benoît Perrot <benoit(a)lrde.epita.fr> Fix from-scratch build. * boostrap: Search for nodes.mk.gen.py in src/inst instead of dev/ (shame on me). Index: bootstrap --- bootstrap (revision 191) +++ bootstrap (working copy) @@ -194,10 +194,10 @@ # Generate Nolimips' nodes.mk - +echo "$0: Generating src/inst/nodes.mk" here=`pwd` cd src/inst -../../dev/inst-nodes-mk-gen.py < ../../dev/nolimips.xml > nodes.mk +PYTHONPATH="../../dev/:$$PYTHONPATH" ./nodes.mk.gen.py < ../../dev/nolimips.xml > nodes.mk cd $here find tests -name '*.ref' -exec touch '{}' ';'

19 years, 3 months

Re: [LrdeTools] 227: Bump Vcs to 0.3.

by olivier

Nicolas Pouillard <ertai(a)lrde.epita.fr> disait le 09/16/05 : > https://svn.lrde.epita.fr/svn/lrdetools/trunk > > Index: ChangeLog > from Nicolas Pouillard <ertai(a)lrde.epita.fr> > > Bump Vcs to 0.3. Cool ! Rolland, tu peux l'installer sur brasilia ? Merci !

19 years, 3 months

[LrdeTools] 227: Bump Vcs to 0.3.

by Nicolas Pouillard

https://svn.lrde.epita.fr/svn/lrdetools/trunk Index: ChangeLog from Nicolas Pouillard <ertai(a)lrde.epita.fr> Bump Vcs to 0.3. * vcs/SPEC.dyn.yml, vcs/NEWS: Update. NEWS | 12 +++++++++--- SPEC.dyn.yml | 9 +++++---- SPEC.yml | 1 + 3 files changed, 15 insertions(+), 7 deletions(-) Index: vcs/SPEC.dyn.yml --- vcs/SPEC.dyn.yml (revision 226) +++ vcs/SPEC.dyn.yml (working copy) @@ -1,9 +1,10 @@ --- !ruby/object:OpenStruct table: + :version_id: '' :url: https://svn.lrde.epita.fr/svn/lrdetools/trunk/vcs - :date: "Fri, 01 Jul 2005" :version: !ruby/object:Version - build: 148 + build: 0 major: 0 - minor: 2 - revision: 206 + minor: 3 + revision: 227 + :date: "Fri, 16 Sep 2005" Index: vcs/SPEC.yml --- vcs/SPEC.yml (revision 226) +++ vcs/SPEC.yml (working copy) @@ -18,6 +18,7 @@ tags_url: https://svn.lrde.epita.fr/svn/lrdetools/tags commit_command: ltci +commit_dir: .. rdoc_files: !filelist - README Index: vcs/NEWS --- vcs/NEWS (revision 226) +++ vcs/NEWS (working copy) @@ -1,3 +1,9 @@ -New in 0.3 ...: - * help - * full stream based +New in 0.3 2005-09-16: + + * The help command now show all commands including vcs ones. + * New system to fill values like the subject, the title... of your + changelog, mails and news which belong to your patches. + * No more put the subject as an argument of vcs. + * Improve the command running handling, vcs calls are now full stream based. + * Add two commands `url' and `script'. + * Improve the error handling.

19 years, 3 months

[LrdeTools] 225: Some last changes before the release.

by Nicolas Pouillard

https://svn.lrde.epita.fr/svn/lrdetools/trunk Index: ChangeLog from Nicolas Pouillard <ertai(a)lrde.epita.fr> Some last changes before the release. * vcs/lib/vcs/mail.rb: Use --confirm instead of --ask. * vcs/lib/vcs/message.rb: Publish the collaboa url if COLLABOA is defined. * vcs/lib/vcs/changelog.rb: Title and subject are not Yaml anymore. * vcs/lib/vcs/vcs.rb: Update packaging. * vcs/lib/vcs/tools.rb: Remove. * vcs/lib/vcs/svn.rb: Remove a require. * vcs/lib/vcs/mycommit.rb, vcs/lib/vcs/conflict.rb, vcs/lib/vcs/news.rb: Use highline instead of ask. * vcs/bin/vcs: Change the version. Make --mk-alias support bash. * vcs/SPEC.yml: Update dependencies and ttk options. * vcs/test/vcs-check.yml: New. The main test suite. * vcs/test/options-suite.yml: New. A simple test suite for options. SPEC.yml | 5 ++++- bin/vcs | 8 ++++---- lib/vcs/changelog.rb | 9 ++++++--- lib/vcs/conflict.rb | 4 ++-- lib/vcs/edit.rb | 1 + lib/vcs/mail.rb | 2 +- lib/vcs/message.rb | 8 ++++++++ lib/vcs/mycommit.rb | 8 ++++---- lib/vcs/news.rb | 4 ++-- lib/vcs/svn.rb | 1 - lib/vcs/tools.rb | 22 ---------------------- lib/vcs/vcs.rb | 6 +++++- test/options-suite.yml | 38 ++++++++++++++++++++++++++++++++++++++ test/vcs-check.yml | 8 ++++++++ 14 files changed, 83 insertions(+), 41 deletions(-) Index: vcs/lib/vcs/tools.rb --- vcs/lib/vcs/tools.rb (revision 224) +++ vcs/lib/vcs/tools.rb (working copy) @@ -1,22 +0,0 @@ -# Author:: Nicolas Pouillard <ertai(a)lrde.epita.fr>. -# Copyright:: Copyright (c) 2004 LRDE. All rights reserved. -# License:: GNU General Public License (GPL). - -# $LastChangedBy: ertai $ -# $Id: header 98 2004-09-29 12:07:43Z ertai $ - -require 'yaml' -module YAML - - def self.chop_header ( io ) - aStr = io.gets - raise Exception, "First line is not valid: `#{aLine}'" unless aStr =~ /^---/ - io.each do |aLine| - break if aLine =~ /^---/ - aStr += aLine - end - YAML::load(aStr) - end - -end # module YAML - Index: vcs/bin/vcs --- vcs/bin/vcs (revision 224) +++ vcs/bin/vcs (working copy) @@ -16,7 +16,7 @@ require 'optparse' require 'set' -VCS_VERSION = '0.2.148' +VCS_VERSION = '0.3.0' VCS_PATH = Pathname.new(__FILE__).expand_path VCS_DIR, VCS = VCS_PATH.split LIB = VCS_DIR + '..' + 'lib' @@ -79,13 +79,13 @@ exit end - opts.on('--mk-alias', 'Use this command like that `vcs --mk-alias`') do + opts.on('--mk-alias', 'Put the result of this command in your .zshrc or .bashrc') do ALL_VCS_NAMES.each do |n| n = n.to_s.downcase if VCS_PATH.executable? - puts "alias #{n}=#{VCS_PATH}-#{n}" + puts "alias #{n}=#{VCS_PATH}-#{n} ;" else - puts "alias #{n}=vcs-#{n}" + puts "alias #{n}=vcs-#{n} ;" end end exit Index: vcs/lib/vcs/news.rb --- vcs/lib/vcs/news.rb (revision 224) +++ vcs/lib/vcs/news.rb (working copy) @@ -70,9 +70,9 @@ server, port = opt[:server].split(/:/) port ||= 119 LOG.info('news') { "Nntp Server: #{server}:#{port}" } - if ask("Post a news, with this subject: #{opt[:subject]}\n" + + 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 + 'Are you sure? (y/n)', true) LOG.error('news') { 'Aborting' } exit end Index: vcs/lib/vcs/mail.rb --- vcs/lib/vcs/mail.rb (revision 224) +++ vcs/lib/vcs/mail.rb (working copy) @@ -10,7 +10,7 @@ MAIL = Sendmail::MAIL_FILE MAILER = Sendmail.new - DEFAULT_OPTIONS = %w[ --ask --sign --mime ] + DEFAULT_OPTIONS = %w[ --confirm --sign --mime ] # # Mail. Index: vcs/SPEC.yml --- vcs/SPEC.yml (revision 224) +++ vcs/SPEC.yml (working copy) @@ -32,4 +32,7 @@ executables: [ vcs, vcs-svn, vcs-cvs, vcs-prcs ] dependencies: - ruby_ex: ~> 0.1.3 + ruby_ex: [~> 0.2.0, 6087/ruby_ex-0.2.0.tar.gz] + +root_test_suite: test/vcs-check.yml +ttk_version: ~> 0.3.0 Index: vcs/test/vcs-check.yml --- vcs/test/vcs-check.yml (revision 0) +++ vcs/test/vcs-check.yml (revision 0) @@ -0,0 +1,8 @@ +--- + +Run all test suites: !S::Iterate + over: !pathlist <<pwd>>/(*)-suite.yml + iter: [it_file, it_name] + test: + Run the <<it_name>> suite: !S::Import + import: <<it_file>> Index: vcs/lib/vcs/changelog.rb --- vcs/lib/vcs/changelog.rb (revision 224) +++ vcs/lib/vcs/changelog.rb (working copy) @@ -64,10 +64,13 @@ raise MustBeFilled, cl if cl.read =~ /\A---/ require 'erb' ls = [] - YAML.each_document(cl.read) { |x| (ls.size == 2)? break : ls << x } - header, input = ls + YAML.each_document("--- |\n" + cl.read) { |x| (ls.size == 2)? break : ls << x } + title_subject, input = ls + header = { 'title' => title_subject[/^title: (.*)$/, 1], + 'subject' => title_subject[/^subject: (.*)$/, 1] } rev = revision.read.to_i + 1 header.merge!('rev' => rev, 'revision' => rev) + raise "no title: reopen #{ADD_CL}" if header['title'].nil? header['title'].sub!(/\.$/, '') b = getBinding(header) header = ERB.new(header.to_yaml, $SAFE, '<-%->', '$erbout_').result(b) @@ -83,7 +86,7 @@ f.puts " |--- | ########## Fill this file correctly and remove this line ########## | --- |title: -|subject: '#{@@subject_format}.' +|subject: #{@@subject_format}. | |--- | ###################### Your ChangeLog entrie ###################### | --- |#{head} Index: vcs/lib/vcs/edit.rb --- vcs/lib/vcs/edit.rb (revision 224) +++ vcs/lib/vcs/edit.rb (working copy) @@ -8,6 +8,7 @@ class Vcs def edit! ( *files ) + # stringify cmd = EDITOR + files.flatten.map { |x| x.to_s } > [STDOUT, STDERR] cmd.run(@runner) end Index: vcs/lib/vcs/conflict.rb --- vcs/lib/vcs/conflict.rb (revision 224) +++ vcs/lib/vcs/conflict.rb (working copy) @@ -12,8 +12,8 @@ def resolve_conflicts! conflicts = mk_conflicts_list - question = "Resolve these conflicts: \n - #{conflicts.join("\n - ")}\n" - if ask(question, :n, STDIN, STDOUT, STDERR) == :y + question = "Resolve these conflicts?: \n - #{conflicts.join("\n - ")}\n(y/n)" + if @h.agree question, true return resolved(conflicts) end end Index: vcs/lib/vcs/svn.rb --- vcs/lib/vcs/svn.rb (revision 224) +++ vcs/lib/vcs/svn.rb (working copy) @@ -6,7 +6,6 @@ # $Id: header 98 2004-09-29 12:07:43Z ertai $ require 'vcs/vcs' -require 'vcs/tools' CL = Pathname.new('ChangeLog') ADD_CL = Pathname.new(',ChangeLog') Index: vcs/lib/vcs/mycommit.rb --- vcs/lib/vcs/mycommit.rb (revision 224) +++ vcs/lib/vcs/mycommit.rb (working copy) @@ -6,7 +6,6 @@ # $Id: header 98 2004-09-29 12:07:43Z ertai $ require 'vcs/vcs' -require 'ask' class Vcs @@ -32,7 +31,7 @@ edit! @@message - if ask('Committing, are you sure?', :y) == :n + unless @h.agree 'Committing, are you sure? (y/n)', true commit_failed end @@ -45,10 +44,11 @@ # FIXME simplify cl_entry contents - if commit!('--message', cl_entry, *(opts + args)) + begin + commit!('--message', cl_entry, *(opts + args)) ADD_CL.rename(COMMITED) TMP_CL.delete if TMP_CL.exist? - else + rescue commit_failed end Index: vcs/lib/vcs/vcs.rb --- vcs/lib/vcs/vcs.rb (revision 224) +++ vcs/lib/vcs/vcs.rb (working copy) @@ -7,7 +7,9 @@ require 'rubygems' require_gem 'ruby_ex' -require 'commands' +require 'ruby_ex' +Commands.import! +Yaml::ChopHeader.import! # The abstract class for a Vcs wrapper. # Conventions: @@ -52,6 +54,7 @@ end def new_command_data + @__instance.status = nil @__instance end @@ -61,6 +64,7 @@ @cmd = aCmd.to_cmd @handlers = Set.new @runner = Commands::Runners::System.new + @h = HighLine.new self.cmd_data_factory = VcsCmdDataFactory.new(:output => STDOUT, :error => STDERR) @runner.subscribe_hook(:failure) do |data| Index: vcs/test/options-suite.yml --- vcs/test/options-suite.yml (revision 0) +++ vcs/test/options-suite.yml (revision 0) @@ -0,0 +1,38 @@ +--- + +Check vcs basic options: !S::Suite + + # What have these test in common + attributes: !S::Cmd # All of them follow the Cmd strategy + command: <<pwd>>/../bin/vcs # They test the same command + exit : 0 # They expect 0 as exit status + error : "" # By default we don't want anything on stderr + + contents: + + - Check the version option: + args: --version # Give --version as arguement + output: !re | # Output will be compared to this regexp + Vcs version: \d+.\d+.\d+ + + - Check the help option: + args: --help + output: "" # Output must be empty + error: | # Stderr output will be compared to this string + Usage: vcs [options] <file>* + + -c, --vcs TYPE Set your vcs + -l, --vcs-list List all vcs + --mk-alias Put the result of this command in your .zshrc or .bashrc + -C, --[no-]check Check your vcs configuration + -d, --debug LEVEL Set debug level + -h, --help Show this message + --version Show version + + + Report bugs to <ertai(a)lrde.epita.fr>. + + - Check the mk-alias option: + args: --mk-alias + # Output will be compared to this regexp + output: !re \A(^alias \w+=.* ;$)+ Index: vcs/lib/vcs/message.rb --- vcs/lib/vcs/message.rb (revision 224) +++ vcs/lib/vcs/message.rb (working copy) @@ -43,6 +43,14 @@ TempPath.new('message') do |tmp| tmp.open('w') do |f| with(f).url! + if defined? COLLABOA + f.puts + f.puts 'You can also view this changeset here:' + f.puts + next_rev = rev.output.read.to_i + next_rev += 1 unless ',commited'.to_path.exist? + f.puts "http://#{COLLABOA}/repository/changesets/#{next_rev}" + end f.puts f.puts 'Index: ChangeLog' f.print cl_entry.sub(/^\d+-\d+-\d+/, 'from')

19 years, 3 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Projects