capistrano_dockerbuild 1.0.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d0d051fdc506aceb1bbc232079f1f04fb2e0b9f
-  data.tar.gz: c0182416f4b9c3fc338fc63d6f89c8d933fe6847
+  metadata.gz: 4ce4c53bd25ff86f3b5e2237b0605b9253b3627a
+  data.tar.gz: 8c139b49008bdc0716fee7999e0d63b36e229234
 SHA512:
-  metadata.gz: b94b0a4e491a17c8a1c32fc2f3898031296438dd3603c40b21606871f6d607acf031a70f49b3e37e1b37fb6988c58ce4d5bed9007755f42cc6cd9239e07092d1
-  data.tar.gz: e483d3ff6866501200b070b7910d218cc73cc1fbeff7ca8cc77f85b9d80f5ee8f187c4f92c1c5b579773beba045c9fa96d8e333387a157d69790dfd89710eb16
+  metadata.gz: d7f6fa7928ff96fb9571bba1c0edcfda610e94bb0cd6e7d3a12473ee4a577d40385dc0b785be2bbf1c751026160264a5ac93b5bef065f57530522887f6e0ec6f
+  data.tar.gz: 57a5f9acf9bef342fc51be5b8796abc74742643921f0eaa62cc11c0012aa79130c634d024469f992e1a60e17ebda3a56cf4def2ae69e487f13a10b4b50103c85

data/.rubocop.yml

@@ -44,6 +44,10 @@ Layout/EmptyLinesAroundClassBody:
 Layout/EmptyLines:
   Enabled: false
 
+Metrics/PerceivedComplexity:
+  Enabled: false
+Metrics/CyclomaticComplexity:
+  Enabled: false
 Metrics/BlockLength:
   Enabled: false
 Metrics/AbcSize:

data/Gemfile

@@ -5,7 +5,7 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in capistrano-docker-build.gemspec
 gemspec
 
-gem 'byebug'
+# gem 'byebug'
 gem 'rspec'
 gem 'rspec-core'
 gem 'pry'

data/README-deploy-compose.md

@@ -1,4 +1,4 @@
-    This content is specific to deployments using docker-compose; if you haven't yet reviewed README.md, you should probably start there.
+_This content is specific to deployments using docker-compose; if you haven't yet reviewed README.md, you should probably start there._
 
 # docker:compose
 
@@ -11,16 +11,16 @@ There is no blue/green, rolling update, auto rollback on failure, or anything ev
 
 ### Roles:
 
-This gem adds the `docker_compose` role, identifying hosts where the docker_compose_file should be copied and ran.
+This plugin adds the `docker_compose` role, identifying hosts where the docker_compose_file should be copied and ran.
 
-If the `docker_build` role is defined, it will identify the source of the docker_compose_file
+If the `docker_build` role is defined, it will identify the source of the docker_compose_file, otherwise the current project directory is the source.
 
 ```ruby
-# using the `server` command
+# using server syntax
 server 'my.remote.server', roles: %w{docker_compose}
 server 'my_other.remote.server', roles: %w{docker_compose}
 
-# or using the `role` command
+# or using role syntax
 role :docker_compose,  %w{localhost} # places localhost within the docker_compose role
 
 # The docker_build role is used to identify the source of the docker_compose_file

data/README-deploy-swarm.md

@@ -1,7 +1,24 @@
-    This content is specific to deployments using Docker Swarm; if you haven't yet reviewed README.md, you should probably start there.
+_This content is specific to deployments using Docker Swarm; if you haven't yet reviewed README.md, you should probably start there._
 
 # docker:swarm
 
+This deploy strategy copies a docker-compose.yml file to the docker swarms you specify, and then runs `docker stack up` across the whole lot.
+
+Deploying to a single swarm member should be enough to deploy across the entire swarm, so choosing one deploy host per swarm is probably the best course of action.
+
+### Roles:
+
+This plugin adds the `docker_swarm` role, identifying hosts where the `docker_compose_file` should be copied and ran.
+
+If the `docker_build` role is defined, it will identify the source of the `docker_compose_file`, otherwise the current project directory is the source.
+
+```ruby
+# using server syntax
+server 'my.swarm.host', roles: %w{docker_swarm}
+
+# or using role syntax
+role :docker_swarm,  %w{my.swarm.host}
+```
 
 
 
@@ -16,15 +33,3 @@ set :docker_compose_path -> { deploy_path }                      # path on remot
 
 set :dockerswarm_deployhook, true                                # set false to skip default deploy hook; default is true
 ```
-
-----
-
-```ruby
-set :docker_compose_project -> { fetch(:application) }        # (required) name of the docker-compose project
-set :docker_compose_file, 'docker-compose.yml'                # name of compose file to use for deploy
-set :docker_compose_cmd, 'docker-compose'                     # name/path to `docker-compose` command on host
-set :docker_compose_opts, nil                                 # general args for `docker-compose`; default is none; (ex: '--project-name myproject --tls')
-set :docker_compose_up_opts, '-d --no-build --remove-orphans' # args for `docker-compose up` command; these are the defaults
-set :docker_compose_stop_opts, nil                            # args for `docker-compose stop` command; default is none; (ex: '--timeout 20')
-set :dockercompose_deployhook, true                           # set false to skip default deploy hook; default is true
-```

data/README.md

@@ -1,9 +1,9 @@
 # capistrano_dockerbuild
 
-Docker image creation, tagging, and repository tasks (and a few optional deployment schemes) for Capistrano v3
+Docker image creation, tagging, and repository tasks for Capistrano v3
 
 ```sh
-cap production docker:build_push # build image and then push to repository
+cap production docker:deploy # build or promote image and push to repository
 ```
 
 This plugin also hooks into the default `cap <environment> deploy` flow as a build action. See [Usage](#usage) for more details.
@@ -47,7 +47,7 @@ role :docker_build,  %w{localhost} # role syntax, making localhost the build age
 server 'my.build.server', roles: %w{docker_build} # server syntax, declaring a remote server
 ```
 
-If no `:docker_build` host is defined, the docker image will be built directly from the current working project directory. A maximum of one `:docker_build` host can be defined; any additional should raise an error.
+If no `:docker_build` host is defined, the docker image will be built directly from the current working project directory. A maximum of one `:docker_build` host can be defined.
 
 #### Run a deploy:
 
@@ -74,27 +74,37 @@ Run `cap -T docker:` for details
 ```ruby
 set :docker_build_image -> { fetch(:application) } # (required) name of the image
 set :docker_build_opts, nil                        # additional `docker build` args; default is none; (ex: '--pull --no-cache --force-rm')
-set :docker_build_tag, 'latest'                    # specific tag name for this build; you can change this and 'latest' tag will still be applied
+set :docker_build_custom_tag, nil                  # custom tag name for this build, if any
+set :docker_build_image_latest_tag?, true          # generates a 'latest' tag when true
+set :docker_build_image_release_tag?, true         # generates a release tag when true
+set :docker_build_image_revision_tag?, true        # generates a scm revision tag when true
+set :docker_build_image_shortrev_tag?, true        # generates a short-form scm revision tag when true
 set :docker_repo_url, nil                          # name/url of remote docker image repository for push
-set :docker_build_context, '.'                     # context passed to `docker build` (within :build_from)
+set :docker_build_context, '.'                     # context passed to `docker build` (from :build_dir)
 set :dockerfile, 'Dockerfile'                      # name of Dockerfile to use for build
 set :docker_cmd, 'docker'                          # name/path to `docker` command on build host
-set :build_from, '.'                               # directory within source repo to run build from
+set :build_dir, '.'                                # directory within source repository to run builds from on remote build hosts
+set :docker_build_promote_image, nil               # repository/image:tag to promote instead of building a new image
 set :dockerbuild_deployhook, true                  # set false to skip default deploy hook; default is true
 set :dockerbuild_trim_release_roles, true          # set false to prevent no_release from being auto-added to all non docker_build servers
 ```
 
-### Created Docker image tags
-Under most use cases the `docker:build` task creates several image tags on the build host upon completion, all pointing to the same image SHA. By default, all of these tags are also pushed up to the docker image repository during the `docker:push` task. You may not want your repository (or build host) filled with a ton of tags, so this gem offers a few ways to control that sprawl.
+### Created docker image tags
+
+By default the `docker:build` task creates several image tags on the build host upon completion, all pointing to the same final image. Unless otherwise altered, all created tags are also pushed up to the docker image repository during the `docker:push` task. You may not want your repository (or build host) filled with a ton of tags, so this gem offers a few ways to control that sprawl.
+
+You can selectively turn off remotely pushed tags by setting these to `false`, as desired:
+
+- `:docker_build_image_latest_tag?`
+- `:docker_build_image_release_tag?`
+- `:docker_build_image_revision_tag?`
+- `:docker_build_image_shortrev_tag?`
+
+`:docker_build_custom_tag` is optional; if you don't want a custom tag created, don't set one.
 
-  docker_build_image_latest_tag,
-  docker_build_image_revision_tag,
-  docker_build_image_shortrev_tag,
-  docker_build_image_release_tag,
-  docker_build_image_tag,
 
 ### Deployment to docker-compose, Docker Swarm, Kubernetes, Marathon, etc
-The primary purpose of this gem is currently to provide tasks for Docker image creation and repository push/transfer. However, some basic deployment tasks are included as optionals, should you decide to use them. Each deploy strategy needs to be specifically enabled by a separate `requires` statement within your Capfile.
+The primary goal of this gem is currently to provide tasks for Docker image creation and repository push/transfer. However, some deployment tasks are also included, should you decide to use them. Each deploy strategy needs to be specifically enabled by a separate `requires` statement within your Capfile.
 
 Refer to the specific deployment documentation for details:
 
@@ -105,9 +115,11 @@ Refer to the specific deployment documentation for details:
 
 Because.
 
+There are at least a dozen other Capistrano + Docker gems out there, but none seemed to match my preferred docker philosophy: Docker images should be built once and then promoted up to higher environments as they pass acceptance tests. This gem aims to provide that type of workflow.
+
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+After checking out the repo, run `bin/setup` to install dependencies. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 

data/capistrano-docker-build.gemspec

@@ -6,12 +6,14 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'capistrano_dockerbuild'
-  spec.version       = '1.0.0'
+  spec.version       = '1.1.1'
   spec.authors       = ['Eric Shorkey']
   spec.email         = ['eric.shorkey@gmail.com']
 
   spec.summary       = 'docker build/push plugin for Capistrano'
-  spec.description   = 'Build, push and deploy your Docker container images as part of your Capistrano workflow. Pretty simple.'
+  spec.description   = 'Build, push, promote, and deploy Docker container images with Capistrano.' \
+                       ' Build images locally or from a build server, rebuild or promote images across deployment environments.' \
+                       ' Deployments for docker-compose and docker swarm.'
   spec.homepage      = 'https://github.com/eshork/capistrano_dockerbuild'
   spec.license       = 'MIT'
 

data/lib/capistrano/dsl/paths.rb

@@ -4,16 +4,16 @@ module Capistrano
   module DSL
     module Paths
 
-      def build_from
-        fetch(:build_from)
+      def build_dir
+        fetch(:build_dir)
       end
 
       # directory within which the build is to be executed
       # respects relative paths (not starting with /)
       def build_path
-        return deploy_path.join(fetch(:current_directory, 'current')) if build_from.nil?
-        return Pathname.new(build_from.strip) if build_from.strip[0] == '/'
-        return deploy_path.join(fetch(:current_directory, 'current'), build_from)
+        return deploy_path.join(fetch(:current_directory, 'current')) if build_dir.nil?
+        return Pathname.new(build_dir.strip) if build_dir.strip[0] == '/'
+        return deploy_path.join(fetch(:current_directory, 'current'), build_dir)
       end
 
     end

data/lib/capistrano/tasks/dockerbuild.rake

@@ -2,6 +2,74 @@
 
 namespace :docker do
 
+  class DockerImage
+    def initialize(repo = nil, name = nil, tag = nil)
+      @repository = repo.nil? || repo.empty? ? nil : repo
+      @name = name.nil? || name.empty? ? nil : name
+      @tag = tag.nil? || tag.empty? ? nil : tag
+    end
+
+    def to_s
+      return nil unless @name
+      "#{@repository ? "#{@repository}/" : nil}#{@name}#{@tag ? ":#{@tag}" : nil}"
+    end
+
+    def repo
+      return @repository
+    end
+
+    def name
+      return @name
+    end
+
+    def tag
+      return @tag
+    end
+
+    def valid?
+      return false if @repository.nil? && @name.nil? && @tag.nil?
+      unless @repository.nil?
+        return false if (@repository =~ /^([\d\w])*(:)?\d*$/).nil?
+      end
+      return false if (@name =~ /^([\d\w])*$/).nil?
+      unless @tag.nil?
+        return false if (@tag =~ /^([\d\w-])*$/).nil?
+      end
+      return true
+    end
+
+    def self.from_str(str)
+      return new unless str
+      repo_str = repo_from_str(str)
+      name_str = name_from_str(str)
+      tag_str = tag_from_str(str)
+      return new repo_str, name_str, tag_str
+    end
+
+    def self.repo_from_str(str)
+      last_slash = str.rindex('/')
+      return nil unless last_slash
+      return str[0...last_slash]
+    end
+
+    def self.name_from_str(str)
+      # remove any repo bits
+      repo_str = repo_from_str(str)
+      str = str.sub("#{repo_str}/", '') if repo_str
+      # remove any tag bits
+      str.split(':')[0]
+    end
+
+    def self.tag_from_str(str)
+      # remove any repo bits
+      repo_str = repo_from_str(str)
+      str = str.sub("#{repo_str}/", '') if repo_str
+      # remove any name bits
+      str_split = str.split(':')
+      return str_split.size > 1 ? str_split[1] : nil
+    end
+  end
+
   # Any extra command-line opts you'd like to insert into the `docker build` command
   # Normally has no preset value (fastest option), but a popular full-rebuild-every-time (thorough build) selection is '--pull --no-cache --force-rm'
   def docker_build_opts
@@ -26,13 +94,13 @@ namespace :docker do
     (fetch(:docker_build_image) { fetch(:application) }) || raise('unable to discern docker_build_image name; specify :application or :docker_build_image')
   end
 
-  def docker_build_tag
-    fetch(:docker_build_tag, 'latest')
+  def docker_build_custom_tag
+    return nil unless fetch(:docker_build_custom_tag, nil)
+    return "#{docker_build_image}:#{fetch(:docker_build_custom_tag)}"
   end
 
-  def docker_build_image_tag
-    return fetch(:docker_build_image_tag) ||
-           set(:docker_build_image_tag, "#{docker_build_image}:#{docker_build_tag}")
+  def docker_build_image_latest_tag?
+    return fetch(:docker_build_image_latest_tag?, true)
   end
 
   def docker_build_image_latest_tag
@@ -40,17 +108,29 @@ namespace :docker do
            set(:docker_build_image_latest_tag, "#{docker_build_image}:latest")
   end
 
+  def docker_build_image_release_tag?
+    return fetch(:docker_build_image_release_tag?, true)
+  end
+
   def docker_build_image_release_tag
     return fetch(:docker_build_image_release_tag) ||
            set(:docker_build_image_release_tag, "#{docker_build_image}:release-#{release_timestamp}")
   end
 
+  def docker_build_image_revision_tag?
+    return fetch(:docker_build_image_revision_tag?, true)
+  end
+
   def docker_build_image_revision_tag
     return nil unless fetch(:current_revision)
     return fetch(:docker_build_image_revision_tag) ||
            set(:docker_build_image_revision_tag, "#{docker_build_image}:REVISION-#{fetch(:current_revision)}")
   end
 
+  def docker_build_image_shortrev_tag?
+    return fetch(:docker_build_image_shortrev_tag?, true)
+  end
+
   def docker_build_image_shortrev_tag
     return nil unless fetch(:current_revision)
     return fetch(:docker_build_image_shortrev_tag) ||
@@ -58,13 +138,13 @@ namespace :docker do
   end
 
   def docker_build_image_tags
-    [
-      docker_build_image_latest_tag,
-      docker_build_image_revision_tag,
-      docker_build_image_shortrev_tag,
-      docker_build_image_release_tag,
-      docker_build_image_tag,
-    ].uniq.compact
+    tags = []
+    tags << docker_build_custom_tag if docker_build_custom_tag
+    tags << docker_build_image_release_tag if docker_build_image_release_tag?
+    tags << docker_build_image_revision_tag if docker_build_image_revision_tag?
+    tags << docker_build_image_shortrev_tag if docker_build_image_shortrev_tag?
+    tags << docker_build_image_latest_tag if docker_build_image_latest_tag?
+    return tags.uniq.compact
   end
 
   def docker_build_image_tags_opt
@@ -84,12 +164,17 @@ namespace :docker do
     docker_build_image_tags.map{|t| docker_repo_tag(t)}
   end
 
-  # TODO: remove this!!!!!!!!
-  task :debug do
-    byebug # rubocop:disable Lint/Debugger
-    puts 'pew pew!'
+  def docker_build_promote_image
+    promote_image_tag = fetch(:docker_build_promote_image, nil)
+    image_name = DockerImage.from_str(promote_image_tag)
+    image_name = DockerImage.new(image_name.repo ? image_name.repo : docker_repo_url,
+                           image_name.name ? image_name.name : docker_build_image,
+                           image_name.tag ? image_name.tag : docker_build_tag)
+    promote_tag = image_name.to_s
+    return promote_tag
   end
 
+
   task :check_docker_build_role do
     if roles(:docker_build).empty?
       run_locally do
@@ -132,7 +217,7 @@ namespace :docker do
     end
   end
 
-  task :local_build_deps => [:local_build_warning]
+  task :local_build_deps => [:local_build_warning, :set_current_revision]
 
   task :build_local => :local_build_deps do
     current_build_dir = pwd
@@ -147,7 +232,7 @@ namespace :docker do
     end
   end
 
-  task :remote_build_deps => [:check_docker_build_role, :check_docker_build_root]
+  task :remote_build_deps => [:check_docker_build_role, :check_docker_build_root, :set_current_revision]
 
   task :build_remote => :remote_build_deps do
     on roles(:docker_build).first do |buildremote|
@@ -164,79 +249,154 @@ namespace :docker do
     end
   end
 
-  task :tag do
+
+  task :set_current_revision => 'deploy:set_current_revision'
+
+  task :get_docker_build_image_id => :set_current_revision do
+
+    run_locally do
+      docker_build_image_tags.each do |image_tag|
+        docker_build_image_id = capture docker_cmd, :image, :ls, '-q', image_tag
+        unless docker_build_image_id.empty?
+          set(:docker_build_image_id, docker_build_image_id)
+          break
+        end
+      end
+      unless fetch(:docker_build_image_id)
+        fatal 'unable to discern image id'
+        raise 'missing image id'
+      end
+    end
+  end
+
+
+  desc "Push the 'latest' image to the repository"
+  task :push do
     if roles(:docker_build).empty?
-      invoke 'docker:tag_local'
+      invoke 'docker:push_local'
     else
-      invoke 'docker:tag_remote'
+      invoke 'docker:push_remote'
     end
   end
 
-  task :tag_local do
-    if docker_build_image_release_tag
-      run_locally do
-        info 'Re-tagging docker images for upstream push...'
-        docker_repo_tags.each do |repo_tag|
+  task :push_local => :get_docker_build_image_id do
+    run_locally do
+      unless docker_repo_url
+        warn ':docker_repo_url not defined! No push destination'
+        next
+      end
+      docker_build_image_tags.each do |local_tag|
+        repo_tag = docker_repo_tag(local_tag)
+        next unless repo_tag
+        run_locally do
           execute docker_cmd, :tag,
-                  docker_build_image_latest_tag,
+                  fetch(:docker_build_image_id),
+                  repo_tag
+          execute docker_cmd, :push,
                   repo_tag
         end
       end
     end
   end
 
-  task :tag_remote => :check_docker_build_role do
-    if docker_build_image_release_tag
-      on roles(:docker_build).first do # |buildremote|
-        info 'Re-tagging docker images for upstream push...'
-        docker_repo_tags.each do |repo_tag|
+  task :push_remote => [:check_docker_build_role, :get_docker_build_image_id] do
+    on roles(:docker_build).first do # |buildremote|
+      unless docker_repo_url
+        warn ':docker_repo_url not defined! No push destination'
+        next
+      end
+      docker_build_image_tags.each do |local_tag|
+        repo_tag = docker_repo_tag(local_tag)
+        next unless repo_tag
+        run_locally do
           execute docker_cmd, :tag,
-                  docker_build_image_latest_tag,
+                  fetch(:docker_build_image_id),
+                  repo_tag
+          execute docker_cmd, :push,
                   repo_tag
         end
       end
     end
   end
 
-  desc "Push the 'latest' image to the repository"
-  task :push do
+  desc 'Build the docker image'
+  task :build do
+    invoke 'docker:build_decision'
+  end
+
+  desc 'Build and push docker image'
+  task :build_push do
+    invoke 'docker:build'
+    invoke 'docker:push'
+  end
+
+
+  desc 'Promote an existing docker image (pull and retag)'
+  task :promote do
     if roles(:docker_build).empty?
-      invoke 'docker:push_local'
+      invoke 'docker:promote_local'
     else
-      invoke 'docker:push_remote'
+      invoke 'docker:promote_remote'
     end
   end
 
-  task :push_local => :tag_local do
+  task :check_docker_build_promote_image do
+    unless fetch :docker_build_promote_image
+      run_locally do
+        fatal ':docker_build_promote_image setting is required for promote task'
+        raise 'missing :docker_build_promote_image'
+      end
+    end
+    unless DockerImage.from_str(docker_build_promote_image).valid?
+      run_locally do
+        fatal ":docker_build_promote_image setting is not valid: '#{fetch(:docker_build_promote_image)}' => '#{docker_build_promote_image}'"
+        raise 'invalid :docker_build_promote_image'
+      end
+    end
+  end
+
+  task :promote_local => :check_docker_build_promote_image do
     run_locally do
-      info 'Pushing docker images upstream...'
+      source_tag = docker_build_promote_image
+      info "Promoting image: #{source_tag}"
+      execute docker_cmd, :pull, source_tag
+
       docker_repo_tags.each do |repo_tag|
+        next if repo_tag == source_tag
+        info "Promoted to: #{repo_tag}"
+        execute docker_cmd, :tag,
+                source_tag,
+                repo_tag
         execute docker_cmd, :push,
                 repo_tag
       end
+
     end
   end
 
-  task :push_remote => [:check_docker_build_role, :tag_remote] do
+  task :promote_remote => :check_docker_build_promote_image do
     on roles(:docker_build).first do # |buildremote|
-      info 'Pushing docker images upstream...'
+      source_tag = docker_build_promote_image
+      info "Promoting image: #{source_tag}"
+      execute docker_cmd, :pull, source_tag
+
       docker_repo_tags.each do |repo_tag|
+        next if repo_tag == source_tag
+        info "Promoted to: #{repo_tag}"
+        execute docker_cmd, :tag,
+                source_tag,
+                repo_tag
         execute docker_cmd, :push,
                 repo_tag
       end
+
     end
   end
 
-  desc 'Build the docker container image'
-  task :build do
-    invoke 'docker:build_decision'
-  end
 
-  desc 'Build and then push docker container image'
-  task :build_push do
-    invoke 'docker:build'
-    invoke 'docker:push'
-  end
+  desc '(alias for docker:build_push)'
+  task :deploy => :build_push
+
 
   # Default `cap env deploy` flow hook
   task :capdeploy_hook do

data/lib/capistrano/tasks/dockercompose.rake

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'byebug'
 require 'tempfile'
 
 namespace :docker do
@@ -94,7 +93,6 @@ namespace :docker do
               download! docker_compose_path.join(docker_compose_file), tmp_file_path
             end
           else
-            # byebug
             invoke 'docker:compose:local_source_warning'
             run_locally do
               warn "fetching #{docker_compose_file}"

data/lib/capistrano/tasks/dockerswarm.rake

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'byebug'
 require 'tempfile'
 
 namespace :docker do

data/spec/capistrano/docker/build_spec.rb

@@ -2,12 +2,12 @@
 
 require 'spec_helper'
 
-RSpec.describe Capistrano::Docker::Build do
-  it 'has a version number' do
-    expect(Capistrano::Docker::Build::VERSION).not_to be nil
-  end
+# RSpec.describe Capistrano::Dockerbuild do
+  # it 'has a version number' do
+  #   expect(Capistrano::Docker::Build::VERSION).not_to be nil
+  # end
 
-  it 'does something useful' do
-    expect(false).to eq(true)
-  end
-end
+  # it 'does something useful' do
+  #   expect(false).to eq(true)
+  # end
+# end

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'bundler/setup'
-require 'capistrano/docker/build'
+# require 'capistrano/dockerbuild'
 
 RSpec.configure do |config|
   # Enable flags like --only-failures and --next-failure

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano_dockerbuild
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Eric Shorkey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-11 00:00:00.000000000 Z
+date: 2018-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -52,8 +52,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '12.0'
-description: Build, push and deploy your Docker container images as part of your Capistrano
-  workflow. Pretty simple.
+description: Build, push, promote, and deploy Docker container images with Capistrano.
+  Build images locally or from a build server, rebuild or promote images across deployment
+  environments. Deployments for docker-compose and docker swarm.
 email:
 - eric.shorkey@gmail.com
 executables: