orchestration 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3ef93d88b5d6c2c60bf1c558ec2f04c3563194bae32a5374b53b8a2dd53a73f
-  data.tar.gz: 1488c9004ca7857e59e4dafd5f2276d4c0dd2ad70776ad57f6250dc633895e99
+  metadata.gz: a8525fb5a3f6bd07564ec80a6f2663f1ab3157f7e4ad7e3db411844e36ae42d1
+  data.tar.gz: 7828198b463b1e40a0f4b085efe848b742aa04dded4278df485706c358eed618
 SHA512:
-  metadata.gz: 93470c6903f7aaa33b3e684712884733b9112080e7b94bd8461feff6c9fe15c9a647710be340fcd4071a143c9d4a31e2dd2c2bd47de31333b8e93bd121072818
-  data.tar.gz: 024df80165322260d9a9df620eedc4b69fe9e4d844b35f5a21b5ce5a7658f380ac85fd37aec169ed2c50f59917dc89a18a75f661062b8cdb12833b29c5c6eb80
+  metadata.gz: 2ca10bebdc3fc34cda1491dfa694386b591c0f1122c1a2d4a1c16273a6f936cdf49aa7b97b9b91b1ab271ff41b0b881a9a736956ff5d3709c07ee42da96030ea
+  data.tar.gz: 6c86b19c30c5265ed9ad37af22ffab8176c88e815918a62278b2cfe82d4ec9cb4f4237f2202e88423ea1580a112058231e5f5005a4e1c5cf63cf7809e105a3d3

data/README.md

@@ -35,7 +35,7 @@ The below screenshot demonstrates _Orchestration_ being installed in a brand new
 Add _Orchestration_ to your Gemfile:
 
 ```ruby
-gem 'orchestration', '~> 0.5.1'
+gem 'orchestration', '~> 0.5.2'
 ```
 
 Install:

data/lib/orchestration.rb

@@ -22,6 +22,7 @@ require 'orchestration/file_helpers'
 require 'orchestration/docker_compose'
 require 'orchestration/environment'
 require 'orchestration/errors'
+require 'orchestration/docker_healthcheck'
 require 'orchestration/install_generator'
 require 'orchestration/railtie' if defined?(Rails)
 require 'orchestration/service_check'

data/lib/orchestration/docker_healthcheck.rb

@@ -1,64 +1,65 @@
 # frozen_string_literal: true
 
 require 'net/http'
+module Orchestration
+  class DockerHealthcheck
+    def self.execute
+      new.execute
+    end
 
-class DockerHealthcheck
-  def self.execute
-    new.execute
-  end
-
-  def execute
-    return_code = 1
+    def execute
+      return_code = 1
 
-    # rubocop:disable Lint/RescueException
-    begin
-      response = run
-      return_code = 0 if success?(response.code)
-      puts message(response.code)
-    rescue Exception => e
-      puts "[#{__FILE__}] ERROR: #{e.inspect}"
-    ensure
-      exit return_code
+      # rubocop:disable Lint/RescueException
+      begin
+        response = run
+        return_code = 0 if success?(response.code)
+        puts message(response.code)
+      rescue Exception => e
+        puts "[#{__FILE__}] ERROR: #{e.inspect}"
+      ensure
+        exit return_code
+      end
+      # rubocop:enable Lint/RescueException
     end
-    # rubocop:enable Lint/RescueException
-  end
 
-  private
+    private
 
-  def request
-    client = Net::HTTP.new(
-      ENV.fetch('WEB_HOST', 'localhost'),
-      ENV.fetch('WEB_PORT', '8080').to_i
-    )
+    def run
+      client = Net::HTTP.new(
+        ENV.fetch('WEB_HOST', 'localhost'),
+        ENV.fetch('WEB_PORT', '8080').to_i
+      )
 
-    client.read_timeout = ENV.fetch('WEB_HEALTHCHECK_READ_TIMEOUT', '10').to_i
-    client.open_timeout = ENV.fetch('WEB_HEALTHCHECK_OPEN_TIMEOUT', '10').to_i
+      client.read_timeout = ENV.fetch('WEB_HEALTHCHECK_READ_TIMEOUT', '10').to_i
+      client.open_timeout = ENV.fetch('WEB_HEALTHCHECK_OPEN_TIMEOUT', '10').to_i
 
-    client.start do |request|
-      request.get(ENV.fetch('WEB_HEALTHCHECK_PATH') { '/' })
+      client.start do |request|
+        request.get(ENV.fetch('WEB_HEALTHCHECK_PATH') { '/' })
+      end
     end
-  end
 
-  def success_codes
-    ENV.fetch('WEB_HEALTHCHECK_SUCCESS_CODES', '200,202,204').split(',')
-  end
-
-  def success?(code)
-    success_codes.include?(code.to_s)
-  end
+    def success_codes
+      ENV.fetch('WEB_HEALTHCHECK_SUCCESS_CODES', '200,202,204').split(',')
+    end
 
-  def message(code)
-    if success?(code)
-      outcome = 'SUCCESS ✓ '
-      in_or_not = 'IN'
-    else
-      outcome = 'FAILURE ✘ '
-      in_or_not = 'NOT IN'
+    def success?(code)
+      success_codes.include?(code.to_s)
     end
 
-    accepted = success_codes.join(', ')
-    message = "#{in_or_not} [#{accepted}] : #{outcome} [#{__FILE__}]"
+    def message(code)
+      if success?(code)
+        outcome = 'SUCCESS ✓ '
+        in_or_not = 'IN'
+      else
+        outcome = 'FAILURE ✘ '
+        in_or_not = 'NOT IN'
+      end
 
-    "# HTTP_STATUS(#{code}) #{message}"
+      accepted = success_codes.join(', ')
+      message = "#{in_or_not} [#{accepted}] : #{outcome} [#{__FILE__}]"
+
+      "# HTTP_STATUS(#{code}) #{message}"
+    end
   end
 end

data/lib/orchestration/templates/Dockerfile.erb

@@ -20,10 +20,10 @@ COPY .build/Gemfile .build/Gemfile.lock ./
 RUN bundle install --without development test --deployment
 <% if defined?(Webpacker) %>
 COPY .build/package.json .build/yarn.lock ./
-RUN . /root/.bashrc && yarn install
+RUN . /root/.bashrc ; yarn install
 <% end %>
 ADD .build/context.tar .
-<% if defined?(Webpacker) %>RUN . /root/.bashrc && NODE_ENV=production RAILS_ENV=production yarn install && NODE_ENV=production RAILS_ENV=production SECRET_KEY_BASE=abc123 bundle exec rake assets:precompile<% elsif Rake::Task.tasks.map(&:name).include?('assets:precompile') %>RUN NODE_ENV=production RAILS_ENV=production SECRET_KEY_BASE=abc123 bundle exec rake assets:precompile<% end %>
+<% if defined?(Webpacker) %>RUN . /root/.bashrc ; NODE_ENV=production RAILS_ENV=production yarn install && NODE_ENV=production RAILS_ENV=production SECRET_KEY_BASE=abc123 bundle exec rake assets:precompile<% elsif Rake::Task.tasks.map(&:name).include?('assets:precompile') %>RUN NODE_ENV=production RAILS_ENV=production SECRET_KEY_BASE=abc123 bundle exec rake assets:precompile<% end %>
 RUN echo "${GIT_COMMIT}" > /app/GIT_COMMIT
 HEALTHCHECK --interval=<%= healthcheck['interval'] %> \
             --timeout=<%= healthcheck['timeout'] %> \

data/lib/orchestration/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Orchestration
-  VERSION = '0.5.1'
+  VERSION = '0.5.2'
 end

data/lib/tasks/orchestration.rake

@@ -23,7 +23,7 @@ namespace :orchestration do
 
   desc I18n.t('orchestration.rake.healthcheck')
   task :healthcheck do
-    Orchestration::Healthcheck.execute
+    Orchestration::DockerHealthcheck.execute
   end
 
   desc I18n.t('orchestration.rake.wait')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orchestration
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Bob Farrell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-28 00:00:00.000000000 Z
+date: 2020-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: database_url