s3repo 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ecce099937f16f752403792e5a6cfc41f01c060
-  data.tar.gz: 6132513147a4f751d4dfebe74089367388da2a04
+  metadata.gz: 847d5009dfb7691f2e3fbf8722db606325ca1e88
+  data.tar.gz: 598f81b0582d8ba8e96863b739bb711b07ed11f3
 SHA512:
-  metadata.gz: e53408628dc06e9ed205463c89b70a1b6d31b3dd89026d436cf7e9dc2ea3e44cf0369cede09f1be271fbe7a7a821651d886b1dd10852189a72a4a947f284082a
-  data.tar.gz: 15a4d3064de5282d23545f1fb4ecccba63c7a4ce6fe8848e8ed6f2f549a348fe4940258c047a097fe14f40e0b7d4b22b5a3f400ab60651f11987cee020bb1799
+  metadata.gz: 0e27e5c737b88a9ce4814a283b601cfd0038a2739f7f61231c1d010022a6343de2b67d9e7c6661c7c032b2bf4bc80912c7ed3608dffc511d38150926dda944ba
+  data.tar.gz: abc8662f38f5ea121c20a4f4b6c93956459f824a1f359b84021218eb233a2b7cf655bd11d83accab4118c8521e8c20a63c45efd219c0231a074383d540818fd4

data/lib/s3repo/metadata.rb

@@ -25,8 +25,7 @@ module S3Repo
 
     def update!
       sign_db if @options[:sign_db]
-      client.upload_file('repo.db', db_path)
-      client.upload_file('repo.db.tar.xz', db_path)
+      db_names.each { |x| client.upload_file(x, db_path) }
     end
 
     def packages
@@ -37,18 +36,31 @@ module S3Repo
 
     private
 
+    def repo_name
+      @options[:repo_name] || raise('No repo name given')
+    end
+
+    def db_names
+      @db_names ||= ['repo', repo_name].flat_map do |x|
+        [x + '.db', x + '.db.tar.xz']
+      end
+    end
+
+    def sig_names
+      @sig_names ||= db_names.map { |x| x + '.sig' }
+    end
+
     def signer
       @options[:signer] ||= Signer.new(@options)
     end
 
     def sign_db
       sig_path = signer.sign(db_path)
-      client.upload_file('repo.db.sig', sig_path)
-      client.upload_file('repo.db.tar.xz.sig', sig_path)
+      sig_names.each { |x| client.upload_file(x, sig_path) }
     end
 
     def db_path
-      @db_path ||= file_cache.download('repo.db.tar.xz')
+      @db_path ||= file_cache.download(db_names.first)
     end
   end
 end

data/lib/s3repo/version.rb

@@ -3,5 +3,5 @@
 ##
 # Define version
 module S3Repo
-  VERSION = '2.0.1'.freeze
+  VERSION = '2.0.2'.freeze
 end

data/s3repo.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'codecov', '~> 0.1.1'
   s.add_development_dependency 'rspec', '~> 3.6.0'
   s.add_development_dependency 'fuubar', '~> 2.2.0'
-  s.add_development_dependency 'webmock', '~> 3.0.0'
+  s.add_development_dependency 'webmock', '~> 3.1.0'
   s.add_development_dependency 'vcr', '~> 3.0.0'
   s.add_development_dependency 'climate_control', '~> 0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: s3repo
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Les Aker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-07 00:00:00.000000000 Z
+date: 2017-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mercenary
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement