capistrano-s3 0.2.11 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d06a9aa33293cfcdd5941b86461010867cc95ef
-  data.tar.gz: 3aa43f1c1d04231492362e93e11d495eef14e88d
+  metadata.gz: f197de9db4d3c744c215aa5919b2413cdee20ca6
+  data.tar.gz: 814d5136a7837d65906aa63f31939f8f1399edd8
 SHA512:
-  metadata.gz: ef49af4bfe32ab6b506961de8e14d3eab16d33258edaed5ce7442f38d93c184817ffbc6d243a669b06ff30cbce61b6807973c736e162b7f7a2971143788eaadc
-  data.tar.gz: eece9d7231502b2040df3ac4c9965acc398e1c8e9baa50c16dc15c16c448687fe30190b1500340059faecd14b8db0ddae2a938b25f26a5d7a98069036edb00dd
+  metadata.gz: 0149e3d1f3b5736644a32efccc4ee25b25d64d9819eda4f1822816385c5dabab81226a04b051bb57c41c18f360681a9537f82d1cb3a32de68dfc81cf413baa2d
+  data.tar.gz: ef18df3303616991b36e32d5a16221c273d86dc8a3dffa76fd5fb5df8fb4f729a33ae8ac834269af70fd421661981509e5ce7f18d3a9b6423a056a90eae95c6f

data/.gitignore

@@ -1,2 +1,3 @@
 *.gem
-.last_published
+.last_published
+Gemfile.lock

data/.travis.yml

@@ -1,5 +1,7 @@
 language: ruby
 bundler_args: --without debug release
+before_install:
+  - gem install bundler
 rvm:
   - 1.9.3
   - 2.0.0

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## v0.3.0
+
+Feature:     Add Capistrano 3.x support (#17)
+Improvement: Set correct headers for ".gz" files. (#21)
+
 ## v0.2.11
 
 Updated signing certificate.

data/Gemfile

@@ -1,17 +1,3 @@
 source 'https://rubygems.org'
 
-group :debug do
-  gem 'awesome_print'
-end
-
-group :test do
-  gem 'rake'
-  gem 'rspec'
-  gem 'mocha'
-end
-
-group :release do
-  gem 'gem-release'
-end
-
 gemspec

data/README.md

@@ -23,34 +23,54 @@ gem 'capistrano-s3'
 
 ### Setup
 
-Install gems with bundle, init capistrano & create your public folder that will be published :
+Install gems with bundle and create your public folder that will be published :
 
     bundle install
-    bundle exec capify .
-    mkdir public
+    mkdir -p public
 
-### Deploy configuration
+Gem supports both flavors of Capistrano (2/3). Configurations between versions differ a bit though.
 
-Replace `deploy.rb` content generated by capify
-with these simple Amazon S3 configurations :
+#### Capistrano 2
 
-```ruby
-# config/deploy.rb
-require 'capistrano/s3'
+First initialise Capistrano for given project - `bundle exec capify .`
 
-set :bucket, "www.cool-website-bucket.com"
-set :access_key_id, "CHANGETHIS"
-set :secret_access_key, "CHANGETHIS"
-```
+Replace `deploy.rb` content generated by capify
+with these simple Amazon S3 configurations :
 
-### Deploying
+    # config/deploy.rb
+    require 'capistrano/s3'
 
-Add content to your public folder and run `cap deploy`.
+    set :bucket,            "www.cool-website-bucket.com"
+    set :access_key_id,     "CHANGETHIS"
+    set :secret_access_key, "CHANGETHIS"
 
 If you want to deploy to multiple buckets, have a look at
 [Capistrano multistage](https://github.com/capistrano/capistrano/wiki/2.x-Multistage-Extension)
 and configure a bucket per stage configuration.
 
+#### Capistrano 3
+
+Initialise Capistrano by running - `bundle exec cap install`
+
+Next add `require "capistrano/s3"` to Capfile.
+
+Finally, replace `deploy.rb` content generated by Capistrano with
+this config:
+
+    # config/deploy.rb
+    set :bucket,            "www.cool-website-bucket.com"
+    set :access_key_id,     "CHANGETHIS"
+    set :secret_access_key, "CHANGETHIS"
+
+### Deploying
+
+Add content to your public folder and run deploy command:
+ - `cap deploy` (Capistrano 2)
+
+ or
+
+ - `cap <stage> deploy` (Capistrano 3).
+
 ## Advanced options
 
 ### Custom endpoint

data/capistrano-s3.gemspec

@@ -3,8 +3,8 @@ $:.unshift(File.dirname(__FILE__) + '/lib')
 require 'capistrano/s3/version'
 
 Gem::Specification.new do |s|
-  s.authors       = ['Jean-Philippe Doyle','Josh Delsman','Aleksandrs Ļedovskis','Douglas Jarquin', 'Amit Barvaz']
-  s.email         = ['jeanphilippe.doyle@hooktstudios.com']
+  s.authors       = ['Jean-Philippe Doyle','Josh Delsman','Aleksandrs Ļedovskis','Douglas Jarquin', 'Amit Barvaz', 'Jan Lindblom']
+  s.email         = ['jeanphilippe.doyle@hooktstudios.com', 'aleksandrs@ledovskis.lv']
   s.description   = 'Enables static websites deployment to Amazon S3 website buckets using Capistrano.'
   s.summary       = 'Build and deploy a static website to Amazon S3'
   s.homepage      = 'http://github.com/hooktstudios/capistrano-s3'
@@ -15,11 +15,19 @@ Gem::Specification.new do |s|
   s.name          = 'capistrano-s3'
   s.require_paths = ['lib']
   s.version       = Capistrano::S3::VERSION
-  s.cert_chain  = ['certs/j15e.pem']
+  s.cert_chain  = ['certs/aleksandrs-ledovskis.pem']
   s.signing_key = File.expand_path("~/.ssh/gem-private_key.pem") if $0 =~ /gem\z/
 
   # Gem dependencies
-  s.add_dependency 'aws-sdk', '~> 1.11'
-  s.add_dependency 'capistrano', '< 3'
-  s.add_dependency 'mime-types', '~> 1.23'
+  s.add_runtime_dependency 'aws-sdk',    '~> 1.11'
+  s.add_runtime_dependency 'capistrano', '>= 2'
+  s.add_runtime_dependency 'mime-types', '~> 1.23'
+  s.add_runtime_dependency 'net-ssh',    '~> 2.9'
+
+  # Development dependencies
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'mocha'
+  s.add_development_dependency 'awesome_print'
+  s.add_development_dependency 'gem-release'
 end

data/certs/aleksandrs-ledovskis.pem

@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDhTCCAm2gAwIBAgIBATANBgkqhkiG9w0BAQUFADBEMRMwEQYDVQQDDAphbGVr
+c2FuZHJzMRkwFwYKCZImiZPyLGQBGRYJbGVkb3Zza2lzMRIwEAYKCZImiZPyLGQB
+GRYCbHYwHhcNMTYwMTAzMTgwNjU5WhcNMTcwMTAyMTgwNjU5WjBEMRMwEQYDVQQD
+DAphbGVrc2FuZHJzMRkwFwYKCZImiZPyLGQBGRYJbGVkb3Zza2lzMRIwEAYKCZIm
+iZPyLGQBGRYCbHYwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4ZS6n
+v2xGstpdX2C2VYlIxJsaZ28u/vc05MA9qCYp2DsEb7956MHSRYWADOMmxHscLc6w
+x79ecayifaDx8mQlKZ/sEM1jkHsm8rtL1Slm8nJoP1JBhbHa3ZHWHcwhi3pIS/JY
+z19tSYHNzB8nFvVspfyjJT4tBtrXQCoNYFrTYYAn+UlpA1yYsDYeyRJJBhIakA5E
+JW01InrCA2zUi0lyuhBBPZNkSaUFXSkXKxgJcTRln0PXCYTRsk21JqxeVQaLp2/y
+oq7JFJacwxKANQI/rDpMrSrvtGQW2CMcXz+SqUQHsko8KGSh7w8EaxA0R9zPtsYg
+Jg1fXc5spVlJH9sJAgMBAAGjgYEwfzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAd
+BgNVHQ4EFgQUQO5dMalHx8ow/7njDvSCb5wPoTYwIgYDVR0RBBswGYEXYWxla3Nh
+bmRyc0BsZWRvdnNraXMubHYwIgYDVR0SBBswGYEXYWxla3NhbmRyc0BsZWRvdnNr
+aXMubHYwDQYJKoZIhvcNAQEFBQADggEBAHr6mHIB4Wagt+1rSYtZd55A3xkOk4/x
+Pxg6EoAql/siXlhei+l5IDqTzqSBakw9NLXgrAIMYMmi6Y7ryv5dIHigf3rpvU9l
+nmjW31hb/3hbY4rESjolO79Mdsawyh2ikG9FSb5CeLQDKCq9eJCfUbSYQ0FANhlb
+v3op3Aa25YFxDpJnzPgOlChUvdo5NsbVyfqqqgtcPqMKO/1Tc91M7bg3nErOgMGR
+JEnsJLaGVuWh+EfN0hAHmZTiTB7KQAxoxyyBRFGnmho+VAZCVhgvK4SOhLzTDGg3
+jHydeDCzaagIJgK21Bl2UEaNGqHPU6bycWBr4SiiAqgf5Ebiz9da58A=
+-----END CERTIFICATE-----

data/lib/capistrano/s3.rb

@@ -1,43 +1,10 @@
-require 'capistrano'
-require 'capistrano/s3/version'
-require 'capistrano/s3/publisher'
-
-module Capistrano
-  unless Configuration.respond_to?(:instance)
-    abort "capistrano-s3 requires Capistrano 2.0 or newer"
-  end
-
-  Configuration.instance(true).load do
-    def _cset(name, *args, &block)
-      set(name, *args, &block) if !exists?(name)
-    end
-
-    _cset :deployment_path, Dir.pwd.gsub("\n", "") + "/public"
-    _cset :bucket_write_options, :acl => :public_read
-    _cset :s3_endpoint, 's3.amazonaws.com'
-    _cset :redirect_options, {}
-
-    # Deployment recipes
-    namespace :deploy do
-      namespace :s3 do
-        desc "Empties bucket of all files. Caution when using this command, as it cannot be undone!"
-        task :empty do
-          S3::Publisher.clear!(s3_endpoint, access_key_id, secret_access_key, bucket)
-        end
-
-        desc "Upload files to the bucket in the current state"
-        task :upload_files do
-          extra_options = { :write => bucket_write_options, :redirect => redirect_options }
-          S3::Publisher.publish!(s3_endpoint, access_key_id, secret_access_key,
-                             bucket, deployment_path, extra_options)
-        end
-      end
-
-      task :update do
-        s3.upload_files
-      end
-
-      task :restart do; end
-    end
-  end
+require "capistrano"
+require "capistrano/s3/publisher"
+require "capistrano/s3/version"
+require "capistrano/s3/defaults"
+
+if Gem::Specification.find_by_name('capistrano').version >= Gem::Version.new('3.0.0')
+  load File.expand_path('../tasks/capistrano_3.rb', __FILE__)
+else
+  require_relative 'tasks/capistrano_2'
 end

data/lib/capistrano/s3/defaults.rb

@@ -0,0 +1,19 @@
+module Capistrano
+  module S3
+    module Defaults
+      DEFAULTS = {
+        :deployment_path      => proc { Dir.pwd.gsub("\n", "") + "/public" },
+        :bucket_write_options => { :acl => :public_read },
+        :s3_endpoint          => "s3.amazonaws.com",
+        :redirect_options     => {},
+      }
+
+      def self.populate(context, set_method)
+        DEFAULTS.each do |key, value|
+          value = value.is_a?(Proc) ? value.call : value
+          context.send(set_method, key, value)
+        end
+      end
+    end
+  end
+end

data/lib/capistrano/s3/publisher.rb

@@ -2,93 +2,121 @@ require 'aws/s3'
 require 'mime/types'
 require 'fileutils'
 
-module Capistrano::S3::Publisher
+module Capistrano
+  module S3
+    module Publisher
+      LAST_PUBLISHED_FILE = '.last_published'
 
-  LAST_PUBLISHED_FILE = '.last_published'
+      def self.publish!(s3_endpoint, key, secret, bucket, source, extra_options)
+        s3 = self.establish_s3_client_connection!(s3_endpoint, key, secret)
 
-  def self.publish!(s3_endpoint, key, secret, bucket, source, extra_options)
-    s3 = self.establish_s3_client_connection!(s3_endpoint, key, secret)
+        self.files(source).each do |file|
+          if !File.directory?(file)
+            next if self.published?(file)
 
-    self.files(source).each do |file|
-      if !File.directory?(file)
-        next if self.published?(file)
+            path = self.base_file_path(source, file)
+            path.gsub!(/^\//, "") # Remove preceding slash for S3
 
-        path = self.base_file_path(source, file)
-        path.gsub!(/^\//, "") # Remove preceding slash for S3
+            self.put_object(s3, bucket, path, file, extra_options)
+          end
+        end
 
-        self.put_object(s3, bucket, path, file, extra_options)
+        FileUtils.touch(LAST_PUBLISHED_FILE)
       end
-    end
-
-    FileUtils.touch(LAST_PUBLISHED_FILE)
-  end
-
-  def self.clear!(s3_endpoint, key, secret, bucket)
-    s3 = self.establish_s3_connection!(s3_endpoint, key, secret)
-    s3.buckets[bucket].clear!
-
-    FileUtils.rm(LAST_PUBLISHED_FILE)
-  end
-
-  private
-
-    # Establishes the connection to Amazon S3
-    def self.establish_connection!(klass, s3_endpoint, key, secret)
-      # Send logging to STDOUT
-      AWS.config(:logger => Logger.new(STDOUT))
-      klass.new(
-        :s3_endpoint => s3_endpoint,
-        :access_key_id => key,
-        :secret_access_key => secret
-      )
-    end
-
-    def self.establish_s3_client_connection!(s3_endpoint, key, secret)
-      self.establish_connection!(AWS::S3::Client, s3_endpoint, key, secret)
-    end
-
-    def self.establish_s3_connection!(s3_endpoint, key, secret)
-      self.establish_connection!(AWS::S3, s3_endpoint, key, secret)
-    end
-
-    def self.base_file_path(root, file)
-      file.gsub(root, "")
-    end
-
-    def self.files(deployment_path)
-      Dir.glob("#{deployment_path}/**/*")
-    end
 
-    def self.published?(file)
-      return false unless File.exists? LAST_PUBLISHED_FILE
-      File.mtime(file) < File.mtime(LAST_PUBLISHED_FILE)
-    end
+      def self.clear!(s3_endpoint, key, secret, bucket)
+        s3 = self.establish_s3_connection!(s3_endpoint, key, secret)
+        s3.buckets[bucket].clear!
 
-    def self.put_object(s3, bucket, path, file, extra_options)
-      options = {
-        :bucket_name => bucket,
-        :key => path,
-        :data => open(file),
-        :acl => :public_read,
-      }
-
-      options.merge!(self.build_content_type_hash(file))
-      options.merge!(self.build_redirect_hash(path, extra_options[:redirect]))
-      options.merge!(extra_options[:write]) if extra_options[:write]
-
-      s3.put_object(options)
-    end
-
-    def self.build_content_type_hash(file)
-      type = MIME::Types.type_for(File.basename(file))
-      return {} unless type && !type.empty?
-
-      { :content_type => type.first.content_type }
-    end
-
-    def self.build_redirect_hash(path, redirect_options)
-      return {} unless redirect_options && redirect_options[path]
+        FileUtils.rm(LAST_PUBLISHED_FILE)
+      end
 
-      { :website_redirect_location => redirect_options[path] }
+      private
+
+        # Establishes the connection to Amazon S3
+        def self.establish_connection!(klass, s3_endpoint, key, secret)
+          # Send logging to STDOUT
+          AWS.config(:logger => ::Logger.new(STDOUT))
+          klass.new(
+            :s3_endpoint => s3_endpoint,
+            :access_key_id => key,
+            :secret_access_key => secret
+          )
+        end
+
+        def self.establish_s3_client_connection!(s3_endpoint, key, secret)
+          self.establish_connection!(AWS::S3::Client, s3_endpoint, key, secret)
+        end
+
+        def self.establish_s3_connection!(s3_endpoint, key, secret)
+          self.establish_connection!(AWS::S3, s3_endpoint, key, secret)
+        end
+
+        def self.base_file_path(root, file)
+          file.gsub(root, "")
+        end
+
+        def self.files(deployment_path)
+          Dir.glob("#{deployment_path}/**/*")
+        end
+
+        def self.published?(file)
+          return false unless File.exists? LAST_PUBLISHED_FILE
+          File.mtime(file) < File.mtime(LAST_PUBLISHED_FILE)
+        end
+
+        def self.put_object(s3, bucket, path, file, extra_options)
+          base_name = File.basename(file)
+          mime_type = mime_type_for_file(base_name)
+          options   = {
+            :bucket_name => bucket,
+            :key         => path,
+            :data        => open(file),
+            :acl         => :public_read,
+          }
+
+          options.merge!(build_redirect_hash(path, extra_options[:redirect]))
+          options.merge!(extra_options[:write] || {})
+
+          if mime_type
+            options.merge!(build_content_type_hash(mime_type))
+
+            if mime_type.sub_type == "gzip"
+              options.merge!(build_gzip_content_encoding_hash)
+              options.merge!(build_gzip_content_type_hash(file, mime_type))
+            end
+          end
+
+          s3.put_object(options)
+        end
+
+        def self.build_redirect_hash(path, redirect_options)
+          return {} unless redirect_options && redirect_options[path]
+
+          { :website_redirect_location => redirect_options[path] }
+        end
+
+        def self.build_content_type_hash(mime_type)
+          { :content_type => mime_type.content_type }
+        end
+
+        def self.build_gzip_content_encoding_hash
+          { :content_encoding => "gzip" }
+        end
+
+        def self.build_gzip_content_type_hash(file, mime_type)
+          orig_name = file.sub(/\.gz$/, "")
+          orig_mime = mime_type_for_file(orig_name)
+
+          return {} unless orig_mime && File.exist?(orig_name)
+
+          { :content_type => orig_mime.content_type }
+        end
+
+        def self.mime_type_for_file(file)
+          type = MIME::Types.type_for(file)
+          (type && !type.empty?) ? type[0] : nil
+        end
     end
+  end
 end

data/lib/capistrano/s3/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module S3
-    VERSION = "0.2.11"
+    VERSION = "0.3.0"
   end
 end

data/lib/capistrano/tasks/capistrano_2.rb

@@ -0,0 +1,32 @@
+module Capistrano
+  Configuration.instance(true).load do
+    def _cset(name, *args, &block)
+      set(name, *args, &block) if !exists?(name)
+    end
+
+    Capistrano::S3::Defaults.populate(self, :_cset)
+
+    # Deployment recipes
+    namespace :deploy do
+      namespace :s3 do
+        desc "Empties bucket of all files. Caution when using this command, as it cannot be undone!"
+        task :empty do
+          S3::Publisher.clear!(s3_endpoint, access_key_id, secret_access_key, bucket)
+        end
+
+        desc "Upload files to the bucket in the current state"
+        task :upload_files do
+          extra_options = { :write => bucket_write_options, :redirect => redirect_options }
+          S3::Publisher.publish!(s3_endpoint, access_key_id, secret_access_key,
+                             bucket, deployment_path, extra_options)
+        end
+      end
+
+      task :update do
+        s3.upload_files
+      end
+
+      task :restart do; end
+    end
+  end
+end

data/lib/capistrano/tasks/capistrano_3.rb

@@ -0,0 +1,25 @@
+namespace :load do
+  task :defaults do
+    Capistrano::S3::Defaults.populate(self, :set)
+  end
+end
+
+namespace :deploy do
+  namespace :s3 do
+    desc "Empties bucket of all files. Caution when using this command, as it cannot be undone!"
+    task :empty do
+      Capistrano::S3::Publisher.clear!(fetch(:s3_endpoint), fetch(:access_key_id), fetch(:secret_access_key), fetch(:bucket))
+    end
+
+    desc "Upload files to the bucket in the current state"
+    task :upload_files do
+      extra_options = { :write => fetch(:bucket_write_options), :redirect => fetch(:redirect_options) }
+      Capistrano::S3::Publisher.publish!(fetch(:s3_endpoint), fetch(:access_key_id), fetch(:secret_access_key),
+                             fetch(:bucket), fetch(:deployment_path), extra_options)
+    end
+  end
+
+  before :updated, :upload_s3 do
+    invoke("deploy:s3:upload_files")
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-s3
 version: !ruby/object:Gem::Version
-  version: 0.2.11
+  version: 0.3.0
 platform: ruby
 authors:
 - Jean-Philippe Doyle
@@ -9,33 +9,33 @@ authors:
 - Aleksandrs Ļedovskis
 - Douglas Jarquin
 - Amit Barvaz
+- Jan Lindblom
 autorequire: 
 bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDmjCCAoKgAwIBAgIBATANBgkqhkiG9w0BAQUFADBJMRswGQYDVQQDDBJqZWFu
-  cGhpbGlwcGUuZG95bGUxFTATBgoJkiaJk/IsZAEZFgVnbWFpbDETMBEGCgmSJomT
-  8ixkARkWA2NvbTAeFw0xNTAyMDIxNjQ5NTNaFw0xNjAyMDIxNjQ5NTNaMEkxGzAZ
-  BgNVBAMMEmplYW5waGlsaXBwZS5kb3lsZTEVMBMGCgmSJomT8ixkARkWBWdtYWls
-  MRMwEQYKCZImiZPyLGQBGRYDY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-  CgKCAQEAzpnUIh2dzSBkAghI4ZzdefobWdGH8M9yjiyZl4DfO+LSLV5ovcqVYPYr
-  fzHm4TJO4w0S7jnfdwq45mGO3ogEMbmQLz4B/bUZXVHX0K9//KRroseRCUH24BE0
-  q46UCeaFMs5wGcniT7XhuDcqPQaqCIxDE1aBxcKlZg8i62yM3BO/yX5DwLPqhyEu
-  XVViJ+PvHjUGa69iw1fqUs9PZaf9WdKHyPHhgbhwy7xqx7EavG+tmHQUxtIf7xhl
-  OU80hUsHQrkj5PxPU2Qfs6q2jOxrfRcUSBJZxUDzjmbhP9eq0XN+b5/Cqz3OboSI
-  nWF0Kj0971wJgZiNdzXsLMy+zmHdiQIDAQABo4GMMIGJMAkGA1UdEwQCMAAwCwYD
-  VR0PBAQDAgSwMB0GA1UdDgQWBBRro81JisHXRBP5dZh5mzOEHsjLxTAnBgNVHREE
-  IDAegRxqZWFucGhpbGlwcGUuZG95bGVAZ21haWwuY29tMCcGA1UdEgQgMB6BHGpl
-  YW5waGlsaXBwZS5kb3lsZUBnbWFpbC5jb20wDQYJKoZIhvcNAQEFBQADggEBAGHG
-  D1ue02ll73MLx4J5IRsF/J4rPUbo+p8pawvBCgH0awoYUJFekvbut8AMRzC4JlZ0
-  nSCTgvkM5PdFj5fptnnthb1+09oDR6iKfLcSSmyFKlEh+vpbkp0YsKyh7BLs+JrJ
-  81UJFxFsZg6BDhLolSJW2AnjMXOnXuGHiBSo7HDGdZDKELqrEMtX4Jr9hSvGBrza
-  AJrNT4WI/JyEwNKpI7PflqnmXWpEwzSDu1L+HCn+sRQ41s1KeWEQTZLpB53lAPAg
-  0BLRj97DRMQzoo+JT8hzfSbUNi/A8++vfRmt3S9M3XsPEMS87qDbomggam5OhepG
-  9tXfRi8fswcQo96T+yg=
+  MIIDhTCCAm2gAwIBAgIBATANBgkqhkiG9w0BAQUFADBEMRMwEQYDVQQDDAphbGVr
+  c2FuZHJzMRkwFwYKCZImiZPyLGQBGRYJbGVkb3Zza2lzMRIwEAYKCZImiZPyLGQB
+  GRYCbHYwHhcNMTYwMTAzMTgwNjU5WhcNMTcwMTAyMTgwNjU5WjBEMRMwEQYDVQQD
+  DAphbGVrc2FuZHJzMRkwFwYKCZImiZPyLGQBGRYJbGVkb3Zza2lzMRIwEAYKCZIm
+  iZPyLGQBGRYCbHYwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4ZS6n
+  v2xGstpdX2C2VYlIxJsaZ28u/vc05MA9qCYp2DsEb7956MHSRYWADOMmxHscLc6w
+  x79ecayifaDx8mQlKZ/sEM1jkHsm8rtL1Slm8nJoP1JBhbHa3ZHWHcwhi3pIS/JY
+  z19tSYHNzB8nFvVspfyjJT4tBtrXQCoNYFrTYYAn+UlpA1yYsDYeyRJJBhIakA5E
+  JW01InrCA2zUi0lyuhBBPZNkSaUFXSkXKxgJcTRln0PXCYTRsk21JqxeVQaLp2/y
+  oq7JFJacwxKANQI/rDpMrSrvtGQW2CMcXz+SqUQHsko8KGSh7w8EaxA0R9zPtsYg
+  Jg1fXc5spVlJH9sJAgMBAAGjgYEwfzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAd
+  BgNVHQ4EFgQUQO5dMalHx8ow/7njDvSCb5wPoTYwIgYDVR0RBBswGYEXYWxla3Nh
+  bmRyc0BsZWRvdnNraXMubHYwIgYDVR0SBBswGYEXYWxla3NhbmRyc0BsZWRvdnNr
+  aXMubHYwDQYJKoZIhvcNAQEFBQADggEBAHr6mHIB4Wagt+1rSYtZd55A3xkOk4/x
+  Pxg6EoAql/siXlhei+l5IDqTzqSBakw9NLXgrAIMYMmi6Y7ryv5dIHigf3rpvU9l
+  nmjW31hb/3hbY4rESjolO79Mdsawyh2ikG9FSb5CeLQDKCq9eJCfUbSYQ0FANhlb
+  v3op3Aa25YFxDpJnzPgOlChUvdo5NsbVyfqqqgtcPqMKO/1Tc91M7bg3nErOgMGR
+  JEnsJLaGVuWh+EfN0hAHmZTiTB7KQAxoxyyBRFGnmho+VAZCVhgvK4SOhLzTDGg3
+  jHydeDCzaagIJgK21Bl2UEaNGqHPU6bycWBr4SiiAqgf5Ebiz9da58A=
   -----END CERTIFICATE-----
-date: 2015-02-02 00:00:00.000000000 Z
+date: 2016-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -55,16 +55,16 @@ dependencies:
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
@@ -79,10 +79,95 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.23'
+- !ruby/object:Gem::Dependency
+  name: net-ssh
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.9'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: gem-release
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Enables static websites deployment to Amazon S3 website buckets using
   Capistrano.
 email:
 - jeanphilippe.doyle@hooktstudios.com
+- aleksandrs@ledovskis.lv
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -92,15 +177,18 @@ files:
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
 - capistrano-s3.gemspec
+- certs/aleksandrs-ledovskis.pem
 - certs/j15e.pem
 - lib/capistrano/s3.rb
+- lib/capistrano/s3/defaults.rb
 - lib/capistrano/s3/publisher.rb
 - lib/capistrano/s3/version.rb
+- lib/capistrano/tasks/capistrano_2.rb
+- lib/capistrano/tasks/capistrano_3.rb
 - spec/publisher_spec.rb
 - spec/sample/fonts/cantarell-regular-webfont.eot
 - spec/sample/fonts/cantarell-regular-webfont.svg
@@ -127,7 +215,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Build and deploy a static website to Amazon S3

data/Gemfile.lock

@@ -1,65 +0,0 @@
-PATH
-  remote: .
-  specs:
-    capistrano-s3 (0.2.11)
-      aws-sdk (~> 1.11)
-      capistrano (< 3)
-      mime-types (~> 1.23)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    awesome_print (1.2.0)
-    aws-sdk (1.61.0)
-      aws-sdk-v1 (= 1.61.0)
-    aws-sdk-v1 (1.61.0)
-      json (~> 1.4)
-      nokogiri (>= 1.4.4)
-    capistrano (2.15.5)
-      highline
-      net-scp (>= 1.0.0)
-      net-sftp (>= 2.0.0)
-      net-ssh (>= 2.0.14)
-      net-ssh-gateway (>= 1.1.0)
-    diff-lcs (1.2.5)
-    gem-release (0.7.3)
-    highline (1.6.21)
-    json (1.8.2)
-    metaclass (0.0.4)
-    mime-types (1.25.1)
-    mini_portile (0.6.2)
-    mocha (1.1.0)
-      metaclass (~> 0.0.1)
-    net-scp (1.2.1)
-      net-ssh (>= 2.6.5)
-    net-sftp (2.1.2)
-      net-ssh (>= 2.6.5)
-    net-ssh (2.9.2)
-    net-ssh-gateway (1.2.0)
-      net-ssh (>= 2.6.5)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
-    rake (10.3.2)
-    rspec (3.0.0)
-      rspec-core (~> 3.0.0)
-      rspec-expectations (~> 3.0.0)
-      rspec-mocks (~> 3.0.0)
-    rspec-core (3.0.0)
-      rspec-support (~> 3.0.0)
-    rspec-expectations (3.0.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.0.0)
-    rspec-mocks (3.0.0)
-      rspec-support (~> 3.0.0)
-    rspec-support (3.0.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  awesome_print
-  capistrano-s3!
-  gem-release
-  mocha
-  rake
-  rspec