ratch 0.2.2 → 0.2.3

data/demo/task/simplebuild

@@ -0,0 +1,15 @@
+#!/usr/bin/env ratch
+
+main :needtest do
+
+  file 'DINO' => ['FRED'] do
+    cp 'FRED', 'DINO'
+  end
+
+  file 'FRED' => ['WILMA'] do
+    cp 'WILMA', 'FRED'
+  end
+
+  build 'DINO'
+end
+

data/demo/task/stats

@@ -0,0 +1,6 @@
+#!/usr/bin/env ratch
+
+p "here"
+
+load('ratch/toolset/ruby/stats')
+

data/demo/task/task

@@ -0,0 +1,6 @@
+#!/usr/bin/env ratch 
+
+main :task => [ 'one' ] do
+  puts "Will it?"
+end
+

data/lib/ratch/argvutils.rb

@@ -1,40 +1,64 @@
+# TITLE:
+#
+#   ArgvUtils
+#
+# COPYING:
+#
+#   Copyright (c) 2007 Psi T Corp.
+#
+#   This file is part of the ProUtils' Ratch program.
+#
+#   Ratch is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation, either version 3 of the License, or
+#   (at your option) any later version.
+#
+#   Ratch is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with Ratch.  If not, see <http://www.gnu.org/licenses/>.
 
 module Ratch
 
-  # No fuss access to ARGV. This shows up as #argv in the ratch api.
+  # No fuss access to ARGV. This shows up as #commandline in the ratch api.
   #
   # Ratch uses '=' for parameterized flags b/c this make parsing stupid simple
-  # and that's a good thing!!!
+  # and that's a good thing!!! However you can use value! if need be.
 
   module ArgvUtils
 
-    def argv
-      @argv ||= (ARGV.dup).extend(Ext)
+    def commandline
+      @commandline ||= (ARGV.dup).extend(Ext)
     end
+    alias_method :argument_vector, :commandline
 
     module Ext
 
-      def flags
-        @flags ||= collect{ |e| e =~ /^-/ && e !~ /=/ }
-      end
-
       def arguments
-        @arguments ||= collect{ |e| e !~ /=/ }
+        @arguments ||= select{ |e| e !~ /^-/ && e !~ /=/ }
       end
 
-      def parameters
-        @parameters ||= (
+      def options
+        @options ||= (
           pms = {}
-          collect{ |e| e =~ /=/ }.each do |e|
+          select{ |e| e =~ /=/ }.each do |e|
             pms.store(*split('='))
           end
           pms
         )
       end
 
-      # Does ARGV include a specifc flag?
+      def flags
+        @flags ||= select{ |e| e =~ /^-/ || e !~ /=/ }
+      end
+
+      # Have specific flag?
+
       def flag?(flag)
-        include?(flag)
+        flags.include?(flag)
       end
 
       # You can use this if you want to use parameterized
@@ -51,6 +75,25 @@ module Ratch
         fetch(index(flag)+1)
       end
 
+      #
+      def value!(flag)
+        @values ||= {}
+        @values[flag] ||= (
+          delete(index(flag))
+          delete(index(flag))
+        )
+      end
+
+#       #
+#       def [](x)
+#         case x
+#         when Integer
+#           super(x)
+#         else
+#           value(x.to_s)
+#         end
+#       end
+
     end
   end
 end

data/lib/ratch/batch.rb

@@ -1,19 +1,61 @@
+# TITLE:
+#
+#   BatchFile
+#
+# COPYING:
+#
+#   Copyright (c) 2007 Psi T Corp.
+#
+#   This file is part of the ProUtils' Ratch program.
+#
+#   Ratch is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation, either version 3 of the License, or
+#   (at your option) any later version.
+#
+#   Ratch is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with Ratch.  If not, see <http://www.gnu.org/licenses/>.
+
 #require 'shellwords'
+require 'yaml'
 require 'rbconfig'  # replace with facets/rbsystem in future ?
-require 'ratch/taskutils'
+#require 'facets/hash/merge'  # for reverse_merge
+
+require 'ratch/options'
+
+require 'ratch/consoleutils'
+require 'ratch/configutils'
+require 'ratch/emailutils'
+require 'ratch/fileutils'
+require 'ratch/argvutils'
+
+require 'ratch/taskable'
+require 'ratch/buildable'
 require 'ratch/batchable'
 
+
 module Ratch
 
-  # Batch File class, is used as an executionm context for a
-  # ratch script.
+  # BatchScript module defines the DSL available to a ratch script.
 
-  class BatchFile < Module
+  module BatchScript #< Module
 
-    include TaskUtils
+    include GeneralOptions
 
+    include ConsoleUtils
+    include ArgvUtils
+    include FileUtils
+    include ConfigUtils
+    include EmailUtils
+
+    include Buildable
+    include Taskable
     include Batchable
-    include OpenBatchable
 
     # Quick start, equivalent to calling new.run(file).
 
@@ -23,27 +65,37 @@ module Ratch
 
     # New Batch File
 
-    def initialize(file)
-      abort "missing batch file -- #{file}" unless File.file?(file)
-      @file = file
-    end
+    #def initialize(file)
+    #  abort "missing batch file -- #{file}" unless File.file?(file)
+    #  @file = file
+    #end
 
     # TODO What todo about arguments?
 
-    def call(arguments=nil)
-      script = File.read($0 = @file)
-      eval(script, binding, $0) #instance_eval(script)
-      #@main.call if @main
-      task_manager.call_main
-      #run(:main) if task_manager.main
-    end
+    #def call(arguments=nil)
+    #  script = File.read($0 = @file)
+#puts script
+#p $0
+#puts
+#      eval(script, binding, $0) #instance_eval(script)
+#      #@main.call if @main
+#      task_manager.call_main
+#      #run(:main) if task_manager.main
+#    end
 
   end
 
 end
 
-# Load TaskUtils directly into to main runspace.
+# Load BatchScript into to main runspace.
+#
+# TODO: Should this be in all Object space (ie. no class << self)?
+class << self
+  include Ratch::BatchScript
+end
+
+$batch_binding = binding
 
-#class << self
-#  include TaskUtils
-#end
+END {
+  task_manager.call_main
+}

data/lib/ratch/batchable.rb

@@ -1,3 +1,26 @@
+# TITLE:
+#
+#   Batchable
+#
+# COPYING:
+#
+#   Copyright (c) 2007 Psi T Corp.
+#
+#   This file is part of the ProUtils' Ratch program.
+#
+#   Ratch is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation, either version 3 of the License, or
+#   (at your option) any later version.
+#
+#   Ratch is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with Ratch.  If not, see <http://www.gnu.org/licenses/>.
+
 module Ratch
 
   class BatchManager
@@ -6,7 +29,8 @@ module Ratch
     attr :cache
 
     # New BatchManager.
-    def initialize
+    def initialize(runspace)
+      @runspace = runspace
       @cache = {}
     end
 
@@ -15,14 +39,16 @@ module Ratch
       @cache[batchfile] ||= run(batchfile, arguments)
     end
 
-    # TODO How to handle arguments?
+    # Run a batch file.
+    # TODO: How to handle arguments?
+
     def run(batchfile, arguments=nil)
-      BatchFile.new(batchfile).call
-      #       # TODO probably should raise error instead
-      #       abort "missing batch file -- #{batchfile}" unless File.file?(batchfile)
-      #       script = File.read($0 = batchfile)
-      #       #instance_eval(script)
-      #       eval(script, binding, $0)
+      # # TODO probably should raise error instead
+      # abort "missing batch file -- #{batchfile}" unless File.file?(batchfile)
+
+      #BatchFile.new(batchfile).call # Old way with batch execution context object.
+      script = File.read($0 = batchfile)
+      eval(script, $batch_binding, $0)
     end
 
     #
@@ -38,7 +64,7 @@ module Ratch
 
     # Reference batch manager.
     def batch_manager
-      @batch_manager ||= BatchManager.new
+      @batch_manager ||= BatchManager.new(self)
     end
 
     # Batch run, ie. run and cache.
@@ -71,17 +97,20 @@ module Ratch
       end
     end
 
+    # Is a file a local batch file?
+
+    def batch?(path)
+      b = File.dirname($0) + "/#{path}"
+      b.chomp!('!')
+      b if FileTest.file?(b) && FileTest.executable?(b)
+    end
+
     # Abort running.
     #def abort(msg=nil)
     #  puts msg if msg
     #  exit 0
     #end
 
-  end
-
-  #
-  module OpenBatchable
-
     # If method is missing try to run an external task
     # or binary by that name. If it is a binary, arguments
     # translate into commandline parameters. For example:
@@ -107,14 +136,14 @@ module Ratch
 
       name = sym.to_s
 
-      task  = task?(name)
-      done  = task && done?(task)
-      cache = task && !done && name[1,-1] != '!'
-      bin   = bin?(name) if (!task || done)
-      none  = task && done && !bin
-      #task  = name if bin
+      bat   = batch?(name)
+      done  = bat && done?(bat)
+      cache = bat && !done && name[1,-1] != '!'
+      bin   = bin?(name) if (!bat || done)
+      none  = bat && done && !bin
+      #bat  = name if bin
 
-      return super unless task || bin
+      return super unless bat || bin
 
       return if none  # nothing to do
 
@@ -123,13 +152,14 @@ module Ratch
       if bin
         cmd = "#{File.basename(bin)} #{params}"
         res = sh(cmd)
-      elsif task
-        cmd = "./#{task} #{params}"
+      elsif bat
+        cmd = "./#{bat} #{params}"
         puts "--> #{cache ? '' : 'not-'}cached execution: #{cmd}" if trace?
-        res = run(task, args)
+        res = batch(bat, args)
         if cache
-          #@batch_catch[task] ||= (system(cmd); true)
-          batch_catch[task] ||= res
+          #@batch_catch[bat] ||= (system(cmd); true)
+          #batch_cache[bat] ||= res
+          batch_manager.cache ||= res
         end
       end
 

data/lib/ratch/batchfile.rb

@@ -0,0 +1,95 @@
+# TITLE:
+#
+#   BatchFile
+#
+# COPYING:
+#
+#   Copyright (c) 2007 Psi T Corp.
+#
+#   This file is part of the ProUtils' Ratch program.
+#
+#   Ratch is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation, either version 3 of the License, or
+#   (at your option) any later version.
+#
+#   Ratch is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with Ratch.  If not, see <http://www.gnu.org/licenses/>.
+
+#require 'shellwords'
+require 'yaml'
+require 'rbconfig'  # replace with facets/rbsystem in future ?
+#require 'facets/hash/merge'  # for reverse_merge
+
+require 'ratch/options'
+
+require 'ratch/consoleutils'
+require 'ratch/configutils'
+require 'ratch/emailutils'
+require 'ratch/fileutils'
+require 'ratch/argvutils'
+
+require 'ratch/taskable'
+require 'ratch/buildable'
+require 'ratch/batchable'
+
+
+module Ratch
+
+  # Batch File class, is used as an executionm context for a
+  # ratch script.
+
+  class BatchFile < Module
+
+    include GeneralOptions
+
+    include ConsoleUtils
+    include ArgvUtils
+    include FileUtils
+    include ConfigUtils
+    include EmailUtils
+
+    include Buildable
+    include Taskable
+    include Batchable
+
+    # Quick start, equivalent to calling new.run(file).
+
+    #def self.start(file)
+    #  new(file).call
+    #end
+
+    # New Batch File
+
+    def initialize(file)
+      abort "missing batch file -- #{file}" unless File.file?(file)
+      @file = file
+    end
+
+    # TODO What todo about arguments?
+
+    def call(arguments=nil)
+      script = File.read($0 = @file)
+puts script
+p $0
+puts
+      eval(script, binding, $0) #instance_eval(script)
+      #@main.call if @main
+      task_manager.call_main
+      #run(:main) if task_manager.main
+    end
+
+  end
+
+end
+
+# Load TaskUtils directly into to main runspace.
+
+#class << self
+#  include TaskUtils
+#end