sphere 0.1.4 → 0.1.5

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/lib/sphere/tasks/upload.rake

@@ -6,9 +6,17 @@ namespace :sphere do
 
     config  = YAML.load_file(Sphere.config.root.join('config', 's3.yml'))[Sphere.config.env].symbolize_keys
     bucket  = config.delete(:bucket)
-
     AWS::S3::Base.establish_connection!(config)
-    Dir[Sphere.config.asset_root.join('**', '*')].sort.each do |source|
+
+    globs   = if Sphere.config.send(:definitions)['s3'].is_a?(Array)
+      Sphere.config.send(:definitions)['s3'].map do |glob|
+        Sphere.config.public_path.join(glob)
+      end
+    else
+      [Sphere.config.asset_root.join('**', '*')]
+    end
+
+    globs.map {|g| Dir[g] }.flatten.sort.each do |source|
       source  = Pathname.new(source)
       target  = source.to_s.sub(/^#{Regexp.escape(Sphere.config.public_path)}\//, '')
 
@@ -17,14 +25,14 @@ namespace :sphere do
         next
       end
 
-      etag    = Digest::MD5.hexdigest(source.read)
+      etag    = Digest::MD5.hexdigest(source.read).inspect
       meta    = AWS::S3::S3Object.about(target, bucket) rescue { "last-modified" => '01/01/1970' }
 
       if meta['etag'] != etag || Time.parse(meta["last-modified"]) < source.mtime
         puts "\e[32m S3/store #{target}\e[0m"
         AWS::S3::S3Object.store(target, source.open, bucket, :access => :public_read)
       else
-        puts "  S3/skip #{local}"
+        puts "  S3/skip #{target}"
       end
     end
   end

data/sphere.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sphere}
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dimitrij Denissenko"]
-  s.date = %q{2010-07-18}
+  s.date = %q{2010-07-24}
   s.description = %q{Rails asset packer and compressor. Supports Compass, built (primarily) to be used with Heroku & AWS/S3}
   s.email = %q{dimitrij@blacksquaremedia.com}
   s.extra_rdoc_files = [

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Dimitrij Denissenko
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-18 00:00:00 +01:00
+date: 2010-07-24 00:00:00 +01:00
 default_executable: 
 dependencies: []