deb-s3 0.9.3 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e8dbe12df60c668bf2f6469b90d6cdd1cd81325
-  data.tar.gz: 0107fe0bd5e38e79a39046ebeb19566b647e3865
+  metadata.gz: 49885adda26d9a194e593feb9db2ff154d697951
+  data.tar.gz: 65f61dd1e945500c9ead7bc772932d8769c7c45a
 SHA512:
-  metadata.gz: 79b208495ff06a5e68a0a6ccb6829fc8bf0b7ef99a78eb33959e688e27ac9407e9f19d1ab6af3e4c90056fb46dd6b354de43e26b1d43df16ed76a586a057c7de
-  data.tar.gz: 720fc4fc1585841872a49e1572a88107adad1b404e65be6984fff915062aa30f9e63ba31215020606e082cbba108506750c63d30a01bdcbd4437c392dec689aa
+  metadata.gz: 78d6217e6414568658bc3b2707fc53865bb52a6ec5fdf48d43d496ad888dd5e96f5882a0d0e7c22b9ff92162a62f7387590b1434deb1ea392a5bc5482c859d5d
+  data.tar.gz: f33a94764a6b2d6e92984a99e9458a11b8dea8148b48285936a41bfd743b9c6f631611246bb56ea87fee124c5dedae6311773a4796a1ece4d81abf0aa0651c7a

data/README.md

@@ -64,7 +64,7 @@ Options:
   -a, [--arch=ARCH]                                        # The architecture of the package in the APT repository.
   -p, [--preserve-versions], [--no-preserve-versions]      # Whether to preserve other versions of a package in the repository when uploading one.
   -l, [--lock], [--no-lock]                                # Whether to check for an existing lock on the repository to prevent simultaneous updates
-      [--fail-if-exists], [--no-fail-if-exists]            # Whether to overwrite any existing package that has the same filename in the pool or the same name and version in the manifest.
+      [--fail-if-exists], [--no-fail-if-exists]            # Whether to overwrite any existing package that has the same filename in the pool or the same name and version in the manifest but different contents.
       [--skip-package-upload], [--no-skip-package-upload]  # Whether to skip all package uploads.This is useful when hosting .deb files outside of the bucket.
   -b, [--bucket=BUCKET]                                    # The name of the S3 bucket to upload to.
       [--prefix=PREFIX]                                    # The path prefix to use when storing on S3.

data/lib/deb/s3.rb

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 module Deb
   module S3
-    VERSION = "0.9.3"
+    VERSION = "0.10.0"
   end
 end

data/lib/deb/s3/cli.rb

@@ -138,7 +138,8 @@ class Deb::S3::CLI < Thor
   :default  => false,
   :type     => :boolean,
   :desc     => "Whether to overwrite any existing package that has the same " +
-    "filename in the pool or the same name and version in the manifest."
+    "filename in the pool or the same name and version in the manifest but " +
+	"different contents."
 
   option :skip_package_upload,
   :default  => false,

data/lib/deb/s3/manifest.rb

@@ -62,11 +62,11 @@ class Deb::S3::Manifest
       packages.each { |p|
         next unless p.name == pkg.name && \
                     p.full_version == pkg.full_version && \
-                    File.basename(p.url_filename) != \
-                    File.basename(pkg.url_filename)
+                    File.basename(p.url_filename(@codename)) != \
+                    File.basename(pkg.url_filename(@codename))
         raise AlreadyExistsError,
               "package #{pkg.name}_#{pkg.full_version} already exists " \
-              "with different filename (#{p.url_filename})"
+              "with different filename (#{p.url_filename(@codename)})"
       }
     end
     if preserve_versions
@@ -96,7 +96,7 @@ class Deb::S3::Manifest
   end
 
   def generate
-    @packages.collect { |pkg| pkg.generate }.join("\n")
+    @packages.collect { |pkg| pkg.generate(@codename) }.join("\n")
   end
 
   def write_to_s3
@@ -105,8 +105,8 @@ class Deb::S3::Manifest
     unless self.skip_package_upload
       # store any packages that need to be stored
       @packages_to_be_upload.each do |pkg|
-        yield pkg.url_filename if block_given?
-        s3_store(pkg.filename, pkg.url_filename, 'application/octet-stream; charset=binary', self.cache_control, self.fail_if_exists)
+        yield pkg.url_filename(@codename) if block_given?
+        s3_store(pkg.filename, pkg.url_filename(@codename), 'application/octet-stream; charset=binary', self.cache_control, self.fail_if_exists)
       end
     end
 
@@ -116,7 +116,7 @@ class Deb::S3::Manifest
     pkgs_temp.close
     f = "dists/#{@codename}/#{@component}/binary-#{@architecture}/Packages"
     yield f if block_given?
-    s3_store(pkgs_temp.path, f, 'text/plain; charset=UTF-8', self.cache_control)
+    s3_store(pkgs_temp.path, f, 'text/plain; charset=utf-8', self.cache_control)
     @files["#{@component}/binary-#{@architecture}/Packages"] = hashfile(pkgs_temp.path)
     pkgs_temp.unlink
 

data/lib/deb/s3/package.rb

@@ -127,15 +127,15 @@ class Deb::S3::Package
     @filename
   end
 
-  def url_filename
-    @url_filename || "pool/#{self.name[0]}/#{self.name[0..1]}/#{File.basename(self.filename)}"
+  def url_filename(codename)
+    @url_filename || "pool/#{codename}/#{self.name[0]}/#{self.name[0..1]}/#{File.basename(self.filename)}"
   end
 
-  def url_filename_encoded
-    @url_filename || "pool/#{self.name[0]}/#{self.name[0..1]}/#{s3_escape(File.basename(self.filename))}"
+  def url_filename_encoded(codename)
+    @url_filename || "pool/#{codename}/#{self.name[0]}/#{self.name[0..1]}/#{s3_escape(File.basename(self.filename))}"
   end
 
-  def generate
+  def generate(codename)
     template("package.erb").result(binding)
   end
 

data/lib/deb/s3/release.rb

@@ -98,7 +98,7 @@ class Deb::S3::Release
     release_tmp.puts self.generate
     release_tmp.close
     yield self.filename if block_given?
-    s3_store(release_tmp.path, self.filename, 'text/plain; charset=UTF-8', self.cache_control)
+    s3_store(release_tmp.path, self.filename, 'text/plain; charset=utf-8', self.cache_control)
 
     # sign the file, if necessary
     if Deb::S3::Utils.signing_key

data/lib/deb/s3/templates/package.erb

@@ -40,7 +40,7 @@ Origin: <%= attributes[:deb_origin] %>
 <% end -%>
 Priority: <%= attributes[:deb_priority] %>
 Homepage: <%= url or "http://nourlgiven.example.com/" %>
-Filename: <%= url_filename_encoded %>
+Filename: <%= url_filename_encoded(codename) %>
 <% if size -%>
 Size: <%= size %>
 <% end -%>

data/lib/deb/s3/utils.rb

@@ -82,7 +82,7 @@ module Deb::S3::Utils
     # check if the object already exists
     if obj != false
       return if (file_md5.to_s == obj[:etag].gsub('"', '') or file_md5.to_s == obj[:metadata]['md5'])
-      raise AlreadyExistsError, "file #{obj.public_url} already exists with different contents" if fail_if_exists
+      raise AlreadyExistsError, "file #{filename} already exists with different contents" if fail_if_exists
     end
 
     options = {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deb-s3
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.10.0
 platform: ruby
 authors:
 - Ken Robertson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-17 00:00:00.000000000 Z
+date: 2018-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor