proutils 0.3.0 → 0.3.1

data/CHANGES

@@ -1,5 +1,9 @@
 = ProUtils -- Revision History
 
+== 0.3.1
+
+* Fixed mint.
+
 == 0.3.0
 
 * With this release proutils is now a single integrated package.

data/bin/mint

@@ -6,6 +6,8 @@ require 'proutils/mint/copier'
 module Mint
 
   # Scaffolding Console Command
+  #
+  # IMPORTANT: When using system lookup, all globs must be in quotes!!!
 
   class Command
 
@@ -22,7 +24,7 @@ module Mint
       @cmd = 'copy'  # default command
 
       opts = GetoptLong.new(
-        ['--source', '-s',             GetoptLong::NO_ARGUMENT],
+        ['--system', '-s',             GetoptLong::NO_ARGUMENT],
         ['--dryrun', '--noharm', '-n', GetoptLong::NO_ARGUMENT],
         ['--skip',                     GetoptLong::NO_ARGUMENT],
         ['--replace',                  GetoptLong::NO_ARGUMENT],
@@ -37,13 +39,18 @@ module Mint
           @options[:skip] = true
         when '--replace'
           @options[:force] = true
+        when '--system'
+          @options[:system] = true
         when '--help'
           @cmd = 'help'
-        when '--source'
-          @options[:special] = true
         end
       end
+    end
+
+    #
 
+    def options
+      @options
     end
 
     # Start execution.
@@ -55,17 +62,12 @@ module Mint
     # Copy scaffolding.
 
     def copy
-      #if @source
-      #  src = Mint.lookup(ARGV[0])
-      #  dst = ARGV[1] || '.'
-      #else
-        src = ARGV[0]
-        dst = ARGV[1] || '.'
-      #end
-
-      if src
-        Copier.new(src, dst, @options).copy
-      else
+      begin
+        destination = ARGV.pop
+        resource    = ARGV.dup
+        copier = Copier.new(resource, destination, options)
+        copier.copy
+      rescue LoadError
         puts "Unrecognized source, '#{src}'."
         exit 0
       end

data/lib/proutils/mint/copier.rb

@@ -17,33 +17,14 @@ require 'proutils/mint/fileutils'
 
 module Mint
 
-#   def self.lookup(type)
-#     globs = []
-#     paths.each do |path|
-#       parts = type.split(/[\/\\]/)
-#       if File.basename(path) == parts.first
-#         globs << File.join(File.dirname(path), type)
-#       end
-#     end
-#     globs.collect{ |g| Dir.glob(g) }.flatten
-#   end
-
   def self.paths
-    @paths ||= (
-      builtin = Dir.glob(File.join(datadir, '*'))
-      paths = ENV['MINT_PATH'].to_s.split(/[:;]/) + builtin
-      paths.inject({}) do |hash, path|
-        dir, type = *File.split(path)
-        hash[type] = dir
-        hash
-      end
-    )
+    (ENV['MINT_PATH'] || []) + [datadir]
   end
 
   # TODO Better way to support RubyGems and Rolls?
 
   def self.datadir
-    dir = File.join(File.dirname(File.dirname(File.dirname(__FILE__))), 'data', 'mint')
+    dir = File.expand_path("#{File.dirname(__FILE__)}/../../../data/mint")
     if File.directory?(dir)
       dir
     else
@@ -51,97 +32,126 @@ module Mint
     end
   end
 
-  # = Mint Copier
+  # Mint Copier provides a factility for
+  # performing interactive, managed copies.
 
   class Copier
 
-    IGNORE = [ '.', '..', '.svn']
+    #IGNORE = [ '.', '..', '.svn']
 
-    attr_reader :sources, :destination, :options
+    # Look for source file(s) in system locations?
 
-    attr_reader :actions
+    attr_accessor :system
 
-    def initialize(sources, destination, options=nil)
-      @sources     = [sources].flatten
-      @destination = destination
-      @options     = options || {}
+    # Source paths to copy. This can be a glob or an array of globs.
 
-      @special     = options[:special]
+    attr_accessor :source
 
-      @dryrun      = options[:dryrun]
-      @force       = options[:force]
-      @skip        = options[:skip]
+    # Directory (or a file, if copying one file) in which to store copied source.
 
-      if special?
-        @sources = special_lookup(*sources)
-      else
-        @sources = general_lookup(*sources)
-      end
+    attr_accessor :destination
+
+    # Just pretend to do the commit action.
+
+    attr_accessor :dryrun
+
+    # Force provided an extra "dangerous" option of "(W)rite all".
+
+    attr_accessor :force
+
+    # Automatically skip all overwrites.
+
+    attr_accessor :skip
+
+    # Stores actions to be performed upon commit.
+
+    attr_reader :actions
+
+    # New copier.
+
+    def initialize(source, destination, options=nil)
+      @source     = [source].flatten
+      @destination = destination
 
       @actions     = []
+
+      options.each do |k,v|
+        send("#{k}=",v)
+      end
     end
 
-    def special? ; @special; end
-    def dryrun?  ; @dryrun ; end
-    def force?   ; @force  ; end
-    def skip?    ; @skip   ; end
+    def system?  ; @system  ; end
 
-    # Lookup in special mint locations.
+    def dryrun?  ; @dryrun  ; end
+    def force?   ; @force   ; end
+    def skip?    ; @skip    ; end
 
-    def special_lookup(*sources)
-      # First lets make sure there are not bad requests.
-      missing = requested_locations(*sources) - Mint.paths.keys
-      unless missing.empty?
-        puts "Missing special sources -- #{missing.join(', ')}"
-        exit 0
-      end
-      #
-      sources.collect do |source|
-        type = *source.split(/[\/\\]/).first
-        [Mint.paths[type], source]
+    # Files to copy.
+
+    def copies
+      if system?
+        system_lookup
+      else
+        common_lookup
       end
     end
 
-    #
-
-    def requested_locations(*sources)
-      sources.collect do |source|
-        source.split(/[\/\\]/).first
+    # Look up file in system locations.
+
+    def system_lookup
+      copies = []
+      Mint.paths.each do |path|
+        source.each do |src|
+          jpath = File.join(path, src)
+          files = Dir.glob(jpath)
+          files.each do |file|
+            file = file.sub(path+'/','')
+            copies << [path, file]
+          end
+        end
       end
+      copies
     end
 
-    #
+    # Non-system lookup.
 
-    def general_lookup(*sources)
-      sources.collect do |source|
-        [ '.', source ]
+    def common_lookup
+      copies = []
+      source.each do |src|
+        files = Dir.glob(File.join(path, src))
+        unless files.empty?
+          copies << [nil, files]
+        end
       end
+      copies
     end
 
     # Copy files.
 
     def copy
-      puts "KEY: (d)iff (r)eplace (s)kip skip(a)ll (q)uit"
-      sources.each do |dir, file|
-        path = File.join(dir, file)
+      puts "KEY: (d)iff (r)eplace (s)kip (a)ll (q)uit"
+      copies.each do |dir, file|
+        path = dir ? File.join(dir, file) : file
         if File.file?(path)
           copy_file(dir, file)
-        else
-          dirs, files = *partition_path(path)
+        elsif File.directory?(path)
+          dirs, files = *partition(path)
           # make empty directories
           dirs.each do |d|
-            if File.directory?(d)
+            if File.directory?(File.join(destination,d))
               skip_dir(d)
             else
               pth = File.join(path,d)
               entries = Dir.entries(pth) - IGNORE
-              make_dir(d) if entries.empty?
+              make_dir(path, d) if entries.empty?
             end
           end
           # copy files in directories
           files.each do |f|
             copy_file(path, f)
           end
+        else
+          raise ArgumentError, "unsupported file object -- #{path}"
         end
       end
       commit
@@ -149,17 +159,11 @@ module Mint
 
   private
 
-    # List of source files.
-
-    #def source_paths
-    #  Dir.glob(File.join(@source, '**/*'))
-    #end
-
-    # Partition a path's contents between dirs and files.
+    # Partition a directory's content between dirs and files.
 
-    def partition_path(path)
+    def partition(directory)
       dirs, files  = [], []
-      chdir(path) do
+      chdir(directory) do
         paths = Dir.glob('**/*')
         dirs, files = *paths.partition do |f|
           File.directory?(f)
@@ -170,11 +174,11 @@ module Mint
 
     # Make a directory.
 
-    def make_dir(dir)
+    def make_dir(source, dir)
       dst = File.join(destination, dir)
       if File.file?(dst)
         puts "Directory to replace file..."
-        action = query(file) || 'skip'
+        action = query(source, dir) || 'skip'
       else
         action = 'make'
       end
@@ -187,15 +191,13 @@ module Mint
     def copy_file(source, file)
       src = File.join(source, file)
       dst = File.join(destination, file)
-
       action = 'skip'
-
       if File.directory?(dst)
         puts "File to replace directory..."
-        action = query(file)
+        action = query(source, file)
       elsif File.file?(dst)
         unless FileTest.identical?(src, dst)
-          action = query(file)
+          action = query(source, file)
         end
       else
         action = 'copy'
@@ -219,6 +221,8 @@ module Mint
     end
 
     # Skip file.
+    #
+    # TODO: Why is this never called?
 
     def skip_file(src, dst)
       @actions << ['skip', [src, dst]]
@@ -227,7 +231,7 @@ module Mint
 
     # Show diff of files.
 
-    def diff(file)
+    def diff(source, file)
       src = File.join(source, file)
       dst = File.join(destination, file)
       diff = FileTest.diff(src, dst)
@@ -236,7 +240,7 @@ module Mint
 
     # Query about file.
 
-    def query(file)
+    def query(source, file)
       return 's' if @safe
       return 'o' if @force
       action = nil
@@ -246,7 +250,7 @@ module Mint
         ans = ask(msg).strip[0,1]
         case ans
         when 'd', 'D'
-          diff(file)
+          diff(source, file)
         when 'r', 'R'
           action = 'replace'
         when 's', 'S'
@@ -261,34 +265,21 @@ module Mint
       return action
     end
 
-    # Get user input
-
-    def ask(msg)
-      print "#{msg} "
-      until inp = $stdin.gets ; sleep 1 ; end
-      inp.chomp
-    end
+    # Action print.
 
-    # Action print
     def action_print(action, file)
       file = file.sub(/^[.]\//,'')
       action = (' ' * (8 - action.size)) + action
       puts "#{action} #{file}"
     end
 
-    def commit
-      ans = ask("Commit y/N?")
-      case ans.downcase
-      when 'y', 'yes'
-        commit!
-      end
-    end
+    # Perform actions.
 
     def commit!
-      @actions.each do |action, path|
+      actions.each do |action, path|
         case action
         when 'make'
-          rm(path) unless File.directory?(path)
+          #rm(path) if File.directory?(path)
           mkdir_p(path)
         when 'copy'
           src, dst = *path
@@ -301,12 +292,30 @@ module Mint
           #mkdir_p(File.dirname(dst))
           cp(src, dst)
         else # skip
-          #
+          # do nothing
         end
       end
     end
 
-    # Delegate to fileutils.
+    # Confirm commit.
+
+    def commit
+      ans = ask("Commit y/N?")
+      case ans.downcase
+      when 'y', 'yes'
+        commit!
+      end
+    end
+
+    # Get user input.
+
+    def ask(msg)
+      print "#{msg} "
+      until inp = $stdin.gets ; sleep 1 ; end
+      inp.chomp
+    end
+
+    # Delegation to FileUtils.
 
     def fu
       @dryrun ? FileUtils::DryRun : FileUtils
@@ -321,4 +330,5 @@ module Mint
     def mkdir_p(*a,&b) ; fu.mkdir_p(*a,&b) ; end
 
   end
+
 end

data/meta/proutils.roll

@@ -1,3 +1,3 @@
-proutils 0.3.0 beta 2007-12-17
+proutils 0.3.1 beta 2007-12-17
 lib/proutils
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4.6
 specification_version: 2
 name: proutils
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
-date: 2007-12-17 00:00:00 -05:00
+  version: 0.3.1
+date: 2007-12-18 00:00:00 -05:00
 summary: Ruby Recursive Archival Format
 require_paths: 
 - lib