deb-s3 0.3.0 → 0.4.0

data/lib/deb/s3.rb

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

data/lib/deb/s3/cli.rb

@@ -9,24 +9,40 @@ require "deb/s3/release"
 
 class Deb::S3::CLI < Thor
 
-  option :bucket,
-    :required => true,
+  class_option :bucket,
     :type     => :string,
     :aliases  => "-b",
     :desc     => "The name of the S3 bucket to upload to."
 
-  option :codename,
+  class_option :codename,
     :default  => "stable",
     :type     => :string,
     :aliases  => "-c",
     :desc     => "The codename of the APT repository."
 
-  option :section,
+  class_option :section,
     :default  => "main",
     :type     => :string,
     :aliases  => "-s",
     :desc     => "The section of the APT repository."
 
+  class_option :access_key,
+    :default  => "$AMAZON_ACCESS_KEY_ID",
+    :type     => :string,
+    :desc     => "The access key for connecting to S3."
+
+  class_option :secret_key,
+    :default  => "$AMAZON_SECRET_ACCESS_KEY",
+    :type     => :string,
+    :desc     => "The secret key for connecting to S3."
+
+  class_option :endpoint,
+    :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",
@@ -39,20 +55,6 @@ class Deb::S3::CLI < Thor
     :desc     => "The access policy for the uploaded files. " +
                  "Can be public, private, or authenticated."
 
-  option :access_key,
-    :default  => "$AMAZON_ACCESS_KEY_ID",
-    :type     => :string,
-    :desc     => "The access key for connecting to S3."
-
-  option :secret_key,
-    :default  => "$AMAZON_SECRET_ACCESS_KEY",
-    :type     => :string,
-    :desc     => "The secret key for connecting to S3."
-  
-  option :endpoint,
-    :type     => :string,
-    :desc     => "The region endpoint for connecting to S3."
-
   option :sign,
     :type     => :string,
     :desc     => "Sign the Release file. Use --sign with your key ID to use " +
@@ -62,14 +64,16 @@ class Deb::S3::CLI < Thor
     :default  => false,
     :type     => :boolean,
     :aliases  => "-p",
-    :desc     => "Whether to preserve other versions of a package " + 
+    :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)
     # make sure the file exists
     error("File doesn't exist") unless File.exists?(file)
+
+    # configure AWS::S3
+    configure_s3_client
+
     Deb::S3::Utils.signing_key = options[:sign]
 
     # make sure we have a valid visibility setting
@@ -83,7 +87,6 @@ class Deb::S3::CLI < Thor
     else
       error("Invalid visibility setting given. Can be public, private, or authenticated.")
     end
-    Deb::S3::Utils.bucket = options[:bucket]
 
     log("Examining package file #{File.basename(file)}")
     pkg = Deb::S3::Package.parse_file(file)
@@ -95,27 +98,6 @@ class Deb::S3::CLI < Thor
     error("No architcture given and unable to determine one from the file. " +
       "Please specify one with --arch [i386,amd64].") unless arch
 
-    # configure AWS::S3
-    access_key = if options[:access_key] == "$AMAZON_ACCESS_KEY_ID"
-      ENV["AMAZON_ACCESS_KEY_ID"]
-    else
-      options[:access_key]
-    end
-    secret_key = if options[:secret_key] == "$AMAZON_SECRET_ACCESS_KEY"
-      ENV["AMAZON_SECRET_ACCESS_KEY"]
-    else
-      options[:secret_key]
-    end
-    error("No access key given for S3. Please specify one.") unless access_key
-    error("No secret access key given for S3. Please specify one.") unless secret_key
-    AWS::S3::Base.establish_connection!(
-      :access_key_id     => access_key,
-      :secret_access_key => secret_key
-    )
-    if options[:endpoint]
-      AWS::S3::DEFAULT_HOST.replace options[:endpoint]
-    end
-
     log("Retrieving existing manifests")
     release  = Deb::S3::Release.retrieve(options[:codename])
     manifest = Deb::S3::Manifest.retrieve(options[:codename], options[:section], arch)
@@ -131,6 +113,47 @@ class Deb::S3::CLI < Thor
     log("Update complete.")
   end
 
+  desc "verify", "Verifies that the files in the package manifests exist"
+
+  option :fix_manifests,
+    :default  => false,
+    :type     => :boolean,
+    :aliases  => "-f",
+    :desc     => "Whether to fix problems in manifests when verifying."
+
+  def verify
+    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)
+      missing_packages = []
+
+      manifest.packages.each do |p|
+        unless Deb::S3::Utils.s3_exists? p.url_filename_encoded
+          sublog("The following packages are missing:\n\n") if missing_packages.empty?
+          puts(p.generate)
+          puts("")
+
+          missing_packages << p
+        end
+      end
+
+      if 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}") }
+        release.update_manifest(manifest)
+        release.write_to_s3 { |f| sublog("Transferring #{f}") }
+
+        log("Update complete.")
+      end
+    end
+  end
+
   private
 
   def log(message)
@@ -146,4 +169,35 @@ class Deb::S3::CLI < Thor
     exit 1
   end
 
+  def access_key
+    if options[:access_key] == "$AMAZON_ACCESS_KEY_ID"
+      ENV["AMAZON_ACCESS_KEY_ID"]
+    else
+      options[:access_key]
+    end
+  end
+
+  def secret_key
+    if options[:secret_key] == "$AMAZON_SECRET_ACCESS_KEY"
+      ENV["AMAZON_SECRET_ACCESS_KEY"]
+    else
+      options[:secret_key]
+    end
+  end
+
+  def configure_s3_client
+    error("No access key given for S3. Please specify one.") unless access_key
+    error("No secret access key given for S3. Please specify one.") unless secret_key
+    error("No value provided for required options '--bucket'") unless options[:bucket]
+
+    AWS::S3::Base.establish_connection!(
+      :access_key_id     => access_key,
+      :secret_access_key => secret_key
+    )
+
+    AWS::S3::DEFAULT_HOST.replace options[:endpoint] if options[:endpoint]
+
+    Deb::S3::Utils.bucket = options[:bucket]
+  end
+
 end

data/lib/deb/s3/utils.rb

@@ -59,6 +59,6 @@ module Deb::S3::Utils
   end
 
   def s3_remove(path)
-    AWS::S3::S3Object.delete(Deb::S3::Utils.bucket, path) if s3_exists?(path)
+    AWS::S3::S3Object.delete(path, Deb::S3::Utils.bucket) if s3_exists?(path)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deb-s3
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-13 00:00:00.000000000 Z
+date: 2013-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.18.0
 - !ruby/object:Gem::Dependency
   name: aws-s3
   requirement: !ruby/object:Gem::Requirement