eb-docker-deploy 0.5.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c85a599060b7de1e5b98586206cf0fbb9daf3a9
-  data.tar.gz: 922128fc059e9d63ee6e57afefaf72ececf1693e
+  metadata.gz: a649466f0fba47202a94d74a12a1e596445b8e7c
+  data.tar.gz: 29623779df7dc7e7566c998e856d00fec769646e
 SHA512:
-  metadata.gz: f11e93101de17d7201f6752546e7c6175eda380fa5a757df90d6a28104bd5c728f33adbb1a61277d5c594e22edd3bb674fe3e4d4f43527a15d0752fb1aba8812
-  data.tar.gz: f85183284ae14d547993b60c0fd6e5ae15829c8dea149b691e4570e41b24648430988882cd8c5580792d8a72d4d0ab66efdab53582517238927d651e6cca58c0
+  metadata.gz: 7ede7b3dd3c2e814653a1b9f5021674cb52aae02728aedfe993352e90310be400d90ef10fa4c8e4ee1da5b7e472ffde799c5a8d41337e678dd641c6131c6c1c9
+  data.tar.gz: 0eea490ea341e7858bf897a17033fa63c9e96f74dd63e2e177dcd0d963e3d5db279c6d7a2c653f6564179386913e5224411afb505e23881c4ce6f28994053447

data/bin/ebd

@@ -2,4 +2,4 @@
 
 require 'deploy'
 
-Deploy::Deployer.start(ARGV)
+Deploy::Runner.start(ARGV)

data/eb-docker-deploy.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = ['eb-deploy', 'ebd']
+  spec.executables   = ['ebd']
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'thor'
   spec.add_dependency 'highline'
 
-  spec.add_dependency 'rest-client'
+  spec.add_dependency 'aws-sdk', '~> 2'
 
   spec.add_dependency 'slack-notifier'
 end

data/lib/deploy.rb

@@ -1,12 +1,15 @@
 require 'thor'
 require 'highline/import'
 require 'slack-notifier'
-require 'rest-client'
+require 'aws-sdk'
 
 require 'deploy/output'
-require 'deploy/docker_hub_api'
+require 'deploy/commands'
+require 'deploy/checks'
+require 'deploy/versions'
+require 'deploy/utility'
 
-require 'deploy/deployer'
+require 'deploy/runner'
 
 module Deploy
 

data/lib/deploy/checks.rb

@@ -0,0 +1,26 @@
+require 'deploy/utility'
+
+module Deploy
+  module Checks
+    include Deploy::Utility
+
+    def check_setup
+      (shout('docker not installed'); exit(1)) unless command?('docker')
+      (shout('eb command not installed'); exit(1)) unless command?('eb')
+      (shout('elasticbeanstalk not configured for this project. run "eb init".'); exit(1)) unless File.exist?('.elasticbeanstalk')
+      (shout('AWS credentials not configured.'); exit(1)) unless ENV['AWS_ACCESS_KEY_ID'] && ENV['AWS_SECRET_ACCESS_KEY'] && ENV['AWS_REGION']
+      (shout('ENV DOCKER_REPO not set'); exit(1)) unless ENV['DOCKER_REPO']
+    end
+
+    def check_rollback_version(version, environment)
+      check_version(version, environment)
+      (shout('You can only rollback to a previous version'); exit(1)) unless application_versions_array.include?(version)
+    end
+
+    def check_version(version, environment)
+      (shout('You must pass a version with -v'); exit(1)) unless version
+      (shout('You are currently on that version'); exit(1)) if current_version_for_environment(environment) == version
+    end
+
+  end
+end

data/lib/deploy/commands.rb

@@ -0,0 +1,44 @@
+require 'deploy/utility'
+
+module Deploy
+  module Commands
+    include Deploy::Utility
+
+    def build_image(repo, tag)
+      shout "Building Docker Image: #{repo}:#{tag}"
+      command = "docker build -t #{repo}:#{tag} ."
+      exit(1) unless system(command)
+    end
+
+    def tag_image_as_latest(repo, tag)
+      shout "Tagging #{tag} Docker Image as Latest"
+      command = "docker tag -f #{repo}:#{tag} #{repo}:latest"
+      exit(1) unless system(command)
+    end
+
+    def push_image(repo, tag)
+      shout "Pushing Docker Image: #{repo}:#{tag}"
+      command = "docker push #{repo}:#{tag}"
+      exit(1) unless system(command)
+    end
+
+    def pull_image(repo, tag)
+      shout "Pulling Docker Image: #{repo}:#{tag}"
+      command = "docker pull #{repo}:#{tag}"
+      exit(1) unless system(command)
+    end
+
+    def run_deploy(version, environment)
+      command = "eb deploy #{environment} --label #{version}"
+      shout "deploying #{version} to elastic beanstalk with command: #{command}"
+      exit(1) unless system(command)
+    end
+
+    def run_rollback(version, environment)
+      command = "eb deploy #{environment} --version #{version}"
+      shout "deploying #{version} to elastic beanstalk with command: #{command}"
+      exit(1) unless system(command)
+    end
+
+  end
+end

data/lib/deploy/output.rb

@@ -1,14 +1,30 @@
 module Deploy
   module Output
 
+    def announce(attachments)
+      shout("#{attachments[:title]} - #{attachments[:text]}")
+      notifier('', attachments)
+    end
+
+    def notifier(message, attachments)
+      if ENV['SLACK_WEBHOOK']
+        @notifier ||= Slack::Notifier.new(ENV['SLACK_WEBHOOK'])
+        @notifier.ping(message, {
+          attachments: [attachments]
+        })
+      else
+        shout 'You can send deployment notifications if you set the SLACK_WEBHOOK environment variable.'
+      end
+    end
+
     def shout(message)
       message_size = message.size
       if message_size < 77
         # lines are always 80 characters
         stars = '*' * (77 - message_size)
-        puts(green("+ ") + "#{message} #{green(stars)}")
+        puts(red("+ ") + "#{message} #{red(stars)}")
       else
-        puts(green('+ ') + message)
+        puts(red('+ ') + message)
       end
     end
 

data/lib/deploy/runner.rb

@@ -0,0 +1,109 @@
+module Deploy
+  class Runner < Thor
+    include Deploy::Output
+    include Deploy::Commands
+    include Deploy::Checks
+    include Deploy::Versions
+    include Deploy::Utility
+
+    method_option :version, aliases: '-v', desc: 'Version', required: true
+    method_option :environment, aliases: '-e', desc: 'Environment', required: true
+    method_option :build, aliases: '-b', desc: 'Build Image', default: true
+    desc 'deploy', 'deploy'
+    def deploy
+      check_setup
+
+      environment = options[:environment]
+      build = options[:build]
+
+      version = options[:version]
+      check_version(version, environment)
+
+      repo = ENV['DOCKER_REPO']
+
+      if build && !version_exists?(version)
+        announce_title = "Deployment started with build"
+        build_image(repo, version)
+      else
+        announce_title = "Deployment started without build"
+        pull_image(repo, version)
+      end
+
+      tag_image_as_latest(repo, version)
+
+      push_image(repo, version)
+      push_image(repo, 'latest')
+
+      announce({ color: '#6080C0', title: announce_title, text: "Deploying version #{version} to #{environment}" })
+      run_deploy(version, environment)
+      announce({ color: 'good', title: 'Deployment Succeeded!!', text: "The current version of #{environment} is #{version}" })
+    end
+
+    method_option :version, aliases: '-v', desc: 'Version', required: true
+    method_option :environment, aliases: '-e', desc: 'Environment', required: true
+    desc 'rollback', 'rollback'
+    def rollback
+      check_setup
+
+      environment = options[:environment]
+      version = options[:version]
+      check_rollback_version(version, environment)
+
+      repo = ENV['DOCKER_REPO']
+
+      announce({ color: '#6080C0', title: "Rollback started", text: "Rolling back to #{version} on #{environment}" })
+
+      pull_image(repo, version)
+
+      tag_image_as_latest(repo, version)
+
+      push_image(repo, 'latest')
+
+      run_rollback(version, environment)
+      announce({ color: 'good', title: 'Rollback Succeeded!!', text: "The current version of #{environment} is #{version}" })
+    end
+
+    desc 'send test notification', 'send test notification'
+    def test_slack
+      notifier('', { color: 'good', title: 'This is a test notification from eb-docker-deploy.' })
+    end
+
+    desc 'list versions', 'list all application versions'
+    def versions
+      check_setup
+
+      application_versions_array.each do |version|
+        shout version
+      end
+    end
+
+    method_option :environment, aliases: '-e', desc: 'Environment', required: true
+    desc 'show version', 'show environment version'
+    def version
+      check_setup
+
+      shout current_version_for_environment(options[:environment])
+    end
+
+    desc 'setup config', 'setup config'
+    def setup
+      (shout('AWS creds already configured in ~/.bashrc'); exit(1)) if ENV['AWS_ACCESS_KEY_ID'] && ENV['AWS_SECRET_ACCESS_KEY'] && ENV['AWS_REGION']
+
+      key = ask('Enter AWS Key:')
+      secret = ask('Enter AWS Secret:')
+      region = ask('Enter AWS Region:', default: 'us-west-2')
+
+      File.open(File.expand_path('~/.bashrc'), 'a') do |f|
+        f.puts ''
+        f.puts '# Variables defined by eb-docker-deploy:'
+        f.puts "export AWS_ACCESS_KEY_ID=#{key}"
+        f.puts "export AWS_SECRET_ACCESS_KEY=#{secret}"
+        f.puts "export AWS_REGION=#{region}"
+      end
+
+      shout('AWS creds successfully configured at ~/.bashrc.')
+      shout('You must now run "source ~/.bashrc"')
+    end
+
+  end
+end

data/lib/deploy/utility.rb

@@ -0,0 +1,9 @@
+module Deploy
+  module Utility
+
+    def command?(command)
+      system("which #{command} > /dev/null 2>&1")
+    end
+
+  end
+end

data/lib/deploy/version.rb

@@ -1,3 +1,3 @@
 module Deploy
-  VERSION = "0.5.2"
+  VERSION = "1.0.0"
 end

data/lib/deploy/versions.rb

@@ -0,0 +1,24 @@
+require 'deploy/utility'
+
+module Deploy
+  module Versions
+    include Deploy::Utility
+
+    def eb
+      Aws::ElasticBeanstalk::Client.new
+    end
+
+    def version_exists?(version)
+      application_versions_array.include?(version)
+    end
+
+    def current_version_for_environment(environment)
+      eb.describe_environments(environment_names: [environment]).environments.first.version_label
+    end
+
+    def application_versions_array
+      @array ||= eb.describe_application_versions.application_versions.reverse.map(&:version_label)
+    end
+
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eb-docker-deploy
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Tim
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-29 00:00:00.000000000 Z
+date: 2015-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,19 +67,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: slack-notifier
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +98,6 @@ description: deploy with docker and aws eb
 email:
 - thogg4@gmail.com
 executables:
-- eb-deploy
 - ebd
 extensions: []
 extra_rdoc_files: []
@@ -108,14 +107,16 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/eb-deploy
 - bin/ebd
 - eb-docker-deploy.gemspec
 - lib/deploy.rb
-- lib/deploy/deployer.rb
-- lib/deploy/docker_hub_api.rb
+- lib/deploy/checks.rb
+- lib/deploy/commands.rb
 - lib/deploy/output.rb
+- lib/deploy/runner.rb
+- lib/deploy/utility.rb
 - lib/deploy/version.rb
+- lib/deploy/versions.rb
 homepage: ''
 licenses:
 - MIT

data/bin/eb-deploy

@@ -1,5 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'deploy'
-
-Deploy::Deployer.start(ARGV)

data/lib/deploy/deployer.rb

@@ -1,187 +0,0 @@
-module Deploy
-  class Deployer < Thor
-    include Deploy::Output
-    include DockerHubApi
-
-    desc 'setup config', 'setup config'
-    def setup
-      # setup aws config
-
-      (shout('AWS creds already configured at ~/.aws/config'); exit(1)) if File.exist?(File.expand_path('~/.aws/config'))
-
-      key = ask('Enter AWS Key:')
-      secret = ask('Enter AWS Secret:')
-
-      Dir.mkdir(File.expand_path('~/.aws'))
-
-      File.open(File.expand_path('~/.aws/config'), 'w') do |f|
-        f.puts '[default]'
-        f.puts "aws_access_key_id = #{key}"
-        f.puts "aws_secret_access_key = #{secret}"
-      end
-      shout('AWS creds successfully configured at ~/.aws/config') if File.exist?(File.expand_path('~/.aws/config'))
-
-      # setup docker hub creds
-      (shout('Docker Hub creds already configured at ~/.docker/config.json'); exit(1)) if File.exist?(File.expand_path('~/.docker/config.json'))
-      command = "docker login"
-      exit(1) unless system(command)
-    end
-
-    method_option :version, aliases: '-v', desc: 'Version'
-    method_option :environment, aliases: '-e', desc: 'Environment'
-    method_option :no_build, aliases: '--no-build', desc: 'Do not Build Image'
-    desc 'deploy', 'deploy'
-    def deploy
-      check_setup
-
-      environment = options[:environment]
-      no_build = options[:no_build]
-
-      version = options[:version]
-      check_version(version)
-
-      repo = ENV['DOCKER_REPO']
-
-      if !no_build
-        announce({ color: '#6080C0', title: "Deployment started with build", text: "Deploying version #{version} to #{environment || 'stage'}" })
-        build_image(repo, version)
-
-        tag_image_as_latest(repo, version)
-
-        push_image(repo, version)
-        push_image(repo, 'latest')
-      else
-        announce({ color: '#6080C0', title: "Deployment started without build", text: "Deploying version #{version} to #{environment || 'stage'}" })
-      end
-
-      run_deploy(version, environment)
-      announce({ color: 'good', title: 'Deployment Succeeded!!', text: "The current version of #{environment || 'stage'} is #{version}" })
-    end
-
-    method_option :version, aliases: '-v', desc: 'Version'
-    method_option :environment, aliases: '-e', desc: 'Environment'
-    desc 'rollback', 'rollback'
-    def rollback
-      check_setup
-
-      environment = options[:environment]
-      version = options[:version]
-      check_rollback_version(version)
-
-      repo = ENV['DOCKER_REPO']
-
-      announce({ color: '#6080C0', title: "Rollback started", text: "Rolling back to #{version} on #{environment || 'stage'}" })
-
-      pull_image(repo, version)
-
-      tag_image_as_latest(repo, version)
-
-      push_image(repo, 'latest')
-
-      run_rollback(version, environment)
-      announce({ color: 'good', title: 'Rollback Succeeded!!', text: "The current version of #{environment || 'stage'} is #{version}" })
-    end
-
-    desc 'send test notification', 'send test notification'
-    def test_slack
-      notifier('', { color: 'good', title: 'This is a test notification from eb-docker-deploy.' })
-    end
-
-    desc 'list versions', 'list versions'
-    def versions
-      check_setup
-
-      versions_array.each do |v|
-        shout v
-      end
-    end
-
-    no_commands do
-
-      def announce(attachments)
-        shout("#{attachments[:title]} - #{attachments[:text]}")
-        notifier('', attachments)
-      end
-
-      def notifier(message, attachments)
-        if ENV['SLACK_WEBHOOK']
-          @notifier ||= Slack::Notifier.new(ENV['SLACK_WEBHOOK'])
-          @notifier.ping(message, {
-            attachments: [attachments]
-          })
-        else
-          shout 'You can send deployment notifications if you set the SLACK_WEBHOOK environment variable.'
-        end
-      end
-
-      def build_image(repo, tag)
-        shout "Building Docker Image: #{repo}:#{tag}"
-        command = "docker build -t #{repo}:#{tag} ."
-        exit(1) unless system(command)
-      end
-
-      def tag_image_as_latest(repo, tag)
-        shout "Tagging #{tag} Docker Image as Latest"
-        command = "docker tag -f #{repo}:#{tag} #{repo}:latest"
-        exit(1) unless system(command)
-      end
-
-      def push_image(repo, tag)
-        shout "Pushing Docker Image: #{repo}:#{tag}"
-        command = "docker push #{repo}:#{tag}"
-        exit(1) unless system(command)
-      end
-
-      def pull_image(repo, tag)
-        shout "Pulling Docker Image: #{repo}:#{tag}"
-        command = "docker pull #{repo}:#{tag}"
-        exit(1) unless system(command)
-      end
-
-      def run_deploy(version, environment=nil)
-        command = environment ? "eb deploy #{environment} --label #{version}" : "eb deploy --label #{version}"
-        shout "deploying #{version} to elastic beanstalk with command: #{command}"
-        exit(1) unless system(command)
-      end
-
-      def run_rollback(version, environment=nil)
-        command = environment ? "eb deploy #{environment} --version #{version}" : "eb deploy --version #{version}"
-        shout "deploying #{version} to elastic beanstalk with command: #{command}"
-        exit(1) unless system(command)
-      end
-
-      def check_setup
-        (shout('docker not installed'); exit(1)) unless command?('docker')
-        (shout('eb command not installed'); exit(1)) unless command?('eb')
-        (shout('elasticbeanstalk not configured for this project. run "eb init".'); exit(1)) unless File.exist?('.elasticbeanstalk')
-        (shout('AWS credentials not configured.'); exit(1)) unless File.exist?(File.expand_path('~/.aws/config'))
-        (shout('Docker Hub credentials not configured.'); exit(1)) unless File.exist?(File.expand_path('~/.docker/config.json'))
-        (shout('ENV DOCKER_REPO not set'); exit(1)) unless ENV['DOCKER_REPO']
-      end
-
-      def command?(command)
-        system("which #{command} > /dev/null 2>&1")
-      end
-
-      def check_rollback_version(version)
-        check_version(version)
-        (shout('You can only rollback to a previous version'); exit(1)) unless versions_array.include?(version)
-      end
-
-      def check_version(version)
-        (shout('You must pass a version with -v'); exit(1)) unless version
-        (shout('You are currently on that version'); exit(1)) if current_version == version
-      end
-
-      def current_version
-        versions_array.last
-      end
-
-      def versions_array
-        get("/v1/repositories/#{ENV['DOCKER_REPO']}/tags").map { |tag| tag['name'] }
-      end
-
-    end
-
-  end
-end

data/lib/deploy/docker_hub_api.rb

@@ -1,15 +0,0 @@
-module DockerHubApi
-
-  ROOT_PATH = 'https://registry.hub.docker.com'
-
-  def get(url)
-    body = RestClient.get("#{ROOT_PATH}#{url}", { Authorization: "Basic #{get_token}" }).body
-    JSON.parse(body)
-  end
-
-  def get_token
-    auths_hash = JSON.parse(File.open(File.expand_path('~/.docker/config.json')).read)['auths']
-    docker_hub_token = auths_hash['https://index.docker.io/v1/']['auth']
-  end
-
-end