imw 0.2.0 → 0.2.1

data/lib/imw/tools.rb

@@ -0,0 +1,8 @@
+module IMW
+  module Tools
+    autoload :Archiver,   'imw/tools/archiver'
+    autoload :Transferer, 'imw/tools/transferer'
+  end
+end
+
+

data/lib/imw/{transforms → tools}/archiver.rb

@@ -1,7 +1,7 @@
 require 'imw/resource'
 
 module IMW
-  module Transforms
+  module Tools
     
     # Packages an Array of input files into a single output archive.
     # When the archive is extracted, all the input files given will be

data/lib/imw/{transforms → tools}/transferer.rb

@@ -1,5 +1,5 @@
 module IMW
-  module Transforms
+  module Tools
     class Transferer
 
       attr_accessor :action, :source, :destination
@@ -59,19 +59,19 @@ module IMW
       #
 
       def file_to_s3
-        IMW::Resources::Schemes::S3.put(source, destination)
+        IMW::Schemes::S3.put(source, destination)
       end
 
       def http_to_s3
-        IMW::Resources::Schemes::S3.put(source, destination)
+        IMW::Schemes::S3.put(source, destination)
       end
 
       def s3_to_file
-        IMW::Resources::Schemes::S3.get(source, destination)
+        IMW::Schemes::S3.get(source, destination)
       end
 
       def s3_to_s3
-        IMW::Resources::Schemes::S3.copy(source, destination)
+        IMW::Schemes::S3.copy(source, destination)
       end
 
       #
@@ -79,23 +79,23 @@ module IMW
       #
 
       def hdfs_to_hdfs
-        IMW::Resources::Schemes::HDFS.fs(action, source.path, destination.path)
+        IMW::Schemes::HDFS.fs(action, source.path, destination.path)
       end
 
       def file_to_hdfs
-        IMW::Resources::Schemes::HDFS.fs(:put, source.path, destination.path)
+        IMW::Schemes::HDFS.fs(:put, source.path, destination.path)
       end
 
       def hdfs_to_file
-        IMW::Resources::Schemes::HDFS.fs(:get, source.path, destination.path)
+        IMW::Schemes::HDFS.fs(:get, source.path, destination.path)
       end
 
       def s3_to_hdfs
-        IMW::Resources::Schemes::HDFS.fs(action, source.s3n_url, destination.path)
+        IMW::Schemes::HDFS.fs(action, source.s3n_url, destination.path)
       end
 
       def hdfs_to_s3
-        IMW::Resources::Schemes::HDFS.fs(action, source.path, destination.s3n_url)
+        IMW::Schemes::HDFS.fs(action, source.path, destination.s3n_url)
       end
 
     end

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

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__),'../../spec_helper')
+require File.join(File.dirname(__FILE__),'../spec_helper')
 
 # To use this shared example group define instance variables
 # <tt>@extension</tt> and <tt>@cannot_append</tt> in your tests:
@@ -11,8 +11,8 @@ require File.join(File.dirname(__FILE__),'../../spec_helper')
 #
 #   it_should_behave_like "an archive of files"
 #
-# The <tt>@extension</tt> should correspond to an IMW::Resources
-# module with a registered handler.
+# The <tt>@extension</tt> should correspond to an IMW module with a
+# registered handler.
 #
 # If <tt>@cannot_append</tt> evaluates to true then the specs for
 # appending to files will check for an error (this is because one

data/spec/imw/{resources/archives_and_compressed → archives}/rar_spec.rb

@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + "/../../../spec_helper"
+require File.dirname(__FILE__) + "/../../spec_helper"
 require File.dirname(__FILE__) + "/../archive_spec"
 
-describe IMW::Resources::Archives::Rar do
+describe IMW::Archives::Rar do
   
   before do
     @extension = 'rar'

data/spec/imw/{resources/archives_and_compressed → archives}/tar_spec.rb

@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + "/../../../spec_helper"
+require File.dirname(__FILE__) + "/../../spec_helper"
 require File.dirname(__FILE__) + "/../archive_spec"
 
-describe IMW::Resources::Archives::Tar do
+describe IMW::Archives::Tar do
   
   before do
     @extension = 'tar'

data/spec/imw/{resources/archives_and_compressed → archives}/tarbz2_spec.rb

@@ -1,8 +1,8 @@
-require File.dirname(__FILE__) + "/../../../spec_helper"
+require File.dirname(__FILE__) + "/../../spec_helper"
 require File.dirname(__FILE__) + "/../archive_spec"
-require File.dirname(__FILE__) + "/../compressed_file_spec"
+require File.dirname(__FILE__) + "/../compressed_files_spec"
 
-describe IMW::Resources::Archives::Tarbz2 do
+describe IMW::Archives::Tarbz2 do
   @cannot_append = true
   before do
     @extension = 'tar.bz2'
@@ -11,7 +11,7 @@ describe IMW::Resources::Archives::Tarbz2 do
   it_should_behave_like 'an archive of files'
 end
 
-describe IMW::Resources::Archives::Tarbz2 do
+describe IMW::Archives::Tarbz2 do
   before do
     @extension = 'tar.bz2'
   end

data/spec/imw/{resources/archives_and_compressed → archives}/targz_spec.rb

@@ -1,8 +1,8 @@
-require File.dirname(__FILE__) + "/../../../spec_helper"
+require File.dirname(__FILE__) + "/../../spec_helper"
 require File.dirname(__FILE__) + "/../archive_spec"
-require File.dirname(__FILE__) + "/../compressed_file_spec"
+require File.dirname(__FILE__) + "/../compressed_files_spec"
 
-describe IMW::Resources::Archives::Targz do
+describe IMW::Archives::Targz do
   @cannot_append = true
   before do
     @extension = 'tar.gz'
@@ -12,7 +12,7 @@ describe IMW::Resources::Archives::Targz do
 end
 
 
-describe IMW::Resources::Archives::Targz do
+describe IMW::Archives::Targz do
   before do
     @extension = 'tar.gz'
   end

data/spec/imw/{resources/archives_and_compressed → archives}/zip_spec.rb

@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + "/../../../spec_helper"
+require File.dirname(__FILE__) + "/../../spec_helper"
 require File.dirname(__FILE__) + "/../archive_spec"
 
-describe IMW::Resources::Archives::Zip do
+describe IMW::Archives::Zip do
   
   before do
     @extension = 'zip'

data/spec/imw/compressed_files/bz2_spec.rb

@@ -0,0 +1,15 @@
+require File.dirname(__FILE__) + "/../../spec_helper"
+require File.dirname(__FILE__) + "/../compressed_files_spec"
+
+describe IMW::CompressedFiles::Bz2 do
+  
+  before do
+    @extension = 'bz2'
+  end
+
+  it_should_behave_like 'a compressed file'
+end
+
+
+
+

data/spec/imw/{resources → compressed_files}/compressible_spec.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__),'../../spec_helper')
 
-describe IMW::Resources::Compressible do
+describe IMW::CompressedFiles::Compressible do
 
   before do
     IMWTest::Random.file('foobar.txt')

data/spec/imw/compressed_files/gz_spec.rb

@@ -0,0 +1,15 @@
+require File.dirname(__FILE__) + "/../../spec_helper"
+require File.dirname(__FILE__) + "/../compressed_files_spec"
+
+describe IMW::CompressedFiles::Gz do
+  
+  before do
+    @extension = 'gz'
+  end
+
+  it_should_behave_like 'a compressed file'
+end
+
+
+
+

data/spec/imw/{resources/compressed_file_spec.rb → compressed_files_spec.rb}

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__),'../../spec_helper')
+require File.join(File.dirname(__FILE__),'../spec_helper')
 
 # To use this shared example group define an instance variable
 # <tt>@extension</tt> in your tests:
@@ -10,8 +10,8 @@ require File.join(File.dirname(__FILE__),'../../spec_helper')
 #
 #   it_should_behave_like "a compressed file"
 #
-# The <tt>@extension</tt> should correspond to an IMW::Resources
-# module with a registered handler.
+# The <tt>@extension</tt> should correspond to an IMW module with a
+# registered handler.
 
 share_examples_for "a compressed file" do
   include Spec::Matchers::IMW

data/spec/imw/{resources/formats → formats}/delimited_spec.rb

@@ -1,6 +1,6 @@
-require File.join(File.dirname(__FILE__),'../../../spec_helper')
+require File.join(File.dirname(__FILE__),'../../spec_helper')
 
-describe IMW::Resources::Formats::Csv do
+describe IMW::Formats::Csv do
   # we don't test Tsv as the differences from Csv are trivial and
   # effect only code within the FasterCSV library
 

data/spec/imw/{resources/formats → formats}/json_spec.rb

@@ -1,6 +1,6 @@
-require File.join(File.dirname(__FILE__),'../../../spec_helper')
+require File.join(File.dirname(__FILE__),'../../spec_helper')
 
-describe IMW::Resources::Formats::Json do
+describe IMW::Formats::Json do
 
   before do
     @sample = IMW.open(File.join(IMWTest::DATA_DIR, 'sample.json'))

data/spec/imw/{resources/formats → formats}/sgml_spec.rb

@@ -1,6 +1,6 @@
-require File.join(File.dirname(__FILE__),'../../../spec_helper')
+require File.join(File.dirname(__FILE__),'../../spec_helper')
 
-describe IMW::Resources::Formats::Xml do
+describe IMW::Formats::Xml do
   # just spec Xml now as the others are identical
 
   before do

data/spec/imw/{resources/formats → formats}/yaml_spec.rb

@@ -1,6 +1,6 @@
-require File.join(File.dirname(__FILE__),'../../../spec_helper')
+require File.join(File.dirname(__FILE__),'../../spec_helper')
 
-describe IMW::Resources::Formats::Yaml do
+describe IMW::Formats::Yaml do
 
   before do
     @sample = IMW.open(File.join(IMWTest::DATA_DIR, 'sample.yaml'))

data/spec/imw/resource_spec.rb

@@ -17,10 +17,10 @@ describe IMW::Resource do
 
     it "should print the modules it's been extended by when raising an IMW::NoMethodError" do
       begin
-        @resource.extend(IMW::Resources::LocalObj)
+        @resource.extend(IMW::Schemes::Local::Base)
         @resource.do_something
       rescue IMW::NoMethodError => e
-        e.message.should match(/extended by IMW::Resources::LocalObj/)
+        e.message.should match(/extended by IMW::Schemes::Local::Base/)
       end
     end
   end
@@ -28,7 +28,7 @@ describe IMW::Resource do
   describe "parsing various and sundry URIs should correctly parse a" do
     
     before do
-      IMW::Resources.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
@@ -68,7 +68,7 @@ describe IMW::Resource do
   end
 
   it "should open a URI without attempting to extend with modules if so asked" do
-    IMW::Resources.should_not_receive(:extend_resource!)
+    IMW::Resource.should_not_receive(:extend_resource!)
     IMW::Resource.new("/path/to/some/file.txt", :skip_modules => true)
   end
    

data/spec/imw/{resources/schemes → schemes}/hdfs_spec.rb

@@ -1,6 +1,6 @@
-require File.join(File.dirname(__FILE__),'../../../spec_helper')
+require File.join(File.dirname(__FILE__),'../../spec_helper')
 
-describe IMW::Resources::Schemes::HDFS do
+describe IMW::Schemes::HDFS do
   before do
     def fake_hdfs_resource path, num_dirs=nil, num_files=nil, size=nil
       if num_dirs && num_files && size
@@ -8,7 +8,7 @@ describe IMW::Resources::Schemes::HDFS do
       else
         response = ""
       end
-      IMW::Resources::Schemes::HDFS.should_receive(:fs).with(:count, path).and_return(response)
+      IMW::Schemes::HDFS.should_receive(:fs).with(:count, path).and_return(response)
       IMW.open("hdfs://#{path}")
     end
     @path = '/path/to/myfile'    
@@ -30,13 +30,13 @@ describe IMW::Resources::Schemes::HDFS do
 
     it "should execute the correct command to delete the path" do
       resource = fake_hdfs_resource(@path, 2, 3, 1000)
-      IMW::Resources::Schemes::HDFS.should_receive(:fs).with(:rm, resource.path)
+      IMW::Schemes::HDFS.should_receive(:fs).with(:rm, resource.path)
       resource.rm
     end
 
     it "should execute the correct command to delete the path when skipping the trash" do
       resource = fake_hdfs_resource(@path, 2, 3, 1000)      
-      IMW::Resources::Schemes::HDFS.should_receive(:fs).with(:rm, '-skipTrash', resource.path)
+      IMW::Schemes::HDFS.should_receive(:fs).with(:rm, '-skipTrash', resource.path)
       resource.rm :skip_trash => true
     end
 
@@ -46,7 +46,7 @@ describe IMW::Resources::Schemes::HDFS do
       resource.num_files.should == 1
       resource.exist?.should be_true
       resource.is_directory?.should be_false
-      resource.resource_modules.should include(IMW::Resources::Schemes::HDFSFile)
+      resource.resource_modules.should include(IMW::Schemes::HDFSFile)
     end
 
     it "should recognize a directory and extend it properly" do
@@ -55,7 +55,7 @@ describe IMW::Resources::Schemes::HDFS do
       resource.num_files.should == 1
       resource.exist?.should be_true
       resource.is_directory?.should be_true
-      resource.resource_modules.should include(IMW::Resources::Schemes::HDFSDirectory)
+      resource.resource_modules.should include(IMW::Schemes::HDFSDirectory)
     end
   end
 end

data/spec/imw/{resources/schemes → schemes}/http_spec.rb

@@ -1,6 +1,6 @@
-require File.join(File.dirname(__FILE__),'../../../spec_helper')
+require File.join(File.dirname(__FILE__),'../../spec_helper')
 
-describe IMW::Resources::Schemes::HTTP do
+describe IMW::Schemes::HTTP do
 
   describe "finding its effective basename" do
     it "should use the real basename when present" do

data/spec/imw/{resources → schemes}/local_spec.rb

@@ -1,16 +1,16 @@
 require File.join(File.dirname(__FILE__),'../../spec_helper')
 
-describe IMW::Resources::LocalObj do
+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.should_not_receive(:extend).with(IMW::Resources::LocalDirectory)
+    @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.should_not_receive(:extend).with(IMW::Resources::LocalFile)
+    @dir.should_not_receive(:extend).with(IMW::Schemes::Local::LocalFile)
     @dir.extend_appropriately!
   end
 
@@ -19,7 +19,7 @@ describe IMW::Resources::LocalObj do
   end
 end
 
-describe IMW::Resources::LocalFile do
+describe IMW::Schemes::Local::LocalFile do
   before do
     IMWTest::Random.file('original.txt')
     @file = IMW::Resource.new('original.txt')
@@ -55,7 +55,7 @@ describe IMW::Resources::LocalFile do
   end
 end
 
-describe IMW::Resources::LocalDirectory do
+describe IMW::Schemes::Local::LocalDirectory do
   before do
     FileUtils.mkdir_p('dir')
     FileUtils.mkdir_p('dir/subdir')

data/spec/imw/{resources → schemes}/remote_spec.rb

@@ -1,11 +1,15 @@
 require File.join(File.dirname(__FILE__),'../../spec_helper')
 
-describe IMW::Resources::RemoteObj do
+describe IMW::Schemes::Remote::Base do
 end
 
-describe IMW::Resources::RemoteFile do
+describe IMW::Schemes::Remote::RemoteFile do
 
-  before { @file = IMW.open('http://www.google.com') }
+  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)
+  end
 
   describe 'with the file' do
 

data/spec/imw/{resources/schemes → schemes}/s3_spec.rb

@@ -1,6 +1,6 @@
-require File.join(File.dirname(__FILE__),'../../../spec_helper')
+require File.join(File.dirname(__FILE__),'../../spec_helper')
 
-describe IMW::Resources::Schemes::S3 do
+describe IMW::Schemes::S3 do
 
   describe 'manipulating S3 paths' do
     before do

data/spec/imw/{transforms → tools}/archiver_spec.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + "/../../spec_helper"
 
-describe IMW::Transforms::Archiver do
+describe IMW::Tools::Archiver do
   before do
     @name = 'foobar'
 
@@ -37,7 +37,7 @@ describe IMW::Transforms::Archiver do
       IMWTest::Random.file path
     end
 
-    @archiver = IMW::Transforms::Archiver.new @name, @all_files
+    @archiver = IMW::Tools::Archiver.new @name, @all_files
   end
 
   after do