s3repo 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7aebb03a0560b531d8ebfec526dfb222382254a
-  data.tar.gz: e8904864cd9c3b2f9d6e9947bdcad1f9318727b2
+  metadata.gz: a2f5a13bde9581df3d0fddd5322d4395e2eacbbc
+  data.tar.gz: 2f3caceae3e9a6b897fbda8ae26ea9ce5e907d89
 SHA512:
-  metadata.gz: 17023c621c360ac03fd092dd7a8959c0e506e09c09874ea8856d4873bdb06ebcf99b284288b05cbfc26876f123eb0c103923dcb8cd19ee581d09d74ad71a28e8
-  data.tar.gz: 327eb69b2a5b7f929043d3470ffbb8fde3f1415dfef2d675e777582bbb89cf08cc49644dbede335dd482e4b7134288a374c4d7029b4cb772464994f61c115b09
+  metadata.gz: f82357bd6a0955041133402a4be1b63fda79e67139df33cd0935c797be221981deaca0afb1f8e5d58baaec140c63cab761484cf6651f3964c826ef6de85269c8
+  data.tar.gz: fd55dd8cff7c2dc69714dc89bb5113b95945456d2f6636729e074ca0d36e111d2ebb60422628536f615005f1fa7dc1f6efb51875a3309e5ddd875f4d839ef820

data/bin/s3repo

@@ -39,6 +39,15 @@ Mercenary.program(:s3repo) do |p|
     end
   end
 
+  p.command(:prune) do |c|
+    c.syntax 'prune'
+    c.description 'Prune package tarballa from the repo'
+
+    c.action do
+      S3Repo.new.prune_packages
+    end
+  end
+
   p.action do
     puts p
     exit 1

data/lib/s3repo/metadata.rb

@@ -33,6 +33,12 @@ module S3Repo
       client.upload!('repo.db', db_path)
     end
 
+    def packages
+      return @packages if @packages
+      cmd = "tar tf #{db_path}"
+      @packages = run(cmd).split.map { |x| x.split('/').first }.uniq
+    end
+
     private
 
     def sign_db

data/lib/s3repo/repo.rb

@@ -1,4 +1,5 @@
 require 'basiccache'
+require 'set'
 
 module S3Repo
   ##
@@ -17,13 +18,7 @@ module S3Repo
     end
 
     def add_packages(paths)
-      paths.each do |path|
-        key = File.basename(path)
-        sig_key, sig_path = [key, path].map { |x| x + '.sig' }
-        next if include? key
-        client.upload!(sig_key, sig_path) if ENV['S3REPO_SIGN_PACKAGES']
-        client.upload!(key, path)
-      end
+      paths.select! { |path| upload_package(path) }
       metadata.add_packages(paths)
     end
 
@@ -31,6 +26,15 @@ module S3Repo
       metadata.remove_packages(packages)
     end
 
+    def prune_packages
+      if orphans.empty?
+        puts 'No orphaned packages'
+        return
+      end
+      puts "Pruning packages: #{orphans.join(', ')}"
+      client.delete_objects(delete: { objects: orphans.map { |x| { key: x } } })
+    end
+
     def packages
       package_cache.cache { parse_packages }
     end
@@ -46,6 +50,21 @@ module S3Repo
 
     private
 
+    def upload_package(path)
+      key = File.basename(path)
+      sig_key, sig_path = [key, path].map { |x| x + '.sig' }
+      return false if include? key
+      client.upload!(sig_key, sig_path) if ENV['S3REPO_SIGN_PACKAGES']
+      client.upload!(key, path)
+      true
+    end
+
+    def orphans
+      packages.map(&:key).reject do |x|
+        metadata.packages.include? x.reverse.split('-', 2).last.reverse
+      end
+    end
+
     def metadata
       @metadata ||= Metadata.new(client: client, file_cache: file_cache)
     end

data/lib/s3repo/version.rb

@@ -1,5 +1,5 @@
 ##
 # Define version
 module S3Repo
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
 end

data/s3repo.gemspec

@@ -21,9 +21,9 @@ Gem::Specification.new do |s|
   s.add_dependency 'aws-sdk', '~> 2.0.0'
   s.add_dependency 'basiccache', '~> 1.0.0'
 
-  s.add_development_dependency 'rubocop', '~> 0.29.0'
+  s.add_development_dependency 'rubocop', '~> 0.30.0'
   s.add_development_dependency 'rake', '~> 10.4.0'
-  s.add_development_dependency 'coveralls', '~> 0.7.1'
+  s.add_development_dependency 'coveralls', '~> 0.8.0'
   s.add_development_dependency 'rspec', '~> 3.2.0'
   s.add_development_dependency 'fuubar', '~> 2.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: s3repo
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Les Aker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-16 00:00:00.000000000 Z
+date: 2015-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mercenary
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.29.0
+        version: 0.30.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.29.0
+        version: 0.30.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement