capistrano-net_storage-s3 0.3.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65abb23d537b71704d92ba0d0ef36cbe59089bafe8aecda6a81bb531af567fc6
-  data.tar.gz: b6374a14eb145e0e3e702cf416c2ff794a1333ce6dd88ffc6fe4ad24210f6fca
+  metadata.gz: 70af8342361107fa073b2c1dcb2ab36ef8e95b12d16730efdfd19e1490872b98
+  data.tar.gz: 3689224a25a2bd3a9ef29d5cd7947f5c6c53e1d0f5ac753b3d97117248496e1b
 SHA512:
-  metadata.gz: f39bbcbf009c681222d26ca87981a8117ee52dd46195054b80587ae0aa66335fccf37a2c67583cd60742dec5e2abf6b9361295efbb834c82b3bcc2775ecb65a6
-  data.tar.gz: 0f1c56c231fb8f176d380bd28216efe8030a6c6aeb881c9022f7d583469871f89c7a091109cab6c94fcbd951931df212bdfeb2535d7e3aa418c323250e798873
+  metadata.gz: 35deda7d822adbfe5b8982736399a83a9360022d00366bf12c6441ceb6be9eb8d20ca38f056b94eb70442bf339ffcc6b473550a340b04fd4da28f7118db6e0b2
+  data.tar.gz: 7d0d46015d5a8c848458c0aebea094113ca52a1222a15aee04e23dbc724412c80e2f09d8993e05dc790b6174a3dc467c9cb2d6aa3f54b10d74eb1bd10107d328

data/.github/workflows/test.yml

@@ -0,0 +1,30 @@
+name: Test
+
+on:
+  push:
+    branches:
+      - master
+
+  pull_request:
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    name: Ruby ${{ matrix.ruby }}
+    strategy:
+      matrix:
+        ruby:
+          - '2.7'
+          - '3.0'
+          - '3.1'
+          - '3.2'
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+    - name: Run the default task
+      run: bundle exec rake

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 1.0.0 (2023/08/07)
+
+Major Update by @aeroastro
+
+Improvement:
+
+* `--no-progress` option is passed to `aws cp` to keep console quiet (#7)
+* README.md has been changed not to `require 'capistrano-net_storage-s3` by bundler (#8)
+* Major improvement for `Capistrano::NetStorage` version 1.0.0 (#9, #10, #11)
+* GitHub Actions has been introduced (#12)
+
 ## 0.2.3 (2017/5/10)
 
 Enhancement:

data/README.md

@@ -1,10 +1,10 @@
 [![Gem Version](https://badge.fury.io/rb/capistrano-net_storage-s3.svg)](https://badge.fury.io/rb/capistrano-net_storage-s3)
-[![Build Status](https://travis-ci.org/DeNADev/capistrano-net_storage-s3.svg?branch=master)](https://travis-ci.org/DeNADev/capistrano-net_storage-s3)
+[![Test](https://github.com/DeNADev/capistrano-net_storage-s3/actions/workflows/test.yml/badge.svg)](https://github.com/DeNADev/capistrano-net_storage-s3/actions/workflows/test.yml?query=branch%3Amaster)
 # Capistrano::NetStorage::S3
 
 **Capistrano::NetStorage::S3** is a transport plugin of
 [Capistrano::NetStorage](https://github.com/DeNADev/capistrano-net_storage) to deploy application
-via [Amazon S3](https://aws.amazon.com/s3/).  
+via [Amazon S3](https://aws.amazon.com/s3/).
 And Capistrano::NetStorage is a plugin of [Capistrano](http://capistranorb.com/).
 
 ## Installation
@@ -12,7 +12,7 @@ And Capistrano::NetStorage is a plugin of [Capistrano](http://capistranorb.com/)
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'capistrano-net_storage-s3'
+gem 'capistrano-net_storage-s3', require: false
 ```
 
 And then execute:
@@ -27,21 +27,32 @@ Or install it yourself as:
 
 Set Capistrano variables by `set name, value`.
 
+#### General Settings
+
+ Name | Default | Description
+------|---------|------------
+ `:net_storage_transport` | NO DEFAULT | Set `Capistrano::NetStorage::S3::Transport`
+ `:net_storage_s3_bucket` | NO DEFAULT | S3 bucket name (e.g. `"your-bucket-name"` )
+ `:net_storage_s3_archives_directory` | `"/"` | Directory for application archives in S3 bucket
+
+#### Settings for AWS
+
  Name | Default | Description
 ------|---------|------------
- `:scm`  | `nil` | Set `:net_storage` for capistrano before v3.7
- `:net_storage_transport` | `nil` | Set `Capistrano::NetStorage::S3::Transport`
- `:net_storage_s3_broker` | `:aws_cli` | Type of transportation broker
  `:net_storage_s3_aws_access_key_id` | `ENV['AWS_ACCESS_KEY_ID']` | AWS Access Key ID
  `:net_storage_s3_aws_secret_access_key` | `ENV['AWS_SECRET_ACCESS_KEY']` | AWS Secret Access Key
  `:net_storage_s3_aws_session_token` | `ENV['AWS_SESSION_TOKEN']` | AWS Session Token
  `:net_storage_s3_aws_region` | `ENV['AWS_DEFAULT_REGION']` | AWS Region
  `:net_storage_s3_aws_profile` | `ENV['AWS_DEFAULT_PROFILE']` | AWS Profile
  `:net_storage_s3_aws_config_file` | `ENV['AWS_CONFIG_FILE']` | AWS Config File
- `:net_storage_s3_bucket` | `nil` | S3 bucket name
- `:net_storage_s3_archives_directory` | `nil` | Directory for application archives in S3 bucket
- `:net_storage_s3_keep_releases` | `:keep_releases` | Number to keep archives in S3
- `:net_storage_s3_max_retry` | `3` | Max retry times for S3 operations
+
+#### Other Settings
+
+**NOTE: We strongly recommend the defaults for integrity and performance. Change at your own risk.**
+
+ Name | Default | Description
+------|---------|------------
+ `:net_storage_s3_max_retry` | `3` | Max retry to download from S3 to each servers
 
 See also
 [the configuration section of Capistrano::NetStorage](https://github.com/DeNADev/capistrano-net_storage#configuration).
@@ -58,12 +69,8 @@ require 'capistrano/setup'
 require 'capistrano/deploy'
 
 # Includes tasks from other gems included in your Gemfile
-if Gem::Version.new(Capistrano::VERSION) < Gem::Version.new('3.7.0')
-  require 'capistrano/net_storage'
-else
-  require "capistrano/net_storage/plugin"
-  install_plugin Capistrano::NetStorage::Plugin
-end
+require "capistrano/net_storage/plugin"
+install_plugin Capistrano::NetStorage::Plugin
 
 # Load transport plugin for Capistrano::NetStorage
 require 'capistrano/net_storage/s3'
@@ -72,21 +79,16 @@ require 'capistrano/net_storage/s3'
 Edit your `config/deploy.rb`:
 
 ```ruby
-if Gem::Version.new(Capistrano::VERSION) < Gem::Version.new('3.7.0')
-  set :scm, :net_storage
-end
 set :net_storage_transport, Capistrano::NetStorage::S3::Transport
-# set :net_storage_config_files, [your_config_files]
-# set :net_storage_with_bundle, true
-# set :net_storage_archiver, Capistrano::NetStorage::Archiver::TarGzip
-set :net_storage_s3_bucket, 'example-bucket'
-# set :net_storage_s3_archives_directory, your_favorite_directory_path
-```
+set :net_storage_config_files, Pathname('path/to/config').glob('*.yml')
 
-## Example
+# These settings upload archives to s3://bucket-for-deployment/api/#{sha1_hash}.tar.gz
+set :net_storage_s3_bucket, 'bucket-for-deployment'
+set :net_storage_s3_archives_directory 'api'
 
-You can see typical usage of this library by
-[capistrano-net_storage_demo](https://github.com/DeNADev/capistrano-net_storage_demo/tree/net_storage-s3).
+set :net_storage_s3_aws_config_file, '~/.aws/config'
+# set :net_storage_s3_aws_profile, 'some-name' # If you are using multiple profiles
+```
 
 ## License
 

data/lib/capistrano/net_storage/s3/config.rb

@@ -1,132 +1,67 @@
 require 'uri'
 
-require 'capistrano/net_storage/s3/base'
-require 'capistrano/net_storage/s3/error'
-require 'capistrano/net_storage/s3/broker/aws_cli'
-
 class Capistrano::NetStorage::S3
   class Config
-    # Broker object for transport operations
-    # @return [Capistrano::NetStorage::S3::Broker::Base]
-    def broker
-      @broker ||= begin
-        case fetch(:net_storage_s3_broker, :aws_cli)
-        when :aws_cli
-          Broker::AwsCLI.new
-        else
-          raise Capistrano::NetStorage::S3::Error, "No broker defined! #{fetch(:net_storage_s3_broker)}"
-        end
-      end
+    def aws_environments
+      {
+        aws_config_file: aws_config_file,
+        aws_default_profile: aws_profile,
+        aws_default_region: aws_region,
+        aws_access_key_id: aws_access_key_id,
+        aws_secret_access_key: aws_secret_access_key,
+        aws_session_token: aws_session_token,
+      }.compact
     end
 
-    # AWS configurations
-
-    # @return [String] AWS Access Key ID
-    def aws_access_key_id
-      @aws_access_key_id ||= fetch(:net_storage_s3_aws_access_key_id, ENV['AWS_ACCESS_KEY_ID'])
+    def bucket
+      fetch(:net_storage_s3_bucket, -> { raise ArgumentError, ':net_storage_s3_bucket is not configured!' })
     end
 
-    # @return [String] AWS Secret Access Key
-    def aws_secret_access_key
-      @aws_secret_access_key ||= fetch(:net_storage_s3_aws_secret_access_key)
-      @aws_secret_access_key ||= ENV['AWS_SECRET_ACCESS_KEY']
+    def archives_url
+      URI.parse("s3://#{bucket}") + archives_directory
     end
 
-    # @return [String] AWS Session Token
-    def aws_session_token
-      @aws_session_token ||= fetch(:net_storage_s3_aws_session_token, ENV['AWS_SESSION_TOKEN'])
-    end
+    def archive_url
+      revision = fetch(:current_revision)
+      raise ArgumentError, ':current_revision is not set! Your deployment flow might be buggy.' unless revision
 
-    # @return [String] AWS Region
-    def aws_region
-      @aws_region ||= fetch(:net_storage_s3_aws_region, ENV['AWS_DEFAULT_REGION'])
+      archives_url + "#{revision}.#{Capistrano::NetStorage.config.archive_file_extension}"
     end
 
-    # @return [String] AWS Profile
-    def aws_profile
-      @aws_profile ||= fetch(:net_storage_s3_aws_profile, ENV['AWS_DEFAULT_PROFILE'])
-    end
+    private
 
-    # AWS Config File
-    def aws_config_file
-      @aws_config_file ||= fetch(:net_storage_s3_aws_config_file, ENV['AWS_CONFIG_FILE'])
-    end
+    def archives_directory
+      directory = fetch(:net_storage_s3_archives_directory, '/')
 
-    # @return [Hash] AWS environment variables
-    def aws_environments
-      @aws_environments ||= begin
-        environments = {}
-        environments[:aws_config_file]       = aws_config_file       if aws_config_file
-        environments[:aws_default_profile]   = aws_profile           if aws_profile
-        environments[:aws_default_region]    = aws_region            if aws_region
-        environments[:aws_access_key_id]     = aws_access_key_id     if aws_access_key_id
-        environments[:aws_secret_access_key] = aws_secret_access_key if aws_secret_access_key
-        environments[:aws_session_token]     = aws_session_token     if aws_session_token
-        environments
-      end
-    end
+      # Make it absolute directory path from root
+      directory = "#{directory}/" unless directory.end_with?('/')
+      directory = "/#{directory}" unless directory.start_with?('/')
 
-    # S3 bucket name via which one transports application archives
-    # @return [String]
-    def bucket
-      @bucket ||= begin
-        unless bucket = fetch(:net_storage_s3_bucket)
-          raise Capistrano::NetStorage::S3::Error, ':net_storage_s3_bucket is not configured!'
-        end
-        bucket
-      end
+      directory
     end
 
-    # S3 bucket URL via which one transports application archives
-    # @return [URI::Generic]
-    def bucket_url
-      @bucket_url ||= URI.parse("s3://#{bucket}")
+    def aws_access_key_id
+      fetch(:net_storage_s3_aws_access_key_id, ENV['AWS_ACCESS_KEY_ID'])
     end
 
-    # Directory path on S3 bucket for application archives
-    # @return [String]
-    def archives_directory
-      # append '/' in case missing
-      @archives_directory ||= begin
-        dir = fetch(:net_storage_s3_archives_directory)
-        dir.sub(%r{[^/]\Z}, '\&/') if dir
-      end
+    def aws_secret_access_key
+      fetch(:net_storage_s3_aws_secret_access_key, ENV['AWS_SECRET_ACCESS_KEY'])
     end
 
-    # S3 URL which contains application archives
-    # @return [URI::Generic]
-    def archives_url
-      @archives_url ||= begin
-        if archives_directory
-          bucket_url + archives_directory
-        else
-          bucket_url
-        end
-      end
+    def aws_session_token
+      fetch(:net_storage_s3_aws_session_token, ENV['AWS_SESSION_TOKEN'])
     end
 
-    # S3 URL of the application archive for current deployment
-    # @return [URI::Generic]
-    def archive_url
-      @archive_url ||= begin
-        unless revision = fetch(:current_revision)
-          raise Capistrano::NetStorage::Error, ':current_revision is not set!'
-        end
-        archive_file = "#{revision}.#{Capistrano::NetStorage.config.archive_suffix}"
-        archives_url + archive_file
-      end
+    def aws_region
+      fetch(:net_storage_s3_aws_region, ENV['AWS_DEFAULT_REGION'])
     end
 
-    # Max retrial number for S3 operations
-    # @return [Fixnum]
-    def max_retry
-      @max_retry ||= fetch(:net_storage_s3_max_retry, 3)
+    def aws_profile
+      fetch(:net_storage_s3_aws_profile, ENV['AWS_DEFAULT_PROFILE'])
     end
 
-    # Number to keep archives on S3
-    # @return [Fixnum]
-    def s3_keep_releases
-      @s3_keep_releases ||= fetch(:net_storage_s3_keep_releases, fetch(:keep_releases, 5))
+    def aws_config_file
+      fetch(:net_storage_s3_aws_config_file, ENV['AWS_CONFIG_FILE'])
     end
   end
 end

data/lib/capistrano/net_storage/s3/transport.rb

@@ -2,16 +2,98 @@ require 'forwardable'
 
 require 'capistrano/net_storage/transport/base'
 
-require 'capistrano/net_storage/s3/base'
-require 'capistrano/net_storage/s3/config'
+require 'capistrano/net_storage/s3'
 
-class Capistrano::NetStorage::S3::Transport < Capistrano::NetStorage::Transport::Base
-  extend Forwardable
-  def_delegators :broker, :check, :find_uploaded, :upload, :download, :cleanup
+module Capistrano
+  module NetStorage
+    class S3
+      class Transport < Capistrano::NetStorage::Transport::Base
+        # These values are intentionally separated from config and fixed.
+        # If you have trouble with these defaults for 10^2 ~ 10^3 servers, please contact us on GitHub.
+        JITTER_DURATION_TO_DOWNLOAD = 4.0
+        MAX_RETRY = 3 # TODO: We need to rewrite this for large-scale AWS S3 stability
+        KEEP_FILE = '.keep'
 
-  private
+        def check
+          config = Capistrano::NetStorage::S3.config
 
-  def broker
-    Capistrano::NetStorage::S3.broker
+          # We check both read and write permissions with aws s3 command
+          run_locally_with_aws_env do
+            unless test :aws, 's3', 'ls', config.archives_url
+              keep = Tempfile.create.path
+              execute :aws, 's3', 'cp', keep, config.archives_url + KEEP_FILE
+            end
+          end
+        end
+
+        def archive_exists?
+          config = Capistrano::NetStorage::S3.config
+
+          run_locally_with_aws_env do
+            test :aws, 's3', 'ls', config.archive_url
+          end
+        end
+
+        def upload
+          config = Capistrano::NetStorage::S3.config
+          ns_config = Capistrano::NetStorage.config
+
+          run_locally_with_aws_env do
+            execute :aws, 's3', 'cp', '--no-progress', ns_config.local_archive_path, config.archive_url
+          end
+        end
+
+        def download
+          config = Capistrano::NetStorage::S3.config
+          ns_config = Capistrano::NetStorage.config
+
+          on release_roles(:all), in: :groups, limit: ns_config.max_parallels do
+            Retryable.retryable(tries: MAX_RETRY, sleep: 0.1) do
+              within releases_path do
+                with(config.aws_environments) do
+                  sleep Random.rand(JITTER_DURATION_TO_DOWNLOAD)
+                  execute :aws, 's3', 'cp', '--no-progress', config.archive_url, ns_config.archive_path
+                end
+              end
+            end
+          end
+        end
+
+        def cleanup
+          config = Capistrano::NetStorage::S3.config
+          ns_config = Capistrano::NetStorage.config
+
+          files = run_locally_with_aws_env do
+            capture :aws, 's3', 'ls', config.archives_url
+          end.lines.sort.map { |line| line.chomp.split(' ').last }
+          releases = files - [KEEP_FILE]
+
+          if releases.count > ns_config.keep_remote_archives
+            run_locally_with_aws_env do
+              info "Keeping #{ns_config.keep_remote_archives} of #{releases.count} in #{config.archives_url}"
+              (releases - releases.last(ns_config.keep_remote_archives)).each do |release|
+                execute :aws, 's3', 'rm', config.archives_url + release
+              end
+            end
+          else
+            run_locally do
+              info "No old archives (keeping newest #{ns_config.keep_remote_archives}) in #{config.archives_url}"
+            end
+          end
+        end
+
+        private
+
+        def run_locally_with_aws_env(&block)
+          config = Capistrano::NetStorage::S3.config
+
+          run_locally do
+            with(config.aws_environments) do
+              instance_eval(&block)
+            end
+          end
+        end
+      end
+    end
   end
 end

data/lib/capistrano/net_storage/s3/version.rb

@@ -1,5 +1,7 @@
-require 'capistrano/net_storage/s3/base'
-
-class Capistrano::NetStorage::S3
-  VERSION = '0.3.0'
+module Capistrano
+  module NetStorage
+    class S3
+      VERSION = '1.0.0'
+    end
+  end
 end

data/lib/capistrano/net_storage/s3.rb

@@ -1,8 +1,18 @@
-require 'capistrano/net_storage/s3/base'
-require 'capistrano/net_storage/s3/error'
 require 'capistrano/net_storage/s3/config'
-require 'capistrano/net_storage/s3/broker/aws_cli'
 require 'capistrano/net_storage/s3/transport'
-require 'capistrano/net_storage/s3/version'
+
+module Capistrano
+  module NetStorage
+    class S3
+      class << self
+        attr_reader :config
+
+        def setup!(config:)
+          @config = config
+        end
+      end
+    end
+  end
+end
 
 Capistrano::NetStorage::S3.setup!(config: Capistrano::NetStorage::S3::Config.new)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-net_storage-s3
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 1.0.0
 platform: ruby
 authors:
 - progrhyme
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-17 00:00:00.000000000 Z
+date: 2023-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano-net_storage
@@ -88,9 +88,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/PULL_REQUEST_TEMPLATE.md"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -99,11 +99,7 @@ files:
 - capistrano-net_storage-s3.gemspec
 - lib/capistrano-net_storage-s3.rb
 - lib/capistrano/net_storage/s3.rb
-- lib/capistrano/net_storage/s3/base.rb
-- lib/capistrano/net_storage/s3/broker/aws_cli.rb
-- lib/capistrano/net_storage/s3/broker/base.rb
 - lib/capistrano/net_storage/s3/config.rb
-- lib/capistrano/net_storage/s3/error.rb
 - lib/capistrano/net_storage/s3/transport.rb
 - lib/capistrano/net_storage/s3/version.rb
 homepage: https://github.com/DeNADev/capistrano-net_storage-s3

data/.travis.yml

@@ -1,12 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-- 2.6.3
-- 2.5.5
-- 2.4.6
-before_install: gem install bundler
-install: bundle install
-script: bundle exec rake spec
-notifications:
-  slack:
-    secure: WFEsKPeewkV6n/LmpsvLbu17nT5AWxVr1yglUjhCEe8OGIukTOpTbdsnhv9ticj0vXNdKZZRQEe4B0BhC8Fn+iPbFLyi1Z4is7dmABVU+b1qSOKIQlCCoPqa8RzYuVPYzMcVs9E1ldVdrQfLXKYoVeFAFeFSzcrf4mmTDrJbHhOXFIp1GYfYnhCIf01R72pcc2sHfWrzL3croIAqVYFiYJlimjQgduqQGVnyQjCeFmERCnnJU4t4VUlDU1gxTi3VYLfUtyUFyo5Kp+msRMbjr7LVuXyv/JplnNX3skG7VYN2nyhL6VuuOMAfCDpDCeCpH5mJcB1xLagide+GgDVYPJMJG419Ao7vCNI+1cl4VojT8aZKOs6vR7AMBSCP6gittrDIWOCuD61fc5HLFBSzL5dD5u2b2AxAUuODohNKigKwY59tE5CePuMycS/wVaFBtZjAKwDJDKU95m8JCtqJGzHQ0mEMKrXKICal9O7GWwEuEV+EnU+yzk+ZqWM6AHpGJ48DSm3pMnlnoPy3SBs4W8tFH+IS18cKBJ795Nj2vdwZFEYUEo0UwZrch/STY0/rPHayts9/7vgzZOIur168kxIw5bDNisPqzMTeNiYECnNLYWBSa0Xqn8mKPu52GVJYW6L0Wa8LRxln6BcNv2DkS+JFjyUC04T5wAdD4ADnQd4=

data/lib/capistrano/net_storage/s3/base.rb

@@ -1,18 +0,0 @@
-require 'forwardable'
-
-module Capistrano
-  module NetStorage
-    class S3
-      class << self
-        attr_reader :config
-
-        extend Forwardable
-        def_delegator :config, :broker
-      end
-
-      def self.setup!(params)
-        @config = params[:config]
-      end
-    end
-  end
-end

data/lib/capistrano/net_storage/s3/broker/aws_cli.rb

@@ -1,104 +0,0 @@
-require 'json'
-require 'time'
-require 'retryable'
-
-require 'capistrano/net_storage/s3/base'
-require 'capistrano/net_storage/s3/broker/base'
-
-class Capistrano::NetStorage::S3::Broker::AwsCLI < Capistrano::NetStorage::S3::Broker::Base
-  def check
-    execute_aws_s3('ls', config.bucket_url)
-  end
-
-  def find_uploaded
-    if capture_aws_s3('ls', config.archive_url)
-      set :net_storage_uploaded_archive, true
-    end
-  rescue SSHKit::StandardError
-    c = config
-    run_locally do
-      info "Archive is not found as #{c.archive_url}"
-    end
-  end
-
-  def upload
-    c  = config
-    ns = net_storage
-    Retryable.retryable(tries: c.max_retry, sleep: 0.1) do
-      execute_aws_s3('cp', '--no-progress', ns.local_archive_path, c.archive_url)
-    end
-  end
-
-  def download
-    c  = config
-    ns = net_storage
-    on ns.servers, in: :groups, limit: ns.max_parallels do
-      Retryable.retryable(tries: c.max_retry, sleep: 0.1) do
-        within releases_path do
-          with(c.aws_environments) do
-            execute :aws, 's3', 'cp', '--no-progress', c.archive_url, ns.archive_path
-          end
-        end
-      end
-    end
-  end
-
-  def cleanup
-    c         = config
-    list_args = %W(--bucket #{c.bucket} --output json)
-    if c.archives_directory
-      list_args += %W(--prefix #{c.archives_directory})
-    end
-    output = capture_aws_s3api('list-objects', list_args)
-    return if output.empty?
-
-    objects = JSON.parse(output)['Contents']
-    sorted  = objects.sort_by { |obj| Time.parse(obj['LastModified']) }
-    c.s3_keep_releases.times do
-      break if sorted.empty?
-      sorted.pop
-    end
-    sorted.each do |obj|
-      delete_args = %W(--bucket #{c.bucket} --key #{obj['Key']})
-      execute_aws_s3api('delete-object', *delete_args)
-    end
-  end
-
-  private
-
-  def execute_aws_s3(cmd, *args)
-    c = config
-    run_locally do
-      with(c.aws_environments) do
-        execute :aws, 's3', cmd, *args
-      end
-    end
-  end
-
-  def capture_aws_s3(cmd, *args)
-    c = config
-    run_locally do
-      with(c.aws_environments) do
-        capture :aws, 's3', cmd, *args
-      end
-    end
-  end
-
-  def execute_aws_s3api(cmd, *args)
-    c = config
-    run_locally do
-      with(c.aws_environments) do
-        execute :aws, 's3api', cmd, *args
-      end
-    end
-  end
-
-  def capture_aws_s3api(cmd, *args)
-    c = config
-    run_locally do
-      with(c.aws_environments) do
-        capture :aws, 's3api', cmd, *args
-      end
-    end
-  end
-end

data/lib/capistrano/net_storage/s3/broker/base.rb

@@ -1,38 +0,0 @@
-require 'capistrano/net_storage/s3/base'
-
-class Capistrano::NetStorage::S3
-  module Broker
-    # @abstract
-    class Base
-      # @abstract
-      def check
-        raise NotImplementedError
-      end
-
-      # @abstract
-      def find_uploaded
-        raise NotImplementedError
-      end
-
-      # @abstract
-      def upload
-        raise NotImplementedError
-      end
-
-      # @abstract
-      def download
-        raise NotImplementedError
-      end
-
-      private
-
-      def config
-        Capistrano::NetStorage::S3.config
-      end
-
-      def net_storage
-        Capistrano::NetStorage.config
-      end
-    end
-  end
-end

data/lib/capistrano/net_storage/s3/error.rb

@@ -1,6 +0,0 @@
-require 'capistrano/net_storage/s3/base'
-
-class Capistrano::NetStorage::S3
-  class Error < StandardError
-  end
-end