vcs 0.1 → 0.2.148

data/Rakefile

@@ -2,15 +2,17 @@ require 'rubygems'
 require 'rake'
 require 'rake/testtask'
 require 'rake/packagetask'
+require 'rake/rdoctask'
 require 'rake/gempackagetask'
 require 'rake/contrib/rubyforgepublisher'
 
-PKG_VERSION = '0.1'
+PKG_VERSION = "0.2.#{`vcs-svn rev`.chomp}"
 
 PKG_FILES = FileList[*%w"
   src/**/*.rb
+  ruby_ex/**/*.rb
   bin/**/*
-  *.rb
+  doc/**/*
   [A-Z]*
 "].exclude(/\b\.svn\b|\..*\.sw[op]$|~$|README/)
 
@@ -22,6 +24,18 @@ task :rubyforge do
   Rake::RubyForgePublisher.new('vcs', 'ertai').upload
 end
 
+
+Rake::RDocTask.new('doc') do |rdoc|
+  rdoc.title = 'Vcs -- A wrapper over any version control system'
+  rdoc.template = 'kilmer'
+  #rdoc.template = 'doc/jamis'
+  rdoc.options << '--line-numbers' << '--inline-source'
+  #rdoc.rdoc_files.add('src/vcs.rb', 'src/**/*.rb')
+  rdoc.rdoc_files.add('src/**/*.rb')
+  #rdoc.main = 
+end
+
+
 # The Gem specification
 spec = Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY
@@ -42,7 +56,7 @@ spec = Gem::Specification.new do |s|
   s.require_path = 'src'
   s.autorequire = 'vcs'
 
-  s.has_rdoc = false
+  s.has_rdoc = true
   s.author = 'Nicolas Pouillard'
   s.email = 'ertai@lrde.epita.fr'
   s.homepage = 'https://svn.lrde.epita.fr/svn/lrdetools/trunk/vcs/'

data/bin/vcs

@@ -14,31 +14,44 @@
 require 'pathname'
 require 'logger'
 require 'optparse'
+require 'set'
 
-begin
-  REV="$Rev$".sub(/LastChangedRevision:\s+/, '').to_i
-rescue
-  REV=-1
-end
-
+VCS_VERSION = '0.2.148'
 VCS_PATH = Pathname.new(__FILE__).expand_path
 VCS_DIR, VCS = VCS_PATH.split
 SRC = VCS_DIR + '..' + 'src'
+RUBY_EX = VCS_DIR + '..' + 'ruby_ex'
 $: << SRC.to_s
-$: << Pathname.pwd + 'vcs'
+$: << RUBY_EX.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)
-LOG.level = Logger::INFO
+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
 
-$debug = ENV['VCS_DEBUG'].to_i
-
-Pathname.glob("{#{SRC},vcs}/*.rb") do |file|
-  LOG.debug file.basename if $debug > 4
-  require file.basename
+Pathname.glob("{#{SRC}/**,#{vcs_dir}}/*.rb") do |file|
+  LOG.debug { file.basename.to_s }
+  begin
+    require file.basename.to_s
+  rescue LoadError => ex
+    begin
+      require file.to_s
+    rescue
+      raise ex
+    end
+  end
 end
 
 ALL_VCS_NAMES = []
@@ -80,6 +93,13 @@ OPTS = OptionParser.new do |opts|
     exit
   end
 
+  opts.on('-C', '--[no-]check', 'Check your vcs configuration') do |check|
+    if check
+      Vcs.new('').call_conf_checkers 
+      exit
+    end
+  end
+
   opts.on('-d', '--debug LEVEL', Integer, 'Set debug level') do |anInteger|
     $debug = anInteger
   end
@@ -90,7 +110,7 @@ OPTS = OptionParser.new do |opts|
   end
 
   opts.on_tail('--version', 'Show version') do
-    STDOUT.puts "Vcs revision: #{REV}"
+    STDOUT.puts "Vcs version: #{VCS_VERSION}"
     exit
   end
 
@@ -113,27 +133,30 @@ end
 FULL_EMAIL = "#{FULLNAME}  <#{EMAIL}>"
 
 def main
-  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
+  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
 
-  if ARGV.empty?
-    meth = :help!
-  else
-    meth = ARGV.shift.sub(/([^!])$/, '\1!')
+    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
-  
-  vcs.send(meth, *ARGV)
 end
 
-begin
-  main()
-rescue Exception
-  raise if $debug > 0
-  LOG.error $!.to_s.sub(/\.$/, '') unless $!.to_s == 'exit'
-end
+main()

data/doc/jamis.rb

@@ -0,0 +1,564 @@
+module RDoc
+module Page
+
+FONTS = "\"Bitstream Vera Sans\", Verdana, Arial, Helvetica, sans-serif"
+
+STYLE = <<CSS
+a {
+  color: #00F;
+  text-decoration: none;
+}
+
+a:hover {
+  color: #77F;
+  text-decoration: underline;
+}
+
+body, td, p {
+  font-family: %fonts%;
+  background: #FFF;
+  color: #000;
+  margin: 0px;
+  font-size: small;
+}
+
+#content {
+  margin: 2em;
+}
+
+#description p {
+  margin-bottom: 0.5em;
+}
+
+.sectiontitle {
+  margin-top: 1em;
+  margin-bottom: 1em;
+  padding: 0.5em;
+  padding-left: 2em;
+  background: #005;
+  color: #FFF;
+  font-weight: bold;
+  border: 1px dotted black;
+}
+
+.attr-rw {
+  padding-left: 1em;
+  padding-right: 1em;
+  text-align: center;
+  color: #055;
+}
+
+.attr-name {
+  font-weight: bold;
+}
+
+.attr-desc {
+}
+
+.attr-value {
+  font-family: monospace;
+}
+
+.file-title-prefix {
+  font-size: large;
+}
+
+.file-title {
+  font-size: large;
+  font-weight: bold;
+  background: #005;
+  color: #FFF;
+}
+
+.banner {
+  background: #005;
+  color: #FFF;
+  border: 1px solid black;
+  padding: 1em;
+}
+
+.banner td {
+  background: transparent;
+  color: #FFF;
+}
+
+h1 a, h2 a, .sectiontitle a, .banner a {
+  color: #FF0;
+}
+
+h1 a:hover, h2 a:hover, .sectiontitle a:hover, .banner a:hover {
+  color: #FF7;
+}
+
+.dyn-source {
+  display: none;
+  background: #FFE;
+  color: #000;
+  border: 1px dotted black;
+  margin: 0.5em 2em 0.5em 2em;
+  padding: 0.5em;
+}
+
+.dyn-source .cmt {
+  color: #00F;
+  font-style: italic;
+}
+
+.dyn-source .kw {
+  color: #070;
+  font-weight: bold;
+}
+
+.method {
+  margin-left: 1em;
+  margin-right: 1em;
+  margin-bottom: 1em;
+}
+
+.description pre {
+  padding: 0.5em;
+  border: 1px dotted black;
+  background: #FFE;
+}
+
+.method .title {
+  font-family: monospace;
+  font-size: large;
+  border-bottom: 1px dashed black;
+  margin-bottom: 0.3em;
+  padding-bottom: 0.1em;
+}
+
+.method .description, .method .sourcecode {
+  margin-left: 1em;
+}
+
+.description p, .sourcecode p {
+  margin-bottom: 0.5em;
+}
+
+.method .sourcecode p.source-link {
+  text-indent: 0em;
+  margin-top: 0.5em;
+}
+
+.method .aka {
+  margin-top: 0.3em;
+  margin-left: 1em;
+  font-style: italic;
+  text-indent: 2em;
+}
+
+h1 {
+  padding: 1em;
+  border: 1px solid black;
+  font-size: x-large;
+  font-weight: bold;
+  color: #FFF;
+  background: #007;
+}
+
+h2 {
+  padding: 0.5em 1em 0.5em 1em;
+  border: 1px solid black;
+  font-size: large;
+  font-weight: bold;
+  color: #FFF;
+  background: #009;
+}
+
+h3, h4, h5, h6 {
+  padding: 0.2em 1em 0.2em 1em;
+  border: 1px dashed black;
+  color: #000;
+  background: #AAF;
+}
+
+.sourcecode > pre {
+  padding: 0.5em;
+  border: 1px dotted black;
+  background: #FFE;
+}
+
+CSS
+
+BODY = <<HTML
+<html>
+  <head>
+    <title>%title%</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=%charset%" />
+    <link rel="stylesheet" href="%style_url%" type="text/css" media="screen" />
+
+    <script type="text/javascript" language="JavaScript">
+      <!--
+        function toggleSource( id )
+        {
+          var elem
+          var link
+
+          if( document.all )
+          {
+            elem = eval( "document.all." + id )
+            link = eval( "document.all.l_" + id )
+          }
+          else
+          {
+            elem = document.getElementById( id )
+            link = document.getElementById( "l_" + id )
+          }
+
+          if( elem.style.display == "block" )
+          {
+            elem.style.display = "none"
+            link.innerHTML = "show source"
+          }
+          else
+          {
+            elem.style.display = "block"
+            link.innerHTML = "hide source"
+          }
+        }
+
+        function openCode( url )
+        {
+          window.open( url, "SOURCE_CODE", "width=400,height=400,scrollbars=yes" )
+        }
+      //-->
+    </script>
+  </head>
+
+  <body>
+!INCLUDE! <!-- banner header -->
+
+  <div id="content">
+IF:diagram
+  <table cellpadding='0' cellspacing='0' border='0' width="100%"><tr><td align="center">
+    %diagram%
+  </td></tr></table>
+ENDIF:diagram
+
+IF:description
+  <div class="description">%description%</div>
+ENDIF:description
+
+IF:requires
+  <div class="sectiontitle">Required Files</div>
+  <ul>
+START:requires
+  <li>HREF:aref:name:</li>
+END:requires
+  </ul>
+ENDIF:requires
+
+IF:methods
+  <div class="sectiontitle">Methods</div>
+  <ul>
+START:methods
+  <li>HREF:aref:name:</li>
+END:methods
+  </ul>
+ENDIF:methods
+
+IF:constants
+  <div class="sectiontitle">Constants</div>
+  <table border='0' cellpadding='5'>
+START:constants
+  <tr valign='top'>
+    <td class="attr-name">%name%</td>
+    <td>=</td>
+    <td class="attr-value">%value%</td>
+  </tr>
+IF:desc
+  <tr valign='top'>
+    <td>&nbsp;</td>
+    <td colspan="2" class="attr-desc">%desc%</td>
+  </tr>
+ENDIF:desc
+END:constants
+  </table>
+ENDIF:constants
+
+IF:attributes
+  <div class="sectiontitle">Attributes</div>
+  <table border='0' cellpadding='5'>
+START:attributes
+  <tr valign='top'>
+    <td class='attr-rw'>
+IF:rw
+[%rw%]
+ENDIF:rw
+    </td>
+    <td class='attr-name'>%name%</td>
+    <td class='attr-desc'>%a_desc%</td>
+  </tr>
+END:attributes
+  </table>
+ENDIF:attributes
+
+IF:classlist
+  <div class="sectiontitle">Classes and Modules</div>
+  %classlist%
+ENDIF:classlist
+
+!INCLUDE! <!-- method descriptions -->
+
+    </div>
+  </body>
+</html>
+HTML
+
+FILE_PAGE = <<HTML
+<table border='0' cellpadding='0' cellspacing='0' width="100%" class='banner'>
+  <tr><td>
+    <table width="100%" border='0' cellpadding='0' cellspacing='0'><tr>
+      <td class="file-title" colspan="2"><span class="file-title-prefix">File</span><br />%short_name%</td>
+      <td align="right">
+        <table border='0' cellspacing="0" cellpadding="2">
+          <tr>
+            <td>Path:</td>
+            <td>%full_path%
+IF:cvsurl
+				&nbsp;(<a href="%cvsurl%">CVS</a>)
+ENDIF:cvsurl
+            </td>
+          </tr>
+          <tr>
+            <td>Modified:</td>
+            <td>%dtm_modified%</td>
+          </tr>
+        </table>
+      </td></tr>
+    </table>
+  </td></tr>
+</table><br>
+HTML
+
+###################################################################
+
+CLASS_PAGE = <<HTML
+<table width="100%" border='0' cellpadding='0' cellspacing='0' class='banner'><tr>
+  <td class="file-title"><span class="file-title-prefix">%classmod%</span><br />%full_name%</td>
+  <td align="right">
+    <table cellspacing=0 cellpadding=2>
+      <tr valign="top">
+        <td>In:</td>
+        <td>
+START:infiles
+HREF:full_path_url:full_path:
+IF:cvsurl
+&nbsp;(<a href="%cvsurl%">CVS</a>)
+ENDIF:cvsurl
+END:infiles
+        </td>
+      </tr>
+IF:parent
+    <tr>
+      <td>Parent:</td>
+      <td>
+IF:par_url
+        <a href="%par_url%">
+ENDIF:par_url
+%parent%
+IF:par_url
+         </a>
+ENDIF:par_url
+     </td>
+   </tr>
+ENDIF:parent
+         </table>
+        </td>
+        </tr>
+      </table>
+HTML
+
+###################################################################
+
+METHOD_LIST = <<HTML
+IF:includes
+<div class="sectiontitle">Included Modules</div>
+<ul>
+START:includes
+  <li>HREF:aref:name:</li>
+END:includes
+</ul>
+ENDIF:includes
+
+IF:method_list
+START:method_list
+IF:methods
+<div class="sectiontitle">%type% %category% methods</div>
+START:methods
+<div class="method">
+  <div class="title">
+IF:callseq
+    <a name="%aref%"></a><b>%callseq%</b>
+ENDIF:callseq
+IFNOT:callseq
+    <a name="%aref%"></a><b>%name%</b>%params%
+ENDIF:callseq
+IF:codeurl
+[ <a href="javascript:openCode('%codeurl%')">source</a> ]
+ENDIF:codeurl
+  </div>
+IF:m_desc
+  <div class="description">
+  %m_desc%
+  </div>
+ENDIF:m_desc
+IF:aka
+<div class="aka">
+  This method is also aliased as
+START:aka
+  <a href="%aref%">%name%</a>
+END:aka
+</div>
+ENDIF:aka
+IF:sourcecode
+<div class="sourcecode">
+  <p class="source-link">[ <a href="javascript:toggleSource('%aref%-source')" id="l_%aref%-source">show source</a> ]</p>
+  <div id="%aref%-source" class="dyn-source">
+<pre>
+%sourcecode%
+</pre>
+  </div>
+</div>
+ENDIF:sourcecode
+</div>
+END:methods
+ENDIF:methods
+END:method_list
+ENDIF:method_list
+HTML
+
+=begin
+=end
+
+########################## Source code ##########################
+
+SRC_PAGE = <<HTML
+<html>
+<head><title>%title%</title>
+<meta http-equiv="Content-Type" content="text/html; charset=%charset%">
+<style>
+.ruby-comment    { color: green; font-style: italic }
+.ruby-constant   { color: #4433aa; font-weight: bold; }
+.ruby-identifier { color: #222222;  }
+.ruby-ivar       { color: #2233dd; }
+.ruby-keyword    { color: #3333FF; font-weight: bold }
+.ruby-node       { color: #777777; }
+.ruby-operator   { color: #111111;  }
+.ruby-regexp     { color: #662222; }
+.ruby-value      { color: #662222; font-style: italic }
+  .kw { color: #3333FF; font-weight: bold }
+  .cmt { color: green; font-style: italic }
+  .str { color: #662222; font-style: italic }
+  .re  { color: #662222; }
+</style>
+</head>
+<body bgcolor="white">
+<pre>%code%</pre>
+</body>
+</html>
+HTML
+
+########################## Index ################################
+
+FR_INDEX_BODY = <<HTML
+!INCLUDE!
+HTML
+
+FILE_INDEX = <<HTML
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=%charset%">
+<style>
+<!--
+  body {
+    background-color: #EEE;
+    font-family: #{FONTS}; 
+    color: #000;
+    margin: 0px;
+  }
+  .banner {
+    background: #005;
+    color: #FFF;
+    padding: 0.2em;
+    font-size: small;
+    font-weight: bold;
+    text-align: center;
+  }
+  .entries {
+    margin: 0.25em 1em 0 1em;
+    font-size: x-small;
+  }
+  a {
+    color: #00F;
+    text-decoration: none;
+  }
+  a:hover {
+    color: #77F;
+    text-decoration: underline;
+  }
+-->
+</style>
+<base target="docwin">
+</head>
+<body>
+<div class="banner">%list_title%</div>
+<div class="entries">
+START:entries
+<a href="%href%">%name%</a><br>
+END:entries
+</div>
+</body></html>
+HTML
+
+CLASS_INDEX = FILE_INDEX
+METHOD_INDEX = FILE_INDEX
+
+INDEX = <<HTML
+<html>
+<head>
+  <title>%title%</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=%charset%">
+</head>
+
+<frameset cols="20%,*">
+    <frameset rows="15%,35%,50%">
+        <frame src="fr_file_index.html"   title="Files" name="Files" />
+        <frame src="fr_class_index.html"  name="Classes" />
+        <frame src="fr_method_index.html" name="Methods" />
+    </frameset>
+IF:inline_source
+      <frame  src="%initial_page%" name="docwin">
+ENDIF:inline_source
+IFNOT:inline_source
+    <frameset rows="80%,20%">
+      <frame  src="%initial_page%" name="docwin">
+      <frame  src="blank.html" name="source">
+    </frameset>
+ENDIF:inline_source
+    <noframes>
+          <body bgcolor="white">
+            Click <a href="html/index.html">here</a> for a non-frames
+            version of this page.
+          </body>
+    </noframes>
+</frameset>
+
+</html>
+HTML
+
+# and a blank page to use as a target
+BLANK = %{
+<html><body bgcolor="white"></body></html>
+}
+
+def write_extra_pages
+  template = TemplatePage.new(BLANK)
+  File.open("blank.html", "w") { |f| template.write_html_on(f, {}) }
+end
+
+end
+end
+