deb-s3 0.11.6 → 0.11.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '041340787f3a58818cab4049b36b08aafd6a7cd402c2ca131c48c89f646ddf6f'
-  data.tar.gz: 7453f5436b991b898a0d7fcadedfe0592aaebe1612253d5b2eca550f3564b761
+  metadata.gz: e7814791d824780db306bf8cb5873fc66449045da8dfa2b4099d507d8020eec3
+  data.tar.gz: 7132767c850193fa1c0d48eabc25535cecf1f5f59ecd8518ba9f6e0d1757f9dc
 SHA512:
-  metadata.gz: a967586900ae51b0eb8c84028a8b988a51c928c41065628029a6acf0274dcabb24c6bbad4588e93aaeb1b70149f243db483620b84451b01ee6a89897b6527954
-  data.tar.gz: 0ecae828a6647a11d1e06b9e5f17f0d06b3aa5897edffd3450300a13cd57e581294b5dffdee053ca2248d9f89c1590f714ef9af7c24dd5de1768e883b4272e65
+  metadata.gz: e4313e4c972bd2064aa9ea2fe89d685f2d89c67deee68aba7de6581bbdb25b5d9b349e0101ddb684268837c54061224eb51863df41b0ff2f9ff6f1846cb6c998
+  data.tar.gz: 72b71065e29eaf7b4490d9bc21ac3effb29e9a8a007525b534dca1520b360f6ac9c6234ddfee71a8b5d9c2d1cfa61a7a78cea636d8f9381a8459332e1bbc04e7

data/README.md

@@ -35,14 +35,14 @@ Install the package via gem
 $ gem install deb-s3
 ```
 
-or via APT:
+or via APT (Debian 11 "Bullseye" and Ubuntu 22.04 "Jammy Jellyfish" and newer):
 
 ```console
 # Add repository key
 $ sudo wget -O /etc/apt/trusted.gpg.d/deb-s3-archive-keyring.gpg https://raw.githubusercontent.com/deb-s3/deb-s3/master/deb-s3-archive-keyring.gpg
 
 # Add repository
-$ echo "deb http://deb-s3-repo.s3.us-east-2.amazonaws.com/debian/ $(lsb_release -cs) main" | sudo tee -a /etc/apt/sources.list > /dev/null
+$ echo "deb http://deb-s3-repo.s3.us-east-2.amazonaws.com/$(lsb_release -is | tr A-Z a-z)/ $(lsb_release -cs) main" | sudo tee -a /etc/apt/sources.list > /dev/null
 
 # Install package
 $ sudo apt-get update

data/lib/deb/s3/cli.rb

@@ -86,7 +86,6 @@ class Deb::S3::CLI < Thor
     "Can be public, private, or authenticated."
 
   class_option :sign,
-  :type       => :array,
   :repeatable => true,
   :desc       => "GPG Sign the Release file when uploading a package, " +
     "or when verifying it after removing a package. " +
@@ -575,7 +574,7 @@ class Deb::S3::CLI < Thor
       missing_packages = []
 
       manifest.packages.each do |p|
-        unless Deb::S3::Utils.s3_exists? p.url_filename_encoded(options[:codename])
+        unless Deb::S3::Utils.s3_exists? p.url_filename(options[:codename])
           sublog("The following packages are missing:\n\n") if missing_packages.empty?
           puts(p.generate(options[:codename]))
           puts("")

data/lib/deb/s3/package.rb

@@ -144,10 +144,6 @@ class Deb::S3::Package
     @url_filename || "pool/#{codename}/#{self.name[0]}/#{self.name[0..1]}/#{File.basename(self.filename)}"
   end
 
-  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(codename)
     template("package.erb").result(binding)
   end
@@ -254,8 +250,7 @@ class Deb::S3::Package
     self.attributes[:deb_installed_size] = fields.delete('Installed-Size')
 
     # Packages manifest fields
-    filename = fields.delete('Filename')
-    self.url_filename = filename && CGI.unescape(filename)
+    self.url_filename = fields.delete('Filename')
     self.sha1 = fields.delete('SHA1')
     self.sha256 = fields.delete('SHA256')
     self.md5 = fields.delete('MD5sum')

data/lib/deb/s3/release.rb

@@ -107,7 +107,7 @@ class Deb::S3::Release
         local_file = release_tmp.path+".asc"
         remote_file = "dists/#{@codename}/InRelease"
         yield remote_file if block_given?
-        raise "Unable to locate InRelease file" unless File.exists?(local_file)
+        raise "Unable to locate InRelease file" unless File.exist?(local_file)
         s3_store(local_file, remote_file, 'application/pgp-signature; charset=us-ascii', self.cache_control)
         File.unlink(local_file)
       else
@@ -117,7 +117,7 @@ class Deb::S3::Release
         local_file = release_tmp.path+".asc"
         remote_file = self.filename+".gpg"
         yield remote_file if block_given?
-        raise "Unable to locate Release signature file" unless File.exists?(local_file)
+        raise "Unable to locate Release signature file" unless File.exist?(local_file)
         s3_store(local_file, remote_file, 'application/pgp-signature; charset=us-ascii', self.cache_control)
         File.unlink(local_file)
       else

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(codename) %>
+Filename: <%= url_filename(codename) %>
 <% if size -%>
 Size: <%= size %>
 <% end -%>

data/lib/deb/s3.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deb-s3
 version: !ruby/object:Gem::Version
-  version: 0.11.6
+  version: 0.11.8
 platform: ruby
 authors:
 - Ken Robertson
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-06 00:00:00.000000000 Z
+date: 2023-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -88,7 +88,7 @@ homepage: http://invalidlogic.com/
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -103,8 +103,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key: 
+rubygems_version: 3.3.15
+signing_key:
 specification_version: 4
 summary: Easily create and manage an APT repository on S3.
 test_files: []