container_ship 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd33f056d20c82975db4c69f44ded7b30125549032afca7d836792eda460bd4f
-  data.tar.gz: 7e86a7a3f8990bc2768e1705df852780d1f731bde97832d35d38227dc0e88512
+  metadata.gz: 5b7ae1e6c79b424625cdfd5f12eacc00fd546ec046151606984a76c5d50cc489
+  data.tar.gz: 1691ee2c77d5f0ddf8064b4966abc2a326ad748615ec5f1b935037d3bc23b38a
 SHA512:
-  metadata.gz: 9f5acd9cd7f5232eddf69661e7c961c6869518dfea10f8e148fbc4e4c0fe5f6270b420d6766286af0ece908fffef0f34224fe3bd4f8d230860db2fe8c3acf298
-  data.tar.gz: 0becf5d69d45bdd794b8b287f2d9c7f263e52ead5a3d0ead6050031fe8860b0526c87d20b3c03a0eb09705e72ed93442a74605cfdae25abd81b98b9cc52259b0
+  metadata.gz: 4a11192e9091856be8e69fea92399a8e97977a8a8778bb5b6671162c9d149380938d3f5162418277e05a77f28c2c472c8cf2e37054150a40752ee82f90976485
+  data.tar.gz: 06543a4fd7906c378acd0a8e3f3d4c6725a594672ad6175f3fc215c769a7cdf30e52e7832a87f2b9889e783218debf9bd0eafc32d9249ba653b0db3476bf8a9a

data/.circleci/config.yml

@@ -0,0 +1,57 @@
+version: 2.1
+
+update_bundler: &update_bundler
+  run:
+    name: update bundler
+    command: gem update bundler
+
+bundle_install: &bundle_install
+  run:
+    name: bundle install
+    command: bundle install --path vendor/bundle --jobs 4
+
+git statusrestore_bundle_cache: &restore_bundle_cache
+  restore_cache:
+    key: cache-bundler-{{ checksum "Gemfile.lock" }}
+
+jobs:
+  build:
+    docker:
+      - image: circleci/ruby
+    steps:
+      - checkout
+      - *restore_bundle_cache
+      - *update_bundler
+      - *bundle_install
+      - save_cache:
+          key: cache-bundler-{{ checksum "Gemfile.lock" }}
+          paths:
+            - vendor/bundle
+  rubocop:
+    docker:
+      - image: circleci/ruby
+    steps:
+      - checkout
+      - *restore_bundle_cache
+      - *update_bundler
+      - *bundle_install
+      - run: bundle exec rubocop
+  rspec:
+    docker:
+      - image: circleci/ruby
+    steps:
+      - checkout
+      - *restore_bundle_cache
+      - *update_bundler
+      - *bundle_install
+      - run:
+          command: bundle exec rspec
+workflows:
+  version: 2.1
+  rspec:
+    jobs:
+      - build
+      - rubocop:
+          requires: [build]
+      - rspec:
+          requires: [build]

data/.rubocop.yml

@@ -0,0 +1,25 @@
+AllCops:
+  Exclude:
+    - 'vendor/**/*'
+    - 'spec/support/*'
+    - 'spec/spec_helper.rb'
+    - 'Rakefile'
+Layout/MultilineMethodCallIndentation:
+  EnforcedStyle: indented_relative_to_receiver
+Style/FrozenStringLiteralComment:
+  Enabled: false
+Documentation:
+  Enabled: false
+Metrics/BlockLength:
+  Exclude:
+    - 'spec/**/*'
+Metrics/LineLength:
+  Max: 120
+  AllowURI: true
+  URISchemes:
+    - http
+    - https
+Metrics/AbcSize:
+  Max: 30
+Metrics/MethodLength:
+  Max: 30

data/Gemfile

@@ -1,4 +1,6 @@
-source "https://rubygems.org"
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
 
 # Specify your gem's dependencies in container_ship.gemspec
 gemspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    container_ship (0.1.0)
+    container_ship (0.1.1)
       aws-sdk-cloudwatchlogs
       aws-sdk-ecs
       thor
@@ -9,53 +9,52 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.0)
+    activesupport (6.0.3.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-      zeitwerk (~> 2.1, >= 2.1.8)
+      zeitwerk (~> 2.2, >= 2.2.2)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    ast (2.4.0)
-    aws-eventstream (1.0.3)
-    aws-partitions (1.226.0)
-    aws-sdk-cloudwatchlogs (1.25.0)
-      aws-sdk-core (~> 3, >= 3.61.1)
+    ast (2.4.1)
+    aws-eventstream (1.1.0)
+    aws-partitions (1.365.0)
+    aws-sdk-cloudwatchlogs (1.36.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.69.1)
-      aws-eventstream (~> 1.0, >= 1.0.2)
-      aws-partitions (~> 1.0)
+    aws-sdk-core (3.105.0)
+      aws-eventstream (~> 1, >= 1.0.2)
+      aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-ecs (1.51.0)
-      aws-sdk-core (~> 3, >= 3.61.1)
+    aws-sdk-ecs (1.68.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.1.0)
-      aws-eventstream (~> 1.0, >= 1.0.2)
-    codecov (0.1.15)
+    aws-sigv4 (1.2.2)
+      aws-eventstream (~> 1, >= 1.0.2)
+    codecov (0.2.10)
       json
       simplecov
-      url
-    coderay (1.1.2)
-    concurrent-ruby (1.1.5)
-    diff-lcs (1.3)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.7)
+    diff-lcs (1.4.4)
     docile (1.3.2)
-    faraday (0.17.0)
+    faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
-    faraday-http-cache (2.0.0)
-      faraday (~> 0.8)
-    ffi (1.11.1)
+    faraday-http-cache (2.2.0)
+      faraday (>= 0.8)
+    ffi (1.13.1)
     formatador (0.2.5)
-    github_changelog_generator (1.14.3)
+    github_changelog_generator (1.15.2)
       activesupport
       faraday-http-cache
       multi_json
       octokit (~> 4.6)
-      rainbow (>= 2.1)
+      rainbow (>= 2.2.1)
       rake (>= 10.0)
-      retriable (~> 2.1)
-    guard (2.15.1)
+      retriable (~> 3.0)
+    guard (2.16.2)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
       lumberjack (>= 1.0.12, < 2.0)
@@ -72,75 +71,79 @@ GEM
     guard-rubocop (1.3.0)
       guard (~> 2.0)
       rubocop (~> 0.20)
-    i18n (1.7.0)
+    i18n (1.8.5)
       concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.3)
     jmespath (1.4.0)
-    json (2.2.0)
-    listen (3.2.0)
+    json (2.3.1)
+    listen (3.2.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    lumberjack (1.0.13)
-    method_source (0.9.2)
-    minitest (5.12.2)
-    multi_json (1.14.1)
+    lumberjack (1.2.8)
+    method_source (1.0.0)
+    minitest (5.14.2)
+    multi_json (1.15.0)
     multipart-post (2.1.1)
     nenv (0.3.0)
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    octokit (4.14.0)
+    octokit (4.18.0)
+      faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
-    parallel (1.18.0)
-    parser (2.6.5.0)
-      ast (~> 2.4.0)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    public_suffix (4.0.1)
+    parallel (1.19.2)
+    parser (2.7.1.4)
+      ast (~> 2.4.1)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    public_suffix (4.0.6)
     rainbow (3.0.0)
-    rake (13.0.0)
-    rb-fsevent (0.10.3)
-    rb-inotify (0.10.0)
+    rake (13.0.1)
+    rb-fsevent (0.10.4)
+    rb-inotify (0.10.1)
       ffi (~> 1.0)
-    retriable (2.1.0)
+    regexp_parser (1.7.1)
+    retriable (3.1.2)
+    rexml (3.2.4)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.0)
-      rspec-support (~> 3.9.0)
-    rspec-expectations (3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-support (3.9.0)
-    rubocop (0.75.1)
-      jaro_winkler (~> 1.5.1)
+    rspec-support (3.9.3)
+    rubocop (0.90.0)
       parallel (~> 1.10)
-      parser (>= 2.6)
+      parser (>= 2.7.1.1)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.7)
+      rexml
+      rubocop-ast (>= 0.3.0, < 1.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (0.3.0)
+      parser (>= 2.7.1.4)
     ruby-progressbar (1.10.1)
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
     shellany (0.0.1)
-    simplecov (0.17.1)
+    simplecov (0.19.0)
       docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    thor (0.20.3)
+      simplecov-html (~> 0.11)
+    simplecov-html (0.12.2)
+    thor (1.0.1)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
-    unicode-display_width (1.6.0)
-    url (0.3.2)
-    zeitwerk (2.2.0)
+    unicode-display_width (1.7.0)
+    zeitwerk (2.4.0)
 
 PLATFORMS
   ruby

data/README.md

@@ -8,9 +8,9 @@
 
 `container_ship` is yet another ECS deployment tool.
 
-Key features are:
+## Key features
 
-- Using raw `task_definition.json` file not a template file with complex state or variables
+- Using raw `task_definition.json` file instead of a template file with complex state or variables
 - Convention over configuration 
 
 ## Installation
@@ -19,9 +19,17 @@ gem 'container_ship'
 ```
 
 ## Usage
-### Prepare task_definition.json
-`container_ship init YOUR_CLUSTER_NAME` will create empty directory for you.
-And you must put `task_definition.json` file in directories like below. 
+### Prepare Dockerfile
+You need to put `Dockerfile` in your app root directory.
+And all the services/tasks will use the image built with that.
+
+### Prepare task_definition.json and Dockerfile
+
+```sh
+container_ship init YOUR_CLUSTER_NAME
+```
+
+will create empty directory for you. And you must put `task_definition.json` file in directories like below. 
 
 ``` 
 your_app
@@ -54,26 +62,29 @@ your_app
 ### Prepare ECS resources
 You must obey `convention over configuration` concept. So, naming convention is presented below.   
 
-- ECS cluster: "#{cluster_name}-#{environment}"
-- ECS service: "#{cluster_name}-#{service_name}-#{environment}"
-- ECS task:    "#{cluster_name}-#{task_name}-#{environment}"
+- ECS cluster: `"#{cluster_name}-#{environment}"`
+- ECS service: `"#{cluster_name}-#{service_name}-#{environment}"`
+- ECS task:    `"#{cluster_name}-#{task_name}-#{environment}"`
 
 And export your ECR repository root uri.
 
-```
+```sh
 export ECR_REPOSITORY=xxxxxxxxxxxxx.dkr.ecr.ap-northeast-1.amazonaws.com/
 ```
 
 ### Deploy a service
-```
+```sh
 container_ship ship CLUSTER_NAME SERVICE_NAME ENVIRONMENT BUILD_NUMBER
 ```
 
+will deploy a service in `.container_ship/CLUSTER_NAME/services/SERVICE_NAME/ENVIRONMENT/task_definition.json`
+
 ### Run a task
-```
+```sh
 container_ship exec CLUSTER_NAME TASK_NAME ENVIRONMENT BUILD_NUMBER
 ```
-  
+will run a task in `.container_ship/CLUSTER_NAME/tasks/TASK_NAME/ENVIRONMENT/task_definition.json`
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/seibii/container_ship. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.

data/Rakefile

@@ -1,6 +1,8 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+# frozen_string_literal: true
+
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/container_ship.gemspec

@@ -1,15 +1,18 @@
-lib = File.expand_path("lib", __dir__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "container_ship/version"
+require 'container_ship/version'
 
-Gem::Specification.new do |spec|
+Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
   spec.name          = 'container_ship'
   spec.version       = ContainerShip::VERSION
+  spec.required_ruby_version = '>= 2.4'
   spec.authors       = ['Yuji Ueki']
   spec.email         = ['unhappychoice@gmail.com']
 
-  spec.summary       = %q{Yet another ECS deployment tool}
-  spec.description   = %q{container_ship is a simple ECS deployment tool. You only need to prepare Dockerfile and task_definition.json}
+  spec.summary       = 'Yet another ECS deployment tool'
+  spec.description   = 'container_ship is a simple ECS deployment tool. You only need to prepare Dockerfile and task_definition.json' # rubocop:disable Metrics/LineLength
   spec.homepage      = 'https://github.com/seibii/container_ship'
   spec.license       = 'MIT'
 
@@ -19,7 +22,7 @@ Gem::Specification.new do |spec|
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
   spec.bindir        = 'exe'

data/lib/container_ship.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'container_ship/cli'
 require 'container_ship/command'
 require 'container_ship/task_definition'

data/lib/container_ship/cli.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'fileutils'
 require 'thor'
 

data/lib/container_ship/command.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'container_ship/command/exec_command'
 require 'container_ship/command/init_command'
 require 'container_ship/command/ship_command'

data/lib/container_ship/command/exec_command.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'aws-sdk-ecs'
 require 'json'
 require 'open3'
@@ -20,15 +22,15 @@ module ContainerShip
 
         push_image task_definition
 
-        revision = print_around_task("Registering task definition... ") do
+        revision = print_around_task('Registering task definition... ') do
           register task_definition
         end
 
-        task_arn = print_around_task("Sending task request... ") do
+        task_arn = print_around_task('Sending task request... ') do
           run_task task_definition, revision
         end
 
-        exit_status = print_around_task("Waiting task is completed... ") do
+        exit_status = print_around_task('Waiting task is completed... ') do
           wait_task task_definition, task_arn
         end
 

data/lib/container_ship/command/init_command.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ContainerShip
   module Command
     class InitCommand
@@ -7,7 +9,7 @@ module ContainerShip
         FileUtils.mkdir_p(".container_ship/#{cluster_name}/services")
         puts "Created .container_ship/#{cluster_name}/services directory"
 
-        puts "Next: Create tasks_definition.json file to deploy in tasks or services directory 🖖🏻"
+        puts 'Next: Create tasks_definition.json file to deploy in tasks or services directory 🖖🏻'
       end
     end
   end

data/lib/container_ship/command/modules/cloudwatch.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'aws-sdk-cloudwatchlogs'
 
 module ContainerShip

data/lib/container_ship/command/modules/docker.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ContainerShip
   module Command
     module Modules
@@ -15,7 +17,7 @@ module ContainerShip
             o.each { |line| puts line }
             status = w.value
           end
-          exit(status.exit_status) unless status.success?
+          exit(status.exitstatus) unless status.success?
         end
       end
     end

data/lib/container_ship/command/modules/ecs.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ContainerShip
   module Command
     module Modules
@@ -47,13 +49,14 @@ module ContainerShip
 
         def do_every_5_seconds
           count = 0
-          while true
+          loop do
             sleep 3
             print '.'
             exit_status = yield
             count += 1
             next if exit_status.nil?
             return 124 if count > 60
+
             return exit_status
           end
         end

data/lib/container_ship/command/modules/print_task.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ContainerShip
   module Command
     module Modules
@@ -7,7 +9,7 @@ module ContainerShip
         def print_around_task(message)
           print message
           result = yield
-          puts "Done"
+          puts 'Done'
           result
         end
       end

data/lib/container_ship/command/ship_command.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'aws-sdk-ecs'
 require 'json'
 require 'open3'

data/lib/container_ship/task_definition.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ContainerShip
   class TaskDefinition
     attr_reader :cluster_name, :name, :environment, :build_number

data/lib/container_ship/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ContainerShip
-  VERSION = "0.1.0"
+  VERSION = '0.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: container_ship
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Yuji Ueki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-24 00:00:00.000000000 Z
+date: 2020-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-cloudwatchlogs
@@ -201,7 +201,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -238,7 +240,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="