deb-s3 0.11.5 → 0.11.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63a8b704bcc52020044d1c8e2a67d5c83b20fdcb0febb012a1aa95b3a7e4e33b
-  data.tar.gz: e0c1a63f7c3528a7493a20ca65837653bd45e2c3e78815e8858becd2372efe1a
+  metadata.gz: 0412b30200d8205a1d117e0aaeaae8ece107a5476b8d587bcd89c5103444afdd
+  data.tar.gz: e60c337da7d341a7bb5738bbaad3e09554295bb573b7009dcb27347b9cc95c0d
 SHA512:
-  metadata.gz: 9fd7a53af575ee39fa3a1ea7577e5c81feea7200715a8477674022c449ed3a7cde33b8f0f84b8c096b8eddfe72a4d56c7e057bbfa4503f75063d23e744348fa6
-  data.tar.gz: d2049aeacd81d10398e901e8413421e4ea06827d426300c85fc7477b36f56fab651bc0b8402cac25f7562de3123d0ba348b9d7b43ceb6a53be36fb666acf9bf5
+  metadata.gz: a8fd3031fd71131c96d0a76b3a9be6e765fd640a5c61c6c2591c1cea48c9318e9c8984bb7c6f771a2a576c9e88ceebfcd41a76a1731e30bc1875d4ac41de129a
+  data.tar.gz: cda76567f2097475cbacaed5c52faf894d21a211996ed71de832b8af49ec0a9e99647584734e88586e534270d01f17f9d16d7f910dc90a9bd419ce9e8a03e708

data/README.md

@@ -29,21 +29,20 @@ With `deb-s3`, there is no need for this. `deb-s3` features:
 
 ## Getting Started
 
-[Install the package via gem](https://github.com/deb-s3/deb-s3/packages/304683) or manually:
+Install the package via gem
 
 ```console
-$ curl -sLO https://github.com/deb-s3/deb-s3/releases/download/0.11.5/deb-s3-0.11.5.gem
-$ gem install deb-s3-0.11.5.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,11 +86,11 @@ class Deb::S3::CLI < Thor
     "Can be public, private, or authenticated."
 
   class_option :sign,
-  :type     => :array,
-  :desc     => "GPG Sign the Release file when uploading a package, " +
+  :repeatable => true,
+  :desc       => "GPG Sign the Release file when uploading a package, " +
     "or when verifying it after removing a package. " +
-    "Use --sign with your space delimited GPG key IDs to use one ore more specific keys " +
-    "(--sign 6643C242C18FE05B 6243C322C18FE05C)."
+    "Use --sign with your GPG key ID to use a specific key (--sign=6643C242C18FE05B)." +
+    "Can be specified multiple times for multiple singing keys."
 
   class_option :gpg_options,
   :default => "",
@@ -574,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/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.5"
+    VERSION = "0.11.7"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deb-s3
 version: !ruby/object:Gem::Version
-  version: 0.11.5
+  version: 0.11.7
 platform: ruby
 authors:
 - Ken Robertson
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-05 00:00:00.000000000 Z
+date: 2023-04-26 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: []