ratch 0.2.1 → 0.2.2

data/data/ratch/rubyproject/install

@@ -1,49 +1,77 @@
 #!/usr/bin/env ratch
 
-# install package to site_ruby
-
-# This tool installs the package to site_ruby
+# Install package to site_ruby.
+#
+# This script installs Facets to site_ruby location
 # using Ruby's defualt configuration settings.
-# If you want to change these you can can supply
-# config settings for 'prefix' and/or 'sitedir'.
+# If you want to change these, you can supply
+# configuration settings for 'prefix' and/or 'sitedir'.
+
+main :install do
+
+  system_prefix = Config::CONFIG['prefix']
+  system_libdir = Config::CONFIG['sitelibdir']
 
-system_prefix = Config::CONFIG['prefix']
-system_libdir = Config::CONFIG['sitelibdir']
+  config = configuration['install'] || {}
 
-config = config_load('install')
+  prefix = config['prefix'] || system_prefix
+  libdir = config['libdir']
 
-prefix = config['prefix'] || system_prefix
-libdir = config['libdir']
+  unless libdir
+    if (prefix == system_prefix) then
+      libdir = system_libdir
+    else
+      libdir = File.join(prefix, system_libdir[system_prefix.size..-1])
+    end
+  end
+
+  # If Rolls is being used.
 
-unless libdir
-  if (prefix == system_prefix) then
-    libdir = system_libdir
+  if roll_file = File.glob('{,meta/}*.roll').first
+    roll = Roll::Package.open
+    lib_paths = roll.lib_paths
   else
-    libdir = File.join(prefix, system_libdir[system_prefix.size..-1])
+    lib_paths = config['lib_path'] || ['lib']
   end
-end
 
-# TODO Probably should get files from manifest, if it exists.
-# files = projectinfo.filelist
-files = Dir.glob("{lib,ext,bin}/**/*").select{ |f| file?(f) }
+  # We need to copy them into site_ruby in the opposite order they
+  # would be searched for by require.
 
-lib_files  = files.grep(/^(lib|ext)/)
-bin_files  = files.grep(/^bin/)
+  lib_paths.reverse!
 
-# Copy files to proper locations.
+  # Copy lib files to site_ruby location, in proper order!
 
-lib_files.each do |file|
-  dest = File.dirname(file).sub('lib/', '')
-  dest = File.join(libdir, dest)
-  #dest.sub!(/(core|more)\//, '')  # SPECIAL FOR FACETS !!!!!
-  mkdir_p dest unless dir?(dest)
-  install file, dest, :mode => 0444
-end
+  lib_paths.each do |loc|
+    files = glob(File.join(loc, "**/*"))
+    files = files.select{ |f| File.file?(f) }
+    files.each do |file|
+      dest = File.dirname(file)
+      dest.sub!(loc, '')
+      dest = File.join(libdir, dest)
+      if noharm?
+        puts "mkdir -p #{dest}" unless File.directory?(dest)
+        puts "install -m 0444 #{file} #{dest}"
+      else
+        mkdir_p dest unless File.directory?(dest)
+        install file, dest, :mode => 0444
+      end
+    end
+  end
 
-bin_files.each do |file|
-  dest = File.dirname(file)
-  dest = File.join(prefix, dest)
-  mkdir_p dest unless dir?(dest)
-  install file, dest, :mode => 0555
-end
+  # Copy bin files to site_ruby location.
 
+  bin_files = glob("bin/*")
+  bin_files = bin_files.select{ |f| File.file?(f) }
+  bin_files.each do |file|
+    dest = File.dirname(file)
+    dest = File.join(prefix, dest)
+    if noharm?
+      puts "mkdir -p #{dest}" unless File.directory?(dest)
+      puts "install -m 0555 #{file} #{dest}"
+    else
+      mkdir_p dest unless File.directory?(dest)
+      install file, dest, :mode => 0555
+    end
+  end
+
+end

data/data/ratch/rubyproject/notes

@@ -1,20 +1,23 @@
 #!/usr/bin/env ratch
 
-# Create the tasks defined by this task lib.
+# scan for notes
 #
-# This task scan source code for developer notes and writes to
+# This task scans source code for developer notes and writes to
 # well organized files.
 
+# TODO Add ability to read header notes.
 # FIXME Should each label of note be written to it's own file?
 
-main :note do
-  notes
-end
-
 DEFAULT_NOTE_FILES  = ['lib/**/*', 'ext/**/*']
 DEFAULT_NOTE_LABELS = ['TODO', 'FIXME']
 DEFAULT_NOTE_FORMAT = 'rdoc'
-DEFAULT_NOTE_OUTPUT = 'note'
+DEFAULT_NOTE_OUTPUT = 'doc/note'
+
+#
+
+main :note do
+  notes
+end
 
 # Notes tool can lookup and list TODO, FIXME and
 # other types of labeled comments from source code.
@@ -135,7 +138,6 @@ end
 
 
 
-
 #     out = ''
 #
 #     case format

data/data/ratch/rubyproject/rdoc

@@ -1,7 +1,7 @@
 #!/usr/bin/env ratch
 
 # generate rdocs
-
+#
 # Generate Rdoc documentation. Settings are
 # the same as the rdoc command's options.
 
@@ -10,16 +10,18 @@ main :rdoc do
 
   config = configuration['rdoc']
 
+  config['op'] = config.delete('output') if config['output']
+
   config = {
     'template'       => 'html',
     'op'             => 'doc/rdoc',
     'merge'          => true,
     'inline-source'  => true,
-    'exclude'        => %w{InstalledFiles Manifest Project dev util},
-    'include'        => %w{[A-Z]* lib}
+    'exclude'        => %w{MANIFEST},
+    'include'        => %w{[A-Z]* lib ext}
   }.update(config)
 
-  output = config['output'] || config['op']
+  output = config['op']
 
   # Check for 'doc' directory.
   # (Helps to ensure we're in the right place.)

data/dev/install.0

@@ -0,0 +1,49 @@
+#!/usr/bin/env ratch
+
+# install package to site_ruby
+
+# This tool installs the package to site_ruby
+# using Ruby's defualt configuration settings.
+# If you want to change these you can can supply
+# config settings for 'prefix' and/or 'sitedir'.
+
+system_prefix = Config::CONFIG['prefix']
+system_libdir = Config::CONFIG['sitelibdir']
+
+config = config_load('install')
+
+prefix = config['prefix'] || system_prefix
+libdir = config['libdir']
+
+unless libdir
+  if (prefix == system_prefix) then
+    libdir = system_libdir
+  else
+    libdir = File.join(prefix, system_libdir[system_prefix.size..-1])
+  end
+end
+
+# TODO Probably should get files from manifest, if it exists.
+# files = projectinfo.filelist
+files = Dir.glob("{lib,ext,bin}/**/*").select{ |f| file?(f) }
+
+lib_files  = files.grep(/^(lib|ext)/)
+bin_files  = files.grep(/^bin/)
+
+# Copy files to proper locations.
+
+lib_files.each do |file|
+  dest = File.dirname(file).sub('lib/', '')
+  dest = File.join(libdir, dest)
+  #dest.sub!(/(core|more)\//, '')  # SPECIAL FOR FACETS !!!!!
+  mkdir_p dest unless dir?(dest)
+  install file, dest, :mode => 0444
+end
+
+bin_files.each do |file|
+  dest = File.dirname(file)
+  dest = File.join(prefix, dest)
+  mkdir_p dest unless dir?(dest)
+  install file, dest, :mode => 0555
+end
+

data/{data/ratch/rubyproject/install2 → dev/install.1}

@@ -1,7 +1,7 @@
 #!/usr/bin/env ratch
 
 # install package to site_ruby
-
+#
 # This tool installs the package to site_ruby
 # using Ruby's defualt configuration settings.
 # If you want to change these you can can supply

data/lib/ratch/configutils.rb

@@ -9,11 +9,13 @@ module Ratch
 
     def configuration(file=nil)
       @configuration ||= {}
-      if file = config_file(file)
-        @configuration[file] ||= config_read(file)
-      else
-        @configuration[file] ||= Hash.new{ |h,k| h[k] = {} }
-      end
+      @configuration[file] ||= (
+        if file = config_file(file)
+          config_read(file)
+        else
+          Hash.new{ |h,k| h[k] = {} }
+        end
+     )
     end
 
     #
@@ -35,7 +37,7 @@ module Ratch
     def config_read(path)
       find = "{#{utility_directory}/,}#{path}{.yaml,.yml,}"
       if file = Dir.glob(find)[0]
-        YAML::load(File.open(file))
+        YAML::load(File.open(file)) || {}  # The || {} is in case the file is empty.
       else
         raise LoadError, "Missing file -- #{path}"
       end

data/lib/ratch/taskable.rb

@@ -82,7 +82,8 @@ module Ratch
       task.preqs.each do |need|
         need = need.to_s
         next if list.include?(need)
-        @tasks[need].plan(need, list)
+        #@tasks[need].plan(need, list)
+        plan(need, list)
       end
       list << task.name
       return list

data/meta/MANIFEST

@@ -11,8 +11,6 @@ data/ratch/rubyproject
 data/ratch/rubyproject/announce
 data/ratch/rubyproject/extest
 data/ratch/rubyproject/install
-data/ratch/rubyproject/install2
-data/ratch/rubyproject/install3
 data/ratch/rubyproject/load
 data/ratch/rubyproject/notes
 data/ratch/rubyproject/publish
@@ -46,6 +44,8 @@ demo/util/rdoc
 demo/util/tryme
 dev
 dev/install
+dev/install.0
+dev/install.1
 dev/ludo
 dev/oldtaskable.rb
 dev/taskable-simple.rb
@@ -61,13 +61,16 @@ lib/ratch/consoleutils.rb
 lib/ratch/emailutils.rb
 lib/ratch/fileutils.rb
 lib/ratch/options.rb
+lib/ratch/t.rb
 lib/ratch/taskable.rb
 lib/ratch/taskutils.rb
 lib/ratch/uploadutils.rb
 meta
 meta/MANIFEST
-meta/RATCH-0.2.1.roll
+meta/RATCH-0.2.2.roll
 task
+task/config.yaml
+task/publish
 task/setup
 task/stats
 test

data/meta/{RATCH-0.2.1.roll → RATCH-0.2.2.roll}

@@ -1,26 +1,27 @@
 ---
 
 title    : Ratch
-summary  : Ruby-based Batch Fils
+subtitle : Ruby-based Batch Files
+slogan   : Ratch It Up!
 description: >
   Ratch is batch file system suitable for creating project build scripts
   and any variety of command line utilities.
 
+status      : beta
 author      : Thomas Sawyer <transfire@gmail.com>
 created     : "2007-08-09"
 homepage    : "http://proutils.rubyforge.org"
 download    : "https://rubyforge.org/frs/?group_id=4411"
 repository  : "http://proutils.rubyforge.org/ratch"
-slogan      : Ratch It Up!
 
-formats     : [gem, tgz]
-
-rubyforge:
-  project   : protutils
-  username  : transami
-  groupid   : 4411
-  package   : ratch
 
 lib_path:
   - lib/ratch
 
+formats     : [gem, tgz]
+
+#rubyforge:
+#  project   : protutils
+#  username  : transami
+#  groupid   : 4411
+#  package   : ratch

data/task/config.yaml

@@ -0,0 +1,6 @@
+
+publish:
+  project  : proutils
+  subdir   : ratch
+  username : transami
+

data/task/publish

@@ -0,0 +1,51 @@
+#!/usr/bin/env ratch
+
+# Publish website to rubyforge
+#
+# This task publishes the source dir (deafult 'doc')
+# to a rubyforge website.
+
+main :publish do
+  config = configuration['publish']
+
+  project     = config['project']
+  subdir      = config['subdir']
+  source      = config['source'] || "doc"
+  username    = config['username'] || ENV['RUBYFORGE_USERNAME']
+  protect     = %w{usage statcvs statsvn robot.txt wiki}
+  exclude     = %w{.svn}
+
+  abort "no project"  unless project
+  abort "no username" unless username
+
+  if subdir
+    destination = File.join(project, subdir)
+  else
+    destination = project
+  end
+
+  dir = source.chomp('/') + '/'
+  url = "#{username}@rubyforge.org:/var/www/gforge-projects/#{destination}"
+
+  op = ['-rLvz', '--delete']  # maybe -p ?
+
+  # add filter options. The commandline version 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"}
+    end
+  end
+
+  op << "--filter='dir-merge #{filter_file}'"
+
+  args = op + [dir, url]
+
+  rsync(*args.to_params)
+end
+

metadata

@@ -3,15 +3,15 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: ratch
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
-date: 2007-10-29 00:00:00 -04:00
-summary: Ruby-based Batch Fils
+  version: 0.2.2
+date: 2007-11-01 00:00:00 -04:00
+summary: Ruby-based Batch Files
 require_paths: 
 - lib
 email: Thomas Sawyer <transfire@gmail.com>
 homepage: http://proutils.rubyforge.org
 rubyforge_project: 
-description: Ruby-based Batch Fils
+description: Ratch is batch file system suitable for creating project build scripts and any variety of command line utilities.
 autorequire: 
 default_executable: 
 bindir: bin
@@ -41,8 +41,6 @@ files:
 - data/ratch/rubyproject/announce
 - data/ratch/rubyproject/extest
 - data/ratch/rubyproject/install
-- data/ratch/rubyproject/install2
-- data/ratch/rubyproject/install3
 - data/ratch/rubyproject/load
 - data/ratch/rubyproject/notes
 - data/ratch/rubyproject/publish
@@ -76,6 +74,8 @@ files:
 - demo/util/tryme
 - dev
 - dev/install
+- dev/install.0
+- dev/install.1
 - dev/ludo
 - dev/oldtaskable.rb
 - dev/taskable-simple.rb
@@ -91,13 +91,16 @@ files:
 - lib/ratch/emailutils.rb
 - lib/ratch/fileutils.rb
 - lib/ratch/options.rb
+- lib/ratch/t.rb
 - lib/ratch/taskable.rb
 - lib/ratch/taskutils.rb
 - lib/ratch/uploadutils.rb
 - meta
 - meta/MANIFEST
-- meta/RATCH-0.2.1.roll
+- meta/RATCH-0.2.2.roll
 - task
+- task/config.yaml
+- task/publish
 - task/setup
 - task/stats
 - test

data/data/ratch/rubyproject/install3

@@ -1,74 +0,0 @@
-#!/usr/bin/env ratch
-
-# Install package to site_ruby.
-#
-# This script installs Facets to site_ruby location
-# using Ruby's defualt configuration settings.
-# If you want to change these, you can supply
-# configuration settings for 'prefix' and/or 'sitedir'.
-
-main :install do
-
-  system_prefix = Config::CONFIG['prefix']
-  system_libdir = Config::CONFIG['sitelibdir']
-
-  config = configuration['install'] || {}
-
-  prefix = config['prefix'] || system_prefix
-  libdir = config['libdir']
-
-  unless libdir
-    if (prefix == system_prefix) then
-      libdir = system_libdir
-    else
-      libdir = File.join(prefix, system_libdir[system_prefix.size..-1])
-    end
-  end
-
-  libpaths = configuration('meta/project.yaml')['libpaths']
-
-  # We need to copy them into site_ruby in the opposite order they
-  # would be searched for by require.
-
-  libpaths.reverse!
-
-  # Copy lib files to site_ruby location, in proper order!
-
-  lib_files = Dir.glob("lib/**/*").select{ |f| File.file?(f) }
-
-  #['core', 'fore', 'more' ]
-  libpaths.each do |loc|
-    files = lib_files.grep(/^#{loc}/)
-    files.each do |file|
-      dest = File.dirname(file)
-      #dest.sub!('lib/', '')
-      #dest.sub!(loc, '')
-      dest.sub!(loc, '')
-      dest = File.join(libdir, dest)
-      if noharm?
-        puts "mkdir -p #{dest}" unless File.directory?(dest)
-        puts "install -m 0444 #{file} #{dest}"
-      else
-        mkdir_p dest unless File.directory?(dest)
-        install file, dest, :mode => 0444
-      end
-    end
-    lib_files -= files  # speed things up be removing what we've already covered.
-  end
-
-  # Copy bin files to site_ruby location.
-
-  bin_files = Dir.glob("bin/*").select{ |f| File.file?(f) }
-  bin_files.each do |file|
-    dest = File.dirname(file)
-    dest = File.join(prefix, dest)
-    if noharm?
-      puts "mkdir -p #{dest}" unless File.directory?(dest)
-      puts "install -m 0555 #{file} #{dest}"
-    else
-      mkdir_p dest unless File.directory?(dest)
-      install file, dest, :mode => 0555
-    end
-  end
-
-end