deb-s3 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83e22542e348437549fe9d78648659ce10f64dd4
-  data.tar.gz: 1e0ca1bb8dc6c822b122c4e3d71199fa9e71398c
+  metadata.gz: bfc086aa33f2a9323c9857a09195870476722f30
+  data.tar.gz: cd183d45cd2c91600ea1ba93f441fd9c0ab2702f
 SHA512:
-  metadata.gz: 448a9252b80774397270906a81b49bb6be58d87bc5d89056a0ea2b468d8fe3bf8132d997d47fbf017b3ca24a8dc79f9c78486214dc7e3e0cc9db249675bf723d
-  data.tar.gz: 35f0553c9830f502bae6c587af1006096d1fb168fae984d580da4408d1500cb6d2bbc75d7e29bd8f98e3e3e0f0aa2e34d32b241aab52cfa9e079b0f18ca90c4f
+  metadata.gz: a5932bfec7b7de8859520e8dfbcf7cb2ce3cb9b2019aa1bde7a98f4b229d1f45240a30aaed12346e1d96ff9925e3db77c833eb72bab091c7d3d12cc2a2213eec
+  data.tar.gz: 3135fb0e0a7f31a2fe5329210514fc3faae5451a6e1f3b55aef4164a320bbb0f5784231e6dbbbcc3a845a538816c94feb33509a9a88a9e0daf7ea755154b1138

data/lib/deb/s3.rb

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

data/lib/deb/s3/cli.rb

@@ -50,6 +50,15 @@ class Deb::S3::CLI < Thor
   :desc     => "The region endpoint for connecting to S3.",
   :default  => "s3.amazonaws.com"
 
+  class_option :proxy_uri,
+  :type     => :string,
+  :desc     => "The URI of the proxy to send service requests through."
+
+  class_option :use_ssl,
+  :default  => true,
+  :type     => :boolean,
+  :desc     => "Whether to use HTTP or HTTPS for request transport."
+
   class_option :visibility,
   :default  => "public",
   :type     => :string,
@@ -286,7 +295,11 @@ class Deb::S3::CLI < Thor
   def configure_s3_client
     error("No value provided for required options '--bucket'") unless options[:bucket]
 
-    settings = { :s3_endpoint => options[:endpoint] }
+    settings = {
+      :s3_endpoint => options[:endpoint],
+      :proxy_uri   => options[:proxy_uri],
+      :use_ssl     => options[:use_ssl]
+    }
     settings.merge!(provider.credentials)
 
     Deb::S3::Utils.s3          = AWS::S3.new(settings)

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

@@ -3,14 +3,14 @@ Date: <%= Time.now.utc.strftime("%a, %d %b %Y %T %Z") %>
 Architectures: <%= architectures.join(" ") %>
 Components: <%= components.join(" ") %>
 MD5Sum:
-<% files.each do |f,p| -%>
+<% files.sort.each do |f,p| -%>
  <%= p[:md5] %> <%= p[:size].to_s.rjust(16) %> <%= f %>
 <% end -%>
 SHA1:
-<% files.each do |f,p| -%>
+<% files.sort.each do |f,p| -%>
  <%= p[:sha1] %> <%= p[:size].to_s.rjust(16) %> <%= f %>
 <% end -%>
 SHA256:
-<% files.each do |f,p| -%>
+<% files.sort.each do |f,p| -%>
  <%= p[:sha256] %> <%= p[:size].to_s.rjust(16) %> <%= f %>
 <% end -%>

data/lib/deb/s3/utils.rb

@@ -64,14 +64,15 @@ module Deb::S3::Utils
     filename = File.basename(path) unless filename
     obj = Deb::S3::Utils.s3.buckets[Deb::S3::Utils.bucket].objects[s3_path(filename)]
 
+    file_md5 = Digest::MD5.file(path)
+
     # check if the object already exists
     if obj.exists?
-      file_md5 = Digest::MD5.file(path)
-      return if file_md5.to_s == obj.etag.gsub('"', '')
+      return if (file_md5.to_s == obj.etag.gsub('"', '') or file_md5.to_s == obj.metadata['md5'])
     end
 
     # upload the file
-    obj.write(Pathname.new(path), :acl => Deb::S3::Utils.access_policy, :content_type => content_type)
+    obj.write(Pathname.new(path), :acl => Deb::S3::Utils.access_policy, :content_type => content_type, :metadata => {'md5' => file_md5})
   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.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Ken Robertson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-25 00:00:00.000000000 Z
+date: 2014-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor