shipwright 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f88149546b30331caf2fcf70d44d3a7e8382b85a
-  data.tar.gz: 0841e894ef5a57f840612e2405b453563c3f6ee0
+  metadata.gz: 0a65b57439f067bc2629f11f268206e38ea2f693
+  data.tar.gz: aec4a8d622075879b06090477c0756be36977e98
 SHA512:
-  metadata.gz: a7bc0c5d9ed82f8d441b3a2fe1043f28ea9eb5571777a6f396058a0ee21301da62577b8e50d01522e240db84fca2839ff4641812f20b941b2c7d70f572b631f0
-  data.tar.gz: 4d9e7c758c36c6b54922e49ad25e1e3f0a498475672f11899926b2da82732c1aa88efbe36aff210162508d133cd57aa663ab51ca1da3a9f4db1d59c644507c8b
+  metadata.gz: 77f900e33b722b2df6c2ff62ab6d631529647b49960f547334fbe93f2d92b5c02d34b3de6404de0f10911d7eeac4df4c2ddf93b2fdafa5344a42e3a232c3ef9c
+  data.tar.gz: a14df74523c3345dfeafcecdc7af2840a3a615f03b6ae0b2c8fffee780e24f0d750e4c3d8ecb32352996fbd591fd4392c79f506205138e2018572878202c5705

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--require spec_helper

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.1.1

data/bin/shipwright

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+
+require "shipwright/cli"
+Shipwright::CLI.start(ARGV)

data/lib/shipwright/builder.rb

@@ -0,0 +1,132 @@
+module Shipwright
+  class Builder
+
+    BASE_VERSION   = '1.0.0'
+    VERSION_FILE   = 'VERSION'
+    DOCKERRUN      = 'Dockerrun.aws.json'
+    COMMIT_MESSAGE = "new version %s built by Shipwright #{Shipwright::VERSION}\n
+    [ci skip]"
+
+    attr_accessor :path, :commit_message, :previous_version, :version
+
+    def self.build(path)
+      new(path).build
+    end
+
+    def self.bump
+      Bump::Bump.run('patch', bundle: false, tag: false)
+      Shipwright.info "Installed #{version} into #{VERSION_FILE}"
+    end
+
+    def self.init
+      return if version
+
+      Shipwright.info "Installing #{BASE_VERSION} into #{VERSION_FILE}"
+      File.open(VERSION_FILE, 'wb') { |f| f.write BASE_VERSION }
+    end
+
+    def self.version
+      Bump::Bump.version_from_version.tap { |v| return v.first if v }
+    end
+
+    def initialize(path)
+      self.path = path
+      shipyard
+    end
+
+    def build
+      self.class.init
+      Shipwright.info "Shipwright is building #{path} (at #{self.class.version})"
+
+      bump_version
+
+      build_image
+      push_image
+
+      update_dockerrun
+      generate_artifact
+      update_ebconfig
+
+      git_commit
+      git_push
+
+      Shipwright.info "VERSION #{version} built"
+    end
+
+    def bump_version
+      self.class.bump
+    end
+
+    def build_image
+      Shipwright.info "Building image with tag #{docker_tag}"
+      run_cmd "docker build -t #{docker_tag} #{path}"
+      # self.image = Docker::Image.build_from_dir(path, 'tag' => docker_tag)
+    end
+
+    def push_image
+      Shipwright.info "Pushing image to #{docker_tag}"
+      run_cmd "docker push #{docker_tag}"
+      # image.push
+    end
+
+    def run_cmd(cmd)
+      IO.popen(cmd).each { |line| Shipwright.info line }
+    end
+
+    def update_dockerrun
+      Shipwright.info "Updating Dockerrun.aws.json"
+      Shipwright::ElasticBeanstalk.update_dockerrun
+    end
+
+    def generate_artifact
+      Shipwright.info "Generating artifact"
+      Shipwright::ElasticBeanstalk.generate_artifact
+    end
+
+    def update_ebconfig
+      Shipwright.info "Updating .elasticbeanstalk/config.yml"
+      Shipwright::ElasticBeanstalk.update_ebconfig
+    end
+
+    def git_commit
+      Shipwright.info "Commiting to git"
+      git.add all: true
+      git.commit COMMIT_MESSAGE % version
+      git.add_tag git_tag
+    end
+
+    def git_push
+      Shipwright.info "Pushing to git"
+      git.push 'origin', git.current_branch, tags: true
+    end
+
+    def git_tag
+      "build-#{version}"
+    end
+
+    def docker_tag
+      "#{shipyard}/#{application}:#{version}"
+    end
+
+    def version
+      @version ||= self.class.version
+    end
+
+    def shipyard
+      ENV.fetch('SHIPYARD') { raise "set SHIPYARD= to your docker host/scope" }
+    end
+
+    def application
+      File.basename Dir.pwd
+    end
+
+    protected
+
+    attr_accessor :image
+
+    def git
+      @git ||= Git.open(Dir.pwd)
+    end
+
+  end
+end

data/lib/shipwright/cli.rb

@@ -9,5 +9,9 @@ module Shipwright
       puts "shipwright version: #{Shipwright::VERSION}"
     end
 
+    desc "build", "Build and push docker image"
+    def build(base=Dir.pwd)
+      Shipwright::Builder.build(base)
+    end
   end
 end

data/lib/shipwright/elastic_beanstalk.rb

@@ -0,0 +1,55 @@
+require 'yaml'
+require 'json'
+require 'fileutils'
+require 'zip'
+
+module Shipwright
+  module ElasticBeanstalk
+
+    EB_CONFIG     = ".elasticbeanstalk/config.yml"
+    EB_EXTENSIONS = '.ebextensions'
+    DOCKERRUN     = 'Dockerrun.aws.json'
+
+    extend self
+
+    def update_dockerrun
+      dockerrun  = JSON.parse(File.read DOCKERRUN)
+
+      dockerrun['containerDefinitions'].each do |container|
+        bits = container['image'].to_s.split(':').tap(&:pop)
+        container['image'] = bits.push(version).join(':')
+      end
+
+      File.open(DOCKERRUN, 'wb') { |file| file.write dockerrun.to_json }
+    end
+
+    def generate_artifact
+      FileUtils.mkdir_p File.dirname(artifact_path)
+      FileUtils.rm artifact_path, force: true
+      Zip::File.open(artifact_path, Zip::File::CREATE) do |zip|
+        zip.add DOCKERRUN, DOCKERRUN
+        ebexts = Dir.glob(File.join EB_EXTENSIONS, '*')
+        if ebexts.any?
+          zip.mkdir EB_EXTENSIONS
+          ebexts.each { |ext| zip.add ext, ext }
+        end
+      end
+    end
+
+    def update_ebconfig
+      config = YAML.load_file EB_CONFIG
+      config['deploy'] ||= {}
+      config['deploy']['artifact'] = artifact_path
+      File.open(EB_CONFIG, 'wb') { |f| f.write config.to_yaml[4..-1] } # skip ---\n
+    end
+
+    def artifact_path
+      File.join Dir.pwd, 'builds', "#{version}.zip"
+    end
+
+    def version
+      Builder.version
+    end
+
+  end
+end

data/lib/shipwright.rb

@@ -1,5 +1,29 @@
-require "shipwright/version"
+require 'aws-sdk'
+require 'bump'
+require 'docker'
+require 'git'
+require 'forwardable'
+require 'logger'
+
+Docker.options.merge! ssl_verify_peer: false
 
 module Shipwright
-  # Your code goes here...
+
+  VERSION = File.read(File.expand_path '../../VERSION', __FILE__).chomp
+
+  extend Forwardable
+  extend self
+
+  attr_accessor :infos
+  attr_accessor :errors
+
+  self.infos  = Logger.new(STDOUT)
+  self.errors = Logger.new(STDERR)
+
+  def_delegator :infos, :info
+  def_delegator :error, :error
+
 end
+
+require 'shipwright/builder'
+require 'shipwright/elastic_beanstalk'

data/shipwright.gemspec

@@ -1,11 +1,11 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'shipwright/version'
+VERSION = File.read(File.expand_path '../VERSION', __FILE__).chomp
 
 Gem::Specification.new do |spec|
   spec.name          = "shipwright"
-  spec.version       = Shipwright::VERSION
+  spec.version       = VERSION
   spec.authors       = ["Adam Hunter"]
   spec.email         = ["adamhunter@me.com"]
 
@@ -26,6 +26,14 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.add_dependency 'aws-sdk',    '~> 2'
+  spec.add_dependency 'thor',       '~> 0.19.1'
+  spec.add_dependency 'bump',       '~> 0.5'
+  spec.add_dependency 'docker-api', '~> 1.21.4'
+  spec.add_dependency 'git',        '~> 1.2.9'
+  spec.add_dependency 'rubyzip',    '~> 1.1.7'
+
   spec.add_development_dependency "bundler", "~> 1.9"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake",    "~> 10.0"
+  spec.add_development_dependency "rspec",   "~> 3.2.0"
 end

metadata

@@ -1,15 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: shipwright
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Adam Hunter
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-05-20 00:00:00.000000000 Z
+date: 2015-05-29 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: aws-sdk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.19.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.19.1
+- !ruby/object:Gem::Dependency
+  name: bump
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: docker-api
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.21.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.21.4
+- !ruby/object:Gem::Dependency
+  name: git
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.9
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.9
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.7
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.2.0
 description: CLI Client for implementing the harbor pattern on AWS Elastic Beanstalk
 email:
 - adamhunter@me.com
@@ -46,22 +144,19 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".travis.yml"
 - Gemfile
 - README.md
 - Rakefile
 - VERSION
 - bin/console
-- bin/harbor
-- bin/hoist
 - bin/setup
-- bin/ship
+- bin/shipwright
 - lib/shipwright.rb
+- lib/shipwright/builder.rb
 - lib/shipwright/cli.rb
-- lib/shipwright/cli/harbor.rb
-- lib/shipwright/cli/hoist.rb
-- lib/shipwright/cli/ship.rb
-- lib/shipwright/version.rb
+- lib/shipwright/elastic_beanstalk.rb
 - shipwright.gemspec
 homepage: https://github.com/tma1/shipwright
 licenses: []

data/bin/harbor

@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-
-require "shipwright/cli/harbor"
-Shipwright::CLI::Harbor.start(ARGV)

data/bin/hoist

@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-
-require "shipwright/cli/hoist"
-Shipwright::CLI::Hoist.start(ARGV)

data/bin/ship

@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-
-require "shipwright/cli/ship"
-Shipwright::CLI::Ship.start(ARGV)

data/lib/shipwright/cli/harbor.rb

@@ -1,9 +0,0 @@
-require 'shipwright/cli'
-
-module Shipwright
-  class CLI
-    class Harbor < CLI
-
-    end
-  end
-end

data/lib/shipwright/cli/hoist.rb

@@ -1,9 +0,0 @@
-require 'shipwright/cli'
-
-module Shipwright
-  class CLI
-    class Hoist < CLI
-
-    end
-  end
-end

data/lib/shipwright/cli/ship.rb

@@ -1,9 +0,0 @@
-require 'shipwright/cli'
-
-module Shipwright
-  class CLI
-    class Ship < CLI
-
-    end
-  end
-end

data/lib/shipwright/version.rb

@@ -1,3 +0,0 @@
-module Shipwright
-  VERSION = File.read(File.expand_path '../../../VERSION', __FILE__).chomp
-end