deb-s3 0.4.0 → 0.5.0

data/README.md

@@ -43,7 +43,7 @@ $ bundle install
 Now to upload a package, simply use:
 
 ```console
-$ deb-s3 upload my-deb-package-1.0.0_amd64.deb --bucket my-bucket
+$ deb-s3 upload --bucket my-bucket my-deb-package-1.0.0_amd64.deb
 >> Examining package file my-deb-package-1.0.0_amd64.deb
 >> Retrieving existing package manifest
 >> Uploading package and new manifests to S3
@@ -56,26 +56,58 @@ $ deb-s3 upload my-deb-package-1.0.0_amd64.deb --bucket my-bucket
 
 ```
 Usage:
-  deb-s3 upload FILE -b, --bucket=BUCKET
+  deb-s3 upload FILES
 
 Options:
-  -b, --bucket=BUCKET            # The name of the S3 bucket to upload to.
+  -a, [--arch=ARCH]              # The architecture of the package in the APT repository.
+      [--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.
+  -b, [--bucket=BUCKET]          # The name of the S3 bucket to upload to.
   -c, [--codename=CODENAME]      # The codename of the APT repository.
                                  # Default: stable
-  -s, [--section=SECTION]        # The section of the APT repository.
+  -m, [--component=COMPONENT]    # The component of the APT repository.
                                  # Default: main
-  -a, [--arch=ARCH]              # The architecture of the package in the APT repository.
+      [--access-key=ACCESS_KEY]  # The access key for connecting to S3.
+                                 # Default: $AMAZON_ACCESS_KEY_ID
+      [--secret-key=SECRET_KEY]  # The secret key for connecting to S3.
+                                 # Default: $AMAZON_SECRET_ACCESS_KEY
+      [--endpoint=ENDPOINT]      # The region endpoint for connecting to S3.
   -v, [--visibility=VISIBILITY]  # The access policy for the uploaded files. Can be public, private, or authenticated.
                                  # Default: public
+
+Uploads the given files to a S3 bucket as an APT repository.
+```
+
+You can also verify an existing APT repository on S3 using the `verify` command:
+
+```console
+deb-s3 verify -b my-bucket
+>> Retrieving existing manifests
+>> Checking for missing packages in: stable/main i386
+>> Checking for missing packages in: stable/main amd64
+>> Checking for missing packages in: stable/main all
+```
+
+```
+Usage:
+  deb-s3 verify
+
+Options:
+  -f, [--fix-manifests]          # Whether to fix problems in manifests when verifying.
+  -b, [--bucket=BUCKET]          # The name of the S3 bucket to upload to.
+  -c, [--codename=CODENAME]      # The codename of the APT repository.
+                                 # Default: stable
+  -m, [--component=COMPONENT]    # The component of the APT repository.
+                                 # Default: main
       [--access-key=ACCESS_KEY]  # The access key for connecting to S3.
                                  # Default: $AMAZON_ACCESS_KEY_ID
       [--secret-key=SECRET_KEY]  # The secret key for connecting to S3.
                                  # Default: $AMAZON_SECRET_ACCESS_KEY
-      [--endpoint=AWS_ENDPOINT]  # The aws region endpoint for connecting to S3.
-      [--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.
+      [--endpoint=ENDPOINT]      # The region endpoint for connecting to S3.
+  -v, [--visibility=VISIBILITY]  # The access policy for the uploaded files. Can be public, private, or authenticated.
+                                 # Default: public
 
-Uploads the given FILE to a S3 bucket as an APT repository.
+Verifies that the files in the package manifests exist
 ```
 
 ## TODO

data/lib/deb/s3.rb

@@ -1,5 +1,5 @@
 module Deb
   module S3
-    VERSION = "0.4.0"
+    VERSION = "0.5.0"
   end
 end

data/lib/deb/s3/cli.rb

@@ -20,11 +20,16 @@ class Deb::S3::CLI < Thor
     :aliases  => "-c",
     :desc     => "The codename of the APT repository."
 
-  class_option :section,
+  class_option :component,
     :default  => "main",
+    :type     => :string,
+    :aliases  => "-m",
+    :desc     => "The component of the APT repository."
+
+  class_option :section,
     :type     => :string,
     :aliases  => "-s",
-    :desc     => "The section of the APT repository."
+    :hide     => true
 
   class_option :access_key,
     :default  => "$AMAZON_ACCESS_KEY_ID",
@@ -40,21 +45,21 @@ class Deb::S3::CLI < Thor
     :type     => :string,
     :desc     => "The region endpoint for connecting to S3."
 
-  desc "upload FILE",
-    "Uploads the given FILE to a S3 bucket as an APT repository."
-
-  option :arch,
-    :type     => :string,
-    :aliases  => "-a",
-    :desc     => "The architecture of the package in the APT repository."
-
-  option :visibility,
+  class_option :visibility,
     :default  => "public",
     :type     => :string,
     :aliases  => "-v",
     :desc     => "The access policy for the uploaded files. " +
                  "Can be public, private, or authenticated."
 
+  desc "upload FILES",
+    "Uploads the given files to a S3 bucket as an APT repository."
+
+  option :arch,
+    :type     => :string,
+    :aliases  => "-a",
+    :desc     => "The architecture of the package in the APT repository."
+
   option :sign,
     :type     => :string,
     :desc     => "Sign the Release file. Use --sign with your key ID to use " +
@@ -67,47 +72,57 @@ class Deb::S3::CLI < Thor
     :desc     => "Whether to preserve other versions of a package " +
                  "in the repository when uploading one."
 
-  def upload(file)
-    # make sure the file exists
-    error("File doesn't exist") unless File.exists?(file)
+  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
+
+    # make sure all the files exists
+    if missing_file = files.detect { |f| !File.exists?(f) }
+      error("File '#{missing_file}' doesn't exist")
+    end
 
     # configure AWS::S3
     configure_s3_client
 
     Deb::S3::Utils.signing_key = options[:sign]
 
-    # make sure we have a valid visibility setting
-    Deb::S3::Utils.access_policy = case options[:visibility]
-    when "public"
-      :public_read
-    when "private"
-      :private
-    when "authenticated"
-      :authenticated_read
-    else
-      error("Invalid visibility setting given. Can be public, private, or authenticated.")
-    end
+    # retrieve the existing manifests
+    log("Retrieving existing manifests")
+    release  = Deb::S3::Release.retrieve(options[:codename])
+    manifests = {}
 
-    log("Examining package file #{File.basename(file)}")
-    pkg = Deb::S3::Package.parse_file(file)
+    # examine all the files
+    files.collect { |f| Dir.glob(f) }.flatten.each do |file|
+      log("Examining package file #{File.basename(file)}")
+      pkg = Deb::S3::Package.parse_file(file)
 
-    # copy over some options if they weren't given
-    arch = options[:arch] || pkg.architecture
+      # copy over some options if they weren't given
+      arch = options[:arch] || pkg.architecture
 
-    # validate we have them
-    error("No architcture given and unable to determine one from the file. " +
-      "Please specify one with --arch [i386,amd64].") unless arch
+      # validate we have them
+      error("No architcture given and unable to determine one for #{file}. " +
+            "Please specify one with --arch [i386,amd64].") unless arch
 
-    log("Retrieving existing manifests")
-    release  = Deb::S3::Release.retrieve(options[:codename])
-    manifest = Deb::S3::Manifest.retrieve(options[:codename], options[:section], arch)
+      # retrieve the manifest for the arch if we don't have it already
+      manifests[arch] ||= Deb::S3::Manifest.retrieve(options[:codename], component, arch)
 
-    # add in the package
-    manifest.add(pkg, options[:preserve_versions])
+      # add in the package
+      manifests[arch].add(pkg, options[:preserve_versions])
+    end
 
-    log("Uploading package and new manifests to S3")
-    manifest.write_to_s3 { |f| sublog("Transferring #{f}") }
-    release.update_manifest(manifest)
+    # upload the manifest
+    log("Uploading packages and new manifests to S3")
+    manifests.each_value do |manifest|
+      manifest.write_to_s3 { |f| sublog("Transferring #{f}") }
+      release.update_manifest(manifest)
+    end
     release.write_to_s3 { |f| sublog("Transferring #{f}") }
 
     log("Update complete.")
@@ -122,14 +137,20 @@ 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])
 
     %w[i386 amd64 all].each do |arch|
-      log("Checking for missing packages in: #{options[:codename]}/#{options[:section]} #{arch}")
-      manifest = Deb::S3::Manifest.retrieve(options[:codename], options[:section], arch)
+      log("Checking for missing packages in: #{options[:codename]}/#{options[:component]} #{arch}")
+      manifest = Deb::S3::Manifest.retrieve(options[:codename], component, arch)
       missing_packages = []
 
       manifest.packages.each do |p|
@@ -198,6 +219,17 @@ class Deb::S3::CLI < Thor
     AWS::S3::DEFAULT_HOST.replace options[:endpoint] if options[:endpoint]
 
     Deb::S3::Utils.bucket = options[:bucket]
-  end
 
+    # make sure we have a valid visibility setting
+    Deb::S3::Utils.access_policy = case options[:visibility]
+    when "public"
+      :public_read
+    when "private"
+      :private
+    when "authenticated"
+      :authenticated_read
+    else
+      error("Invalid visibility setting given. Can be public, private, or authenticated.")
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deb-s3
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-27 00:00:00.000000000 Z
+date: 2013-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor