s3repo 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5985eb821b9ae69a840ae755eeab39f9b0f59f46
-  data.tar.gz: 9ee25f6bce8c773786e2407fa9003cbe5cb7188a
+  metadata.gz: 0641c73158e5144c4a988efb266b2fa57b2cde5d
+  data.tar.gz: 5ef0a969a378659cbc9f2aeb5f16b1a962890fc2
 SHA512:
-  metadata.gz: 15ea01a2f0f96fd33158c39456d3b7bc53c25d2e129355ebccdf7ed02b683d2a7765fc9dba372d6311ab1e12a16515e60cbc787bc74a5f5e0c3d5299085309d4
-  data.tar.gz: 0d08b62db3819acd33bbb578291422d50bfa9cbf2f413d6d16c106ebfaf37597707ece3cff8e321e7fff7e815cea59debb3fe45d282ea409e3f7122be52595b4
+  metadata.gz: 047abc0e5e6448278c265082985f14d7a7da59026720658f42899ecd5547b2f9be88770ea5091e35ce6bb97ba66488ac9b516c09d7290066d198f52c9db433a4
+  data.tar.gz: e6272c8574e44c6c830d87ba15718c70c0c10f0ba619d3e5ee2855c61f3830122514a2514cd933ffbf0fe86ea0f7ce5a28b35c655a5381782d3e0bc45e5a69a3

data/lib/s3repo.rb

@@ -14,6 +14,4 @@ end
 require 's3repo/base'
 require 's3repo/cache'
 require 's3repo/client'
-require 's3repo/package'
-require 's3repo/metadata'
 require 's3repo/repo'

data/lib/s3repo/cache.rb

@@ -12,51 +12,39 @@ module S3Repo
       [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 }
+    def serve(key, refresh = true)
+      path = expand_path key
+      download(key, path) if refresh || !cached?(path)
+      File.open(path) { |fh| fh.read }
+    rescue Aws::S3::Errors::NoSuchKey
+      nil
     end
 
     private
 
-    def expand_path(path)
-      File.absolute_path(path, cachedir)
+    def expand_path(key)
+      File.absolute_path(key, cachedir)
     end
 
-    def cached?(epath)
-      File.exist? epath
+    def cached?(path)
+      File.exist? path
     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
+    def download(key, path)
+      FileUtils.mkdir_p File.dirname(path)
+      tmpfile = Tempfile.create(key, partialdir)
+      object = client.get_object(
+        key: key, if_none_match: etags[key], response_target: tmpfile
+      )
       tmpfile.close
-      [tmpfile, parse_etag(object)]
-    end
-
-    def parse_etag(object)
-      tag = object.etag.gsub('"', '')
-      return tag if tag.match(/^\h+$/)
-      fail('Invalid etag')
+      File.rename tmpfile.path, path
+      etags[key] = object.etag
+    rescue Aws::S3::Errors::NotModified
+      return
     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 }
+    def etags
+      @etags ||= {}
     end
 
     def cachedir

data/lib/s3repo/repo.rb

@@ -1,30 +1,38 @@
+require 'basiccache'
+
 module S3Repo
   ##
   # Repo object, represents an Arch repo inside an S3 bucket
   class Repo < Base
+    def initialize(params = {})
+      super
+    end
+
     def add_package(file)
       upload!(file)
-      package = Package.new(client: client, key: file)
-      metadata.add_package(package)
-      package
     end
 
     def packages
-      @packages ||= parse_packages
+      meta_cache.cache { parse_packages }
     end
 
-    def serve(path, recheck = true)
-      cache.serve(path, recheck)
+    def include?(key)
+      !packages.find { |x| x.key == key }.nil?
     end
 
-    def metadata
-      @metadata ||= Metadata.new(client: client)
+    def serve(key)
+      refresh = !key.match(/\.pkg\.tar\.xz$/)
+      file_cache.serve(key, refresh)
     end
 
     private
 
-    def cache
-      @cache ||= Cache.new(client: client, tmpdir: @options[:tmpdir])
+    def file_cache
+      @file_cache ||= Cache.new(client: client, tmpdir: @options[:tmpdir])
+    end
+
+    def meta_cache
+      @meta_cache ||= BasicCache::TimeCache.new lifetime: 600
     end
 
     def upload!(file)
@@ -36,9 +44,9 @@ module S3Repo
     end
 
     def parse_packages
-      resp = client.list_objects(bucket: bucket).contents.map(&:key)
-      resp.select! { |x| x.match(/.*\.pkg\.tar\.xz$/) }
-      resp.map { |x| Package.new(client: client, key: x) }
+      client.list_objects(bucket: bucket).contents.select do |x|
+        x.key.match(/.*\.pkg\.tar\.xz$/)
+      end
     end
   end
 end

data/s3repo.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 's3repo'
-  s.version     = '0.0.2'
+  s.version     = '0.0.3'
   s.date        = Time.now.strftime('%Y-%m-%d')
 
   s.summary     = 'S3 Archlinux repo library'
@@ -16,6 +16,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'mercenary', '~> 0.3.4'
   s.add_dependency 'aws-sdk', '~> 2.0.0'
+  s.add_dependency 'basiccache', '~> 1.0.0'
 
   s.add_development_dependency 'rubocop', '~> 0.28.0'
   s.add_development_dependency 'rake', '~> 10.4.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: s3repo
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Les Aker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-28 00:00:00.000000000 Z
+date: 2015-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mercenary
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: basiccache
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -128,8 +142,6 @@ files:
 - lib/s3repo/base.rb
 - lib/s3repo/cache.rb
 - lib/s3repo/client.rb
-- lib/s3repo/metadata.rb
-- lib/s3repo/package.rb
 - lib/s3repo/repo.rb
 - s3repo.gemspec
 - spec/s3repo_spec.rb

data/lib/s3repo/metadata.rb

@@ -1,9 +0,0 @@
-module S3Repo
-  ##
-  # Metadata object, represents a package DB
-  class Metadata < Base
-    def add_package(package)
-      puts "Adding #{package}"
-    end
-  end
-end

data/lib/s3repo/package.rb

@@ -1,13 +0,0 @@
-module S3Repo
-  ##
-  # Package object, represents a single package tarball
-  class Package < Base
-    private
-
-    def info
-      lines = `tar xOf #{@options[:file]} .PKGINFO`.split("\n")
-      lines.reject! { |x| x.match(/^#/) }
-      lines.map { |x| x.split(' = ', 2) }.to_h
-    end
-  end
-end