s3repo 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0641c73158e5144c4a988efb266b2fa57b2cde5d
-  data.tar.gz: 5ef0a969a378659cbc9f2aeb5f16b1a962890fc2
+  metadata.gz: 7e1bc9926cf762452f2d9a97ce3285aff708d2fd
+  data.tar.gz: 4b8c64c255cf57d2d42f542a3af02d0b42cfb320
 SHA512:
-  metadata.gz: 047abc0e5e6448278c265082985f14d7a7da59026720658f42899ecd5547b2f9be88770ea5091e35ce6bb97ba66488ac9b516c09d7290066d198f52c9db433a4
-  data.tar.gz: e6272c8574e44c6c830d87ba15718c70c0c10f0ba619d3e5ee2855c61f3830122514a2514cd933ffbf0fe86ea0f7ce5a28b35c655a5381782d3e0bc45e5a69a3
+  metadata.gz: f9f8031ab8c1ccdd6cfe815028595b7cceb82084f1cfe7c8ef70bf4bfdf6d7cd97ebb986d87b923bc6b383929df9738529407399b03a9b59905280ed1047f855
+  data.tar.gz: 7f75e8489ecbc9dd87ea43717ae0dec64c034602731a472e45a80a6ac890ab0161f29e6134223c8bcfaa0ef875f7a9a4650c8cdf22294b6b697df4d54acae90f

data/bin/s3repo

@@ -2,3 +2,27 @@
 
 require 's3repo'
 require 'mercenary'
+
+Mercenary.program(:s3repo) do |p|
+  p.version S3Repo::VERSION
+  p.description 'Package management tool for Archlinux repos'
+  p.syntax 's3repo <subcommand> [args]'
+
+  p.command(:build) do |c|
+    c.syntax 'build'
+    c.description 'Build package files from PKGBUILDs'
+
+    c.action do
+      S3Repo.new.build_packages Dir.glob('*/PKGBUILD')
+    end
+  end
+
+  p.command(:upload) do |c|
+    c.syntax 'upload'
+    c.description 'Upload packages to repo'
+
+    c.action do
+      S3Repo.new.add_packages Dir.glob('*/*.pkg.tar.xz')
+    end
+  end
+end

data/lib/s3repo.rb

@@ -11,7 +11,9 @@ module S3Repo
   end
 end
 
+require 's3repo/version'
 require 's3repo/base'
+require 's3repo/metadata'
 require 's3repo/cache'
 require 's3repo/client'
 require 's3repo/repo'

data/lib/s3repo/base.rb

@@ -1,3 +1,5 @@
+require 'English'
+
 module S3Repo
   ##
   # Base object, used to provide common attributes
@@ -8,6 +10,12 @@ module S3Repo
 
     private
 
+    def run(cmd)
+      results = `#{cmd} 2>&1`
+      return results if $CHILD_STATUS.success?
+      fail "Failed running #{cmd}:\n#{results}"
+    end
+
     def bucket
       @bucket ||= @options[:bucket] || ENV['S3_BUCKET']
       return @bucket if @bucket
@@ -17,5 +25,11 @@ module S3Repo
     def client
       @client ||= @options[:client] || Client.new(bucket: bucket)
     end
+
+    def file_cache
+      @file_cache ||= @options[:file_cache] || Cache.new(
+        client: client, tmpdir: @options[:tmpdir]
+      )
+    end
   end
 end

data/lib/s3repo/cache.rb

@@ -1,11 +1,12 @@
 require 'fileutils'
+require 'tmpdir'
 require 'tempfile'
 
 module S3Repo
   ##
   # Cache object, stores S3 objects on disk
   class Cache < Base
-    TMPDIRS = [ENV['S3REPO_TMPDIR'], ENV['TMPDIR'], '/tmp/s3repo']
+    TMPDIRS = [ENV['S3REPO_TMPDIR'], ENV['TMPDIR'], Dir.tmpdir, '/tmp/s3repo']
 
     def initialize(params = {})
       super
@@ -13,15 +14,19 @@ module S3Repo
     end
 
     def serve(key, refresh = true)
-      path = expand_path key
-      download(key, path) if refresh || !cached?(path)
-      File.open(path) { |fh| fh.read }
+      File.open(download(key, refresh)) { |fh| fh.read }
     rescue Aws::S3::Errors::NoSuchKey
       nil
     end
 
     private
 
+    def download(key, refresh = true)
+      path = expand_path key
+      get_object(key, path) if refresh || !cached?(path)
+      path
+    end
+
     def expand_path(key)
       File.absolute_path(key, cachedir)
     end
@@ -30,17 +35,22 @@ module S3Repo
       File.exist? path
     end
 
-    def download(key, path)
+    def get_object(key, path)
       FileUtils.mkdir_p File.dirname(path)
+      object = atomic_get_object(key, path)
+      etags[key] = object.etag
+    rescue Aws::S3::Errors::NotModified
+      return
+    end
+
+    def atomic_get_object(key, path)
       tmpfile = Tempfile.create(key, partialdir)
       object = client.get_object(
         key: key, if_none_match: etags[key], response_target: tmpfile
       )
       tmpfile.close
       File.rename tmpfile.path, path
-      etags[key] = object.etag
-    rescue Aws::S3::Errors::NotModified
-      return
+      object
     end
 
     def etags

data/lib/s3repo/client.rb

@@ -13,6 +13,11 @@ module S3Repo
       @api.respond_to?(method, include_all) || super
     end
 
+    def upload!(key, path)
+      puts "Uploading #{key}"
+      put_object key: key, body: File.open(path) { |fh| fh.read }
+    end
+
     private
 
     def method_missing(method, *args, &block)

data/lib/s3repo/metadata.rb

@@ -0,0 +1,41 @@
+require 'fileutils'
+require 'tempfile'
+
+module S3Repo
+  ##
+  # Metadata object, represents repo's DB file
+  class Metadata < Base
+    def initialize(params = {})
+      super
+      FileUtils.mkdir_p db_dir
+    end
+
+    def add_packages(paths)
+      @db_path = nil
+      paths.each do |path|
+        puts "Adding #{File.basename(path)} to repo.db"
+        run("repo-add #{db_path} #{path}")
+      end
+      client.upload!('repo.db', db_path)
+    end
+
+    private
+
+    def db_path
+      @db_path ||= download_db
+    end
+
+    def download_db
+      tmpfile = Tempfile.create(['repo', '.db.tar.xz'], db_dir)
+      tmpfile << file_cache.serve('repo.db')
+      tmpfile.close
+      tmpfile.path
+    end
+
+    def db_dir
+      @db_dir ||= File.absolute_path(
+        @options[:tmpdir] || Cache::TMPDIRS.compact.first
+      )
+    end
+  end
+end

data/lib/s3repo/repo.rb

@@ -8,12 +8,25 @@ module S3Repo
       super
     end
 
-    def add_package(file)
-      upload!(file)
+    def build_packages(paths)
+      paths.each do |path|
+        dir = File.dirname(path)
+        puts "Building #{File.basename(dir)}"
+        Dir.chdir(dir) { run 'makepkg -f' }
+      end
+    end
+
+    def add_packages(paths)
+      paths.each do |path|
+        key = File.basename(path)
+        next if include? key
+        client.upload!(key, path)
+      end
+      metadata.add_packages(paths)
     end
 
     def packages
-      meta_cache.cache { parse_packages }
+      package_cache.cache { parse_packages }
     end
 
     def include?(key)
@@ -27,20 +40,12 @@ module S3Repo
 
     private
 
-    def file_cache
-      @file_cache ||= Cache.new(client: client, tmpdir: @options[:tmpdir])
-    end
-
-    def meta_cache
-      @meta_cache ||= BasicCache::TimeCache.new lifetime: 600
+    def metadata
+      @metadata ||= Metadata.new(client: client, file_cache: file_cache)
     end
 
-    def upload!(file)
-      client.put_object(
-        bucket: bucket,
-        key: file,
-        body: File.open(file) { |fh| fh.read }
-      )
+    def package_cache
+      @package_cache ||= BasicCache::TimeCache.new lifetime: 600
     end
 
     def parse_packages

data/lib/s3repo/version.rb

@@ -0,0 +1,5 @@
+##
+# Define version
+module S3Repo
+  VERSION = '0.1.0'
+end

data/s3repo.gemspec

@@ -1,6 +1,9 @@
+$:.unshift File.expand_path('../lib/', __FILE__)
+require 's3repo/version'
+
 Gem::Specification.new do |s|
   s.name        = 's3repo'
-  s.version     = '0.0.3'
+  s.version     = S3Repo::VERSION
   s.date        = Time.now.strftime('%Y-%m-%d')
 
   s.summary     = 'S3 Archlinux repo library'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: s3repo
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Les Aker
@@ -142,7 +142,9 @@ files:
 - lib/s3repo/base.rb
 - lib/s3repo/cache.rb
 - lib/s3repo/client.rb
+- lib/s3repo/metadata.rb
 - lib/s3repo/repo.rb
+- lib/s3repo/version.rb
 - s3repo.gemspec
 - spec/s3repo_spec.rb
 - spec/spec_helper.rb