orchestration 0.7.2 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3423dc31e2b526868cb869c930d6f73039437939aa7b2ceb859e0e8106536344
-  data.tar.gz: 4669fd75876e047f52d256dd2f2e3840ecd42f157b04c6f4f81e315ae96ca6ff
+  metadata.gz: ec214938f5a9d352579f7fa8f84ae16ef4c957698eab47ab058fa0cdbb1bde7b
+  data.tar.gz: e3e10e2c892d33271ecf36d48ffff35b861e13aeee59f0d49bdf08c4e3b30763
 SHA512:
-  metadata.gz: 2a4f0579b2698d30103975b175b8a4cdc1df51c5ce883560f2b11f24b8fd3307fd1e6a35868689f6152d182e07ddbc65b6f081fe4b33ae1114e7957b64338c02
-  data.tar.gz: 380413ccb1b108614ad09247a2435178a042c352775712b287c79e707938aa409290ab42f9b0b5d7cc32184fe73de200a8a551ae5c24ba37b3c08655e4caeaf0
+  metadata.gz: dcd8cd6fd5b6b8dbec62e42a1a8dbc6c199d8b822eac2c8fb46350e7057ce8f8d397f0f0baf61239e5e65ede48fdbfe799d3a4ae4db8bba7e9bc6514e1c6ca89
+  data.tar.gz: 10253172f0a5f1c984134c71a375c71388b7eeeff2afdb160ff10e4a7179e80c4a440227cf892487d1d9634edc6e6deeaed083ba476a755fc2c3df7794c8f8e1

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    orchestration (0.7.2)
+    orchestration (0.7.4)
       database_url (~> 0.1.2)
+      dotenv-rails (~> 2.8)
       erubis (~> 2.7)
       i18n
       paint (~> 2.2)
@@ -94,6 +95,10 @@ GEM
     devpack (0.4.0)
     diff-lcs (1.5.0)
     digest (3.1.0)
+    dotenv (2.8.1)
+    dotenv-rails (2.8.1)
+      dotenv (= 2.8.1)
+      railties (>= 3.2)
     erubi (1.10.0)
     erubis (2.7.0)
     globalid (1.0.0)

data/README.md

@@ -31,7 +31,7 @@ Add _Orchestration_ to your `Gemfile`:
 _Ruby 3.x_:
 
 ```ruby
-gem 'orchestration', '~> 0.7.2'
+gem 'orchestration', '~> 0.7.3'
 ```
 
 _Ruby 2.x_:
@@ -166,30 +166,15 @@ make push
 
 ### Development
 
-An [`.env` file](https://docs.docker.com/compose/env-file/) is created automatically in your project root. This file is _not_ stored in version control. Set all application environment variables in this file.
+A [`.env` file](https://docs.docker.com/compose/env-file/) is created automatically in your project root. This file is _not_ stored in version control. Set all application environment variables in this file.
 
 #### Launching a development server
 
-To load all variables from `.env` and launch a development server, run the following command:
+Use vanilla _Rails_ commands to load a server or console. If present, a `.env` file will be read and loaded (via the [dotenv](https://github.com/bkeepers/dotenv) gem) to populate the environment.
 
 ```bash
-make serve
-```
-
-To load a _Rails_ console:
-```bash
-make console
-```
-
-The application environment will be output on launch for convenience.
-
-To pass extra commands to the _Rails_ server:
-```bash
-# Custom server, custom port
-make serve server='webrick -p 3001'
-
-# Default server, custom port, custom bind address
-make serve server='-p 3001 -b 192.168.0.1'
+bundle exec rails s # Launch a server
+bundle exec rails c # Launch a console
 ```
 
 ### Testing

data/lib/orchestration/make/orchestration.mk

@@ -220,11 +220,16 @@ all: build
 
 ### Container management commands ###
 
+.PHONY: pull
+pull:
+	@$(call system,${compose_human} pull)
+	@${compose} pull
+
 .PHONY: start
 ifndef network
 start: network := ${compose_project_name}
 endif
-start: _create-log-directory _clean-logs
+start: _create-log-directory _clean-logs pull
 ifneq (,${compose_services})
 	@$(call system,${compose_human} up --detach)
 ifeq (${env},$(filter ${env},test development))

data/lib/orchestration/terminal.rb

@@ -47,6 +47,10 @@ module Orchestration
       @settings.set(setting, read(prompt, default))
     end
 
+    def print_variable(variable, value)
+      $stdout.print "#{Paint[variable, :blue]}#{Paint['=', :white]}#{Paint[value, :cyan]}"
+    end
+
     private
 
     def prompt(message, default)

data/lib/orchestration/version.rb

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

data/lib/orchestration.rb

@@ -33,28 +33,67 @@ require 'orchestration/terminal'
 require 'orchestration/version'
 
 module Orchestration
-  def self.root
-    Pathname.new(File.dirname(__dir__))
-  end
+  class << self
+    def root
+      Pathname.new(File.dirname(__dir__))
+    end
 
-  def self.makefile
-    root.join('lib', 'orchestration', 'make', 'orchestration.mk')
-  end
+    def makefile
+      root.join('lib', 'orchestration', 'make', 'orchestration.mk')
+    end
 
-  def self.rakefile
-    root.join('lib', 'Rakefile')
-  end
+    def rakefile
+      root.join('lib', 'Rakefile')
+    end
 
-  def self.error(key, options = {})
-    warn('# Orchestration Error')
-    warn("# #{I18n.t("orchestration.#{key}", options)}")
-  end
+    def error(key, options = {})
+      warn('# Orchestration Error')
+      warn("# #{I18n.t("orchestration.#{key}", options)}")
+    end
+
+    def random_local_port
+      socket = Socket.new(:INET, :STREAM, 0)
+      socket.bind(Addrinfo.tcp('127.0.0.1', 0))
+      port = socket.local_address.ip_port
+      socket.close
+      port
+    end
+
+    def print_environment
+      return unless File.exist?('.env')
 
-  def self.random_local_port
-    socket = Socket.new(:INET, :STREAM, 0)
-    socket.bind(Addrinfo.tcp('127.0.0.1', 0))
-    port = socket.local_address.ip_port
-    socket.close
-    port
+      $stdout.puts
+      $stdout.puts("#{prefix} #{Paint['Loading environment from', :cyan]} #{Paint['.env', :green]}")
+      $stdout.puts
+      environment_variables.each do |variable, value|
+        terminal.print_variable(variable, value)
+      end
+      $stdout.puts
+    end
+
+    private
+
+    def terminal
+      @terminal ||= Terminal.new(Environment.new.settings)
+    end
+
+    def prefix
+      "#{Paint['[', :white]}#{Paint['orchestration', :cyan]}#{Paint[']', :white]}"
+    end
+
+    def environment_variables
+      File.readlines('.env').reject { |line| line.match(/^\s*#/) }
+          .select { |line| line.include?('=') }
+          .map do |line|
+            variable, _, value = line.partition('=')
+            [variable, value]
+          end
+    end
   end
 end
+
+if ENV['RAILS_ENV'] == 'development'
+  require 'dotenv-rails'
+  Dotenv::Railtie.load
+  Orchestration.print_environment
+end

data/orchestration.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'database_url', '~> 0.1.2'
+  spec.add_runtime_dependency 'dotenv-rails', '~> 2.8'
   spec.add_runtime_dependency 'erubis', '~> 2.7'
   spec.add_runtime_dependency 'i18n'
   spec.add_runtime_dependency 'paint', '~> 2.2'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orchestration
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.4
 platform: ruby
 authors:
 - Bob Farrell
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-05 00:00:00.000000000 Z
+date: 2023-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: database_url
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.2
+- !ruby/object:Gem::Dependency
+  name: dotenv-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement