evoker 0.0.4 → 0.0.5

data/lib/evoker/s3cache.rb

@@ -2,75 +2,85 @@
 
 require 'evoker'
 require 'fog'
+require 'rake/clean'
 
 module Evoker
   def _get_bucket
     $s3 ||= Fog::Storage.new(
       :provider => "AWS",
       :aws_access_key_id => CACHE_S3_ACCESS_KEY_ID,
-      :aws_secret_access_key => CACHE_S3_SECRET_ACCESS_KEY)
+      :aws_secret_access_key => CACHE_S3_SECRET_ACCESS_KEY,
+      :persistent => false)
     $bucket ||= $s3.directories.get(CACHE_S3_BUCKET)
   end
 
-  desc "Store all downloaded entities in an S3 bucket"
-  task :cache => ENTITIES do
-    bucket = _get_bucket
+  # hack to add cached tarballs to clobber before we know cache basename
+  task :_s3cache_clobber_tarball do
+    CLOBBER.add("#{CACHE_BASENAME}*.tgz")
+  end
+  task :clobber => :_s3cache_clobber_tarball
 
-    if tarball = bucket.files.get(CACHE_TARBALL)
-      if ENV['FORCE']
-        puts "INFO: deleting file #{CACHE_TARBALL} from bucket because FORCE"
-        tarball.destroy
-        bucket.reload
-      else
-        raise "ERROR: file #{CACHE_TARBALL} already in the bucket."
+  namespace :s3cache do
+    desc "Pack current directory and store resulting tarball in an S3 bucket"
+    task :upload do
+      bucket = _get_bucket
+
+      if tarball = bucket.files.get(CACHE_TARBALL)
+        if ENV['FORCE']
+          puts "INFO: deleting file #{CACHE_TARBALL} from bucket because FORCE"
+          tarball.destroy
+          bucket.reload
+        else
+          raise "ERROR: file #{CACHE_TARBALL} already in the bucket."
+        end
+      end
+      sh "tar -czf #{CACHE_TARBALL} --exclude '#{CACHE_BASENAME}*.tgz' ."
+      puts "INFO: uploading #{CACHE_TARBALL} to #{CACHE_S3_BUCKET}..."
+      File.open(CACHE_TARBALL, 'r') do |tarball|
+        bucket.files.create(
+          :key => CACHE_TARBALL,
+          :body => tarball)
       end
     end
-    sh "tar -czf #{CACHE_TARBALL} --exclude '#{CACHE_BASENAME}*.tgz' ."
-    puts "INFO: uploading #{CACHE_TARBALL} to #{CACHE_S3_BUCKET}..."
-    File.open(CACHE_TARBALL, 'r') do |tarball|
-      bucket.files.create(
-        :key => CACHE_TARBALL,
-        :body => tarball)
-    end
-  end
 
-  desc "Download pre-cached entities from an S3 bucket"
-  task :uncache do
-    wait = ENV['WAIT'] ? ENV['WAIT'].to_i : 60*45
-    bucket = _get_bucket
+    desc "Download pre-cached entities from an S3 bucket"
+    task :download do
+      wait = ENV['WAIT'] ? ENV['WAIT'].to_i : 60*45
+      bucket = _get_bucket
 
-    if wait > 0
-      print "Waiting for #{CACHE_TARBALL} .."
-      STDOUT.flush
-      bucket.wait_for(wait) {
-        print '.'
+      if wait > 0
+        print "Waiting for #{CACHE_TARBALL} .."
         STDOUT.flush
-        bucket.files.find { |f| f.key == CACHE_TARBALL }
-      } or raise "Timed out waiting for #{CACHE_TARBALL}"
-      puts " got it."
-    end
+        bucket.wait_for(wait) {
+          print '.'
+          STDOUT.flush
+          bucket.files.find { |f| f.key == CACHE_TARBALL }
+        } or raise "Timed out waiting for #{CACHE_TARBALL}"
+        puts " got it."
+      end
 
-    print "Downloading #{CACHE_TARBALL} .."
-    STDOUT.flush
-    File.open(CACHE_TARBALL, 'w') { |tarball_file|
-      bucket.files.get(CACHE_TARBALL) { |tarball_contents, _, _|
-        print '.'
-        STDOUT.flush
-        tarball_file.write(tarball_contents)
+      print "Downloading #{CACHE_TARBALL} .."
+      STDOUT.flush
+      File.open(CACHE_TARBALL, 'w') { |tarball_file|
+        bucket.files.get(CACHE_TARBALL) { |tarball_contents, _, _|
+          print '.'
+          STDOUT.flush
+          tarball_file.write(tarball_contents)
+        }
       }
-    }
-    puts " got it."
+      puts " got it."
 
-    sh "tar -xvf #{CACHE_TARBALL}"
-  end
+      sh "tar -xzf #{CACHE_TARBALL}"
+    end
 
-  desc "Download pre-cached entities from an S3 bucket if available; download normally and cache if not available."
-  task :uncache_or_cache do
-    bucket = _get_bucket
-    if bucket.files.find { |f| f.key == CACHE_TARBALL }
-      Rake::Task[:uncache].execute
-    else
-      Rake::Task[:cache].execute
+    desc "Download pre-cached entities from an S3 bucket if available; download normally and cache if not available."
+    task :download_or_upload do
+      bucket = _get_bucket
+      if bucket.files.find { |f| f.key == CACHE_TARBALL }
+        Rake::Task["s3cache:download"].invoke
+      else
+        Rake::Task["s3cache:upload"].invoke
+      end
     end
   end
 end

data/lib/evoker/version.rb

@@ -2,7 +2,7 @@ module Evoker
   module VERSION
     MAJOR = 0
     MINOR = 0
-    TINY  = 4
+    TINY  = 5
     STRING = [MAJOR, MINOR, TINY].join('.')
 
     def VERSION.require_version(major, minor=0, tiny=0)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: evoker
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Maciej Pasternacki
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-29 00:00:00 +02:00
+date: 2011-04-30 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency