vcs 0.3.0 → 0.4.0

data/bin/vcs-prcs

@@ -1,10 +1,9 @@
 #!/usr/bin/env ruby
-# Author: Nicolas Pouillard  <ertai@lrde.epita.fr>.
-# Copyright: Copyright (c) 2004 LRDE. All rights reserved.
-# License: GNU General Public License (GPL).
+# Author::    Nicolas Pouillard  <ertai@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

data/bin/vcs-svn

@@ -1,10 +1,9 @@
 #!/usr/bin/env ruby
-# Author: Nicolas Pouillard  <ertai@lrde.epita.fr>.
-# Copyright: Copyright (c) 2004 LRDE. All rights reserved.
-# License: GNU General Public License (GPL).
+# Author::    Nicolas Pouillard  <ertai@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

data/lib/vcs/add.rb

@@ -0,0 +1,21 @@
+# Copyright:: Copyright (c) 2005  LRDE. All rights reserved.
+# Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
+# License::   Gnu General Public License.
+# Revision::  $Id: add.rb 265 2005-10-03 12:37:03Z pouill_n $
+
+class Vcs
+
+  specific_options << '--auto'
+
+  def add! ( files=[], options={} )
+    if options[:auto]
+      options.delete(:auto)
+      list!(files, :unrecognize => true) do |path_list|
+        add_!(path_list.stringify, options) unless path_list.empty?
+      end
+    else
+      add_!(files, options)
+    end
+  end
+
+end # class Vcs

data/lib/vcs/app.rb

@@ -0,0 +1,129 @@
+# Copyright:: Copyright (c) 2005  LRDE. All rights reserved.
+# Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
+# License::   Gnu General Public License.
+# Revision::  $Id: app.rb 261 2005-10-03 00:45:53Z pouill_n $
+
+require 'pathname'
+
+# vcs: The version control system wrapper.
+#
+# Vcs is a wrapper over any version control system.
+class VcsApp
+
+  @@vcs_dir        ||= Pathname.new(__FILE__).expand_path.dirname
+  @@dir            ||= @@vcs_dir.parent
+  @@extension_dirs ||= []
+
+  require @@vcs_dir + 'vcs' unless defined? Vcs
+
+  @@dir.load_path!
+
+  cattr_accessor :vcs_dir
+  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$/
+        logger.debug { file.basename.to_s } if require file.to_s
+      end
+      grab_all_vcs()
+    end
+
+    def grab_all_vcs
+      @@all_vcs ||= {}
+
+      if @@all_vcs.empty?
+        ObjectSpace.each_object(Class) do |aClass|
+          if aClass != Vcs and aClass.ancestors.include? Vcs
+            name = aClass.to_s.demodulize.underscore.to_sym
+            @@all_vcs[name] = aClass
+          end
+        end
+      end
+    end
+
+    def all_vcs
+      @@all_vcs.keys
+    end
+
+  end
+
+  requirements()
+  require 'vcs/opt_parse'
+  @@parser = Vcs::OptParse.new
+
+  def initialize ( __file__, vcs_type=nil )
+    @@path = __file__.to_path
+    Vcs.default ||= vcs_type
+  end
+
+  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
+    grab_dirs('.vcs').each do |vcs_user_conf|
+      Vcs.merge_user_conf(vcs_user_conf)
+    end
+  end
+
+  def run
+    vcs = nil
+    begin
+      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
+        STDERR.puts "
+          |
+          |Specify at least a Vcs type, or use a wrapped command
+          |like svn, cvs, prcs in the vcs bin directory.
+        ".head_cut!
+        exit
+      end
+      vcs = @@all_vcs[Vcs.default.to_s.downcase.to_sym].new
+      vcs.run_argv(ARGV)
+
+    rescue SystemExit => ex
+      raise ex
+    rescue Exception => ex
+      if vcs.nil?
+        logger.error { "No Vcs instanciated" }
+      else
+        vcs.call_handlers
+      end
+      err = ex.to_s.sub(/\.$/, '')
+      logger.debug { err = ex.long_pp ; "Backtrace enabled:" }
+      err = ex.inspect if err.empty?
+      logger.error { err }
+      exit 1
+    end
+  end
+
+end # class VcsApp
+

data/lib/vcs/back.rb

@@ -0,0 +1,36 @@
+# Copyright:: Copyright (c) 2005  Nicolas Pouillard. All rights reserved.
+# Author::    Nicolas Pouillard  <ertai@lrde.epita.fr>.
+# License::   Gnu General Public License.
+# Revision::  $Id: back.rb 261 2005-10-03 00:45:53Z pouill_n $
+
+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

data/lib/vcs/changelog.rb

@@ -1,164 +1,109 @@
 # Author::    Nicolas Pouillard  <ertai@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 $
 
-require 'vcs/vcs'
-require 'vcs/svn'
 
-class Svn
+class Vcs
 
-  @@file_st =
+  @@file_st ||=
   {
-    'A' => 'New',
-    'D' => 'Remove',
+    ?A => 'new',
+    ?D => 'remove',
   }
-  @@file_st.default = ''
 
-  @@prop_st =
+  @@prop_st ||=
   {
-    'M' => 'Changed property'
+    ?M => 'changed property'
   }
 
-  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 == 'ChangeLog'
-      ls = []
-      ls << @@file_st[file_st] if @@file_st.has_key? file_st
-      ls << @@prop_st[prop_st].downcase if @@prop_st.has_key? prop_st
-      result << [file, ls.join(', ')]
+  @@entries ||= {}
+
+  def mk_log_entry_contents ( *args )
+    return @@entries[args] if @@entries.has_key? args
+    @@entries[args] = result = []
+    status(*args) do |se|
+      next if se.file_st.chr =~ /[?X\\,+]/
+      next if se.file.to_s == 'ChangeLog'
+      ls = [@@file_st[se.file_st], @@prop_st[se.prop_st]].compact!
+      ls.first.capitalize! unless ls.empty?
+      se.comment = ls.join(', ')
+      result << se
     end
     raise Failure, 'No changes, so no ChangeLog entry.' if result.empty?
     result
   end
-  private :mkchangelog_from_status
-
-end # class Svn
-
+  private :mk_log_entry_contents
 
-class Vcs
 
-  class MustBeFilled < Exception
-    attr_reader :file
-    def initialize ( file )
-      @file = file
-      super("You must fill this file: `#{file.to_s}'")
+  # Same switches as status
+  def mk_log_entry! ( *args )
+    with_cache! LogEntry, 'Log entry' do
+      mk_log_entry_contents(*args).each do |se|
+        puts "- #{se.file}: #{se.comment}."
+      end
     end
   end
-
-  @@subject_format = '<%= rev %>: <%= title %>'
-
-  def mkchangelog! ( *args )
-    error_handling :changelog_failed
-
-    unless CL.exist?
-      raise Failure, "No `#{CL}', you are probably not in a valid directory."
-    end
-
-    cl = ADD_CL
-
-    # Already filled if ,ChangeLog.add exists and not begin by ---
-    if cl.exist?
-      raise MustBeFilled, cl if cl.read =~ /\A---/
-      require 'erb'
-      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)
-      META.open('w') { |f| f.puts header }
-      output = ERB.new(input, $SAFE, '<-%->', '$erbout_').result(b)
-      return output
+  alias_command :mkl, :mk_log_entry
+  LogEntry = ',log'.to_path unless defined? LogEntry
+
+  def log_to_changelog ( aString )
+    if aString.blank?
+      puts
+    else
+      putc ?\t
+      aString.sub!(/^-/, '*')
+      puts aString
     end
+  end
+  private :log_to_changelog
 
-    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}")
-      f.puts "
-|--- | ########## Fill this file correctly and remove this line ########## | ---
-|title: 
-|subject: #{@@subject_format}.
-|
-|--- | ###################### Your ChangeLog entrie ###################### | ---
-      |#{head}
-      |
-      |\t<%= title %>.
-      |
-      |".head_cut!
-
-      cl_add.each do |file, str|
-        f.puts "\t* #{file}: #{str}."
-      end
+  # Same switches as mk_log_entry
+  def mk_changelog_entry! ( *args )
+      puts Time.now.strftime("%Y-%m-%d  #{Vcs.full_email}")
+      puts
+      mk_log_entry(*args).each_line(&method(:log_to_changelog))
+  end
+  alias_command :mkcl, :mk_changelog_entry
 
-      f.puts "|
-|--- | ########### This line, and those below, will be ignored ########### | ---
-      |Instructions:
-      |\t* The first line must be removed when this file is filled.
-      |\t* After you must specify a title, for the news/mail subject.
-      |\t* The line containing <%= title %> will be replaced by your title,
-      |\t  <%= subject %> by the subject line, <%= rev %> by the revision...
-      |\t* Everywhere in the document you can get/compute some values with
-      |\t  these tags <%= aRubyExpression %> even some vcs specific call.
-      |\t  For example <%= status.read %> will include the `svn status' output.
-      |
-      |".head_cut!
-      with(f).diff!(*args)
-    end
 
-    raise MustBeFilled, cl
+  # Same switches as mk_log_entry
+  def mk_message_entry! ( *args )
+      puts 'Index: ChangeLog'
+      puts "from  #{Vcs.full_email}"
+      puts
+      mk_log_entry(*args).each_line(&method(:log_to_changelog))
   end
+  alias_command :mkml, :mk_message_entry
 
-  def concat_changelog! ( *args )
-    error_handling :changelog_failed
-
-    if cl_entry = mkchangelog(*args)
 
-      unless TMP_CL.exist?
-	LOG.info "Moving `#{CL}' to `#{TMP_CL}' ..."
-	CL.rename(TMP_CL)
-      end
 
-      CL.open('w') do |file|
-	LOG.info "Prepending `#{ADD_CL}' to `#{CL}' ..."
-	file.print cl_entry
-	file.puts
-        file.print TMP_CL.read
-      end
+  # Same switches as mk_changelog_entry
+  def concat_changelog! ( *args )
+    error_handling :concat_changelog_failed
 
-      return cl_entry
+    unless TMP_CL.exist?
+      logger.info "Backup your `#{CL}' to `#{TMP_CL}' ..."
+      CL.rename(TMP_CL)
+    end
 
+    CL.open('w') do |file|
+      logger.info "#{CL}: Writing your new entry ..."
+      with(file).mk_changelog_entry!(*args)
+      file.puts
+      logger.info "#{CL}: Writing the others ..."
+      file.print TMP_CL.read
     end
   end
+  alias_command :catcl, :concat_changelog
 
-  def changelog_failed
+  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
-    LOG.info "#{ADD_CL}: Contains your ChangeLog entry" if ADD_CL.exist?
-  end
-
-  def getBinding ( header )
-    code = []
-    header.each do |k, v|
-      code << "#{k} = #{v.inspect}"
-    end
-    code << 'binding'
-    eval(code.join('; '))
   end
-  protected :getBinding
 
-  alias_command :mkcl, :mkchangelog
-  alias_command :ctcl, :concat_changelog
 
 end # class Vcs