orchestration 0.4.18 → 0.4.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08fca47f0273e73914f4c193051888311774c6528c050dceee40e4d8353c6e61'
-  data.tar.gz: 60cd871dcf3db083486ec995975fc2a11b0429690e52bb42271576a4b6fd9795
+  metadata.gz: 04c4bf8c7efdcf0b21359de761d23fef858c08bb856f11c84d28aff11901a08c
+  data.tar.gz: 63288ca1f09bb6527f683c67157b44b446d6ed7d0a0c04a84519c70ca05b5bd7
 SHA512:
-  metadata.gz: e5146caceb7ad9e3a267864bf9b1e642902ad75ca2d1bacd4c2cc8f3ae961095079b41a34fc8d2e8fe492c701d59e0a91441e031be4d36fa421c0aa9c8a3380b
-  data.tar.gz: bab2849a365ee3c43596d158164e2adc0ba7d9c6ec7e1933a9be43d13e05882cbafab5f8f0e44f4219ed5620f2502866bd3a92788066a695325d0241cba6d7ce
+  metadata.gz: a338efc12f119888a068f675f465293fe2b1a1e1cc8e22d7cc78ce22f44d824ed09c989f0790ae59effdcd2eee59203e122c9577b34ab329fca44e98b87dca00
+  data.tar.gz: 302f228e2b1c44ba70453f744e3721b7efa2a61d982d7704274790bbeb38c8a16fa65d8205ec2e0d68b768dee434b1c80e58f24d157eda2c675e32ac10d79b31

data/.gitignore

@@ -17,6 +17,7 @@ Gemfile.lock
 spec/dummy/log/*
 !spec/dummy/log/.keep
 spec/dummy/.gitignore
+spec/dummy/Gemfile
 spec/dummy/Makefile
 spec/dummy/orchestration/*
 spec/dummy/config/unicorn.rb

data/.rubocop.yml

@@ -6,6 +6,11 @@ Metrics/BlockLength:
     - 'spec/**/*'
     - '*.gemspec'
     - 'lib/tasks/orchestration.rake'
+    - 'spec/**/*'
+
+Metrics/ModuleLength:
+  Exclude:
+    - 'lib/orchestration/file_helpers.rb'
 
 AllCops:
   Exclude:

data/Gemfile

@@ -6,21 +6,3 @@ 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.18'
+gem 'orchestration', '~> 0.4.19'
 ```
 
 Install:
@@ -185,6 +185,12 @@ To launch all dependency containers, run database migrations, and run tests:
 make test
 ```
 
+If you prefer to run tests manually (e.g. if you want to run tests for a specific file) then the `test-setup` target can be used:
+```
+make test-setup
+bundle exec rspec spec/my_class_spec.rb
+```
+
 Note that _Orchestration_ will wait for all services to become fully available (i.e. running and providing valid responses) before attempting to run tests. This is specifically intended to facilitate testing in continuous integration environments.
 
 _(See [sidecar containers](#sidecar-containers) if you are running your test/development server inside _Docker_)_.

data/lib/orchestration/file_helpers.rb

@@ -99,23 +99,32 @@ module Orchestration
       @terminal.write(:skip, relpath)
     end
 
-    def ensure_line_in_file(path, line, echo: true)
-      return if line_in_file?(path, line)
+    def ensure_line_in_file(path, line, echo: true, regex: nil)
+      return if line_in_file?(path, line: line, regex: regex)
 
       append_file(path, "\n#{line.chomp}\n", echo: echo)
       true
     end
 
-    def line_in_file?(path, line)
+    def line_in_file?(path, line: nil, regex: nil)
       return false unless File.exist?(path)
+      return regex_in_file?(path, regex) unless regex.nil?
 
       File.readlines(path).map(&:chomp).include?(line.chomp)
     end
 
+    def regex_in_file?(path, regex)
+      File.readlines(path).map(&:chomp).any? { |line| regex.match(line) }
+    end
+
     def templates_path
       Orchestration.root.join('lib', 'orchestration', 'templates')
     end
 
+    def gemfile_path
+      @env.root.join('Gemfile')
+    end
+
     def read_template(template)
       File.read(templates_path.join("#{template}.erb"))
     end

data/lib/orchestration/install_generator.rb

@@ -87,6 +87,8 @@ module Orchestration
       content = template('unicorn.rb')
       path = @env.root.join('config', 'unicorn.rb')
       create_file(path, content, backup: true)
+      regex = /gem\s+['"]unicorn['"]/
+      ensure_line_in_file(gemfile_path, "gem 'unicorn'", regex: regex)
     end
 
     def database_yml

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

@@ -49,24 +49,28 @@ else
   project_base := $(project_name)
 endif
 
-sidecar_suffix := $(shell test -f ${orchestration_dir}/.sidecar && cat ${orchestration_dir}/.sidecar)
-ifneq (,${sidecar_suffix})
-  sidecar := 1
-endif
-
-ifdef sidecar
-  # Set the variable to an empty string so that "#{sidecar-1234}" will evaluate
-  # to "1234" in port mappings.
-  sidecar_compose = sidecar=''
-  ifeq (,${sidecar_suffix})
-    sidecar_suffix := $(call token)
-    _ignore := $(shell echo ${sidecar_suffix} > ${orchestration_dir}/.sidecar)
+ifneq (,$(findstring deploy,$(MAKECMDGOALS)))
+  sidecar_suffix := $(shell test -f ${orchestration_dir}/.sidecar && cat ${orchestration_dir}/.sidecar)
+  ifneq (,${sidecar_suffix})
+    sidecar := 1
   endif
 
-  ifeq (,${sidecar_suffix})
-    $(warning Unable to generate project suffix; project name collisions may occur.)
+  ifdef sidecar
+    # Set the variable to an empty string so that "#{sidecar-1234}" will
+    # evaluate to "1234" in port mappings.
+    sidecar_compose = sidecar=''
+    ifeq (,${sidecar_suffix})
+      sidecar_suffix := $(call token)
+      _ignore := $(shell echo ${sidecar_suffix} > ${orchestration_dir}/.sidecar)
+    endif
+
+    ifeq (,${sidecar_suffix})
+      $(warning Unable to generate project suffix; project name collisions may occur.)
+    endif
+    compose_project_name = ${project_base}_${sidecar_suffix}
+  else
+    compose_project_name = ${project_base}
   endif
-  compose_project_name = ${project_base}_${sidecar_suffix}
 else
   compose_project_name = ${project_base}
 endif
@@ -133,7 +137,7 @@ start-<%= service %>:
 
 .PHONY: stop
 stop: network := ${compose_project_name}_default
-stop: _clean-logs
+stop:
 	@$(call print,'${yellow}Stopping containers${reset} ...')
 	@if docker ps --format "{{.ID}}" | grep -q $(shell hostname) ; \
           then \

data/lib/orchestration/version.rb

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

data/orchestration.gemspec

@@ -19,11 +19,29 @@ Gem::Specification.new do |spec|
     File.readlines('MANIFEST').map(&:chomp)
   end
   spec.bindir = 'bin'
-  spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.executables = []
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'database_url', '~> 0.1.2'
   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', '~> 1.0'
+
+  spec.add_development_dependency 'activerecord', '~> 6.0'
+  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', '~> 6.0'
+  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.18
+  version: 0.4.19
 platform: ruby
 authors:
 - Bob Farrell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-24 00:00:00.000000000 Z
+date: 2020-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: database_url
@@ -66,15 +66,248 @@ 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: '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: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.0'
+- !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: '6.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.0'
+- !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
-executables:
-- console
-- rspec
-- rubocop
-- setup
-- strong_versions
+executables: []
 extensions: []
 extra_rdoc_files: []
 files: