imw 0.2.10 → 0.2.11

data/Gemfile

@@ -2,15 +2,20 @@
 source :gemcutter
 gem 'activesupport', '2.3.5', :require => 'active_support'
 gem 'addressable', :require => 'addressable/uri'
-gem 'rake'
-gem 'rest-client', '>= 1.6.1', :require => 'restclient'
 gem 'uuidtools'
+gem 'rake'
+
+# The following Gems qre required for specific transport schemes and
+# are not used by core IMW functions.
+group :schemes do
+  gem 'aws-s3', :require => 'aws/s3'
+  gem 'dbi'
+  gem 'rest-client', '>= 1.6.1', :require => 'restclient'
+end
 
 # The following Gems qre required for specific data formats and are
 # not used by core IMW functions.
 group :formats do
-  gem 'aws-s3', :require => 'aws/s3'
-  gem 'dbi'
   gem 'fastercsv'
   gem 'hpricot'
   gem 'json'

data/Gemfile.lock

@@ -13,7 +13,7 @@ GEM
       deprecated (= 2.0.1)
     deprecated (2.0.1)
     fastercsv (1.5.3)
-    hpricot (0.8.2)
+    hpricot (0.8.3)
     json (1.4.6)
     mime-types (1.16)
     pdf-reader (0.8.6)

data/VERSION

@@ -1 +1 @@
-0.2.10
+0.2.11

data/lib/imw/schemes/local.rb

@@ -127,10 +127,9 @@ module IMW
         # Write the text with a trailing newline to this resource.
         #
         # @param [String, #to_s] text
-        def puts text
+        def << text
           io.write text.to_s + "\n"
         end
-        alias_method :<<, :puts
 
         # Return the lines in this file.
         #
@@ -160,7 +159,7 @@ module IMW
         # @param [String, Array, #each] data object to emit
         def emit data, options={}
           data.each do |element|  # works if data is an Array or a String
-            io.puts(element.to_s)
+            io << (element.to_s)
           end
         end
 

data/lib/imw/schemes/s3.rb

@@ -29,13 +29,14 @@ module IMW
       # @param [String, IMW::Resource] new_uri
       # @return [IMW::Resource] the new resource
       def cp new_uri
-        IMW::Tools::Transferer.new(:cp, self, new_uri).transfer!
+        #IMW::Tools::Transferer.new(:cp, self, new_uri).transfer!
+        IMW::Schemes::S3.get(self, new_uri)
       end
 
       # The AWS::S3::S3Object corresponding to this resource.
       def s3_object
-        self.class.make_connection!
-        @s3_object ||= AWS::S3::S3Object.new(path, bucket)
+        ::IMW::Schemes::S3.make_connection!
+        @s3_object ||= AWS::S3::S3Object.new(path, :bucket => bucket)
       end
 
       # Does this resource exist on S3?
@@ -80,7 +81,7 @@ module IMW
       def self.put source, destination
         source       = IMW.open(source)
         destintation = IMW.open(destination)
-        raise IMW::ArgumentError.new("destination must be on S3 -- #{destination.uri} given") unless destination.on_s3?
+        raise IMW::ArgumentError.new("destination must be on S3 -- #{destination} given") unless destination.on_s3?
         make_connection!
         AWS::S3::S3Object.store(destination.path, source.io, destination.bucket)
         destination
@@ -93,9 +94,10 @@ module IMW
       # @return [IMW::Resource] the new resource
       def self.get source, destination
         source      = IMW.open(source)
-        destination = IMW.open(destination)
+        destination = IMW.open!(destination)
+        raise IMW::ArgumentError.new("source must be on S3 -- #{source} given") unless source.on_s3?
         make_connection!
-        AWS::S3::Object.stream(source.path, source.bucket) do |chunk|
+        AWS::S3::S3Object.stream(source.path, source.bucket) do |chunk|
           destination.write(chunk)
         end
         destination.close

data/lib/imw/tools/aggregator.rb

@@ -11,12 +11,12 @@ module IMW
     #
     # Any remote resources will be downloaded into the directory.
     # 
-    # If any of the resources are (local and) archives, they will first be
+    # If any of the resources are archives, they will first be
     # extracted, with only their contents winding up in the final
     # directory (the file hierarchy of the archive will be preserved).
     #
-    # If any of the resources are (local and) compressed, they will
-    # first be uncompressed before being added to the directory.
+    # If any of the resources are compressed, they will first be
+    # uncompressed before being added to the directory.
     #
     # As an example:
     # 
@@ -90,7 +90,7 @@ module IMW
       # @return [IMW::Tools::Aggregator]
       def aggregate *paths_or_inputs
         @errors = []
-        paths_or_inputs.each do |path_or_input|
+        paths_or_inputs.flatten.compact.each do |path_or_input|
           input = IMW.open(path_or_input)
           if input.is_local?
             aggregate_local_input(input)

data/lib/imw/tools/extension_analyzer.rb

@@ -38,8 +38,9 @@ module IMW
       # @return [Hash]
       def normalized_extension_counts
         @normalized_extension_counts ||= returning({}) do |weighted|
+          num_files = resources.reject(&:is_directory?).length.to_f
           extension_counts.each_pair do |extension, count|
-            weighted[extension] = count.to_f / num_files.to_f
+            weighted[extension] = count.to_f / num_files
           end
         end
       end

data/lib/imw/utils.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'fileutils'
-require 'active_support'
+require 'active_support/core_ext/object/blank'
+require 'active_support/core_ext/object/misc'
 require 'imw/utils/error'
 require 'imw/utils/log'
 require 'imw/utils/paths'

data/spec/support/random.rb

@@ -24,11 +24,11 @@ module IMWTest
     # length of the filename returned.
     def self.basename options = {}
       length = (options[:length] or FILENAME_MAX_LENGTH)
-      filename = (1..length).map { |i| FILENAME_CHARS.rand }.join
+      filename = (1..length).map { |i| FILENAME_CHARS.choice }.join
 
       # filenames beginning with hyphens suck
       while (filename[0,1] == '-') do
-        filename[0] = FILENAME_CHARS.rand
+        filename[0] = FILENAME_CHARS.choice
       end
       filename
     end
@@ -38,7 +38,7 @@ module IMWTest
     def self.text options = {}
       length = (options[:length] or TEXT_MAX_LENGTH)
       char_pool = options[:newlines] ? TEXT_CHARS : STRING_CHARS
-      (1..length).map { |i| char_pool.rand }.join
+      (1..length).map { |i| char_pool.choice }.join
     end
 
     # Create a random file by matching the extension of the given
@@ -190,7 +190,7 @@ module IMWTest
       FileUtils.mkdir_p(directory)
 
       (rand(options[:num_files]) + 2).times do
-        ext = options[:extensions].rand
+        ext = options[:extensions].choice
         name = self.basename
         if ext == 'dir' then
           if depth <= options[:max_depth] then

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: imw
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 0
   - 2
-  - 10
-  version: 0.2.10
+  - 11
+  version: 0.2.11
 platform: ruby
 authors: 
 - Dhruv Bansal
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-29 00:00:00 -05:00
+date: 2010-11-15 00:00:00 -06:00
 default_executable: imw
 dependencies: []