dpkg-s3 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8085118424eabe4c62a7016b26f53033f27719496830531aa12dadde91887553
-  data.tar.gz: 8894ff4df72564465523ba841ea680f0e370970ce2fe5922c478d13236c69da1
+  metadata.gz: 543c4501eca1fde367aec9d6f5c06c5ebfcdd8c1a8f24917e664133375061ad3
+  data.tar.gz: b84c89139bec19e5e0f3489a3272c76138e26d6bf2ac12ac7273c5d38312c92f
 SHA512:
-  metadata.gz: 66a81617d7e57fd104e9ec3a03b682e607f2dcdd454148e4fd6a25b778d393ee349cf62a9336f9100cfa51e1e6c7c5b53ed533708f92b4d85452c4eb558b1db0
-  data.tar.gz: 712883d85bc9704a0a009be8674c672911b51351ab74101130c981698b24156f53d3066833d9a1c95cd97610165b39efd211009eb0f21af4e9cab0a18d43bfb8
+  metadata.gz: 523d6e5aa5731035fe940a0ee826877d237fd19c1f055a025094bf4489957546281238411273185cf6bff3a2496a24264cc430adbb291332f12441c7123f1600
+  data.tar.gz: e99e6632a28bc3f556ac43412dab1eacb6f7fff3eaa68119368a1eff247599921d476bf9d407680dec637991acc6d888c7e7eb76a18e5065d4d767d0c3a511bc

data/README.md

@@ -1,6 +1,8 @@
 # dpkg-s3
 
-[![Build Status](https://travis-ci.org/gamunu/dpkg-s3.svg?branch=master)](https://travis-ci.org/gamunu/dpkg-s3)
+<p align="left">
+  <a href="https://github.com/gamunu/dpkg-s3/actions"><img alt="test status" src="https://github.com/gamunu/dpkg-s3/workflows/build-test/badge.svg"></a>
+</p>
 
 `dpkg-s3` is a simple utility to make creating and managing APT repositories on
 S3.

data/bin/dpkg-s3

@@ -6,5 +6,8 @@ $:.unshift File.join(Pathname.new(__FILE__).realpath,'../../lib')
 require 'rubygems'
 require 'dpkg/s3/cli'
 
-Dpkg::S3::CLI.start
-
+begin
+  Dpkg::S3::CLI.start
+rescue
+  $stderr.puts "\n\tError during processing: #{$!.message}\n\n"
+end

data/lib/dpkg/s3.rb

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 module Dpkg
   module S3
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

data/lib/dpkg/s3/cli.rb

@@ -1,10 +1,6 @@
 # -*- encoding : utf-8 -*-
-require "aws-sdk"
+require "aws-sdk-s3"
 require "thor"
-
-# Hack: aws requires this!
-require "json"
-
 require "dpkg/s3"
 require "dpkg/s3/utils"
 require "dpkg/s3/manifest"
@@ -147,6 +143,10 @@ class Dpkg::S3::CLI < Thor
   :desc     => "Whether to skip all package uploads." +
     "This is useful when hosting .deb files outside of the bucket."
 
+  def self.exit_on_failure?
+    true
+  end
+
   def upload(*files)
     if files.nil? || files.empty?
       error("You must specify at least one file to upload")
@@ -638,4 +638,4 @@ class Dpkg::S3::CLI < Thor
         error("Invalid visibility setting given. Can be public, private, authenticated, or bucket_owner.")
       end
   end
-end
+end

data/lib/dpkg/s3/lock.rb

@@ -2,6 +2,7 @@
 require "tempfile"
 require "socket"
 require "etc"
+require "securerandom"
 
 class Dpkg::S3::Lock
   attr_accessor :user
@@ -28,13 +29,17 @@ class Dpkg::S3::Lock
 
     def lock(codename, component = nil, architecture = nil, cache_control = nil)
       lockfile = Tempfile.new("lockfile")
-      lockfile.write("#{Etc.getlogin}@#{Socket.gethostname}")
+      lock_content = generate_lock_content
+      lockfile.write lock_content
       lockfile.close
 
       Dpkg::S3::Utils.s3_store(lockfile.path,
                               lock_path(codename, component, architecture, cache_control),
                               "text/plain",
                               cache_control)
+
+      return if lock_content == Dpkg::S3::Utils.s3_read(lock_path(codename, component, architecture, cache_control))
+      throw "Failed to acquire lock, was overwritten by another deb-s3 process"
     end
 
     def unlock(codename, component = nil, architecture = nil, cache_control = nil)
@@ -43,7 +48,7 @@ class Dpkg::S3::Lock
 
     def current(codename, component = nil, architecture = nil, cache_control = nil)
       lock_content = Dpkg::S3::Utils.s3_read(lock_path(codename, component, architecture, cache_control))
-      lock_content = lock_content.split('@')
+      lock_content = lock_content.split.first.split('@')
       lock = Dpkg::S3::Lock.new
       lock.user = lock_content[0]
       lock.host = lock_content[1] if lock_content.size > 1
@@ -54,5 +59,9 @@ class Dpkg::S3::Lock
     def lock_path(codename, component = nil, architecture = nil, cache_control = nil)
       "dists/#{codename}/#{component}/binary-#{architecture}/lockfile"
     end
+
+    def generate_lock_content
+      "#{Etc.getlogin}@#{Socket.gethostname}\n#{SecureRandom.hex}"
+    end
   end
 end

data/lib/dpkg/s3/manifest.rb

@@ -106,7 +106,7 @@ class Dpkg::S3::Manifest
       # store any packages that need to be stored
       @packages_to_be_upload.each do |pkg|
         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)
+        s3_store(pkg.filename, pkg.url_filename(@codename), 'application/x-debian-package', self.cache_control, self.fail_if_exists)
       end
     end
 
@@ -126,7 +126,7 @@ class Dpkg::S3::Manifest
     Zlib::GzipWriter.open(gztemp.path) { |gz| gz.write manifest }
     f = "dists/#{@codename}/#{@component}/binary-#{@architecture}/Packages.gz"
     yield f if block_given?
-    s3_store(gztemp.path, f, 'application/x-gzip; charset=binary', self.cache_control)
+    s3_store(gztemp.path, f, 'application/x-gzip', self.cache_control)
     @files["#{@component}/binary-#{@architecture}/Packages.gz"] = hashfile(gztemp.path)
     gztemp.unlink
 

data/lib/dpkg/s3/package.rb

@@ -4,7 +4,7 @@ require "digest/sha2"
 require "digest/md5"
 require "socket"
 require "tmpdir"
-require "uri"
+require "cgi"
 
 require 'dpkg/s3/utils'
 
@@ -84,7 +84,7 @@ class Dpkg::S3::Package
 
         Dir.mktmpdir do |path|
           safesystem("#{extract_control_tarball_cmd} | tar -#{compression}xf - -C #{path}")
-          File.read(File.join(path, "control"))
+          File.read(File.join(path, "control"), :encoding => "UTF-8")
         end
       end
     end
@@ -146,7 +146,7 @@ class Dpkg::S3::Package
     @url_filename || "pool/#{codename}/#{self.name[0]}/#{self.name[0..1]}/#{s3_escape(File.basename(self.filename))}"
   end
 
-  def generate(codename)
+  def generate(codename = nil)
     template("package.erb").result(binding)
   end
 
@@ -253,7 +253,7 @@ class Dpkg::S3::Package
 
     # Packages manifest fields
     filename = fields.delete('Filename')
-    self.url_filename = filename && URI.unescape(filename)
+    self.url_filename = filename && CGI.unescape(filename)
     self.sha1 = fields.delete('SHA1')
     self.sha256 = fields.delete('SHA256')
     self.md5 = fields.delete('MD5sum')
@@ -309,4 +309,4 @@ class Dpkg::S3::Package
       fields[field] = value if field
     end
   end
-end
+end

data/lib/dpkg/s3/utils.rb

@@ -73,7 +73,7 @@ module Dpkg::S3::Utils
     false
   end
 
-  def s3_store(path, filename=nil, content_type='application/octet-stream; charset=binary', cache_control=nil, fail_if_exists=false)
+  def s3_store(path, filename=nil, content_type='application/x-debian-package', cache_control=nil, fail_if_exists=false)
     filename = File.basename(path) unless filename
     obj = s3_exists?(filename)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dpkg-s3
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Gamunu Balagalla
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
-  name: aws-sdk
+  name: aws-sdk-s3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '1.64'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '1.64'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '5.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '5.8'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11'
+        version: '13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11'
+        version: '13'
 description: Easily create and manage an APT repository on S3.
 email: gamunu.balagalla@outlook.com
 executables:
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Easily create and manage an APT repository on S3.