imw 0.2.1 → 0.2.2

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/lib/imw.rb

@@ -46,9 +46,14 @@ module IMW
   # Passing in an IMW::Resource will simply return it.
   #
   # @param  [String, Addressable::URI, IMW::Resource] obj the URI to open
+  # @param [Hash] options
+  # @option options [Array<String,Module>] as same as <tt>:use_modules</tt> in IMW::Resource.extend_resource!
+  # @option options [Array<String,Module>] without same as <tt>:skip_modules</tt> in IMW::Resource.extend_resource!  
   # @return [IMW::Resource] the resulting resource, property extended for the given URI
   def self.open obj, options={}
     return obj if obj.is_a?(IMW::Resource)
+    options[:use_modules]  ||= (options[:as]      || [])
+    options[:skip_modules] ||= (options[:without] || [])
     IMW::Resource.new(obj, options)
   end
 
@@ -101,7 +106,7 @@ module IMW
   # @param [Hash]   options a hash of options (see IMW::Dataset)
   # @return [IMW::Dataset] the new dataset
   def self.dataset handle, options={}, &block
-    d = IMW::Dataset.new(handle, options)
+    d = IMW::Dataset.new(handle, options.merge(:repository => IMW.repository))
     d.instance_eval(&block) if block_given?
     d
   end

data/lib/imw/archives.rb

@@ -39,7 +39,12 @@ module IMW
 
       # Create an archive of the given +input_paths+.
       #
-      # @param [String, IMW::Resource] input_paths the paths to add to this archive
+      # The input paths must be strings and will be shell-escaped
+      # before further processing.  This means you cannot use a shell
+      # glob!
+      #
+      # @param [String] input_paths the paths to add to this archive
+      # @return [IMW::Resource] the resutling archive
       def create *input_paths
         should_have_archive_setting!("Cannot create archive #{path}", :program, :create)
         IMW.system archive_settings[:program], archive_settings[:create], path, *input_paths.flatten
@@ -48,24 +53,32 @@ module IMW
 
       # Append to this archive the given +input_paths+.
       #
-      # @param [String, IMW::Resource] input_paths the paths to add to this archive
+      # The input paths must be strings and will be shell-escaped
+      # before further processing.  This means you cannot use a shell
+      # glob!
+      #
+      # @param [String] input_paths the paths to add to this archive
+      # @return [IMW::Resource] the resutling archive      
       def append *input_paths
-        should_have_archive_setting!("Cannot append to archive #{path}", :append)
+        should_have_archive_setting!("Cannot append to archive #{path}", :program, :append)
         IMW.system archive_settings[:program], archive_settings[:append], path, *input_paths.flatten
         self
       end
 
       # Extract the files from this archive to the current directory.
+      #
+      # @return [IMW::Resource] this archive
       def extract
         should_exist!("Cannot extract archive.")        
         should_have_archive_setting!("Cannot extract archive #{path}", :extract, [:unarchving_program, :program])
         program = archive_settings[:unarchiving_program] || archive_settings[:program]
         IMW.system program, archive_settings[:extract], path
+        self
       end
 
       # Return a (sorted) list of contents in this archive.
       #
-      # @return [Array] a list of paths in the archive.
+      # @return [Array<String>] a list of paths in the archive.
       def contents
         should_exist!("Cannot list archive contents.")
         should_have_archive_setting!("Cannot list archive #{path}", :list, [:unarchiving_program, :program])

data/lib/imw/dataset/workflow.rb

@@ -148,7 +148,6 @@ module IMW
       @options = OpenStruct.new(DEFAULT_OPTIONS)
       define_initialize_task
       define_workflow_tasks
-      define_workflow_task_methods
       define_clean_task
       define_tasks
     end
@@ -186,16 +185,11 @@ module IMW
       define_workflow_task({:package => [:fix]},                "Package dataset in final form."          )
     end
 
-    # Dynamically define methods for each of the workflow steps which
-    # act as shorcuts for accessing the corresponding tasks.
-    def define_workflow_task_methods
-      workflow_steps.each do |step|
-        self.class.class_eval <<RUBY
-          def #{step} deps, &block
-            self[step].enhance(step => deps, &block)
-          end
-RUBY
-      end
-    end
+
+    def rip(deps=nil, &block);     self[:rip].enhance(deps, &block);     end
+    def parse(deps=nil, &block);   self[:parse].enhance(deps, &block);   end
+    def fix(deps=nil, &block);     self[:fix].enhance(deps, &block);     end
+    def package(deps=nil, &block); self[:package].enhance(deps, &block); end
+
   end
 end

data/lib/imw/repository.rb

@@ -4,6 +4,7 @@ module IMW
   # command-line +imw+ tool.
   class Repository < Hash
     alias_method :datasets, :values
+    alias_method :handles,  :keys
   end
   
 end

data/lib/imw/resource.rb

@@ -50,11 +50,36 @@ module IMW
   class Resource
 
     attr_reader :uri, :mode
-    
+
+    # Create a new resource representing +uri+.
+    #
+    # IMW will automatically extend the resulting IMW::Resourcen
+    # instance with modules appropriate to the given URI.
+    #
+    #   r = IMW::Resource.new("http://www.infochimps.com")
+    #   r.resource_modules
+    #   => [IMW::Schemes::Remote::Base, IMW::Schemes::Remote::RemoteFile, IMW::Schemes::HTTP, IMW::Formats::Html]
+    #
+    # You can prevent this altogether by passing in
+    # <tt>:no_modules</tt>:
+    #
+    #   r = IMW::Resource.new("http://www.infochimps.com")
+    #   r.resource_modules
+    #   => [IMW::Schemes::Remote::Base, IMW::Schemes::Remote::RemoteFile, IMW::Schemes::HTTP, IMW::Formats::Html]
+    #
+    # And you can exert more fine-grained control with the
+    # <tt>:use_modules</tt> and <tt>:skip_modules</tt> options, see
+    # IMW::Resource.extend_resource! for details.
+    #
+    # @param [String, Addressable::URI] uri
+    # @param [Hash] options
+    # @option options [true, false] no_modules
+    # @option options [String] mode the mode to open the resource in (will be ignored when inapplicable)
+    # @return [IMW::Resource]
     def initialize uri, options={}
       self.uri = uri
       @mode    = options[:mode] || 'r'
-      extend_appropriately! unless options[:skip_modules]
+      extend_appropriately!(options) unless options[:no_modules]
     end
 
     # Return the modules this resource has been extended by.
@@ -73,8 +98,10 @@ module IMW
 
     # Extend this resource with modules by passing it through a
     # collection of handlers defined by IMW::Resource.handlers.
-    def extend_appropriately!
-      self.class.extend_resource!(self)
+    #
+    # Accepts the same options as Resource.extend_resource!.
+    def extend_appropriately! options={}
+      self.class.extend_resource!(self, options)
     end
 
     # Set the URI of this resource by parsing the given +uri+ (if
@@ -197,18 +224,26 @@ module IMW
     # +resource+ with modules whose handler conditions match the
     # resource.
     #
+    # Passing in <tt>:use_modules</tt> or <tt>:skip_modules</tt>
+    # allows overriding the default behavior of handlers.
+    #
     # @param [IMW::Resource] resource the resource to extend
+    # @param [Hash] options
+    # @option options [Array<String,Module>] use_modules a list of modules used regardless of handlers
+    # @option options [Array<String,Module>] skip_modules a list of modules not to be used regardless of handlers
     # @return [IMW::Resource] the extended resource
-    def self.extend_resource! resource
+    def self.extend_resource! resource, options={}
+      options.reverse_merge!(:use_modules => [], :skip_modules => [])
       handlers.each do |mod_name, handler|
         case handler
-        when Regexp    then extend_resource_with_mod_or_string!(resource, mod_name) if handler =~ resource.uri.to_s
-        when Proc      then extend_resource_with_mod_or_string!(resource, mod_name) if handler.call(resource)
-        when TrueClass then extend_resource_with_mod_or_string!(resource, mod_name)
+        when Regexp    then extend_resource_with_mod_or_string!(resource, mod_name, options[:skip_modules]) if handler =~ resource.uri.to_s
+        when Proc      then extend_resource_with_mod_or_string!(resource, mod_name, options[:skip_modules]) if handler.call(resource)
+        when TrueClass then extend_resource_with_mod_or_string!(resource, mod_name, options[:skip_modules])
         else
           raise IMW::TypeError("A handler must be Regexp, Proc, or true")
         end
       end
+      options[:use_modules].each { |mod_name| extend_resource_with_mod_or_string!(resource, mod_name, options[:skip_modules]) }
       resource
     end
     
@@ -257,31 +292,15 @@ module IMW
     #
     # @param [Module, String] mod_or_string the module or string
     # representing a module to extend the resource with
-    def self.extend_resource_with_mod_or_string! resource, mod_or_string
+    #
+    # @param [Array<Module,String>] skip_modules modules to exclude
+    def self.extend_resource_with_mod_or_string! resource, mod_or_string, skip_modules
+      return if skip_modules.include?(mod_or_string)
       if mod_or_string.is_a?(Module)
         resource.extend(mod_or_string)
       else
-        # Given a string "Mod::SubMod::SubSubMod" first split it into
-        # its parts ["Mod", "SubMod", "SubSubMod"] and then begin
-        # class_eval'ing them in order so that each is class_eval'd in
-        # the scope of the one before it.
-        #
-        # There is almost certainly a better way to do this.
-        # mod_names = mod_or_string.to_s.split('::')
-        # mods = []
-        # mod_names.each_with_index do |name, index|
-        #   if index == 0
-        #     mods << IMW.class_eval(name)
-        #   else
-        #     begin
-        #       mods << class_eval(name)
-        #     rescue NameError
-        #       mods << mods[index - 1].class_eval(name)
-        #     end
-        #   end
-        # end
-        # resource.extend(mods.last)
-        resource.extend(IMW.class_eval(mod_or_string))
+        m = IMW.class_eval(mod_or_string)
+        resource.extend(m) unless skip_modules.include?(m)
       end
     end    
   end

data/lib/imw/runner.rb

@@ -33,6 +33,14 @@ module IMW
 
 EOF
 
+        opts.on('-v', '--verbose', "Print verbose output") do
+          IMW.verbose = true      # class level, see IMW::Runner.verbose?
+        end
+
+        opts.on('-d', '--skip-dependencies', "Execute given tasks without invoking dependencies first") do
+          options[:execute] = true
+        end
+
         opts.on('-l', '--list', "List datasets in repository") do
           options[:list] = true
         end
@@ -49,7 +57,8 @@ EOF
     end
 
     def require_files
-      Dir['*.imw'].each { |path| load File.expand_path(path) }      
+      Dir['*.imw'].each { |path| load File.expand_path(path) }
+      Dir['*.rb'].each { |path| require path.gsub(/\.rb$/,'') }
       options[:requires].each do |path|
         IMW.open(path) do |requireable|
           if requireable.directory?
@@ -67,19 +76,13 @@ EOF
     end
 
     def handles
-      require 'set'
-      matched_handles = Set.new
       if options[:selectors].blank?
-        matched_handles += IMW.repository.keys
+        IMW.repository.keys.sort
       else
-        keys = IMW.repository.keys
-        unless keys.empty?
-          options[:selectors].each do |selector|
-            matched_handles += keys.find_all { |key| key =~ Regexp.new(selector) }
-          end
-        end
+        IMW.repository.handles.map do |handle|
+          handle if options[:selectors].all? { |selector| handle.to_s =~ Regexp.new(selector) }
+        end.compact.sort
       end
-      matched_handles.to_a.sort
     end
 
     def datasets
@@ -93,7 +96,7 @@ EOF
 
     def run_task!
       datasets.each do |dataset|
-        dataset[task].invoke
+        dataset[task].send(options[:execute] ? :execute : :invoke)
       end
       exit
     end

data/lib/imw/schemes/local.rb

@@ -58,6 +58,13 @@ module IMW
         def mv new_uri
           IMW::Tools::Transferer.new(:mv, self, new_uri).transfer!
         end
+
+        # Return the directory of this resource.
+        #
+        # @return [IMW::Resource]
+        def dir
+          IMW.open(dirname)
+        end
         
       end
 
@@ -155,6 +162,7 @@ module IMW
           FileUtils.rmdir path
           self
         end
+        alias_method :rmdir!, :rmdir
 
         # Delete this directory recursively.
         #
@@ -163,6 +171,7 @@ module IMW
           FileUtils.rm_rf path
           self
         end
+        alias_method :rm_rf!, :rm_rf
 
         # Return a list of paths relative to this directory which match
         # the +selector+.  Works just like Dir[].
@@ -210,6 +219,38 @@ module IMW
           end.compact
         end
 
+        # Package the contents of this directory to an archive at
+        # +package_path+.
+        #
+        # @param [String, IMW::Resource] package_path
+        # @return [IMW::Resource] the new package
+        def package package_path
+          temp_package = IMW.open(File.join(dirname, File.basename(package_path)))
+          FileUtils.cd(dirname) { temp_package.create(basename) }
+          temp_package.path == File.expand_path(package_path) ? temp_package : temp_package.mv(package_path)
+        end
+        alias_method :package!, :package
+
+        # Change the working directory to this local directory.
+        #
+        # If passed a black, execute the block in this directory and
+        # then change back to the initial directory.
+        #
+        # This method works the same as FileUtils.cd.
+        def cd &block
+          FileUtils.cd(path, &block)
+        end
+
+        # Create this directory.
+        #
+        # No error if the directory already exists.
+        #
+        # @return [IMW::Resource] this directory
+        def create
+          FileUtils.mkdir_p(path) unless exist?
+          self
+        end
+
       end
     end
   end

data/lib/imw/tools/archiver.rb

@@ -65,7 +65,7 @@ module IMW
 
       attr_accessor :name, :local_inputs, :remote_inputs
 
-      def initialize name, raw_inputs
+      def initialize name, *raw_inputs
         @name   = name
         self.inputs = raw_inputs
       end
@@ -73,12 +73,12 @@ module IMW
       # Set the inputs for this archiver.
       #
       # @param [String, IMW::Resource] new_inputs the inputs to archive, local or remote
-      def inputs= new_inputs
+      def inputs= raw_inputs
         @local_inputs, @remote_inputs = [], []
-        new_inputs.each do |obj|
-          input = obj.is_a?(IMW::Resource) ? obj : IMW.open(obj)  # take either paths/URIs or IMW::Resource objects
+        raw_inputs.flatten.each do |raw_input|
+          input = IMW.open(raw_input)
           if input.is_local?
-            @local_inputs << (input.directory? ? input.resources : input)  # recurse through directories
+            @local_inputs << input
           else
             @remote_inputs << input
           end
@@ -133,17 +133,21 @@ module IMW
           new_path      = File.join(dir, existing_file.basename)
           case
           when existing_file.is_archive?
+            IMW.announce_if_verbose("Extracting #{existing_file}...")
             FileUtils.cd(dir) do
               existing_file.extract
             end
           when existing_file.is_compressed?
+            IMW.announce_if_verbose("Decompressing #{existing_file}...")
             existing_file.cp(new_path).decompress!
           else
+            IMW.announce_if_verbose("Copying #{existing_file}...")
             existing_file.cp(new_path)
           end
         end
         
         remote_inputs.each do |remote_input|
+          IMW.announce_if_verbose("Downloading #{remote_input}...")
           remote_input.cp(File.join(dir, remote_input.effective_basename))
         end
       end        
@@ -199,7 +203,7 @@ module IMW
         output = IMW.open(output)
         FileUtils.mkdir_p(output.dirname) unless File.exist?(output.dirname)        
         output.rm!                        if output.exist?
-        FileUtils.cd(tmp_dir) { IMW.open(output.basename).create(*Dir["#{name}/**/*"]).mv(output.path) }
+        FileUtils.cd(tmp_dir) { IMW.open(output.basename).create(name).mv(output.path) }
         add_processing_error "Archiver: couldn't create archive #{output.path}" unless output.exists?
         output
       end

data/lib/imw/tools/transferer.rb

@@ -11,15 +11,27 @@ module IMW
         raise IMW::PathError.new("Source and destination have the same URI: #{@source.uri}") if @source.uri.to_s == @destination.uri.to_s
       end
 
+      # Transfer source to destination.
+      #
+      # For local transfer, will raise errors unless the necessary
+      # paths exist.
       def transfer!
         if source.is_local? 
-          source.should_exist!("Cannot copy") # don't bother checking for remote resources
-          source_scheme = 'file'              # make sure it isn't blank
+          source.should_exist!("Cannot #{action}") 
+          source_scheme = 'file'                   
         else
           source_scheme = source.scheme
         end
-        destination_scheme = destination.is_local? ? 'file' : destination.scheme
+        
+        if destination.is_local?
+          destination.dir.should_exist!("Cannot #{action}")          
+          destination_scheme = 'file'
+        else
+          destination_scheme = destination.scheme
+        end
+        
         method             = "#{source_scheme}_to_#{destination_scheme}"
+        
         if respond_to?(method)
           send(method)
         else
@@ -43,7 +55,8 @@ module IMW
       #
 
       def file_to_file
-        FileUtils.send(action, source.path, destination.path)
+        fu_action = (action == :cp && source.is_directory?) ? :cp_r : action
+        FileUtils.send(fu_action, source.path, destination.path)
       end
 
       #

data/lib/imw/utils/extensions.rb

@@ -57,6 +57,7 @@ module IMW
   # which will work fine since +flags+ will automatically be flattend.
   def self.system *commands
     stripped_commands = commands.flatten.map { |command| command.to_s unless command.blank? }.compact
+    IMW.announce_if_verbose(stripped_commands.join(" "))
     Kernel.system(*stripped_commands)
     raise IMW::SystemCallError.new($?.dup, commands.join(' ')) unless $?.success?
   end

data/lib/imw/utils/extensions/array.rb

@@ -109,7 +109,7 @@ class Array
 
   # Dump the data in this array to the resource at the given +uri+.
   def dump uri
-    IMW.open(uri, :mode => 'w').dump(self)
+    IMW.open!(uri).dump(self)
   end
 
 end

data/lib/imw/utils/extensions/hash.rb

@@ -203,6 +203,6 @@ class Hash
 
   # Dump the data from this Hash into the given +uri+.
   def dump uri
-    IMW.open(uri).dump(self)
+    IMW.open!(uri).dump(self)
   end
 end

data/lib/imw/utils/extensions/string.rb

@@ -33,7 +33,7 @@ class String
 
   # Dump this string into the given +uri+.
   def dump uri
-    IMW.open(uri).dump(self)
+    IMW.open!(uri).dump(self)
   end
 
 end

data/lib/imw/utils/log.rb

@@ -4,10 +4,26 @@ module IMW
 
   # Default log file.
   LOG_FILE_DESTINATION = STDERR             unless defined?(LOG_FILE_DESTINATION)
-  
-  LOG_TIMEFORMAT       = "%Y%m%d-%H:%M:%S " unless defined?(LOG_TIMEFORMAT)
 
-  class << self; attr_accessor :log end
+  # Default log file time format
+  LOG_TIMEFORMAT       = "%Y-%m-%d %H:%M:%S " unless defined?(LOG_TIMEFORMAT)
+
+  # Default verbosity
+  VERBOSE = false
+
+  class << self; attr_accessor :log, :verbose end
+
+  # Is IMW operating in verbose mode?
+  #
+  # Calls to <tt>IMW.warn_if_verbose</tt> and friends utilize this
+  # method.  Verbosity is controlled on the command line (see
+  # IMW::Runner) or by setting IMW::VERBOSE in your configuration
+  # file.
+  #
+  # @return [nil, false, true]
+  def self.verbose?
+    VERBOSE || verbose
+  end
   
   # Create a Logger and point it at IMW::LOG_FILE_DESTINATION which is
   # set in ~/.imwrc and defaults to STDERR.
@@ -17,21 +33,29 @@ module IMW
     IMW.log.level           = Logger::INFO
   end
 
-  def announce *events
+  def self.announce *events
     options = events.flatten.extract_options!
     options.reverse_merge! :level => Logger::INFO
     IMW.log.add options[:level], events.join("\n")
   end
-  def banner *events
+  def self.announce_if_verbose *events
+    announce(*events) if IMW.verbose?
+  end
+  
+  def self.banner *events
     options = events.flatten.extract_options!
     options.reverse_merge! :level => Logger::INFO
     announce(["*"*75, events, "*"*75], options)
   end
-  def warn *events
+
+  def self.warn *events
     options = events.flatten.extract_options!
     options.reverse_merge! :level => Logger::WARN
     announce events, options
   end
+  def self.warn_if_verbose *events
+    warn(*events) if IMW.verbose?
+  end
 
   PROGRESS_TRACKERS = {}
   #

data/spec/imw/archives/rar_spec.rb

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + "/../../spec_helper"
-require File.dirname(__FILE__) + "/../archive_spec"
+require File.dirname(__FILE__) + "/../archives_spec"
 
 describe IMW::Archives::Rar do
   

data/spec/imw/archives/tar_spec.rb

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + "/../../spec_helper"
-require File.dirname(__FILE__) + "/../archive_spec"
+require File.dirname(__FILE__) + "/../archives_spec"
 
 describe IMW::Archives::Tar do
   

data/spec/imw/archives/tarbz2_spec.rb

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + "/../../spec_helper"
-require File.dirname(__FILE__) + "/../archive_spec"
+require File.dirname(__FILE__) + "/../archives_spec"
 require File.dirname(__FILE__) + "/../compressed_files_spec"
 
 describe IMW::Archives::Tarbz2 do

data/spec/imw/archives/targz_spec.rb

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + "/../../spec_helper"
-require File.dirname(__FILE__) + "/../archive_spec"
+require File.dirname(__FILE__) + "/../archives_spec"
 require File.dirname(__FILE__) + "/../compressed_files_spec"
 
 describe IMW::Archives::Targz do

data/spec/imw/archives/zip_spec.rb

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + "/../../spec_helper"
-require File.dirname(__FILE__) + "/../archive_spec"
+require File.dirname(__FILE__) + "/../archives_spec"
 
 describe IMW::Archives::Zip do
   

data/spec/imw/{archive_spec.rb → archives_spec.rb}

@@ -20,7 +20,6 @@ require File.join(File.dirname(__FILE__),'../spec_helper')
 # variable should be defined OUTSIDE a before block.
 
 share_examples_for "an archive of files" do
-  include Spec::Matchers::IMW
 
   before do
     @root = File.join(IMWTest::TMP_DIR, 'an_archive_of_files_shared_example_group')
@@ -40,6 +39,10 @@ share_examples_for "an archive of files" do
     @archive.should contain_paths_like(@initial_directory, :relative_to => @root)
   end
 
+  it "returns an IMW resource when creating" do
+    @archive.create(*Dir[@initial_directory + '/**/*']).class.should == IMW::Resource
+  end
+
   if @cannot_append
     it "cannot append to an archive which already exists" do
       @archive.create(*Dir[@initial_directory + "/**/*"])
@@ -56,7 +59,12 @@ share_examples_for "an archive of files" do
       @archive.append(*Dir[@appending_directory + "/**/*"])    
       @archive.should contain_paths_like(@appending_directory, :relative_to => @root)
     end
+
+    it "returns an IMW resource when appending" do
+      @archive.append(*Dir[@appending_directory + "/**/*"]).class.should == IMW::Resource
+    end
   end
+  
 
   it "can extract files which match the original ones it archived" do
     @archive.create(*Dir[@initial_directory + "/**/*"])

data/spec/imw/compressed_files_spec.rb

@@ -14,7 +14,6 @@ require File.join(File.dirname(__FILE__),'../spec_helper')
 # registered handler.
 
 share_examples_for "a compressed file" do
-  include Spec::Matchers::IMW
 
   before do
     @root = File.join(IMWTest::TMP_DIR, 'a_compressed_file_shared_example_group')

data/spec/imw/resource_spec.rb

@@ -4,7 +4,7 @@ describe IMW::Resource do
 
   describe "handling missing methods" do
     before do
-      @resource = IMW::Resource.new('/home/foof.txt', :skip_modules => true)
+      @resource = IMW::Resource.new('/home/foof.txt', :no_modules => true)
     end
 
     it "should return false when querying with a method that isn't defined" do
@@ -28,7 +28,7 @@ describe IMW::Resource do
   describe "parsing various and sundry URIs should correctly parse a" do
     
     before do
-      IMW::Resource.should_receive(:extend_resource!).with(an_instance_of(IMW::Resource))
+      IMW::Resource.should_receive(:extend_resource!).with(an_instance_of(IMW::Resource), {})
     end
 
     it "local file path" do
@@ -69,9 +69,36 @@ describe IMW::Resource do
 
   it "should open a URI without attempting to extend with modules if so asked" do
     IMW::Resource.should_not_receive(:extend_resource!)
-    IMW::Resource.new("/path/to/some/file.txt", :skip_modules => true)
+    IMW::Resource.new("/path/to/some/file.txt", :no_modules => true)
   end
-   
+
+  describe "extending resources with specific modules" do
+    before do 
+      @resource = IMW::Resource.new('http://www.infochimps.com/data', :no_modules => true)
+    end
+
+    it "should use a specific module when asked with a string" do
+      IMW::Resource.extend_resource!(@resource, :use_modules => ["Formats::Csv"])
+      @resource.resource_modules.should include(IMW::Formats::Csv)
+    end
+
+    it "should use a specific module when asked with a module" do
+      IMW::Resource.extend_resource!(@resource, :use_modules => [IMW::Formats::Csv])
+      @resource.resource_modules.should include(IMW::Formats::Csv)
+    end
+
+    it "should not use a specific module when asked with a string" do
+      IMW::Resource.extend_resource!(@resource, :skip_modules => ["Schemes::HTTP"])
+      @resource.resource_modules.should_not include(IMW::Schemes::HTTP)
+    end
+
+    it "should not use a specific module when asked with a module" do
+      IMW::Resource.extend_resource!(@resource, :skip_modules => [IMW::Schemes::HTTP])
+      @resource.resource_modules.should_not include(IMW::Schemes::HTTP)
+    end
+    
+  end
+
 end
 
 

data/spec/imw/schemes/local_spec.rb

@@ -3,13 +3,13 @@ require File.join(File.dirname(__FILE__),'../../spec_helper')
 describe IMW::Schemes::Local::Base do
 
   it "should not extend a local file with LocalDirectory" do
-    @file = IMW::Resource.new('foo.txt', :skip_modules => true)
+    @file = IMW::Resource.new('foo.txt', :no_modules => true)
     @file.should_not_receive(:extend).with(IMW::Schemes::Local::LocalDirectory)
     @file.extend_appropriately!
   end
 
   it "should not extend a local directory with LocalFile" do
-    @dir = IMW::Resource.new(IMWTest::TMP_DIR, :skip_modules => true)
+    @dir = IMW::Resource.new(IMWTest::TMP_DIR, :no_modules => true)
     @dir.should_not_receive(:extend).with(IMW::Schemes::Local::LocalFile)
     @dir.extend_appropriately!
   end
@@ -17,6 +17,13 @@ describe IMW::Schemes::Local::Base do
   it "should correctly resolve relative paths" do
     IMW.open('foobar').dirname.should == IMWTest::TMP_DIR
   end
+
+  it "should be able to return its directory as an IMW object" do
+    IMW.open('/path/to/file').dir.path.should == '/path/to'
+    IMW.open('/').dir.path.should == '/'
+  end
+
+  
 end
 
 describe IMW::Schemes::Local::LocalFile do
@@ -93,6 +100,13 @@ describe IMW::Schemes::Local::LocalDirectory do
     @dir.resources.map(&:class).uniq.first.should == IMW::Resource
   end
 
+  describe 'can package itself to' do
+    ['tar', 'tar.bz2', 'tar.gz', 'zip', 'rar'].each do |extension|
+      it "a #{extension} archive" do
+        @dir.package("package.#{extension}").exist?.should be_true # FIXME should explicitly check paths are correct in archive
+      end
+    end
+  end
 end
 
 

data/spec/imw/schemes/remote_spec.rb

@@ -7,8 +7,7 @@ describe IMW::Schemes::Remote::RemoteFile do
 
   before do
     # skip modules or else it will automatically become HTML!
-    @file = IMW.open('http://www.google.com', :skip_modules => true)
-    @file.extend(IMW::Schemes::Remote::Base)
+    @file = IMW.open('http://www.google.com', :skip_modules => ["Schemes::HTTP", "Formats::HTML"])
   end
 
   describe 'with the file' do

data/spec/imw/tools/transferer_spec.rb

@@ -2,10 +2,14 @@ require File.dirname(__FILE__) + "/../../spec_helper"
 
 describe IMW::Tools::Transferer do
   before do
-    @local  = IMW.open("foobar.txt")
-    @http   = IMW.open("http://www.google.com")
-    @hdfs   = IMW.open("hdfs:///path/to/foobar.txt")
-    @s3     = IMW.open("s3://mybucket/foo/bar")
+    @dir     = IMW.open("dir")
+    @new_dir = IMW.open("new_dir")
+    @nested  = IMW.open('new_dir/nested.txt')
+    @nested_dir = IMW.open('new_dir/nested')
+    @local   = IMW.open("foobar.txt")
+    @http    = IMW.open("http://www.google.com")
+    @hdfs    = IMW.open("hdfs:///path/to/foobar.txt")
+    @s3      = IMW.open("s3://mybucket/foo/bar")
   end
 
   it "should raise an error unless the action is one of :cp, :copy, :mv :move, or :mv!" do
@@ -22,25 +26,91 @@ describe IMW::Tools::Transferer do
   end
 
   describe "transfering local files" do
+
+    before do
+      IMWTest::Random.file @local.path
+    end
+    
     it "should raise an error if the source doesn't exist" do
+      @local.rm!
       lambda { IMW::Tools::Transferer.new(:cp, @local, 'barbaz.txt').transfer! }.should raise_error(IMW::PathError)
     end
 
+    it "should raise an error if the directory of the destination doesn't exist" do
+      lambda { IMW::Tools::Transferer.new(:cp, @local, @nested).transfer! }.should raise_error(IMW::PathError)
+    end
+
     it "can copy a local file" do
-      IMWTest::Random.file @local.path
       IMW::Tools::Transferer.new(:cp, @local, 'barbaz.txt').transfer!
       @local.exist?.should be_true
       IMW.open('barbaz.txt').exist?.should be_true
     end
 
+    it "can copy a local file to a directory" do
+      FileUtils.mkdir(@dir.path)
+      IMW::Tools::Transferer.new(:cp, @local, @dir).transfer!
+      IMW.open(File.join(@dir.path, @local.basename)).exist?.should be_true
+    end
+
     it "can move a local file" do
-      IMWTest::Random.file @local.path 
       IMW::Tools::Transferer.new(:mv, @local, 'barbaz.txt').transfer!
       @local.exist?.should be_false
       IMW.open('barbaz.txt').exist?.should be_true
     end
 
+    it "can move a local file to a directory" do
+      FileUtils.mkdir(@dir.path)
+      IMW::Tools::Transferer.new(:mv, @local, @dir).transfer!
+      IMW.open(File.join(@dir.path, @local.basename)).exist?.should be_true
+      @local.exist?.should be_false
+    end
+    
+
+  end
+
+  describe "transfering local directories" do
+
+    before do
+      IMWTest::Random.directory_with_files @dir.path
+      @dir = @dir.reopen
+    end
+    
+    it "should raise an error if the source doesn't exist" do
+      @dir.rm_rf!
+      lambda { IMW::Tools::Transferer.new(:cp, @dir, @new_dir).transfer! }.should raise_error(IMW::PathError)
+    end
+
+    it "should raise an error if the directory of the destination doesn't exist" do
+      lambda { IMW::Tools::Transferer.new(:cp, @dir, @nested_dir).transfer! }.should raise_error(IMW::PathError)
+    end
+
+    it "can copy a local directory" do
+      IMW::Tools::Transferer.new(:cp, @dir, @new_dir).transfer!
+      @dir.exist?.should be_true
+      @new_dir.exist?.should be_true
+    end
+
+    it "can move a local directory" do
+      IMW::Tools::Transferer.new(:mv, @dir, @new_dir).transfer!
+      @dir.exist?.should be_false
+      @new_dir.exist?.should be_true
+    end
+
+    it "can copy a local directory to an existing directory" do
+      FileUtils.mkdir(@new_dir.path)
+      IMW::Tools::Transferer.new(:cp, @dir, @nested_dir).transfer!
+      @dir.exist?.should be_true
+      @nested_dir.exist?.should be_true
+    end
+
+    it "can move a local directory to an existing directory" do
+      FileUtils.mkdir(@new_dir.path)
+      IMW::Tools::Transferer.new(:mv, @dir, @nested_dir).transfer!
+      @dir.exist?.should_not be_true
+      @nested_dir.exist?.should be_true
+    end
   end
+  
 
   describe "transferring HTTP files" do
     it "can copy a remote file to a local path" do

data/spec/spec_helper.rb

@@ -16,7 +16,7 @@ end
 
 Spec::Runner.configure do |config|
 
-  config.include CustomMatchers
+  config.include IMWTest::CustomMatchers
   
   config.before do
     FileUtils.mkdir_p IMWTest::TMP_DIR

data/spec/support/custom_matchers.rb

@@ -1,21 +1,28 @@
-module CustomMatchers
-  def contain *paths
-    paths = paths.flatten
-    simple_matcher("contain #{paths.inspect}") do |given, matcher|
-      given_contents = Dir[given + "/**/*"].map do |abs_path|
-        abs_path[(given.length + 1)..-1]
+module IMWTest
+  module CustomMatchers
+
+    # Check to see whether the given directory (a String) contains the
+    # given +paths+
+    #
+    # @param [Array<String>] paths
+    def contain *paths
+      paths = paths.flatten
+      simple_matcher("contain #{paths.inspect}") do |given, matcher|
+        given_contents = Dir[given + "/**/*"].map do |abs_path|
+          abs_path[(given.length + 1)..-1]
+        end
+        matcher.failure_message = "expected #{given} to contain #{paths.inspect}, instead it contained #{given_contents.inspect}"
+        matcher.negative_failure_message = "expected #{given} not to contain #{paths.inspect}"
+        paths.all? { |path| given_contents.include?(path.gsub(/\/+$/,'')) }
       end
-      matcher.failure_message = "expected #{given} to contain #{paths.inspect}, instead it contained #{given_contents.inspect}"
-      matcher.negative_failure_message = "expected #{given} not to contain #{paths.inspect}"
-      paths.all? { |path| given_contents.include?(path) }
     end
-  end
 
-  def exist
-    simple_matcher("exist") do |given, matcher|
-      matcher.failure_message = "expected #{given} to exist on disk"
-      matcher.failure_message = "expected #{given} not to exist on disk"
-      File.exist?(given)
+    def exist
+      simple_matcher("exist") do |given, matcher|
+        matcher.failure_message = "expected #{given} to exist on disk"
+        matcher.failure_message = "expected #{given} not to exist on disk"
+        File.exist?(given)
+      end
     end
   end
 end

data/spec/support/file_contents_matcher.rb

@@ -1,50 +1,30 @@
-#
-# h2. spec/imw/matchers/file_contents_matcher.rb -- matches contents of two files
-#
-# == About
-#
-# An RSpec matcher which tests that two files have the same contents
-# on disk.
-#
-# Author::    (Philip flip Kromer, Dhruv Bansal) for Infinite Monkeywrench Project (mailto:coders@infochimps.org)
-# Copyright:: Copyright (c) 2008 infochimps.org
-# License::   GPL 3.0
-# Website::   http://infinitemonkeywrench.org/
-# 
+module IMWTest
+  module CustomMatchers
 
-require 'ftools'
-
-module Spec
-  module Matchers
-    module IMW
-
-      class FileContentsMatcher
-        def initialize orig
-          @orig = File.expand_path orig
-        end
-
-        def matches? copy
-          @copy = File.expand_path copy
-          File.compare(@orig,@copy)
-        end
+    class FileContentsMatcher
+      def initialize orig
+        @orig = File.expand_path orig
+      end
 
-        def failure_message
-          "files #{@orig} and #{@copy} are different"
-        end
+      def matches? copy
+        @copy = File.expand_path copy
+        File.compare(@orig,@copy)
+      end
 
-        def negative_failure_message
-          "expected files #{@orig} and #{@copy} to differ"
-        end
+      def failure_message
+        "files #{@orig} and #{@copy} are different"
       end
 
-      # Matches the contents of one file against another using
-      # File.compare.
-      def have_contents_matching_those_of path
-        FileContentsMatcher.new(path)
+      def negative_failure_message
+        "expected files #{@orig} and #{@copy} to differ"
       end
-      
     end
+
+    # Matches the contents of one file against another using
+    # File.compare.
+    def have_contents_matching_those_of path
+      FileContentsMatcher.new(path)
+    end
+    
   end
 end
-
-# puts "#{File.basename(__FILE__)}: From far away, the folders appear the same; from up close, they are different." # at bottom

data/spec/support/paths_matcher.rb

@@ -1,67 +1,66 @@
 require 'set'
 
-module Spec
-  module Matchers
-    module IMW
+module IMWTest
 
-      class PathsMatcher
+  module CustomMatchers
 
-        attr_accessor :given, :given_contents, :given_base, :to_match, :to_match_contents, :to_match_base
+    class PathsMatcher
 
-        def initialize given, options={}
-          @given_base     = options[:given_base] || options[:relative_to]
-          @to_match_base  = options[:to_match_base]
-          @given          = given
-          @given_contents = get_contents(given, given_base)
-        end
-        
-        def matches? to_match
-          @to_match          = to_match
-          @to_match_contents = get_contents(to_match, to_match_base)
-          to_match_contents == given_contents
-        end
+      attr_accessor :given, :given_contents, :given_base, :to_match, :to_match_contents, :to_match_base
 
-        def failure_message
-          given_string    = given_contents.to_a.join("\n\t")
-          to_match_string = to_match_contents.to_a.join("\n\t")          
-          "expected contents to be identical.\n\ngiven #{given.inspect}:\n\t#{given_string}\n\nto match #{to_match}:\n\t#{to_match_string}"
-        end
+      def initialize given, options={}
+        @given_base     = options[:given_base] || options[:relative_to]
+        @to_match_base  = options[:to_match_base]
+        @given          = given
+        @given_contents = get_contents(given, given_base)
+      end
+      
+      def matches? to_match
+        @to_match          = to_match
+        @to_match_contents = get_contents(to_match, to_match_base)
+        to_match_contents == given_contents
+      end
 
-        def negative_failure_message
-          "expected contents of #{given} and #{to_match} to be different"
-        end
+      def failure_message
+        given_string    = given_contents.to_a.join("\n\t")
+        to_match_string = to_match_contents.to_a.join("\n\t")          
+        "expected contents to be identical.\n\ngiven #{given.inspect}:\n\t#{given_string}\n\nto match #{to_match}:\n\t#{to_match_string}"
+      end
 
-        protected
-        def get_contents obj, base=nil
-          if obj.is_a?(String) || obj.is_a?(Array)
-            contents = [obj].flatten.map do |raw_path|
-              path = File.expand_path(raw_path)
-              if File.directory?(path)
-                Dir[path + "/**/*"]
-              else
-                path
-              end
-            end.flatten
-          else
-            # obj is an IMW obj (archive or directory) so it has a
-            # contents method
-            contents = obj.contents
-          end
-          if base
-            contents.map do |path|
-              new_path = path[base.length + 1..-1]
-              new_path = nil if !new_path.nil? && new_path.size == 0
-              new_path
-            end.compact.to_set
-          else
-            contents.to_set
-          end
-        end
+      def negative_failure_message
+        "expected contents of #{given} and #{to_match} to be different"
       end
-      
-      def contain_paths_like given, options={}
-        PathsMatcher.new(given, options)
+
+      protected
+      def get_contents obj, base=nil
+        if obj.is_a?(String) || obj.is_a?(Array)
+          contents = [obj].flatten.map do |raw_path|
+            path = File.expand_path(raw_path)
+            if File.directory?(path)
+              Dir[path + "/**/*"]
+            else
+              path
+            end
+          end.flatten
+        else
+          # obj is an IMW obj (archive or directory) so it has a
+          # contents method
+          contents = obj.send(obj.respond_to?(:all_contents) ? :all_contents : :contents)
+        end
+        if base
+          contents.map do |path|
+            new_path = path[base.length + 1..-1]
+            new_path = nil if !new_path.nil? && new_path.size == 0
+            new_path
+          end.compact.to_set
+        else
+          contents.to_set
+        end
       end
     end
+    
+    def contain_paths_like given, options={}
+      PathsMatcher.new(given, options)
+    end
   end
 end

data/spec/support/without_regard_to_order_matcher.rb

@@ -1,58 +1,41 @@
-#
-# h2. spec/imw/matchers/without_regard_to_order_matcher.rb -- set matcher for non-sets
-#
-# == About
-#
-# A simple matcher which compares two objects as though they were
-# sets, i.e. - without regard to the order of their elements.
-#
-# Author::    (Philip flip Kromer, Dhruv Bansal) for Infinite Monkeywrench Project (mailto:coders@infochimps.org)
-# Copyright:: Copyright (c) 2008 infochimps.org
-# License::   GPL 3.0
-# Website::   http://infinitemonkeywrench.org/
-# 
-
 require 'set'
 require 'imw/utils'
 
-module Spec
-  module Matchers
-    module IMW
-
-      # Match the contents of two arrays without regard to the order
-      # of their elements by treating each as a set.
-      class WithoutRegardToOrder
-
-        private
-        def initialize known_array
-          @known_array = known_array.to_set
-        end
-
-        public
-        def matches? array_to_test
-          @array_to_test = array_to_test.to_set
-          @array_to_test == @known_array
-        end
-
-        def failure_message
-          missing_from_array_to_test = "missing from array to test: #{(@known_array - @array_to_test).to_a.quote_items_with "and"}\n"
-          missing_from_known_array = "missing from known array: #{(@array_to_test - @known_array).to_a.quote_items_with "and"}\n"
-          common_to_both = "common to both: #{(@array_to_test & @known_array).to_a.quote_items_with "and"}\n"
-          "expected contents of the arrays to be identical:\n\n#{missing_from_array_to_test}\n#{missing_from_known_array}\n#{common_to_both}"
-        end
-
-        def negative_failure_message
-          "expected contents of the arrays to differ."
-        end
+module IMWTest
+  module CustomMatchers
+
+    # Match the contents of two arrays without regard to the order
+    # of their elements by treating each as a set.
+    class WithoutRegardToOrder
+
+      private
+      def initialize known_array
+        @known_array = known_array.to_set
+      end
+
+      public
+      def matches? array_to_test
+        @array_to_test = array_to_test.to_set
+        @array_to_test == @known_array
       end
 
-      # Check that the contents of one array match another without
-      # regard to ordering.
-      def match_without_regard_to_order known_array
-        WithoutRegardToOrder.new(known_array)
+      def failure_message
+        missing_from_array_to_test = "missing from array to test: #{(@known_array - @array_to_test).to_a.quote_items_with "and"}\n"
+        missing_from_known_array = "missing from known array: #{(@array_to_test - @known_array).to_a.quote_items_with "and"}\n"
+        common_to_both = "common to both: #{(@array_to_test & @known_array).to_a.quote_items_with "and"}\n"
+        "expected contents of the arrays to be identical:\n\n#{missing_from_array_to_test}\n#{missing_from_known_array}\n#{common_to_both}"
       end
+
+      def negative_failure_message
+        "expected contents of the arrays to differ."
+      end
+    end
+
+    # Check that the contents of one array match another without
+    # regard to ordering.
+    def match_without_regard_to_order known_array
+      WithoutRegardToOrder.new(known_array)
     end
   end
 end
 
-# puts "#{File.basename(__FILE__)}: The leg bone's connected to the...knee bone, the knee bone's connected...wait, isn't it the other way 'round?" # at bottom

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: imw
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Dhruv Bansal
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-14 00:00:00 -05:00
+date: 2010-05-17 00:00:00 -05:00
 default_executable: imw
 dependencies: []
 
@@ -95,12 +95,12 @@ files:
 - spec/data/sample.txt
 - spec/data/sample.xml
 - spec/data/sample.yaml
-- spec/imw/archive_spec.rb
 - spec/imw/archives/rar_spec.rb
 - spec/imw/archives/tar_spec.rb
 - spec/imw/archives/tarbz2_spec.rb
 - spec/imw/archives/targz_spec.rb
 - spec/imw/archives/zip_spec.rb
+- spec/imw/archives_spec.rb
 - spec/imw/compressed_files/bz2_spec.rb
 - spec/imw/compressed_files/compressible_spec.rb
 - spec/imw/compressed_files/gz_spec.rb
@@ -168,7 +168,6 @@ test_files:
 - spec/imw/archives/rar_spec.rb
 - spec/imw/tools/archiver_spec.rb
 - spec/imw/tools/transferer_spec.rb
-- spec/imw/archive_spec.rb
 - spec/imw/compressed_files/compressible_spec.rb
 - spec/imw/compressed_files/bz2_spec.rb
 - spec/imw/compressed_files/gz_spec.rb
@@ -182,6 +181,7 @@ test_files:
 - spec/imw/formats/yaml_spec.rb
 - spec/imw/formats/delimited_spec.rb
 - spec/imw/formats/sgml_spec.rb
+- spec/imw/archives_spec.rb
 - spec/imw/schemes/http_spec.rb
 - spec/imw/schemes/local_spec.rb
 - spec/imw/schemes/remote_spec.rb