deb-s3 0.6.0 → 0.6.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 83e22542e348437549fe9d78648659ce10f64dd4
+  data.tar.gz: 1e0ca1bb8dc6c822b122c4e3d71199fa9e71398c
+SHA512:
+  metadata.gz: 448a9252b80774397270906a81b49bb6be58d87bc5d89056a0ea2b468d8fe3bf8132d997d47fbf017b3ca24a8dc79f9c78486214dc7e3e0cc9db249675bf723d
+  data.tar.gz: 35f0553c9830f502bae6c587af1006096d1fb168fae984d580da4408d1500cb6d2bbc75d7e29bd8f98e3e3e0f0aa2e34d32b241aab52cfa9e079b0f18ca90c4f

data/README.md

@@ -1,5 +1,7 @@
 # deb-s3
 
+[![Build Status](https://travis-ci.org/krobertson/deb-s3.svg?branch=master)](https://travis-ci.org/krobertson/deb-s3)
+
 `deb-s3` is a simple utility to make creating and managing APT repositories on
 S3.
 

data/lib/deb/s3.rb

@@ -1,5 +1,5 @@
 module Deb
   module S3
-    VERSION = "0.6.0"
+    VERSION = "0.6.1"
   end
 end

data/lib/deb/s3/cli.rb

@@ -95,7 +95,7 @@ class Deb::S3::CLI < Thor
     end
 
     # make sure all the files exists
-    if missing_file = files.detect { |f| !File.exists?(f) }
+    if missing_file = files.find { |pattern| Dir.glob(pattern).empty? }
       error("File '#{missing_file}' doesn't exist")
     end
 

data/lib/deb/s3/manifest.rb

@@ -1,5 +1,7 @@
 require "tempfile"
 require "zlib"
+require 'deb/s3/utils'
+require 'deb/s3/package'
 
 class Deb::S3::Manifest
   include Deb::S3::Utils
@@ -10,6 +12,8 @@ class Deb::S3::Manifest
 
   attr_accessor :files
 
+  attr_reader :packages
+
   def initialize
     @packages = []
     @component = nil
@@ -41,17 +45,13 @@ class Deb::S3::Manifest
     end
   end
 
-  def packages
-    @packages
-  end
-
   def add(pkg, preserve_versions)
     if preserve_versions
-      @packages.delete_if { |p| p.name == pkg.name && p.version == pkg.version }
+      packages.delete_if { |p| p.name == pkg.name && p.full_version == pkg.full_version }
     else
-      @packages.delete_if { |p| p.name == pkg.name }
+      packages.delete_if { |p| p.name == pkg.name }
     end
-    @packages << pkg
+    packages << pkg
     pkg
   end
 
@@ -82,7 +82,7 @@ class Deb::S3::Manifest
     @packages.each do |pkg|
       if pkg.needs_uploading?
         yield pkg.url_filename if block_given?
-        s3_store(pkg.filename, pkg.url_filename_encoded)
+        s3_store(pkg.filename, pkg.url_filename, 'application/octet-stream; charset=binary')
       end
     end
 
@@ -92,7 +92,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)
+    s3_store(pkgs_temp.path, f, 'text/plain; charset=us-ascii')
     @files["#{@component}/binary-#{@architecture}/Packages"] = hashfile(pkgs_temp.path)
     pkgs_temp.unlink
 
@@ -102,7 +102,7 @@ class Deb::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)
+    s3_store(gztemp.path, f, 'application/x-gzip; charset=binary')
     @files["#{@component}/binary-#{@architecture}/Packages.gz"] = hashfile(gztemp.path)
     gztemp.unlink
 

data/lib/deb/s3/package.rb

@@ -3,6 +3,7 @@ require "digest/sha2"
 require "digest/md5"
 require "socket"
 require "tmpdir"
+require 'deb/s3/utils'
 
 class Deb::S3::Package
   include Deb::S3::Utils
@@ -57,11 +58,23 @@ class Deb::S3::Package
     end
 
     def extract_control(package)
-      if system("which dpkg 2>&1 >/dev/null")
+      if system("which dpkg &> /dev/null")
         `dpkg -f #{package}`
       else
+        # ar fails to find the control.tar.gz tarball within the .deb
+        # on Mac OS. Try using ar to list the control file, if found,
+        # use ar to extract, otherwise attempt with tar which works on OS X.
+        extract_control_tarball_cmd = "ar p #{package} control.tar.gz"
+
+        begin
+          safesystem("ar t #{package} control.tar.gz &> /dev/null")
+        rescue SafeSystemError
+          warn "Failed to find control data in .deb with ar, trying tar."
+          extract_control_tarball_cmd = "tar zxf #{package} --to-stdout control.tar.gz"
+        end
+
         Dir.mktmpdir do |path|
-          safesystem("ar p #{package} control.tar.gz | tar -zxf - -C #{path}")
+          safesystem("#{extract_control_tarball_cmd} | tar -zxf - -C #{path}")
           File.read(File.join(path, "control"))
         end
       end
@@ -111,6 +124,11 @@ class Deb::S3::Package
     @needs_uploading = false
   end
 
+  def full_version
+    return nil if [epoch, version, iteration].all?(&:nil?)
+    [[epoch, version].compact.join(":"), iteration].compact.join("-")
+  end
+
   def filename=(f)
     @filename = f
     @needs_uploading = true

data/lib/deb/s3/release.rb

@@ -86,7 +86,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)
+    s3_store(release_tmp.path, self.filename, 'text/plain; charset=us-ascii')
 
     # sign the file, if necessary
     if Deb::S3::Utils.signing_key
@@ -96,7 +96,7 @@ class Deb::S3::Release
         remote_file = self.filename+".gpg"
         yield remote_file if block_given?
         raise "Unable to locate Release signature file" unless File.exists?(local_file)
-        s3_store(local_file, remote_file)
+        s3_store(local_file, remote_file, 'application/pgp-signature; charset=us-ascii')
         File.unlink(local_file)
       else
         raise "Signing the Release file failed."

data/lib/deb/s3/utils.rb

@@ -18,10 +18,12 @@ module Deb::S3::Utils
   def prefix; @prefix end
   def prefix= v; @prefix = v end
 
+  class SafeSystemError < RuntimeError; end
+
   def safesystem(*args)
     success = system(*args)
     if !success
-      raise "'system(#{args.inspect})' failed with error code: #{$?.exitstatus}"
+      raise SafeSystemError, "'system(#{args.inspect})' failed with error code: #{$?.exitstatus}"
     end
     return success
   end
@@ -58,7 +60,7 @@ module Deb::S3::Utils
     Deb::S3::Utils.s3.buckets[Deb::S3::Utils.bucket].objects[s3_path(path)].read
   end
 
-  def s3_store(path, filename=nil)
+  def s3_store(path, filename=nil, content_type='application/octet-stream; charset=binary')
     filename = File.basename(path) unless filename
     obj = Deb::S3::Utils.s3.buckets[Deb::S3::Utils.bucket].objects[s3_path(filename)]
 
@@ -69,7 +71,7 @@ module Deb::S3::Utils
     end
 
     # upload the file
-    obj.write(Pathname.new(path), :acl => Deb::S3::Utils.access_policy)
+    obj.write(Pathname.new(path), :acl => Deb::S3::Utils.access_policy, :content_type => content_type)
   end
 
   def s3_remove(path)

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: deb-s3
 version: !ruby/object:Gem::Version
-  version: 0.6.0
-  prerelease: 
+  version: 0.6.1
 platform: ruby
 authors:
 - Ken Robertson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-28 00:00:00.000000000 Z
+date: 2014-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,11 +34,38 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.18'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Easily create and manage an APT repository on S3.
 email: ken@invalidlogic.com
 executables:
@@ -51,37 +74,36 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/deb-s3
+- README.md
+- lib/deb/s3/release.rb
+- lib/deb/s3/package.rb
+- lib/deb/s3/utils.rb
 - lib/deb/s3/cli.rb
 - lib/deb/s3/manifest.rb
-- lib/deb/s3/package.rb
-- lib/deb/s3/release.rb
-- lib/deb/s3/templates/package.erb
 - lib/deb/s3/templates/release.erb
-- lib/deb/s3/utils.rb
+- lib/deb/s3/templates/package.erb
 - lib/deb/s3.rb
-- README.md
 homepage: http://invalidlogic.com/
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Easily create and manage an APT repository on S3.
 test_files: []