ratch 0.4.0 → 0.4.1

data/CHANGES

@@ -1,6 +1,12 @@
 = Ratch Revision History
 
-== 0.3.0 / 2007-12-
+== 0.4.1 / 2007-12-18
+
+* #rollrc will be deprecated, it is now just an alias of #release.
+* #release gets it's data from the .roll file (no longer ROLLRC).
+* Split ruby/svn/log task into two; one for text log and the other for xml log.
+
+== 0.4.0 / 2007-12-14
 
 * Reorganized batch scripts --eventually to simplify the code a bit more.
 * Made bin? and safe? functions of FileTest.

data/bin/ratch

@@ -1,21 +1,36 @@
 #! /usr/bin/env ruby
 
+# TODO Create a more robust parser.
+
 if ARGV[0] == '-s'
   require 'ratch/manager'
   manager = Ratch::Manager.new
-  file = ARGV[1]
-  if file
-    # run tool
-    if tool = manager.tool?(file)
-      require 'ratch/dsl'
-      load(tool)
+
+  set  = ARGV[1]
+  path = ARGV[2]
+
+  if set
+    if setdirectory = manager.toolset?(set)
+      if path
+        if batchfile = manager.tool?(set, path)
+          require 'ratch/dsl'
+          self.batch_directory = setdirectory
+          load($0 = batchfile)
+        else
+          puts "no #{set} tool -- #{path}"
+        end
+      else
+        puts manager.tools(set).join("\n")
+      end
     else
-      puts "no tool -- #{file}"
+      puts "no toolset -- #{set}"
     end
   else
-    puts manager.toolset.join("\n")
+    puts manager.toolsets.join("\n")
   end
+
 elsif ARGV.empty?
+
   # TODO read stdin for ratch script
 
 else

data/lib/ratch/dsl/batch.rb

@@ -62,15 +62,21 @@ module Dsl
       @call_directory ||= File.expand_path(File.dirname($0))
     end
 
-    # TODO Better name? Better definition?
+    # TODO Better name? (system_directory ?)
 
     def batch_directory
+      # TODO: Better definition?
       @batch_directory ||= (
         dir = call_directory.sub(root_directory + '/', '').split('/').first
         File.join(root_directory, dir)
       )
     end
 
+    # If a system directory is used (as opposed to a local project directory)
+    # then the batch directory will need to be set explicitly.
+
+    attr_writer :batch_directory
+
     # Current batch file, relative to the batch directory.
 
     def batch_file

data/lib/ratch/dsl/build.rb

@@ -68,7 +68,7 @@ module Dsl
       # Define a file build task.
 
       def define_file(name, *depend, &block)
-        build = Build::File.new(name, *depend, &block)
+        build = Build.new(name, *depend, &block)
         builds << build
       end
 

data/lib/ratch/dsl/meta.rb

@@ -40,17 +40,10 @@ module Dsl
 
     # Roll file information.
 
-    def rollrc
+    def release
       @rollrc ||= Release.load
-      #     @rollrc ||= (
-      #       file = Dir.glob('{meta/,}rollrc', File::FNM_CASEFOLD).first
-      #       data = File.read(file).split(/\n/)
-      #       data, *libpath = *data
-      #       name, version, status, date, default, *null = *data.split(/\s+/)
-      #       klass = Struct.new("ROLLRC", :file, :name, :version, :status, :date, :default, :libpath)
-      #       klass.new(file, name, version, status, date, default, libpath)
-      #     )
     end
+    alias_method :rollrc, :release
 
     # Load configuration data from a file. The file will
     # be looked for in the current script directory then

data/lib/ratch/manager.rb

@@ -1,34 +1,53 @@
-
 module Ratch
 
    class Manager
 
-     def toolset_directory
-       File.join(File.dirname(__FILE__), 'toolset')
+     # Return master toolset directory. If toolset if given then
+     # return that toolsets directory.
+
+     def toolset_directory(toolset=nil)
+       if toolset
+         File.join(File.dirname(__FILE__), 'toolset', toolset)
+       else
+         File.join(File.dirname(__FILE__), 'toolset')
+       end
      end
 
-     #
+     # List toolsets.
 
-     def toolset
+     def toolsets
        files = []
        Dir.chdir(toolset_directory) do
-         files = Dir.glob('**/*')
+         files = Dir.glob('*/').map{ |d| d.chomp('/') }
        end
        files
      end
 
-     #
+     # List tools for a give toolset.
 
-     def tool?(fname)
-       file = File.join(toolset_directory, fname)
-       if File.exist?(file)
-         file
-       else
-         false
+     def tools(toolset=nil)
+       files = []
+       direc = toolset ? File.join(toolset_directory, toolset) : toolset_directory
+       Dir.chdir(direc) do
+         files = Dir.glob('**/*') - Dir.glob('**/*/').map{ |d| d.chomp('/') }
        end
+       files
+     end
+
+     # Verify a toolset exists?
+
+     def toolset?(toolset)
+       path = File.join(toolset_directory, toolset)
+       File.exist?(path) ? path : false
+     end
+
+     # Verify a tool exists for a given toolset.
+
+     def tool?(toolset, batchfile)
+       path = File.join(toolset_directory, toolset, batchfile)
+       File.exist?(path) ? path : false
      end
 
    end
 
 end
-

data/lib/ratch/metadata/release.rb

@@ -34,10 +34,6 @@ module Ratch
 
     attr_accessor :name
 
-    validate "name is required" do
-      name
-    end
-
     # Version number.
 
     attr_accessor :version
@@ -69,12 +65,12 @@ module Ratch
 
     #
 
-    ROLLRC_FILE   = '{.,meta/}{roll}{.rc,rc,}'
+    ROLL_FILE   = '{,meta/}*.roll'
 
     # Load release information.
 
     def self.load
-      file = Dir.glob(ROLLRC_FILE, File::FNM_CASEFOLD).first
+      file = Dir.glob(ROLL_FILE, File::FNM_CASEFOLD).first
       if file
         Release.new(parse_rollrc(File.open(file)))
       else

data/meta/MANIFEST

@@ -67,7 +67,8 @@ lib/ratch/toolset/ruby/announce
 lib/ratch/toolset/ruby/clobber
 lib/ratch/toolset/ruby/clobber/rdoc
 lib/ratch/toolset/ruby/compile
-lib/ratch/toolset/ruby/docpkg
+lib/ratch/toolset/ruby/doc
+lib/ratch/toolset/ruby/doc/zip
 lib/ratch/toolset/ruby/install
 lib/ratch/toolset/ruby/notes
 lib/ratch/toolset/ruby/pack
@@ -83,6 +84,7 @@ lib/ratch/toolset/ruby/stats
 lib/ratch/toolset/ruby/svn
 lib/ratch/toolset/ruby/svn/log
 lib/ratch/toolset/ruby/svn/tag
+lib/ratch/toolset/ruby/svn/xlog
 lib/ratch/toolset/ruby/test
 lib/ratch/toolset/ruby/test/crosstest
 lib/ratch/toolset/ruby/test/extest
@@ -92,15 +94,16 @@ lib/ratch/toolset/ruby/test/loadtest
 lib/ratch/toolset/ruby/test/syntax
 lib/ratch/toolset/ruby/test/test
 lib/ratch/toolset/sandbox
+lib/ratch/toolset/sandbox/query
 man
 man/ratch.man
 meta
 meta/MANIFEST
-meta/ProjectInfo
-meta/ROLLRC
 meta/config.yaml
 meta/icli.yaml
 meta/project.yaml
+meta/ratch.roll
+meta/xProjectInfo
 task
 task/clobber
 task/clobber/package
@@ -112,63 +115,6 @@ task/setup
 task/stats
 test
 test/fixtures
-website
-website/images
-website/images/appendix.png
-website/images/clipboard2.png
-website/images/flexihead-flip.jpg
-website/images/flexihead.jpg
-website/images/head1.jpg
-website/images/icon
-website/images/icon/book.jpg
-website/images/icon/development.png
-website/images/icon/download_arrow.gif
-website/images/icon/license.png
-website/images/icon/logohover.png
-website/images/icon/source.png
-website/images/process.gif
-website/images/radio_earth.jpg
-website/images/ready.png
-website/images/redratchet.jpg
-website/images/rivet
-website/images/rivet/board-blue.png
-website/images/rivet/board-gray.png
-website/images/rivet/board-green.png
-website/images/rivet/board-red.png
-website/images/rivet/folder-blue.png
-website/images/rivet/folder-gray.png
-website/images/rivet/folder-green.png
-website/images/rivet/folder-red.png
-website/images/rivet/paper-blue.png
-website/images/rivet/paper-gray.png
-website/images/rivet/paper-green.png
-website/images/rivet/paper-red.png
-website/images/ruby.gif
-website/images/runneth.png
-website/images/scrap
-website/images/scrap/_mat.jpg
-website/images/scrap/clipboard.jpg
-website/images/scrap/cubeYellow.jpg
-website/images/scrap/dove.jpg
-website/images/scrap/drink.png
-website/images/scrap/masu.jpg
-website/images/scrap/package.png
-website/images/scrap/ptyid879.jpg
-website/images/scrap/ratch.jpg
-website/images/scrap/ratch2.jpg
-website/images/scrap/ready.svg
-website/images/scrap/red-ratch.jpg
-website/images/scrap/red_book.gif
-website/images/scrap/takara.gif
-website/images/silver.gif
-website/images/test.jpg
-website/index.html
-website/javascript
-website/javascript/jquery.js
-website/javascript/jquery.tabs.js
-website/library.html
-website/manual.html
-website/style.css
 work
 work/old
 work/old/batchfile.rb

data/meta/config.yaml

@@ -1,7 +1,6 @@
 
 publish:
-  project  : proutils
-  subdir   : ratch
+  project  : ratchets
   username : transami
 
 rdoc:

data/meta/ratch.roll

@@ -0,0 +1,2 @@
+ratch 0.4.1 beta (2007-11-18)
+lib/ratch

data/task/publish

@@ -1,6 +1,6 @@
 #!/usr/bin/env ratch
 
-# Publish website to rubyforge
+# publish website to rubyforge
 #
 # This task publishes the source dir (deafult 'doc')
 # to a rubyforge website.
@@ -12,8 +12,15 @@ main :publish do
   subdir      = config['subdir']
   source      = config['source'] || "doc"
   username    = config['username'] || ENV['RUBYFORGE_USERNAME']
-  protect     = %w{usage statcvs statsvn robot.txt wiki}
-  exclude     = %w{.svn}
+  clear       = config['clear']
+
+  if clear
+    protect   = config['protect'].to_a
+    exclude   = config['exclude'].to_a
+  else
+    protect   = %w{usage statcvs statsvn robot.txt wiki} + config['protect'].to_a
+    exclude   = %w{.svn} + config['exclude'].to_a
+  end
 
   abort "no project"  unless project
   abort "no username" unless username
@@ -27,25 +34,24 @@ main :publish do
   dir = source.chomp('/') + '/'
   url = "#{username}@rubyforge.org:/var/www/gforge-projects/#{destination}"
 
-  op = ['-rLvz', '--delete']  # maybe -p ?
+  op = ['-rLvz', '--delete-after']  # maybe -p ?
 
-  # add filter options. The commandline version didn't seem
+  # Using commandline filter options didn't seem
   # to work, so I opted for creating an .rsync_filter file for
   # all cases.
 
-  filter_file = File.join(source,'.rsync-filter')
-
-  unless file?(filter_file)
-    File.open(filter_file, 'w') do |f|
-      exclude.map{|e| f << "- #{e}\n"}
-      protect.map{|e| f << "P #{e}\n"}
+  unless protect.empty? && exclude.empty?
+    rsync_file = File.join(source,'.rsync-filter')
+    unless file?(rsync_file)
+      File.open(rsync_file, 'w') do |f|
+        exclude.each{|e| f << "- #{e}\n"}
+        protect.each{|e| f << "P #{e}\n"}
+      end
     end
+    op << "--filter='dir-merge #{rsync_file}'"
   end
 
-  op << "--filter='dir-merge #{filter_file}' --delete-after"
-
   args = op + [dir, url]
 
   rsync(*args.to_params)
 end
-

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4.6
 specification_version: 2
 name: ratch
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
-date: 2007-12-14 00:00:00 -05:00
+  version: 0.4.1
+date: 2007-12-18 00:00:00 -05:00
 summary: Ruby Batch Files
 require_paths: 
 - lib
@@ -89,6 +89,7 @@ files:
 - lib/ratch/toolset/ruby/release
 - lib/ratch/toolset/ruby/stamp
 - lib/ratch/toolset/sandbox
+- lib/ratch/toolset/sandbox/query
 - lib/ratch/support
 - lib/ratch/support/filetest.rb
 - lib/ratch/support/filename.rb
@@ -126,8 +127,8 @@ files:
 - meta/icli.yaml
 - meta/config.yaml
 - meta/MANIFEST
-- meta/ROLLRC
 - meta/project.yaml
+- meta/ratch.roll
 - meta/xProjectInfo
 - README
 - task

data/meta/ROLLRC

@@ -1,2 +0,0 @@
-ratch 0.4.0 beta (2007-11-18)
-lib/ratch