orchestration 0.7.8 → 0.7.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c7e9edb1bd0c867ecf0ec2e04843a9088da9094a58db4a5316d232f08852383
-  data.tar.gz: de0f1c365a23e2d88ee01f108800801ee261765d756cff2d28bf548d0d3c9c06
+  metadata.gz: a7f2c48f8cea2252de2052ebe5f7f5a668b1fc61163cc08e299f14c0029dce8e
+  data.tar.gz: b886c269f560b78e6123285b476dd30ceee7c234a530e5ba6bbfc5eeb83b9e2a
 SHA512:
-  metadata.gz: dcd287e55fddb78b737ae52a8c5af3e632c34cb55391aa7ea14593f501c1935e66e9070064c83b251a408326b3f31099b9bcbc3c56f76123e5a3da6e47a4ef02
-  data.tar.gz: cf2f763a19c10b0717c2918ebd996371e0b3445db287833b14d66cef07e4737f183692944d5f1b468436fb6775a786a64ad4866ab843e04f9f7009ee3ffb610f
+  metadata.gz: 4d4e59b7abdeabc3b354b6826a5d3fcceb8f4dcdfd7ce76008e765a6a94e334a335589374ee5dca2da7ee762ffc615c9d789ad469149cdadca25408c958c986e
+  data.tar.gz: b17ebc5095a553993b64df89d56671cc61852d136e1dcc8c1a0217d74a4cd355d9d513401259e59143158ce91c220a765ad17083c66c596a190b10fb4904fd14

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    orchestration (0.7.8)
+    orchestration (0.7.9)
       database_url (~> 0.1.2)
       dotenv-rails (~> 2.8)
       erubis (~> 2.7)

data/README.md

@@ -60,6 +60,12 @@ To rebuild all build-out at any time, pass `force=yes` to the above install comm
 
 You will be prompted to enter values for your _Docker_ organisation and repository name. For example, the _organisation_ and _repository_ for https://hub.docker.com/r/rubyorchestration/sampleapp are `rubyorchestration` and `sampleapp` respectively. If you are unsure of these values, they can be modified later by editing `.orchestration.yml` in the root of your project directory.
 
+Override these values from the command line by passing `project` and `organization` variables:
+
+```bash
+rake orchestration:install project=myapp organization=myorg
+```
+
 #### Configuration files
 
 _Orchestration_ generates the following files where appropriate. Backups are created if a file is replaced.

data/lib/orchestration/install_generator.rb

@@ -17,10 +17,8 @@ module Orchestration
     end
 
     def orchestration_configuration
-      path = @env.orchestration_configuration_path
-      @terminal.ask_setting('docker.organization')
-      @terminal.ask_setting('docker.repository', @env.default_app_name)
-      relpath = relative_path(path)
+      configure_orchestration_settings
+      relpath = relative_path(@env.orchestration_configuration_path)
       return @terminal.write(:create, relpath) unless @settings.exist? || force?
       return @terminal.write(:update, relpath) if @settings.dirty?
 
@@ -155,6 +153,19 @@ module Orchestration
         healthcheck: DockerCompose::AppService.healthcheck
       )
     end
+
+    def configure_orchestration_settings
+      @terminal.ask_setting(
+        'docker.organization',
+        override: ENV.fetch('organization', nil)
+      )
+
+      @terminal.ask_setting(
+        'docker.repository',
+        default: @env.default_app_name,
+        override: ENV.fetch('project', nil)
+      )
+    end
   end
   # rubocop:enable Metrics/ClassLength
 end

data/lib/orchestration/terminal.rb

@@ -39,8 +39,9 @@ module Orchestration
       result
     end
 
-    def ask_setting(setting, default = nil)
+    def ask_setting(setting, default: nil, override: nil)
       return unless @settings.get(setting).nil?
+      return @settings.set(setting, override) unless override.nil?
 
       write(:setup, t("settings.#{setting}.description"))
       prompt = t("settings.#{setting}.prompt")

data/lib/orchestration/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orchestration
 version: !ruby/object:Gem::Version
-  version: 0.7.8
+  version: 0.7.9
 platform: ruby
 authors:
 - Bob Farrell
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-05 00:00:00.000000000 Z
+date: 2023-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: database_url