orchestration 0.4.16 → 0.4.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08cb63f8d0226bd0b07c09121cc205ef5eb8f1f1fb1f0864e28488101454476e'
-  data.tar.gz: db348fe347aa7f392720ebc8e47aa64e2597db27cc734a365517e6cb69eb3962
+  metadata.gz: a91b51286907a3f83d8f26c2f624af7ff8693df631e192d5277c47448c0221be
+  data.tar.gz: a28bd46e9cc53ad6e9205244d9619de37bd20323a2f8123744e00b50c85271dc
 SHA512:
-  metadata.gz: ae72a1e819f51e9ead41dac74480ef66854f939c9f15d2f9b887e48c39a52293e8561c76afd3de6e2252a8f0e4b5810a8309e1ee2fe403b99d46d1fde81b5509
-  data.tar.gz: 7c7d5383dae27a4d19a31e03212704f98bd15ec808ee62a197b307b69ba2ee0cc34127b16c467e2029cf4285446529e00edcd691680b0824b076062d730b5fbb
+  metadata.gz: eaf2803526480a45a24c606666579d18e12acf654bf00066c2dcb2bc477c32c6398d8d306935a45279999202ebc949c2546b3ad010e4f8c8214603a791e2a2a2
+  data.tar.gz: 0d47869a2a00259d33001358eccb717e2c407b1c29e3da65dce51f029669c2078de72d811a5cf6401e5bf6a71ca44a2040fd9735e749d3c5eb543c77c27c187d

data/Gemfile

@@ -6,3 +6,21 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in orchestration.gemspec
 gemspec
+
+gem 'activerecord', '~> 6.0'
+gem 'betterp', '~> 0.1.3'
+gem 'bundler', '~> 1.16'
+gem 'bunny', '~> 2.12'
+gem 'byebug', '~> 10.0'
+gem 'mongoid', '~> 7.0'
+gem 'mysql2', '~> 0.5.2'
+gem 'pg', '~> 1.1'
+gem 'rails', '~> 6.0'
+gem 'rake', '~> 10.0'
+gem 'rspec', '~> 3.0'
+gem 'rspec-its', '~> 1.2'
+gem 'rubocop', '~> 0.77.0'
+gem 'sqlite3', '~> 1.3'
+gem 'strong_versions', '~> 0.3.1'
+gem 'thor', '~> 1.0'
+gem 'webmock', '~> 3.4'

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.4.16'
+gem 'orchestration', '~> 0.4.17'
 ```
 
 Install:
@@ -276,6 +276,11 @@ A convenience `Makefile` target `dump` is provided which will output all consume
 make dump
 ```
 
+All commands also support the `verbose` flag which will output all logs immediately to the console:
+```bash
+make build verbose=1
+```
+
 <a name="build-environment"></a>
 ## Build Environment
 

data/lib/orchestration/environment.rb

@@ -69,12 +69,12 @@ module Orchestration
     end
 
     def default_app_name
-      default = root.basename.to_s
+      default = docker_filter(root.basename.to_s)
       return default unless defined?(Rails)
       # Edge case if Rails is used as a dependency but we are not a Rails app:
-      return default if Rails.application.class.parent == Object
+      return default if rails_application == Object
 
-      Rails.application.class.parent.name.underscore
+      docker_filter(rails_application.name.underscore)
     end
 
     def rabbitmq_url
@@ -114,5 +114,22 @@ module Orchestration
     def mongo_volume
       'mongo'
     end
+
+    private
+
+    def rails_application
+      app_class = Rails.application.class
+      # Avoid deprecation warning in Rails 6:
+      # `Module#parent` has been renamed to `module_parent`. `parent`
+      return app_class.module_parent if app_class.respond_to?(:module_parent)
+
+      app_class.parent
+    end
+
+    def docker_filter(string)
+      # Filter out characters not accepted by Docker Hub
+      permitted = [('0'..'9'), ('a'..'z')].map(&:to_a).flatten
+      string.split('').select { |char| permitted.include?(char) }.join
+    end
   end
 end

data/lib/orchestration/templates/makefile_macros.mk.erb

@@ -30,9 +30,11 @@ printrawln=$(call printraw,$1'\n')
 stdout=${pwd}/log/orchestration.stdout.log
 stderr=${pwd}/log/orchestration.stderr.log
 log_path_length=$(shell echo "${stdout}" | wc -c)
+ifndef verbose
 log:= >>${stdout} 2>>${stderr}
 progress_point:=perl -e 'while( my $$line = <STDIN> ) { printf("."); select()->flush(); }'
 log_progress:= > >(tee -ai ${stdout} >&1 | ${progress_point}) 2> >(tee -ai ${stderr} 2>&1 | ${progress_point})
+endif
 red:=$(shell tput setaf 1)
 green:=$(shell tput setaf 2)
 yellow:=$(shell tput setaf 3)

data/lib/orchestration/templates/orchestration.mk.erb

@@ -202,6 +202,7 @@ endif
 
 .PHONY: dump
 dump:
+	ifndef verbose
 	@$(call println)
 	@$(call println,'${yellow}Captured${reset} ${green}stdout${reset} ${yellow}and${reset} ${red}stderr${reset} ${yellow}log data${reset}:')
 	@$(call println)
@@ -222,6 +223,7 @@ dump:
           echo ; cat '${stderr}' ; echo ; \
           $(call hr,${red}) ; \
         )
+	endif
 
 .PHONY: image
 image:

data/lib/orchestration/version.rb

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

data/orchestration.gemspec

@@ -26,22 +26,4 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'erubis', '~> 2.7'
   spec.add_runtime_dependency 'i18n', '>= 0.5'
   spec.add_runtime_dependency 'paint', '~> 2.0'
-  spec.add_runtime_dependency 'thor', '~> 0.20.0'
-
-  spec.add_development_dependency 'activerecord', '~> 5.2'
-  spec.add_development_dependency 'betterp', '~> 0.1.3'
-  spec.add_development_dependency 'bundler', '~> 1.16'
-  spec.add_development_dependency 'bunny', '~> 2.12'
-  spec.add_development_dependency 'byebug', '~> 10.0'
-  spec.add_development_dependency 'mongoid', '~> 7.0'
-  spec.add_development_dependency 'mysql2', '~> 0.5.2'
-  spec.add_development_dependency 'pg', '~> 1.1'
-  spec.add_development_dependency 'rails', '~> 5.2'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rspec-its', '~> 1.2'
-  spec.add_development_dependency 'rubocop', '~> 0.77.0'
-  spec.add_development_dependency 'sqlite3', '~> 1.3'
-  spec.add_development_dependency 'strong_versions', '~> 0.3.1'
-  spec.add_development_dependency 'webmock', '~> 3.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orchestration
 version: !ruby/object:Gem::Version
-  version: 0.4.16
+  version: 0.4.17
 platform: ruby
 authors:
 - Bob Farrell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-21 00:00:00.000000000 Z
+date: 2019-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: database_url
@@ -66,244 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: thor
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.20.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.20.0
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.2'
-- !ruby/object:Gem::Dependency
-  name: betterp
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.3
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
-- !ruby/object:Gem::Dependency
-  name: bunny
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.12'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.12'
-- !ruby/object:Gem::Dependency
-  name: byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: mongoid
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '7.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '7.0'
-- !ruby/object:Gem::Dependency
-  name: mysql2
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.5.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.5.2
-- !ruby/object:Gem::Dependency
-  name: pg
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.2'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !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.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rspec-its
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.77.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.77.0
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: strong_versions
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.1
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
 description: Tools to help launch apps in Docker
 email:
 - robertanthonyfarrell@gmail.com