tomo 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 115894083bfa6e3a5bae19a6f13bcdecb64cafa048330a5983ff06c56c0a4afd
-  data.tar.gz: a56fd377d7af6322c87864993d84f63320d44684d61aa93e43b5b455f3831cef
+  metadata.gz: '098582c6866a637c63527b1bf1fecd347686cf1472ddf4e93b11002180b4e0c3'
+  data.tar.gz: 74ea3479cd90f9d3cf038d7b8e6cffa0200a98a51562798ba1b852ca66866f4e
 SHA512:
-  metadata.gz: a126544a598ca800627fb65602793ef52929f89d8fc4dd4efff32cae78e667a48987e8a1acea1541897125c6b3402ef57703f691db2b6d143044b6dc4433feb6
-  data.tar.gz: '0582041ef4e25413d349e9799335d0a9794e926a7bfe54b0a67f4287a0146cf91be246b1df118debf19cec53e5088eba474a8214dd9111b4dd4952480d7e37af'
+  metadata.gz: 7ddd09600b3eae9914c7641b08f169f7f802297cf76170b7faffc0d0cb75cd0af22071c5e8d358c244464efe00672d4573054f30a2947b258aaef3af98e9ed74
+  data.tar.gz: 78c334db75ce535dd00c434fb3a4a927af4369d7f747cc3776334146c9c41bbae785ddb15e4ec42bdea59a66223a3836644f6bf0ec74e42f57c6de85fc822025

data/lib/tomo/console.rb

@@ -12,9 +12,10 @@ module Tomo
       def_delegators :@instance, :interactive?, :prompt, :menu
     end
 
-    def initialize(env=ENV, input=$stdin)
+    def initialize(env=ENV, input=$stdin, output=$stdout)
       @env = env
       @input = input
+      @output = output
     end
 
     def interactive?
@@ -24,7 +25,7 @@ module Tomo
     def prompt(question)
       assert_interactive
 
-      print question
+      output.print question
       line = input.gets
       raise_non_interactive if line.nil?
 
@@ -39,7 +40,7 @@ module Tomo
 
     private
 
-    attr_reader :env, :input
+    attr_reader :env, :input, :output
 
     CI_VARS = %w[
       JENKINS_HOME

data/lib/tomo/plugin/env/tasks.rb

@@ -1,7 +1,7 @@
 require "monitor"
 
 module Tomo::Plugin::Env
-  class Tasks < Tomo::TaskLibrary
+  class Tasks < Tomo::TaskLibrary # rubocop:disable Metrics/ClassLength
     include MonitorMixin
 
     def show
@@ -10,8 +10,8 @@ module Tomo::Plugin::Env
     end
 
     def setup
-      update
       modify_bashrc
+      update
     end
 
     def update
@@ -103,12 +103,37 @@ module Tomo::Plugin::Env
       existing_rc = remote.capture("cat", paths.bashrc, raise_on_error: false)
       return if existing_rc.include?(". #{env_path}")
 
+      fail_if_different_app_already_configured!(existing_rc)
+
       remote.write(text: <<~BASHRC + existing_rc, to: paths.bashrc)
-        if [ -f #{env_path} ]; then
-          . #{env_path}
-        fi
+        if [ -f #{env_path} ]; then  # DO NOT MODIFY THESE LINES
+          . #{env_path}              # ENV MAINTAINED BY TOMO
+        fi                #{' ' * env_path.to_s.length}# END TOMO ENV
 
       BASHRC
     end
+
+    def fail_if_different_app_already_configured!(bashrc)
+      existing_env_path = bashrc[/\s*\.\s+(.+)\s+# ENV MAINTAINED BY TOMO/, 1]
+      return if existing_env_path.nil?
+
+      die <<~REASON
+        Based on the contents of #{paths.bashrc}, it looks like another application
+        is already being deployed via tomo to this host, using the following envrc
+        path:
+
+          #{existing_env_path}
+
+        Tomo is designed such that only one application can be deployed to a given
+        user@host. To deploy multiple applications to the same host, use a separate
+        deployer user per app. Refer to the tomo FAQ for details:
+
+          https://tomo-deploy.com/#faq
+
+        You may be receiving this message in error if you recently renamed or
+        reconfigured your application. In this case, remove the references to the
+        old envrc path in the host's #{paths.bashrc} and re-run env:setup.
+      REASON
+    end
   end
 end

data/lib/tomo/version.rb

@@ -1,3 +1,3 @@
 module Tomo
-  VERSION = "1.2.0".freeze
+  VERSION = "1.3.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tomo
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Matt Brictson
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-07-11 00:00:00.000000000 Z
+date: 2020-08-08 00:00:00.000000000 Z
 dependencies: []
 description: Tomo is a feature-rich deployment tool that contains everything you need
   to deploy a basic Rails app out of the box. It has an opinionated, production-tested