vcs 0.4.1 → 0.5.2.4

data/lib/vcs/delete.rb

@@ -1,7 +1,7 @@
 # Copyright:: Copyright (c) 2005  LRDE. All rights reserved.
 # Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # License::   Gnu General Public License.
-# Revision::  $Id: delete.rb 265 2005-10-03 12:37:03Z pouill_n $
+# Revision::  $Id: /lrde/tools/trunk/vcs/lib/vcs/delete.rb 9106 2005-10-03T12:37:03.631187Z pouill_n  $
 
 class Vcs
 

data/lib/vcs/diff.rb

@@ -16,6 +16,17 @@ class Vcs
   end
   add_conf_checker :check_gnu_diff
 
+  def diffw_base ( files_orig=[], options={} )
+    files = []
+    status(files_orig, just_standard_options(options)) do |se|
+      next if se.file_st.chr =~ /[?X\\,+D]/
+      next if se.file.to_s == 'ChangeLog'
+      next if se.file.directory?
+      files << se.file unless files.include? se.file
+    end
+    files
+  end
+
 end # class Vcs
 
 
@@ -23,16 +34,21 @@ class Svn < Vcs
 
   # A diff only for your eyes
   def diffw! ( files_orig=[], options={} )
-    files = []
-    status(files_orig) do |se|
-      next if se.file_st.chr =~ /[?X\\,+D]/
-      next if se.file.to_s == 'ChangeLog'
-      next if se.file.directory?
-      files << se.file unless files.include? se.file
-    end
+    files = diffw_base(files_orig, options)
     return if files.empty? and not files_orig.empty?
     diff_! files,
            options.merge(:diff_cmd => 'diff', :extensions => '-NPbuw')
   end
 
 end # class Svn
+
+class Cvs < Vcs
+
+  # A diff only for your eyes
+  def diffw! ( files_orig=[], options={} )
+    files = diffw_base(files_orig, options)
+    return if files.empty? and not files_orig.empty?
+    diff_! files, options.merge(:N => true, :u => true)
+  end
+
+end # class Cvs

data/lib/vcs/edit.rb

@@ -1,7 +1,7 @@
 # Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # Copyright:: Copyright (c) 2004, 2005 LRDE. All rights reserved.
 # License::   GNU General Public License (GPL).
-# Revision::  $Id: edit.rb 244 2005-09-29 12:45:05Z pouill_n $
+# Revision::  $Id: /w/lrde/tools/trunk/vcs/lib/vcs/edit.rb 21851 2006-02-18T14:20:56.019344Z pouillar  $
 
 require 'vcs/vcs'
 
@@ -12,4 +12,9 @@ class Vcs
     cmd.run(@runner)
   end
 
+  def paginate! ( files=[], options={} )
+    cmd = Vcs.pager + files > [STDOUT, STDERR]
+    cmd.run(@runner)
+  end
+
 end # class Vcs

data/lib/vcs/environment.rb

@@ -1,14 +1,14 @@
 # Copyright:: Copyright (c) 2005  LRDE. All rights reserved.
 # Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # License::   Gnu General Public License.
-# Revision::  $Id: environment.rb 242 2005-09-28 14:19:47Z pouill_n $
+# Revision::  $Id: /w/lrde/tools/trunk/vcs/lib/vcs/environment.rb 21852 2006-02-18T14:21:45.776145Z pouillar  $
 
 class Vcs
 
   class << self
 
     def fullname
-      env('FULLNAME') { Etc.getpwnam(user).gecos }
+      env('FULLNAME') { Etc.getpwnam(user).gecos.gsub(/,+$/, '') }
     end
 
     def editor

data/lib/vcs/form.rb

@@ -1,39 +1,50 @@
 # Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # Copyright:: Copyright (c) 2005 LRDE. All rights reserved.
 # License::   GNU General Public License (GPL).
-# Revision::  $Id: form.rb 266 2005-10-03 13:11:29Z pouill_n $
+# Revision::  $Id: /w/lrde/tools/trunk/vcs/lib/vcs/form.rb 22059 2006-02-20T21:45:33.186346Z pouillar  $
 
 class Vcs
 
   def edit_form! ( *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)"
-    else
-      mk_iform(*args)
-      return YAML.load(IForm.read)['commited']
-    end
+    edit! Form
+    mk_iform(*args)
+    return YAML.load(IForm.read)['Revision'] || :committing
   end
 
+  @@last_line ||= '--This line, and those below, will be ignored--'
 
   def mk_iform! ( *args )
-    with_cache! IForm, 'instanciated form (title, subject, ChangeLog entry, diff)' do
-      cl = mk_form(*args).read
-      ls = []
-      YAML.each_document("--- |\n" + cl) { |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!('revision' => rev, 'commited' => false)
-      if header['title'].nil? or header['title'].blank?
+    with_cache! IForm, 'instanciated form' do
+      form = mk_form(*args).read
+
+      # Remove the first info line if present
+      form.gsub!(/\A--.*\n/, '')
+
+      # Get the message between the `message line' and the `last line'
+      message = form[/^#{@@message_line}$(.*)^#{@@last_line}$/m, 1]
+
+      # Remove every thing after the `message line'
+      form.gsub!(/^#{@@message_line}$.*\Z/m, '')
+
+      # Handle ChangeLog entries to make it Yaml compliant
+      form.gsub!(/^(ChangeLog:)$/, '\1 |2')
+      form.gsub!(/^\t/, "  \t")
+      form.gsub!(/^ {8}/, "  \t")
+
+      header = YAML.load(form)
+
+      input = header['Log'] || header['ChangeLog']
+
+      if header['Title'].nil? or header['Title'].blank?
         raise Failure, "No title found. Reopen `#{Form}' and add it"
       end
-      header['title'] += '.' unless header['title'] =~ /[.?!]$/
-      b = getBinding(header.merge(:rev => rev))
+      header['Title'] += '.' unless header['Title'] =~ /[.?!]$/
+      rev = '<%= rev %>' # make the revision substitution afterward
+      b = getBinding(header.merge(:rev => rev, :revision => rev))
       input = ERB.new(input, nil, '<-%->', '$erbout_').result(b)
       LogEntry.open('w') { |f| f.print input }
+      header['Message'] = message
       header.each_value do |v|
         next unless v.is_a? String
         v.replace(ERB.new(v, nil, '<-%->', '$erbout_').result(b))
@@ -44,51 +55,80 @@ class Vcs
   IForm = ',iform'.to_path unless defined? Vcs::IForm
 
 
-  @@subject_format ||= '<%= rev %>: <%= title %>'
+  @@subject_format ||= '<%= Revision %>: <%= Title %>'
+  @@message_line ||= '--text follow this line--'
 
   def mk_form! ( files=[], options={} )
     with_cache! Form, 'complete form (title, subject, ChangeLog entry, diff)' do
 
       puts "
-      |--- | ########## Fill this file correctly and remove this line ########## | ---
-      |title: 
-      |subject: #{@@subject_format}
-      |
-      |--- | ###################### Your ChangeLog entry ###############  80c| # | ---
-      |<%= title %>
-      |
+      |--You must fill this file correctly to continue--#{' '*13}-*- vcs -*-
+      |Title: \"\"
+      |Subject: #{@@subject_format.dump}
+      |From: \"#{Vcs.full_email}\"
+      |To: [#{options[:to].join(', ')}]
       |".head_cut!
 
-      mk_log_entry!(files)
-
-      puts "|
-      |--- | ########### This line, and those below, will be ignored #### 80c| # | ---
-      |Instructions:
-      |- The first line must be removed when this file is filled.
-      |- After you must specify a title, for the news/mail subject.
-      |  The line containing <%= title %> will be replaced by your title,
-      |  <%= subject %> by the subject line, <%= rev %> by the revision...
-      |- Everywhere in the document you can get/compute some values with
-      |  these tags <%= aRubyExpression %> even some vcs specific call.
-      |  For example <%= status.read %> will include the 'svn status' output.
-      |- Tabulations and stars ('*') will be added in the ChangeLog before each line.
-      |- The '80c|' on the fourth line is here to show you where will be the
-      |  limit. The '|' is the 79th char.
+      options = just_standard_options options
+
+      case Vcs.user_conf.log_mode.to_sym
+      when :change_log
+        puts "
+        |ChangeLog:
+        |".head_cut!
+        mk_log_entry(files, options).each_line(&method(:log_to_changelog))
+      when :log
+        puts "
+        |Log: |2
+        |".head_cut!
+        mk_log_entry(files, options).each_line { |line| puts "  #{line}" }
+      when :yaml_log
+        puts "
+        |YamlLog:
+        |".head_cut!
+        mk_yaml_log_entry!(files, options)
+      end
+      puts "
+      |#{@@message_line}
       |
+      |#{@@last_line}
       |".head_cut!
 
-      diffw!(files)
+      if Vcs.user_conf.new_user
+        puts "|
+        |Instructions:
+        |- Fill the changelog/log entry.
+        |- The first line must be removed when this file is filled.
+        |- After you must specify a title, for the news/mail subject.
+        |  The tag <%= Title %> will be automatically replaced by your title,
+        |  <%= Subject %> by the subject line, <%= Rev %> by the revision...
+        |- Everywhere in the document you can get/compute some values with
+        |  these tags <%= aRubyExpression %> even some vcs specific call.
+        |  For example <%= status.read %> will include the 'svn status' output.
+        |- The Title will be automatically added on the top of your ChangeLog
+        |  entry. The line with the date and your name will be added too.
+        |
+        |".head_cut!
+        case Vcs.user_conf.log_mode.to_sym
+        when :log
+          puts "- Tabulations and stars ('*') will be added in the ChangeLog before each line."
+        end
+      end
+
+      mk_message!(files, options)
+      Message.unlink
     end
   end
   alias_command :mkf, :mk_form
   Form = ',form'.to_path unless defined? Vcs::Form
 
   def getBinding ( header )
-    code = []
+    code = ['module GetBinding']
     header.each do |k, v|
-      code << "#{k} = #{v.inspect}"
+      code << "#{k.to_s.capitalize} = #{v.inspect}"
+      code << "#{k.to_s.downcase} = #{v.inspect}"
     end
-    code << 'binding'
+    code << 'binding' << 'end'
     eval(code.join('; '))
   end
   protected :getBinding

data/lib/vcs/ignore.rb

@@ -1,7 +1,7 @@
 # Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # Copyright:: Copyright (c) 2005  LRDE. All rights reserved.
 # License::   Gnu General Public License.
-# Revision::  $Id: ignore.rb 260 2005-10-02 20:22:46Z pouill_n $
+# Revision::  $Id: /lrde/tools/trunk/vcs/lib/vcs/ignore.rb 9101 2005-10-02T20:22:46.082320Z pouill_n  $
 
 
 class Svn

data/lib/vcs/junk.rb

@@ -1,7 +1,7 @@
 # Copyright:: Copyright (c) 2005  Nicolas Pouillard. All rights reserved.
 # Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # License::   Gnu General Public License.
-# Revision::  $Id: junk.rb 257 2005-09-30 16:43:57Z pouill_n $
+# Revision::  $Id: /lrde/tools/trunk/vcs/lib/vcs/junk.rb 9098 2005-09-30T16:43:57.025414Z pouill_n  $
 
 
 class Vcs

data/lib/vcs/list.rb

@@ -1,7 +1,7 @@
 # Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # Copyright:: Copyright (c) 2005  LRDE. All rights reserved.
 # License::   Gnu General Public License.
-# Revision::  $Id: list.rb 264 2005-10-03 12:32:51Z pouill_n $
+# Revision::  $Id: /w/lrde/tools/trunk/vcs/lib/vcs/list.rb 21853 2006-02-18T14:22:27.363424Z pouillar  $
 
 require 'vcs/svn'
 
@@ -35,16 +35,16 @@ class Svn
         files << '.' if files.empty?
         files.each do |file|
           file.to_path.find do |path|
-            Find.prune if path.to_s =~ /(\/|^)\.svn$/
             if path.directory?
-              if (path/'.svn').exist?
+              if path.dirname.to_s == '.svn'
+              elsif (path/'.svn').exist?
                 inside_versioned << path
               else
                 outside_versioned << path
-                Find.prune
               end
+              Find.prune
             else
-              outside_versioned << path
+              inside_versioned << path
             end
           end
         end

data/lib/vcs/mail.rb

@@ -10,8 +10,11 @@ class Vcs
 
   MAIL = Sendmail::MAIL_FILE unless defined? MAIL
   @@mailer ||= Sendmail.new
-  @@default_options ||= { :confirm => true, :mime => true,
-                          :header => "X-Mailer: Vcs.mail (#{Vcs.version})" }
+  @@default_options ||= {
+    :mime => true,
+    :header => { 'X-Mailer' => "Vcs.mail (#{Vcs::Version})" }
+  }
+  cattr_accessor :mail_options
 
   #
   # Mail.
@@ -19,27 +22,37 @@ class Vcs
   # FIXME handle options properly.
   # Delegate the option parsing to Sendmail.
   def mail! ( files=[], options={} )
-
     # Backward compatiblity
-    files, options = [], files if files.is_a? Hash
-
-    error_handling :mail_failed
+    files, options = [], files if files.is_a? Hash or files.is_a? OpenStruct
+    options = @@default_options.merge(options)
+    options[:signed] = Vcs.user_conf.sign
+    options = @@mailer.parse_mail_options(options)
+    if editing?
+      Vcs.mail_options = options
+      return
+    end
+    header = YAML.load(IForm.read)
+    %w[ Log ChangeLog YamlLog Message Title ].each { |x| header.delete x }
+    options.to = header['To']
+    from = header['From']
+    options.from = from[/<(.*)>/, 1] || from
+    options.header.merge! header
+    options.header.symbolize_keys!
+    return if header['To'].nil?
+    rev = header['Revision']
     unless MAIL.exist?
-      options = @@default_options.merge(options)
-      options[:signed] = Vcs.user_conf.sign
-      print_body(MAIL, @@mailer.parse_mail_options(options), files)
+      print_body(MAIL, options, files)
     end
-    @@mailer.sendmail
-    puts 'Mail: Sent.'
-  end
-
-  def mail_failed
-    if defined? @@mail and @@mail.exist?
-      logger.info { "#{MAIL}: Contains the generated mail" }
-      logger.info { "       AND information to send it (smtpserver, port...)" }
+    if sending?
+      mail = MAIL.read.gsub(/<%= rev %>/, rev.to_s)
+      MAIL.open('w') { |f| f.puts mail }
+      @@mailer.sendmail
+      puts 'Mail: Sent.'
     end
   end
 
+  at_exit { MAIL.unlink if defined? MAIL and MAIL.exist? }
+
   def mail_conf_checker
     if Vcs.user_conf.sign
       unless `gpg --version` =~ /^gpg \(GnuPG\)/

data/lib/vcs/message.rb

@@ -3,6 +3,8 @@
 # License::   GNU General Public License (GPL).
 # Revision::  $Id: header 98 2004-09-29 12:07:43Z ertai $
 
+
+
 class Vcs
 
   def print_body ( file, options, files=[] )
@@ -11,7 +13,6 @@ class Vcs
       f.puts '---'
       f.puts options.to_yaml.gsub(/---\s*/, '')
       f.puts '---'
-      f.puts
       with(f).mk_message!(files)
     end
   end
@@ -21,23 +22,24 @@ class Vcs
   def mk_message! ( files=[], options={} )
     with_cache! Message, 'generated message (ChangeLog, diffstat, diff)' do
       url!
+      if msg = options['Message']
+        puts msg
+      end
+      options = just_standard_options options
       if defined? COLLABOA
-        puts
         puts 'You can also view this changeset here:'
         puts
-        next_rev = rev.output.read.to_i
-        next_rev += 1 unless commited?
-        puts "http://#{COLLABOA}/repository/changesets/#{next_rev}"
+        puts "http://#{COLLABOA}/repository/changesets/<%= rev %>"
       end
       puts
       flush
-      mk_message_entry!(files)
+      mk_message_entry!(files, options)
       puts
       flush
-      diffstat!(files)
+      diffstat!(files, options)
       puts
       flush
-      diffw(files).each_line do |line|
+      diffw(files, options).each_line do |line|
         print line if line !~ /^=+$/
       end
     end
@@ -45,5 +47,4 @@ class Vcs
   alias_command :msg, :mk_message
   Message = ',message'.to_path unless defined? Message
 
-
 end # class Vcs

data/lib/vcs/opt_parse.rb

@@ -1,7 +1,7 @@
 # Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
 # Copyright:: Copyright (c) 2005 LRDE. All rights reserved.
 # License::   GNU General Public License (GPL).
-# Revision::  $Id: opt_parse.rb 242 2005-09-28 14:19:47Z pouill_n $
+# Revision::  $Id: /w/lrde/tools/trunk/vcs/lib/vcs/opt_parse.rb 22373 2006-02-28T14:38:25.955275Z pouillar  $
 
 
 class Vcs
@@ -44,6 +44,7 @@ class Vcs
       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
+          next if n == 'prcs'
           if VcsApp.path.executable?
             puts "alias #{n}=#{VcsApp.path}-#{n} ;"
           else
@@ -71,7 +72,7 @@ class Vcs
       end
 
       o.on_tail('--version', 'Show version') do
-        STDOUT.puts "Vcs version: #{Vcs.version}"
+        STDOUT.puts "Vcs version: #{Vcs::Version.major_minor} (#{Vcs::Version.tag.pretty_string})"
         exit
       end