s3repo 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5575094474d0415e12cdd36b75d9cbb6a09af19f
-  data.tar.gz: 77e89871b806a7f07dc1c152c13cb3b4942fdc2a
+  metadata.gz: 5985eb821b9ae69a840ae755eeab39f9b0f59f46
+  data.tar.gz: 9ee25f6bce8c773786e2407fa9003cbe5cb7188a
 SHA512:
-  metadata.gz: c999c20619aa6407b3a143c212c2413198f23558c4515f0e3ec9a17418ea1285936901b4a8cd76faa539d60d547b16cd0416b8baffc106961aecdd329facae5e
-  data.tar.gz: 370965115705922b94325879ec7baf2a3eb25188921946032ae66ca58c75031ed9c1f1f0a742556f709ebb907f5c82eb5e78610db2bdc4d5aadbe6ba5691673f
+  metadata.gz: 15ea01a2f0f96fd33158c39456d3b7bc53c25d2e129355ebccdf7ed02b683d2a7765fc9dba372d6311ab1e12a16515e60cbc787bc74a5f5e0c3d5299085309d4
+  data.tar.gz: 0d08b62db3819acd33bbb578291422d50bfa9cbf2f413d6d16c106ebfaf37597707ece3cff8e321e7fff7e815cea59debb3fe45d282ea409e3f7122be52595b4

data/lib/s3repo.rb

@@ -12,6 +12,7 @@ module S3Repo
 end
 
 require 's3repo/base'
+require 's3repo/cache'
 require 's3repo/client'
 require 's3repo/package'
 require 's3repo/metadata'

data/lib/s3repo/cache.rb

@@ -0,0 +1,74 @@
+require 'fileutils'
+require 'tempfile'
+
+module S3Repo
+  ##
+  # Cache object, stores S3 objects on disk
+  class Cache < Base
+    TMPDIRS = [ENV['S3REPO_TMPDIR'], ENV['TMPDIR'], '/tmp/s3repo']
+
+    def initialize(params = {})
+      super
+      [partialdir, cachedir].each { |x| FileUtils.mkdir_p x }
+    end
+
+    def serve(path, recheck = true)
+      epath = expand_path(path)
+      prune(path, epath) if recheck
+      download(path, epath) unless File.exist?(epath)
+      File.open(epath) { |fh| fh.read }
+    end
+
+    private
+
+    def expand_path(path)
+      File.absolute_path(path, cachedir)
+    end
+
+    def cached?(epath)
+      File.exist? epath
+    end
+
+    def download(path, epath)
+      FileUtils.mkdir_p File.dirname(epath)
+      tmpfile, etag = safe_download(path)
+      etag_path = "#{epath}-#{etag}"
+      File.rename tmpfile.path, etag_path
+      File.symlink(etag_path, epath)
+    end
+
+    def safe_download(path)
+      tmpfile = Tempfile.create(path.split('/').last, partialdir)
+      object = client.get_object(key: path)
+      tmpfile << object.body.read
+      tmpfile.close
+      [tmpfile, parse_etag(object)]
+    end
+
+    def parse_etag(object)
+      tag = object.etag.gsub('"', '')
+      return tag if tag.match(/^\h+$/)
+      fail('Invalid etag')
+    end
+
+    def prune(path, epath)
+      return unless cached? epath
+      current = File.readlink(epath).split('-').last
+      new = parse_etag client.head_object(key: path)
+      return if new == current
+      [epath, File.readlink(epath)].each { |x| File.unlink x }
+    end
+
+    def cachedir
+      File.join(tmpdir, 'cache')
+    end
+
+    def partialdir
+      File.join(tmpdir, 'partial')
+    end
+
+    def tmpdir
+      @tmpdir ||= File.absolute_path(@options[:tmpdir] || TMPDIRS.compact.first)
+    end
+  end
+end

data/lib/s3repo/client.rb

@@ -16,14 +16,19 @@ module S3Repo
     private
 
     def method_missing(method, *args, &block)
-      if @api.respond_to?(method) && args.size == 1 && args.first.is_a?(Hash)
-        define_singleton_method(method) do |*a|
-          @api.send(method, @defaults.dup.merge!(a.first))
-        end
-        send(method, args.first)
-      else
-        super
+      return super unless @api.respond_to?(method)
+      define_singleton_method(method) do |*singleton_args|
+        params = build_params(singleton_args)
+        @api.send(method, params)
       end
+      send(method, args.first)
+    end
+
+    def build_params(args)
+      fail 'Too many arguments given' if args.size > 1
+      params = args.first || {}
+      fail 'Argument must be a hash' unless params.is_a? Hash
+      @defaults.dup.merge!(params)
     end
   end
 end

data/lib/s3repo/repo.rb

@@ -9,17 +9,24 @@ module S3Repo
       package
     end
 
-    def packages(cache = true)
-      @packages = nil unless cache
+    def packages
       @packages ||= parse_packages
     end
 
+    def serve(path, recheck = true)
+      cache.serve(path, recheck)
+    end
+
     def metadata
       @metadata ||= Metadata.new(client: client)
     end
 
     private
 
+    def cache
+      @cache ||= Cache.new(client: client, tmpdir: @options[:tmpdir])
+    end
+
     def upload!(file)
       client.put_object(
         bucket: bucket,

data/s3repo.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 's3repo'
-  s.version     = '0.0.1'
+  s.version     = '0.0.2'
   s.date        = Time.now.strftime('%Y-%m-%d')
 
   s.summary     = 'S3 Archlinux repo library'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: s3repo
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Les Aker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-23 00:00:00.000000000 Z
+date: 2015-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mercenary
@@ -126,6 +126,7 @@ files:
 - bin/s3repo
 - lib/s3repo.rb
 - lib/s3repo/base.rb
+- lib/s3repo/cache.rb
 - lib/s3repo/client.rb
 - lib/s3repo/metadata.rb
 - lib/s3repo/package.rb