shipitron 1.2.0 → 1.4.0

data/lib/shipitron/version.rb

@@ -1,3 +1,3 @@
 module Shipitron
-  VERSION = '1.2.0'
+  VERSION = '1.4.0'
 end

data/scripts/docker-entrypoint.sh

@@ -1,5 +1,26 @@
 #!/bin/sh
-set -e
+
+set -euo pipefail
+
+su-exec ${FIXUID:?Missing FIXUID var}:${FIXGID:?Missing FIXGID var} fixuid
+
+chown_dir() {
+  dir=$1
+  if [[ -d ${dir} ]] && [[ "$(stat -c %u:%g ${dir})" != "${FIXUID}:${FIXGID}" ]]; then
+    echo chown $dir
+    chown shipitron:shipitron $dir
+  fi
+}
+
+chown_dir /home/shipitron
+chown_dir /usr/local/bundle
+
+if [ "$1" = 'bundle' ]; then
+  set -- su-exec shipitron "$@"
+  exec "$@"
+elif [ "$1" = 'rake' ] && [ "$2" = 'release' ]; then
+  exec "$@"
+fi
 
 if [ -n "$USE_BUNDLE_EXEC" ]; then
   BINARY="bundle exec shipitron"
@@ -7,10 +28,23 @@ else
   BINARY=shipitron
 fi
 
-if ${BINARY} help "$1" 2>&1 | grep -q "shipitron $1"; then
+if [ "$(ls -A /usr/local/bundle/bin)" = '' ]; then
+  echo 'command not in path and bundler not initialized'
+  echo 'running bundle install'
+  su-exec shipitron bundle install
+else
+  su-exec shipitron bash -c 'bundle check || bundle install'
+fi
+
+# ${BINARY} help "$1"
+
+if ls /usr/local/bundle/bin | grep -q "\b$1\b"; then
+  set -- su-exec shipitron bundle exec "$@"
+
+elif ${BINARY} help "$1" 2>&1 | grep -q "shipitron $1"; then
   set -- su-exec shipitron ${BINARY} "$@"
 
-  if [ -n "$FOG_LOCAL" ]; then
+  if [ -n "${FOG_LOCAL:-}" ]; then
     chown -R shipitron:shipitron /fog
   fi
 fi

data/scripts/release-entrypoint.sh

@@ -0,0 +1,20 @@
+#!/bin/sh
+
+set -euo pipefail
+
+if [ -n "$USE_BUNDLE_EXEC" ]; then
+  BINARY="bundle exec shipitron"
+else
+  BINARY=shipitron
+fi
+
+# ${BINARY} help "$1"
+
+if ls /usr/local/bundle/bin | grep -q "\b$1\b"; then
+  set -- su-exec shipitron bundle exec "$@"
+
+elif ${BINARY} help "$1" 2>&1 | grep -q "shipitron $1"; then
+  set -- su-exec shipitron ${BINARY} "$@"
+fi
+
+exec "$@"

data/shipitron.gemspec

@@ -17,23 +17,26 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'thor', '~> 0.20'
+  spec.add_runtime_dependency 'thor', '~> 1.0'
   spec.add_runtime_dependency 'aws-sdk-ecs', '~> 1.8'
-  spec.add_runtime_dependency 'hashie', '~> 3.5'
-  spec.add_runtime_dependency 'metaractor', '~> 0.5'
+  spec.add_runtime_dependency 'aws-sdk-s3', '~> 1.96'
+  spec.add_runtime_dependency 'hashie', '~> 4.1'
+  spec.add_runtime_dependency 'metaractor', '~> 3.1'
   spec.add_runtime_dependency 'diplomat', '~> 2.0'
-  spec.add_runtime_dependency 'fog-aws', '~> 2.0'
+  spec.add_runtime_dependency 'fog-aws', '~> 3.6'
   spec.add_runtime_dependency 'mime-types', '~> 3.1'
   spec.add_runtime_dependency 'minitar', '~> 0.6'
   spec.add_runtime_dependency 'mustache', '~> 1.0'
   spec.add_runtime_dependency 'tty-command', '~> 0.7'
   spec.add_runtime_dependency 'tty-table', '~> 0.9'
   spec.add_runtime_dependency 'pastel', '~> 0.7'
+  spec.add_runtime_dependency 'excon', '~> 0.82'
+  spec.add_runtime_dependency 'rugged', '~> 1.0'
 
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 12.3"
-  spec.add_development_dependency "pry-byebug", "~> 3.5"
-  spec.add_development_dependency "rspec", "~> 3.7"
+  spec.add_development_dependency "bundler", "~> 2.1"
+  spec.add_development_dependency "rake", "~> 13.0"
+  spec.add_development_dependency "pry-byebug", "~> 3.9"
+  spec.add_development_dependency "rspec", "~> 3.10"
   spec.add_development_dependency "fivemat", "~> 1.3"
   spec.add_development_dependency "fog-local", "~> 0.4"
 end

data/test.yml

@@ -0,0 +1,5 @@
+version: '3.8'
+services:
+  specs:
+    volumes:
+      - "/var/lib/buildkite-agent/buildkite-agent:/usr/local/bin/buildkite-agent"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shipitron
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Ryan Schlesinger
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-09-11 00:00:00.000000000 Z
+date: 2021-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: aws-sdk-ecs
   requirement: !ruby/object:Gem::Requirement
@@ -38,34 +38,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-s3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.96'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.96'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: metaractor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: diplomat
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
@@ -178,62 +192,90 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: excon
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.82'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.82'
+- !ruby/object:Gem::Dependency
+  name: rugged
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: fivemat
   requirement: !ruby/object:Gem::Requirement
@@ -262,7 +304,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
-description: 
+description:
 email:
 - ryan@outstand.com
 executables:
@@ -270,25 +312,31 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".buildkite/pipeline.yml"
 - ".dockerignore"
+- ".gitattributes"
 - ".gitignore"
 - ".rspec"
+- Deskfile
 - Dockerfile
 - Dockerfile.release
+- Dockerfile.staging
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
-- build_dev.sh
+- docker-compose.yml
 - exe/shipitron
 - lib/shipitron.rb
 - lib/shipitron/cli.rb
+- lib/shipitron/client.rb
 - lib/shipitron/client/bootstrap_application.rb
 - lib/shipitron/client/create_ecs_services.rb
 - lib/shipitron/client/deploy_application.rb
 - lib/shipitron/client/ensure_deploy_not_running.rb
 - lib/shipitron/client/fetch_clusters.rb
 - lib/shipitron/client/force_deploy.rb
+- lib/shipitron/client/generate_deploy.rb
 - lib/shipitron/client/load_application_config.rb
 - lib/shipitron/client/load_templates.rb
 - lib/shipitron/client/register_ecs_task_definitions.rb
@@ -299,10 +347,13 @@ files:
 - lib/shipitron/ecs_client.rb
 - lib/shipitron/ecs_task_def.rb
 - lib/shipitron/fetch_bucket.rb
+- lib/shipitron/find_docker_volume_name.rb
+- lib/shipitron/git_info.rb
 - lib/shipitron/logger.rb
 - lib/shipitron/mustache_yaml_parser.rb
 - lib/shipitron/parse_templates.rb
 - lib/shipitron/post_build.rb
+- lib/shipitron/s3_copy.rb
 - lib/shipitron/server/deploy_application.rb
 - lib/shipitron/server/docker/build_image.rb
 - lib/shipitron/server/docker/configure.rb
@@ -312,6 +363,7 @@ files:
 - lib/shipitron/server/ecs_task_defs/map_parsed_templates.rb
 - lib/shipitron/server/ecs_task_defs/update_from_params.rb
 - lib/shipitron/server/ecs_task_defs/update_in_place.rb
+- lib/shipitron/server/fetch_deploy.rb
 - lib/shipitron/server/git/clone_local_copy.rb
 - lib/shipitron/server/git/configure.rb
 - lib/shipitron/server/git/download_cache.rb
@@ -327,11 +379,13 @@ files:
 - lib/shipitron/smash.rb
 - lib/shipitron/version.rb
 - scripts/docker-entrypoint.sh
+- scripts/release-entrypoint.sh
 - shipitron.gemspec
+- test.yml
 homepage: https://github.com/outstand/shipitron
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -346,9 +400,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: A deployment tool for use with Docker and ECS.
 test_files: []

data/build_dev.sh

@@ -1,27 +0,0 @@
-#!/bin/bash
-set -e -x
-
-build_image=outstand/shipitron:dev
-dockerfile=Dockerfile
-bundler_data_dir=cache
-
-tar_container=''
-
-function cleanup {
-  if [ -n "$tar_container" ]; then
-    docker rm -fv ${tar_container}
-  fi
-
-  rm -f ${bundler_data_dir}/cidfile
-}
-
-trap cleanup EXIT
-
-build_args=''
-mkdir -p ${bundler_data_dir}
-
-docker build -t ${build_image} -f ${dockerfile} ${build_args} .
-
-docker run -t --cidfile=${bundler_data_dir}/cidfile -w /usr/local/bundle ${build_image} tar -zcf /tmp/bundler-data.tar.gz .
-tar_container=$(cat ${bundler_data_dir}/cidfile)
-docker cp ${tar_container}:/tmp/bundler-data.tar.gz ${bundler_data_dir}/bundler-data.tar.gz