deb-s3 0.1.1 → 0.2.0

data/README.md

@@ -10,15 +10,17 @@ sync the files to S3.
 
 The annoying thing about this process is it requires you to maintain a local
 copy of the file tree for regenerating and syncing the next time. Personally,
-my process is to use one-off virtual machines with [Vagrant](http://vagrantup.com),
-script out the build process, and then would prefer to just upload the final
-`.deb` from my Mac.
+my process is to use one-off virtual machines with
+[Vagrant](http://vagrantup.com), script out the build process, and then would
+prefer to just upload the final `.deb` from my Mac.
 
 With `deb-s3`, there is no need for this. `deb-s3` features:
 
 * Downloads the existing package manifest and parses it.
-* Updates it with the new package, replacing the existing entry if already there.
-* Uploads the package itself, the Packages manifest, and the Packages.gz manifest.
+* 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.
 * Updates the Release file with the new hashes and file sizes.
 
 ## Getting Started
@@ -70,6 +72,7 @@ Options:
       [--secret-key=SECRET_KEY]  # The secret key for connecting to S3.
                                  # Default: $AMAZON_SECRET_ACCESS_KEY
       [--sign=SIGN]              # Sign the Release file. Use --sign with your key ID to use a specific key.
+  -p, [--preserve-versions]      # Whether to preserve other versions of a package in the repository when uploading one.
 
 Uploads the given FILE to a S3 bucket as an APT repository.
 ```
@@ -79,4 +82,3 @@ Uploads the given FILE to a S3 bucket as an APT repository.
 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.
-* Clean up the code some more.

data/lib/deb/s3.rb

@@ -1,5 +1,5 @@
 module Deb
   module S3
-    VERSION = "0.1.1"
+    VERSION = "0.2.0"
   end
 end

data/lib/deb/s3/cli.rb

@@ -55,6 +55,13 @@ class Deb::S3::CLI < Thor
     :desc     => "Sign the Release file. Use --sign with your key ID to use " +
                  "a specific key."
 
+  option :preserve_versions,
+    :default  => false,
+    :type     => :boolean,
+    :aliases  => "-p",
+    :desc     => "Whether to preserve other versions of a package " + 
+                 "in the repository when uploading one."
+
   desc "upload FILE",
     "Uploads the given FILE to a S3 bucket as an APT repository."
   def upload(file)
@@ -108,7 +115,7 @@ class Deb::S3::CLI < Thor
     manifest = Deb::S3::Manifest.retrieve(options[:codename], options[:section], arch)
 
     # add in the package
-    manifest.add(pkg)
+    manifest.add(pkg, options[:preserve_versions])
 
     log("Uploading package and new manifests to S3")
     manifest.write_to_s3 { |f| sublog("Transferring #{f}") }

data/lib/deb/s3/manifest.rb

@@ -45,8 +45,12 @@ class Deb::S3::Manifest
     @packages
   end
 
-  def add(pkg)
-    @packages.delete_if { |p| p.name == pkg.name }
+  def add(pkg, preserve_versions)
+    if preserve_versions
+      @packages.delete_if { |p| p.name == pkg.name && p.version == pkg.version }
+    else
+      @packages.delete_if { |p| p.name == pkg.name }
+    end
     @packages << pkg
     pkg
   end

data/lib/deb/s3/package.rb

@@ -239,6 +239,7 @@ class Deb::S3::Package
     self.url = parse.call("Homepage")
     self.vendor = parse.call("Vendor") || self.vendor
     self.attributes[:deb_priority] = parse.call("Priority")
+    self.attributes[:deb_installed_size] = parse.call("Installed-Size")
 
     # Packages manifest fields
     self.url_filename = parse.call("Filename")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deb-s3
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-22 00:00:00.000000000 Z
+date: 2013-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor