deb-s3 0.6.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bfc086aa33f2a9323c9857a09195870476722f30
-  data.tar.gz: cd183d45cd2c91600ea1ba93f441fd9c0ab2702f
+  metadata.gz: 6c95a36618dfc6b8a2853b54c17101ae09140b3c
+  data.tar.gz: 5e14dda3916cd69e1e4eb3e5e26dd78b0f5cd94e
 SHA512:
-  metadata.gz: a5932bfec7b7de8859520e8dfbcf7cb2ce3cb9b2019aa1bde7a98f4b229d1f45240a30aaed12346e1d96ff9925e3db77c833eb72bab091c7d3d12cc2a2213eec
-  data.tar.gz: 3135fb0e0a7f31a2fe5329210514fc3faae5451a6e1f3b55aef4164a320bbb0f5784231e6dbbbcc3a845a538816c94feb33509a9a88a9e0daf7ea755154b1138
+  metadata.gz: fa1ce1124db8ca4a388e7a8141c88ccf6b262fe5d0f3f91a124e4311a255008b7f3b2c50c167154bbbeb31d614c380d22da02f0b8f7a9d8708ef968144795e38
+  data.tar.gz: c99fbb92d14f98a643b3f21d337aef9c6f773b98385eca3db3584480dd1369af2fff7c0fb93128f7ef624a488b9b50d37439176fd72697e4b8f14e53ed6a9f49

data/README.md

@@ -22,7 +22,7 @@ With `deb-s3`, there is no need for this. `deb-s3` features:
 * Updates it with the new package, replacing the existing entry if already
   there or adding a new one if not.
 * Uploads the package itself, the Packages manifest, and the Packages.gz
-  manifest.
+  manifest. It will skip the uploading if the package is already there.
 * Updates the Release file with the new hashes and file sizes.
 
 ## Getting Started
@@ -124,8 +124,3 @@ Options:
 Verifies that the files in the package manifests exist
 ```
 
-## TODO
-
-This is still experimental.  These are several things to be done:
-
-* Don't re-upload a package if it already exists and has the same hashes.

data/lib/deb/s3.rb

@@ -1,5 +1,6 @@
+# -*- encoding : utf-8 -*-
 module Deb
   module S3
-    VERSION = "0.6.2"
+    VERSION = "0.7.0"
   end
 end

data/lib/deb/s3/cli.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require "aws"
 require "thor"
 
@@ -20,6 +21,15 @@ class Deb::S3::CLI < Thor
   :type     => :string,
   :desc     => "The path prefix to use when storing on S3."
 
+  class_option :origin,
+  :type     => :string,
+  :aliases  => "-o",
+  :desc     => "The origin to use in the repository Release file."
+
+  class_option :suite,
+  :type     => :string,
+  :desc     => "The suite to use in the repository Release file."
+
   class_option :codename,
   :default  => "stable",
   :type     => :string,
@@ -77,6 +87,22 @@ class Deb::S3::CLI < Thor
   :type    => :string,
   :desc    => "Additional command line options to pass to GPG when signing"
 
+  class_option :encryption,
+  :default  => false,
+  :type     => :boolean,
+  :aliases  => "-e",
+  :desc     => "Use S3 server side encryption"
+
+  class_option :quiet,
+  :type => :boolean,
+  :aliases => "-q",
+  :desc => "Doesn't output information, just returns status appropriately."
+
+  class_option :cache_control,
+  :type     => :string,
+  :aliases  => "-C",
+  :desc     => "Add cache-control headers to S3 objects"
+
   desc "upload FILES",
   "Uploads the given files to a S3 bucket as an APT repository."
 
@@ -93,12 +119,6 @@ class Deb::S3::CLI < Thor
     "in the repository when uploading one."
 
   def upload(*files)
-    component = options[:component]
-    if options[:section]
-      component = options[:section]
-      warn("===> WARNING: The --section/-s argument is deprecated, please use --component/-m.")
-    end
-
     if files.nil? || files.empty?
       error("You must specify at least one file to upload")
     end
@@ -113,8 +133,13 @@ class Deb::S3::CLI < Thor
 
     # retrieve the existing manifests
     log("Retrieving existing manifests")
-    release  = Deb::S3::Release.retrieve(options[:codename])
+    release  = Deb::S3::Release.retrieve(options[:codename], options[:origin], options[:suite], options[:cache_control])
     manifests = {}
+    release.architectures.each do |arch|
+      manifests[arch] = Deb::S3::Manifest.retrieve(options[:codename], component, arch, options[:cache_control])
+    end
+
+    packages_arch_all = []
 
     # examine all the files
     files.collect { |f| Dir.glob(f) }.flatten.each do |file|
@@ -126,13 +151,36 @@ class Deb::S3::CLI < Thor
 
       # validate we have them
       error("No architcture given and unable to determine one for #{file}. " +
-            "Please specify one with --arch [i386,amd64].") unless arch
+            "Please specify one with --arch [i386|amd64].") unless arch
+
+      # If the arch is all and the list of existing manifests is none, then
+      # throw an error. This is mainly the case when initializing a brand new
+      # repository. With "all", we won't know which architectures they're using.
+      if arch == "all" && manifests.count == 0
+        error("Package #{File.basename(file)} had architecture \"all\", " +
+              "however noexisting package lists exist. This can often happen " +
+              "if the first package you are add to a new repository is an " +
+              "\"all\" architecture file. Please use --arch [i386|amd64] or " +
+              "another platform type to upload the file.")
+      end
 
       # retrieve the manifest for the arch if we don't have it already
-      manifests[arch] ||= Deb::S3::Manifest.retrieve(options[:codename], component, arch)
+      manifests[arch] ||= Deb::S3::Manifest.retrieve(options[:codename], component, arch, options[:cache_control])
 
-      # add in the package
+      # add package in manifests
       manifests[arch].add(pkg, options[:preserve_versions])
+
+      # If arch is all, we must add this package in all arch available
+      if arch == 'all'
+        packages_arch_all << pkg
+      end
+    end
+
+    manifests.each do |arch, manifest|
+      next if arch == 'all'
+      packages_arch_all.each do |pkg|
+        manifest.add(pkg, options[:preserve_versions], false)
+      end
     end
 
     # upload the manifest
@@ -146,6 +194,158 @@ class Deb::S3::CLI < Thor
     log("Update complete.")
   end
 
+  desc "list", "Lists packages in given codename, component, and optionally architecture"
+
+  option :long,
+  :type     => :boolean,
+  :aliases  => '-l',
+  :desc     => "Shows all package information in original format",
+  :default  => false
+
+  option :arch,
+  :type     => :string,
+  :aliases  => "-a",
+  :desc     => "The architecture of the package in the APT repository."
+
+  def list
+    configure_s3_client
+
+    release = Deb::S3::Release.retrieve(options[:codename])
+    archs = release.architectures
+    archs &= [options[:arch]] if options[:arch] && options[:arch] != "all"
+    widths = [0, 0]
+    rows = archs.map { |arch|
+      manifest = Deb::S3::Manifest.retrieve(options[:codename], component,
+                                            arch, options[:cache_control])
+      manifest.packages.map do |package|
+        if options[:long]
+          package.generate
+        else
+          [package.name, package.full_version, package.architecture].tap do |row|
+            row.each_with_index do |col, i|
+              widths[i] = [widths[i], col.size].max if widths[i]
+            end
+          end
+        end
+      end
+    }.flatten(1)
+
+    if options[:long]
+      $stdout.puts rows.join("\n")
+    else
+      rows.each do |row|
+        $stdout.puts "% -#{widths[0]}s  % -#{widths[1]}s  %s" % row
+      end
+    end
+  end
+
+  desc "show PACKAGE VERSION ARCH", "Shows information about a package."
+
+  def show(package_name, version, arch)
+    if version.nil?
+      error "You must specify the name of the package to show."
+    end
+    if version.nil?
+      error "You must specify the version of the package to show."
+    end
+    if arch.nil?
+      error "You must specify the architecture of the package to show."
+    end
+
+    configure_s3_client
+
+    # retrieve the existing manifests
+    manifest = Deb::S3::Manifest.retrieve(options[:codename], component, arch,
+                                          options[:cache_control])
+    package = manifest.packages.detect { |p|
+      p.name == package_name && p.full_version == version
+    }
+    if package.nil?
+      error "No such package found."
+    end
+
+    puts package.generate
+  end
+
+  desc "copy PACKAGE TO_CODENAME TO_COMPONENT ",
+    "Copy the package named PACKAGE to given codename and component. If --versions is not specified, copy all versions of PACKAGE. Otherwise, only the specified versions will be copied. Source codename and component is given by --codename and --component options."
+
+  option :cache_control,
+  :type     => :string,
+  :aliases  => "-C",
+  :desc     => "Add cache-control headers to S3 objects"
+
+  option :arch,
+    :type     => :string,
+    :aliases  => "-a",
+    :desc     => "The architecture of the package in the APT repository."
+
+  option :versions,
+    :default  => nil,
+    :type     => :array,
+    :desc     => "The space-delimited versions of PACKAGE to delete. If not" +
+    "specified, ALL VERSIONS will be deleted. Fair warning." +
+    "E.g. --versions \"0.1 0.2 0.3\""
+
+  option :preserve_versions,
+    :default  => false,
+    :type     => :boolean,
+    :aliases  => "-p",
+    :desc     => "Whether to preserve other versions of a package " +
+    "in the repository when uploading one."
+
+  def copy(package_name, to_codename, to_component)
+    if package_name.nil?
+      error "You must specify a package name."
+    end
+    if to_codename.nil?
+      error "You must specify a codename to copy to."
+    end
+    if to_component.nil?
+      error "You must specify a component to copy to."
+    end
+
+    arch = options[:arch]
+    if arch.nil?
+      error "You must specify the architecture of the package to copy."
+    end
+
+    versions = options[:versions]
+    if versions.nil?
+      warn "===> WARNING: Copying all versions of #{package_name}"
+    else
+      log "Versions to copy: #{versions.join(', ')}"
+    end
+
+    configure_s3_client
+
+    # retrieve the existing manifests
+    log "Retrieving existing manifests"
+    from_manifest = Deb::S3::Manifest.retrieve(options[:codename],
+                                               component, arch,
+                                               options[:cache_control])
+    to_release = Deb::S3::Release.retrieve(to_codename)
+    to_manifest = Deb::S3::Manifest.retrieve(to_codename, to_component, arch,
+                                             options[:cache_control])
+    packages = from_manifest.packages.select { |p|
+      p.name == package_name &&
+        (versions.nil? || versions.include?(p.full_version))
+    }
+    if packages.size == 0
+      error "No packages found in repository."
+    end
+
+    packages.each do |package|
+      to_manifest.add package, options[:preserve_versions], false
+    end
+
+    to_manifest.write_to_s3 { |f| sublog("Transferring #{f}") }
+    to_release.update_manifest(to_manifest)
+    to_release.write_to_s3 { |f| sublog("Transferring #{f}") }
+
+    log "Copy complete."
+  end
+
   desc "delete PACKAGE",
     "Remove the package named PACKAGE. If --versions is not specified, delete" +
     "all versions of PACKAGE. Otherwise, only the specified versions will be " +
@@ -164,12 +364,6 @@ class Deb::S3::CLI < Thor
     "E.g. --versions \"0.1 0.2 0.3\""
 
   def delete(package)
-    component = options[:component]
-    if options[:section]
-      component = options[:section]
-      warn("===> WARNING: The --section/-s argument is deprecated, please use --component/-m.")
-    end
-
     if package.nil?
       error("You must specify a package name.")
     end
@@ -190,8 +384,8 @@ class Deb::S3::CLI < Thor
 
     # retrieve the existing manifests
     log("Retrieving existing manifests")
-    release  = Deb::S3::Release.retrieve(options[:codename])
-    manifest = Deb::S3::Manifest.retrieve(options[:codename], component, options[:arch])
+    release  = Deb::S3::Release.retrieve(options[:codename], options[:origin], options[:suite])
+    manifest = Deb::S3::Manifest.retrieve(options[:codename], component, options[:arch], options[:cache_control])
 
     deleted = manifest.delete_package(package, versions)
     if deleted.length == 0
@@ -224,20 +418,15 @@ class Deb::S3::CLI < Thor
   :desc     => "Whether to fix problems in manifests when verifying."
 
   def verify
-    component = options[:component]
-    if options[:section]
-      component = options[:section]
-      warn("===> WARNING: The --section/-s argument is deprecated, please use --component/-m.")
-    end
-
     configure_s3_client
 
     log("Retrieving existing manifests")
-    release = Deb::S3::Release.retrieve(options[:codename])
+    release = Deb::S3::Release.retrieve(options[:codename], options[:origin], options[:suite])
 
-    %w[amd64 armel i386 all].each do |arch|
+    release.architectures.each do |arch|
       log("Checking for missing packages in: #{options[:codename]}/#{options[:component]} #{arch}")
-      manifest = Deb::S3::Manifest.retrieve(options[:codename], component, arch)
+      manifest = Deb::S3::Manifest.retrieve(options[:codename], component,
+                                            arch, options[:cache_control])
       missing_packages = []
 
       manifest.packages.each do |p|
@@ -250,7 +439,7 @@ class Deb::S3::CLI < Thor
         end
       end
 
-      if options[:fix_manifests] && !missing_packages.empty?
+      if options[:sign] || (options[:fix_manifests] && !missing_packages.empty?)
         log("Removing #{missing_packages.length} package(s) from the manifest...")
         missing_packages.each { |p| manifest.packages.delete(p) }
         manifest.write_to_s3 { |f| sublog("Transferring #{f}") }
@@ -264,16 +453,31 @@ class Deb::S3::CLI < Thor
 
   private
 
+  def component
+    return @component if @component
+    @component = if (section = options[:section])
+                   warn("===> WARNING: The --section/-s argument is " \
+                        "deprecated, please use --component/-m.")
+                   section
+                 else
+                   options[:component]
+                 end
+  end
+
+  def puts(*args)
+    $stdout.puts(*args) unless options[:quiet]
+  end
+
   def log(message)
-    puts ">> #{message}"
+    puts ">> #{message}" unless options[:quiet]
   end
 
   def sublog(message)
-    puts "   -- #{message}"
+    puts "   -- #{message}" unless options[:quiet]
   end
 
   def error(message)
-    puts "!! #{message}"
+    $stderr.puts "!! #{message}" unless options[:quiet]
     exit 1
   end
 
@@ -307,6 +511,7 @@ class Deb::S3::CLI < Thor
     Deb::S3::Utils.signing_key = options[:sign]
     Deb::S3::Utils.gpg_options = options[:gpg_options]
     Deb::S3::Utils.prefix      = options[:prefix]
+    Deb::S3::Utils.encryption  = options[:encryption]
 
     # make sure we have a valid visibility setting
     Deb::S3::Utils.access_policy =

data/lib/deb/s3/manifest.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require "tempfile"
 require "zlib"
 require 'deb/s3/utils'
@@ -8,21 +9,25 @@ class Deb::S3::Manifest
 
   attr_accessor :codename
   attr_accessor :component
+  attr_accessor :cache_control
   attr_accessor :architecture
 
   attr_accessor :files
 
   attr_reader :packages
+  attr_reader :packages_to_be_upload
 
   def initialize
     @packages = []
+    @packages_to_be_upload = []
     @component = nil
     @architecture = nil
     @files = {}
+    @cache_control = ""
   end
 
   class << self
-    def retrieve(codename, component, architecture)
+    def retrieve(codename, component, architecture, cache_control)
       m = if s = Deb::S3::Utils.s3_read("dists/#{codename}/#{component}/binary-#{architecture}/Packages")
         self.parse_packages(s)
       else
@@ -32,6 +37,7 @@ class Deb::S3::Manifest
       m.codename = codename
       m.component = component
       m.architecture = architecture
+      m.cache_control = cache_control 
       m
     end
 
@@ -45,13 +51,14 @@ class Deb::S3::Manifest
     end
   end
 
-  def add(pkg, preserve_versions)
+  def add(pkg, preserve_versions, needs_uploading=true)
     if preserve_versions
       packages.delete_if { |p| p.name == pkg.name && p.full_version == pkg.full_version }
     else
       packages.delete_if { |p| p.name == pkg.name }
     end
     packages << pkg
+    packages_to_be_upload << pkg if needs_uploading
     pkg
   end
 
@@ -62,7 +69,7 @@ class Deb::S3::Manifest
         if p.name != pkg
            p
         # Also include the packages not matching a specified version
-        elsif (!versions.nil? and p.name == pkg and !versions.include? p.version)
+        elsif (!versions.nil? and p.name == pkg and !versions.include? p.version and !versions.include? p.version + "-" + p.iteration)
             p
         end
     }
@@ -79,11 +86,9 @@ class Deb::S3::Manifest
     manifest = self.generate
 
     # store any packages that need to be stored
-    @packages.each do |pkg|
-      if pkg.needs_uploading?
-        yield pkg.url_filename if block_given?
-        s3_store(pkg.filename, pkg.url_filename, 'application/octet-stream; charset=binary')
-      end
+    @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')
     end
 
     # generate the Packages file
@@ -92,7 +97,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=us-ascii')
+    s3_store(pkgs_temp.path, f, 'binary/octet-stream; charset=binary', self.cache_control)
     @files["#{@component}/binary-#{@architecture}/Packages"] = hashfile(pkgs_temp.path)
     pkgs_temp.unlink
 
@@ -102,7 +107,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, 'application/x-gzip; charset=binary')
+    s3_store(gztemp.path, f, 'application/x-gzip; charset=binary', self.cache_control)
     @files["#{@component}/binary-#{@architecture}/Packages.gz"] = hashfile(gztemp.path)
     gztemp.unlink
 

data/lib/deb/s3/package.rb

@@ -1,8 +1,11 @@
+# -*- encoding : utf-8 -*-
 require "digest/sha1"
 require "digest/sha2"
 require "digest/md5"
 require "socket"
 require "tmpdir"
+require "uri"
+
 require 'deb/s3/utils'
 
 class Deb::S3::Package
@@ -21,11 +24,6 @@ class Deb::S3::Package
   attr_accessor :description
 
   attr_accessor :dependencies
-  attr_accessor :provides
-  attr_accessor :conflicts
-  attr_accessor :replaces
-  attr_accessor :excludes
-
 
   # Any other attributes specific to this package.
   # This is where you'd put rpm, deb, or other specific attributes.
@@ -116,12 +114,7 @@ class Deb::S3::Package
     @filename = nil
     @url_filename = nil
 
-    @provides = []
-    @conflicts = []
-    @replaces = []
     @dependencies = []
-
-    @needs_uploading = false
   end
 
   def full_version
@@ -131,7 +124,6 @@ class Deb::S3::Package
 
   def filename=(f)
     @filename = f
-    @needs_uploading = true
     @filename
   end
 
@@ -143,10 +135,6 @@ class Deb::S3::Package
     @url_filename || "pool/#{self.name[0]}/#{self.name[0..1]}/#{s3_escape(File.basename(self.filename))}"
   end
 
-  def needs_uploading?
-    @needs_uploading
-  end
-
   def generate
     template("package.erb").result(binding)
   end
@@ -232,55 +220,52 @@ class Deb::S3::Package
 
   # from fpm
   def extract_info(control)
-    parse = lambda do |field|
-      value = control[/^#{field}: .*/]
-      if value.nil?
-        return nil
-      else
-        return value.split(": ",2).last
-      end
-    end
+    fields = parse_control(control)
 
     # Parse 'epoch:version-iteration' in the version string
-    version_re = /^(?:([0-9]+):)?(.+?)(?:-(.*))?$/
-    m = version_re.match(parse.call("Version"))
-    if !m
-      raise "Unsupported version string '#{parse.call("Version")}'"
+    full_version = fields.delete('Version')
+    if full_version !~ /^(?:([0-9]+):)?(.+?)(?:-(.*))?$/
+      raise "Unsupported version string '#{full_version}'"
     end
-    self.epoch, self.version, self.iteration = m.captures
-
-    self.architecture = parse.call("Architecture")
-    self.category = parse.call("Section")
-    self.license = parse.call("License") || self.license
-    self.maintainer = parse.call("Maintainer")
-    self.name = parse.call("Package")
-    self.url = parse.call("Homepage")
-    self.vendor = parse.call("Vendor") || self.vendor
-    self.attributes[:deb_priority] = parse.call("Priority")
-    self.attributes[:deb_origin] = parse.call("Origin")
-    self.attributes[:deb_installed_size] = parse.call("Installed-Size")
+    self.epoch, self.version, self.iteration = $~.captures
+
+    self.architecture = fields.delete('Architecture')
+    self.category = fields.delete('Section')
+    self.license = fields.delete('License') || self.license
+    self.maintainer = fields.delete('Maintainer')
+    self.name = fields.delete('Package')
+    self.url = fields.delete('Homepage')
+    self.vendor = fields.delete('Vendor') || self.vendor
+    self.attributes[:deb_priority] = fields.delete('Priority')
+    self.attributes[:deb_origin] = fields.delete('Origin')
+    self.attributes[:deb_installed_size] = fields.delete('Installed-Size')
 
     # Packages manifest fields
-    self.url_filename = parse.call("Filename")
-    self.sha1 = parse.call("SHA1")
-    self.sha256 = parse.call("SHA256")
-    self.md5 = parse.call("MD5sum")
-    self.size = parse.call("Size")
-
-    # The description field is a special flower, parse it that way.
-    # The description is the first line as a normal Description field, but also continues
-    # on future lines indented by one space, until the end of the file. Blank
-    # lines are marked as ' .'
-    description = control[/^Description: .*[^\Z]/m]
-    description = description.gsub(/^[^(Description|\s)].*$/, "").split(": ", 2).last
-    self.description = description.gsub(/^ /, "").gsub(/^\.$/, "")
+    filename = fields.delete('Filename')
+    self.url_filename = filename && URI.unescape(filename)
+    self.sha1 = fields.delete('SHA1')
+    self.sha256 = fields.delete('SHA256')
+    self.md5 = fields.delete('MD5sum')
+    self.size = fields.delete('Size')
+    self.description = fields.delete('Description')
 
     #self.config_files = config_files
 
-    self.dependencies += Array(parse_depends(parse.call("Depends")))
-    self.conflicts += Array(parse_depends(parse.call("Conflicts")))
-    self.provides += Array(parse_depends(parse.call("Provides")))
-    self.replaces += Array(parse_depends(parse.call("Replaces")))
+    self.dependencies += Array(parse_depends(fields.delete('Depends')))
+
+    self.attributes[:deb_recommends] = fields.delete('Recommends')
+    self.attributes[:deb_suggests]   = fields.delete('Suggests')
+    self.attributes[:deb_enhances]   = fields.delete('Enhances')
+    self.attributes[:deb_pre_depends] = fields.delete('Pre-Depends')
+
+    self.attributes[:deb_breaks]    = fields.delete('Breaks')
+    self.attributes[:deb_conflicts] = fields.delete('Conflicts')
+    self.attributes[:deb_provides]  = fields.delete('Provides')
+    self.attributes[:deb_replaces]  = fields.delete('Replaces')
+
+    self.attributes[:deb_field] = Hash[fields.map { |k, v|
+      [k.sub(/\AX[BCS]{0,3}-/, ''), v]
+    }]
   end # def extract_info
 
   def apply_file_info(file)
@@ -289,4 +274,28 @@ class Deb::S3::Package
     self.sha256 = Digest::SHA2.file(file).hexdigest
     self.md5 = Digest::MD5.file(file).hexdigest
   end
+
+  def parse_control(control)
+    field = nil
+    value = ""
+    {}.tap do |fields|
+      control.each_line do |line|
+        if line =~ /^(\s+)(\S.*)$/
+          indent, rest = $1, $2
+          # Continuation
+          if indent.size == 1 && rest == "."
+            value << "\n\n"
+            rest = ""
+          elsif value.size > 0
+            value << "\n"
+          end
+          value << rest
+        elsif line =~ /^([-\w]+):(.*)$/
+          fields[field] = value if field
+          field, value = $1, $2.strip
+        end
+      end
+      fields[field] = value if field
+    end
+  end
 end

data/lib/deb/s3/release.rb

@@ -1,32 +1,42 @@
+# -*- encoding : utf-8 -*-
 require "tempfile"
 
 class Deb::S3::Release
   include Deb::S3::Utils
 
   attr_accessor :codename
+  attr_accessor :origin
+  attr_accessor :suite
   attr_accessor :architectures
   attr_accessor :components
+  attr_accessor :cache_control
 
   attr_accessor :files
   attr_accessor :policy
 
   def initialize
+    @origin = nil
+    @suite = nil
     @codename = nil
     @architectures = []
     @components = []
+    @cache_control = ""
     @files = {}
     @policy = :public_read
   end
 
   class << self
-    def retrieve(codename)
+    def retrieve(codename, origin=nil, suite=nil, cache_control=nil)
       if s = Deb::S3::Utils.s3_read("dists/#{codename}/Release")
-        self.parse_release(s)
+        rel = self.parse_release(s)
       else
         rel = self.new
         rel.codename = codename
-        rel
+        rel.origin = origin unless origin.nil?
+        rel.suite = suite unless suite.nil?
       end
+      rel.cache_control = cache_control
+      rel
     end
 
     def parse_release(str)
@@ -52,6 +62,8 @@ class Deb::S3::Release
 
     # grab basic fields
     self.codename = parse.call("Codename")
+    self.origin = parse.call("Origin") || nil
+    self.suite = parse.call("Suite") || nil
     self.architectures = (parse.call("Architectures") || "").split(/\s+/)
     self.components = (parse.call("Components") || "").split(/\s+/)
 
@@ -86,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=us-ascii')
+    s3_store(release_tmp.path, self.filename, 'binary/octet-stream; charset=binary', self.cache_control)
 
     # sign the file, if necessary
     if Deb::S3::Utils.signing_key
@@ -96,7 +108,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, 'application/pgp-signature; charset=us-ascii')
+        s3_store(local_file, remote_file, 'application/pgp-signature; charset=us-ascii', self.cache_control)
         File.unlink(local_file)
       else
         raise "Signing the Release file failed."

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

@@ -8,25 +8,31 @@ Installed-Size: <%= attributes[:deb_installed_size] %>
 <% if !dependencies.empty? and !attributes[:no_depends?] -%>
 Depends: <%= dependencies.collect { |d| fix_dependency(d) }.flatten.join(", ") %>
 <% end -%>
-<% if !conflicts.empty? -%>
-Conflicts: <%= conflicts.join(", ") %>
+<% if attributes[:deb_conflicts] -%>
+Conflicts: <%= attributes[:deb_conflicts] %>
+<% end -%>
+<% if attributes[:deb_breaks] -%>
+Breaks: <%= attributes[:deb_breaks] %>
 <% end -%>
 <% if attributes[:deb_pre_depends] -%>
-Pre-Depends: <%= attributes[:deb_pre_depends].collect { |d| fix_dependency(d) }.flatten.join(", ") %>
+Pre-Depends: <%= attributes[:deb_pre_depends] %>
 <% end -%>
-<% if !provides.empty? -%>
+<% if attributes[:deb_provides] -%>
 <%# Turn each provides from 'foo = 123' to simply 'foo' because Debian :\ -%>
 <%#  http://www.debian.org/doc/debian-policy/ch-relationships.html -%>
-Provides: <%= provides.map {|p| p.split(" ").first}.join ", " %>
+Provides: <%= attributes[:deb_provides] %>
 <% end -%>
-<% if !replaces.empty? -%>
-Replaces: <%= replaces.join(", ") %>
+<% if attributes[:deb_replaces] -%>
+Replaces: <%= attributes[:deb_replaces] %>
 <% end -%>
 <% if attributes[:deb_recommends] -%>
-Recommends: <%= attributes[:deb_recommends].collect { |d| fix_dependency(d) }.flatten.join(", ") %>
+Recommends: <%= attributes[:deb_recommends] %>
 <% end -%>
 <% if attributes[:deb_suggests] -%>
-Suggests: <%= attributes[:deb_suggests].collect { |d| fix_dependency(d) }.flatten.join(", ") %>
+Suggests: <%= attributes[:deb_suggests] %>
+<% end -%>
+<% if attributes[:deb_enhances] -%>
+Enhances: <%= attributes[:deb_enhances] %>
 <% end -%>
 Section: <%= category %>
 <% if attributes[:deb_origin] -%>

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

@@ -1,7 +1,11 @@
+<% if origin -%>
+Origin: <%= origin %>
+<% end -%>
 Codename: <%= codename %>
 Date: <%= Time.now.utc.strftime("%a, %d %b %Y %T %Z") %>
 Architectures: <%= architectures.join(" ") %>
 Components: <%= components.join(" ") %>
+Suite: <%= suite %>
 MD5Sum:
 <% files.sort.each do |f,p| -%>
  <%= p[:md5] %> <%= p[:size].to_s.rjust(16) %> <%= f %>

data/lib/deb/s3/utils.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require "base64"
 require "digest/md5"
 require "erb"
@@ -17,6 +18,8 @@ module Deb::S3::Utils
   def gpg_options= v; @gpg_options = v end
   def prefix; @prefix end
   def prefix= v; @prefix = v end
+  def encryption; @encryption end
+  def encryption= v; @encryption = v end
 
   class SafeSystemError < RuntimeError; end
 
@@ -46,7 +49,7 @@ module Deb::S3::Utils
 
   # from fog, Fog::AWS.escape
   def s3_escape(string)
-    string.gsub(/([^a-zA-Z0-9_.\-~]+)/) {
+    string.gsub(/([^a-zA-Z0-9_.\-~+]+)/) {
       "%" + $1.unpack("H2" * $1.bytesize).join("%").upcase
     }
   end
@@ -60,7 +63,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, content_type='application/octet-stream; charset=binary')
+  def s3_store(path, filename=nil, content_type='application/octet-stream; charset=binary', cache_control=nil)
     filename = File.basename(path) unless filename
     obj = Deb::S3::Utils.s3.buckets[Deb::S3::Utils.bucket].objects[s3_path(filename)]
 
@@ -71,8 +74,16 @@ module Deb::S3::Utils
       return if (file_md5.to_s == obj.etag.gsub('"', '') or file_md5.to_s == obj.metadata['md5'])
     end
 
+    options = {:acl => Deb::S3::Utils.access_policy, :content_type => content_type, :metadata => {'md5' => file_md5}}
+    if !cache_control.nil?
+      options[:cache_control] = cache_control
+    end
+
+    # specify if encryption is required
+    options[:server_side_encryption] = :aes256 if Deb::S3::Utils.encryption
+
     # upload the file
-    obj.write(Pathname.new(path), :acl => Deb::S3::Utils.access_policy, :content_type => content_type, :metadata => {'md5' => file_md5})
+    obj.write(Pathname.new(path), options)
   end
 
   def s3_remove(path)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deb-s3
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Ken Robertson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-03 00:00:00.000000000 Z
+date: 2015-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -73,16 +73,16 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- bin/deb-s3
-- README.md
 - lib/deb/s3/release.rb
+- lib/deb/s3/templates/package.erb
+- lib/deb/s3/templates/release.erb
 - lib/deb/s3/package.rb
-- lib/deb/s3/utils.rb
 - lib/deb/s3/cli.rb
 - lib/deb/s3/manifest.rb
-- lib/deb/s3/templates/release.erb
-- lib/deb/s3/templates/package.erb
+- lib/deb/s3/utils.rb
 - lib/deb/s3.rb
+- bin/deb-s3
+- README.md
 homepage: http://invalidlogic.com/
 licenses: []
 metadata: {}