tomo 0.14.0 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fccccb439486dd6a01d1ae1c4fd89a00449847275c4510dae1e8de286c21d875
-  data.tar.gz: 249c53ba5dcbc1592fcf8ba1c45212dd97c2dbb018ca88b5d6d5a12dcd401895
+  metadata.gz: 3cbbf974be9564d4c3a62f37c35168b6bb843d7795713747a4ed61e8900e1dfc
+  data.tar.gz: 0c9d63948b5685c078e7e29516361aedb92bca506f8d288dd2dcb6b7167c9f4f
 SHA512:
-  metadata.gz: a0638893655f98866b04052ca6d512a42d5f56e6cde2a3798b6e5009ac8cff4fe65561159f22aa8791399bd89dc07a12b904a761c921eeba5eb7d5a054545645
-  data.tar.gz: e15be0b3b72f5f50733bda37bf5012e7a16b0c4abfff7a2b3f248c87008437df54f4c920846bf07b03368c3745bfe052e7f85819fd408ab758bd24bb3fb0d21d
+  metadata.gz: f1dac487e03b17256a35565d150ae6da864ef36d7770e7eaceca41b49411445809ba7c1e4e30d9fd7e89cbc1020a986c179710b32a87d681953dc35747f57379
+  data.tar.gz: bc052619039101ca8383aad67e26c330300ae1819432e381a978660e17cd525e4bb5a91cf65ae211c50abf15688e85c78bbb66ceb028c1aaa0db15e977410c05

data/README.md

@@ -204,6 +204,26 @@ By default, tomo uses the ["accept-new"](https://www.openssh.com/txt/release-7.6
 set ssh_strict_host_key_checking: true # or false
 ```
 
+#### Can I deploy multiple apps to a single host?
+
+Tomo relies on the host user's bash profile for various things, like setting environment variables and initializing rbenv and nodenv. This makes it impractical to deploy multiple apps to a single host using the same deploy user.
+
+The solution is to create multiple users on the remote host, and then configure a different user for deploying each app. That way each user can have its own distinct environment variables and you can easily configure each app differently without risking conflicts. Refer to the [tomo Rails tutorial](https://tomo-deploy.com/tutorials/deploying-rails-from-scratch/#set-up-a-deployer-user) for instructions on creating a deploy user.
+
+E.g. app1 would be configured to deploy as:
+
+```ruby
+host "app1@example.com"
+```
+
+And app2 would be configured to deploy as:
+
+```ruby
+host "app2@example.com"
+```
+
+Next run `tomo setup` for _both_ apps; this will set everything up for both users on the remote host (environment variables, rbenv, etc.). You can now deploy both apps to the same host, with the confidence that their configurations will be kept cleanly separated.
+
 ## Support
 
 This project is a labor of love and I can only spend a few hours a week maintaining it, at most. If you'd like to help by submitting a pull request, or if you've discovered a bug that needs my attention, please let me know. Check out [CONTRIBUTING.md](https://github.com/mattbrictson/tomo/blob/master/CONTRIBUTING.md) to get started. Happy hacking! —Matt

data/lib/tomo/testing/docker_image.rb

@@ -34,6 +34,7 @@ module Tomo
 
         set_up_build_dir
         pull_base_image_if_needed
+        set_up_private_key
         @image_id = build_image
         @container_id = start_container
         @host = Host.parse("deployer@localhost", port: find_ssh_port)
@@ -59,13 +60,10 @@ module Tomo
       # for storing known_hosts.
       def ssh_settings
         hosts_file = File.join(Dir.tmpdir, "tomo_#{SecureRandom.hex(8)}_hosts")
-        key_file = File.expand_path("tomo_test_ed25519", __dir__)
-        FileUtils.chmod(0o600, key_file)
-
         {
           ssh_extra_opts: [
             "-o", "UserKnownHostsFile=#{hosts_file}",
-            "-o", "IdentityFile=#{key_file}"
+            "-o", "IdentityFile=#{private_key_path}"
           ],
           ssh_strict_host_key_checking: false
         }
@@ -73,13 +71,25 @@ module Tomo
 
       private
 
-      attr_reader :container_id, :image_id
+      attr_reader :container_id, :image_id, :private_key_path
 
       def pull_base_image_if_needed
         images = Local.capture('docker images --format "{{.ID}}" ubuntu:18.04')
         Local.capture("docker pull ubuntu:18.04") if images.strip.empty?
       end
 
+      def set_up_private_key
+        @private_key_path = File.join(
+          Dir.tmpdir,
+          "tomo_test_ed25519_#{SecureRandom.hex(8)}"
+        )
+        FileUtils.cp(
+          File.expand_path("tomo_test_ed25519", __dir__),
+          private_key_path
+        )
+        FileUtils.chmod(0o600, private_key_path)
+      end
+
       def build_image
         Local.capture(
           "docker build #{build_dir}"

data/lib/tomo/version.rb

@@ -1,3 +1,3 @@
 module Tomo
-  VERSION = "0.14.0".freeze
+  VERSION = "0.14.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tomo
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.14.1
 platform: ruby
 authors:
 - Matt Brictson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-28 00:00:00.000000000 Z
+date: 2019-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -330,7 +330,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: A friendly CLI for deploying Rails apps ✨