tomo 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64db4196df1505dcfb7b3be9098bf1fdcd6583dda180ac2108a01c4b8ee399da
-  data.tar.gz: 2409539abd04df955234e48d26a463a4a5491a2626d482e9b519016f479d3064
+  metadata.gz: 43daca76a8f7fc58c99f3365f71d6ef1349643879d5237f9be63fcf956a1a238
+  data.tar.gz: 5a37ebc5429e0feb93fd2591fd268ee0544de08145a950d3f3f37bab50b9a58e
 SHA512:
-  metadata.gz: 9c4ac76cbece92d504f2e229eb68779c679e9c1389554bcb1a39ef76bf88e15e9543b9b4b711990a6faaf0cdbba6b2a022606bc701fe32342f2e98c2100cbd9e
-  data.tar.gz: dd03847eb940857c45fe7a02b662b07280fe669de17cd778cb8ad542bafc3b81306fff543d37ce2e613ba3ab813356a8bd8f6af47726919d0106c84cb154bf7b
+  metadata.gz: 06f34c6c9d0ea370e6fc3cd1095874b53b423edae499b88f8ed7789ee308bbacd69324fadcab590b3e264ebdaf4093129708358744f6e9ded69ef7c7432b8c71
+  data.tar.gz: 605619d1fc09d99eee6c244adba219cd263c0b00d4975f06a3ea1110699a0a0f64cf5226be1a69ff80491906c9e51e35da2be2a8ef2fffc683b214ffee5fd770

data/README.md

@@ -169,12 +169,12 @@ Read the [Writing Custom Tasks](https://tomo-deploy.com/tutorials/writing-custom
   - [bundler](https://tomo-deploy.com/plugins/bundler/)
   - [env](https://tomo-deploy.com/plugins/env/)
   - [git](https://tomo-deploy.com/plugins/git/)
-  - [nvm](https://tomo-deploy.com/plugins/nvm/)
+  - [nodenv](https://tomo-deploy.com/plugins/nodenv/)
   - [puma](https://tomo-deploy.com/plugins/puma/)
   - [rails](https://tomo-deploy.com/plugins/rails/)
   - [rbenv](https://tomo-deploy.com/plugins/rbenv/)
 - Tutorials
-  - [Deploying Rails From Scratch](https://tomo-deploy.com/tutorials/deploying-rails-from-scratch/) [TODO]
+  - [Deploying Rails From Scratch](https://tomo-deploy.com/tutorials/deploying-rails-from-scratch/)
   - [Writing Custom Tasks](https://tomo-deploy.com/tutorials/writing-custom-tasks/)
   - [Publishing a Plugin](https://tomo-deploy.com/tutorials/publishing-a-plugin/) [TODO]
 - API

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

@@ -0,0 +1,60 @@
+require "shellwords"
+
+module Tomo::Plugin::Nodenv
+  class Tasks < Tomo::TaskLibrary
+    def install
+      run_installer
+      modify_bashrc
+      install_node
+      install_yarn
+    end
+
+    private
+
+    def run_installer
+      install_url = "https://github.com/nodenv/nodenv-installer/raw/master/bin/nodenv-installer"
+      remote.env PATH: raw("$HOME/.nodenv/bin:$HOME/.nodenv/shims:$PATH") do
+        remote.run("curl -fsSL #{install_url.shellescape} | bash")
+      end
+    end
+
+    def modify_bashrc
+      existing_rc = remote.capture("cat", paths.bashrc, raise_on_error: false)
+      return if existing_rc.include?("nodenv init")
+
+      remote.write(text: <<~BASHRC + existing_rc, to: paths.bashrc)
+        if [ -d $HOME/.nodenv ]; then
+          export PATH="$HOME/.nodenv/bin:$PATH"
+          eval "$(nodenv init -)"
+        fi
+      BASHRC
+    end
+
+    def install_node
+      require_setting :nodenv_node_version
+      node_version = settings[:nodenv_node_version]
+
+      unless node_installed?(node_version)
+        remote.run "nodenv install #{node_version.shellescape}"
+      end
+      remote.run "nodenv global #{node_version.shellescape}"
+    end
+
+    def install_yarn
+      version = settings[:nodenv_yarn_version]
+      return remote.run "npm i -g yarn@#{version.shellescape}" if version
+
+      logger.info "No :nodenv_yarn_version specified; "\
+      "skipping yarn installation."
+    end
+
+    def node_installed?(version)
+      versions = remote.capture("nodenv versions", raise_on_error: false)
+      if versions.include?(version)
+        logger.info("Node #{version} is already installed.")
+        return true
+      end
+      false
+    end
+  end
+end

data/lib/tomo/plugin/nodenv.rb

@@ -0,0 +1,13 @@
+require_relative "nodenv/tasks"
+
+module Tomo::Plugin
+  module Nodenv
+    extend Tomo::PluginDSL
+
+    defaults bashrc_path: ".bashrc",
+             nodenv_node_version: nil,
+             nodenv_yarn_version: nil
+
+    tasks Tomo::Plugin::Nodenv::Tasks
+  end
+end

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

@@ -3,10 +3,8 @@ module Tomo::Plugin::Puma
     def restart
       return if try_restart
 
-      remote.chdir(paths.current) do
-        logger.info "Puma is not running. Starting it now."
-        remote.bundle("exec", "puma", "--daemon", *control_options)
-      end
+      logger.info "Puma is not running. Starting it now."
+      start
     end
 
     private
@@ -26,6 +24,25 @@ module Tomo::Plugin::Puma
       true
     end
 
+    def start
+      require_settings :puma_stdout_path, :puma_stderr_path
+
+      ensure_output_directory
+
+      remote.chdir(paths.current) do
+        remote.bundle(
+          "exec", "puma", "--daemon", *control_options,
+          raw(">"), paths.puma_stdout,
+          raw("2>"), paths.puma_stderr
+        )
+      end
+    end
+
+    def ensure_output_directory
+      dirs = [paths.puma_stdout, paths.puma_stderr].map(&:dirname).map(&:to_s)
+      remote.mkdir_p dirs.uniq
+    end
+
     def control_options
       require_settings :puma_control_token, :puma_control_url
 

data/lib/tomo/plugin/puma.rb

@@ -7,6 +7,8 @@ module Tomo::Plugin
     tasks Tomo::Plugin::Puma::Tasks
 
     defaults puma_control_token: "tomo",
-             puma_control_url: "tcp://127.0.0.1:9293"
+             puma_control_url: "tcp://127.0.0.1:9293",
+             puma_stderr_path: "%<shared_path>/log/puma.err",
+             puma_stdout_path: "%<shared_path>/log/puma.out"
   end
 end

data/lib/tomo/templates/config.rb.erb

@@ -2,7 +2,7 @@ plugin "git"
 plugin "env"
 plugin "bundler"
 plugin "rails"
-plugin "nvm"
+plugin "nodenv"
 plugin "puma"
 plugin "rbenv"
 plugin "./plugins/<%= app %>.rb"
@@ -11,9 +11,9 @@ host "user@hostname.or.ip.address"
 
 set application: <%= app.inspect %>
 set deploy_to: "/var/www/%<application>"
-set nvm_node_version: <%= node_version&.inspect || "nil # FIXME" %>
-set nvm_yarn_version: <%= yarn_version.inspect %>
 set rbenv_ruby_version: <%= RUBY_VERSION.inspect %>
+set nodenv_node_version: <%= node_version&.inspect || "nil # FIXME" %>
+set nodenv_yarn_version: <%= yarn_version.inspect %>
 set git_url: <%= git_origin_url&.inspect || "nil # FIXME" %>
 set git_branch: "master"
 set git_exclusions: %w[
@@ -22,8 +22,9 @@ set git_exclusions: %w[
   test/
 ]
 set env_vars: {
-  RAILS_ENV: "production",
   RACK_ENV: "production",
+  RAILS_ENV: "production",
+  RAILS_SERVE_STATIC_FILES: "1",
   DATABASE_URL: :prompt,
   SECRET_KEY_BASE: :prompt
 }
@@ -32,6 +33,9 @@ set linked_dirs: %w[
   log
   node_modules
   public/assets
+  tmp/cache
+  tmp/pids
+  tmp/sockets
 ]
 
 setup do
@@ -40,7 +44,7 @@ setup do
   run "git:clone"
   run "git:create_release"
   run "core:symlink_shared"
-  run "nvm:install"
+  run "nodenv:install"
   run "rbenv:install"
   run "bundler:upgrade_bundler"
   run "bundler:install"

data/lib/tomo/version.rb

@@ -1,3 +1,3 @@
 module Tomo
-  VERSION = "0.4.1".freeze
+  VERSION = "0.5.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tomo
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Matt Brictson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-05 00:00:00.000000000 Z
+date: 2019-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -218,8 +218,8 @@ files:
 - lib/tomo/plugin/git.rb
 - lib/tomo/plugin/git/helpers.rb
 - lib/tomo/plugin/git/tasks.rb
-- lib/tomo/plugin/nvm.rb
-- lib/tomo/plugin/nvm/tasks.rb
+- lib/tomo/plugin/nodenv.rb
+- lib/tomo/plugin/nodenv/tasks.rb
 - lib/tomo/plugin/puma.rb
 - lib/tomo/plugin/puma/tasks.rb
 - lib/tomo/plugin/rails.rb

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

@@ -1,61 +0,0 @@
-require "shellwords"
-
-module Tomo::Plugin::Nvm
-  class Tasks < Tomo::TaskLibrary
-    def install
-      remote.mkdir_p raw("$HOME/.nvm")
-      modify_bashrc
-      run_installer
-      install_node
-      install_yarn
-    end
-
-    private
-
-    def run_installer
-      require_setting :nvm_version
-
-      nvm_version = settings[:nvm_version]
-      install_url = "https://raw.githubusercontent.com/creationix/nvm/"\
-                    "v#{nvm_version}/install.sh"
-      remote.run("curl -o- #{install_url.shellescape} | bash")
-    end
-
-    def modify_bashrc
-      existing_rc = remote.capture("cat", paths.bashrc, raise_on_error: false)
-      return if existing_rc.include?("nvm.sh")
-
-      remote.write(text: <<~BASHRC + existing_rc, to: paths.bashrc)
-        export NVM_DIR="$HOME/.nvm"
-        [ -s "$NVM_DIR/nvm.sh" ] && \\. "$NVM_DIR/nvm.sh"
-
-      BASHRC
-    end
-
-    def install_node
-      require_setting :nvm_node_version
-      node_version = settings[:nvm_node_version]
-
-      unless node_installed?(node_version)
-        remote.run "nvm", "install", node_version
-      end
-      remote.run "nvm", "alias", "default", node_version
-    end
-
-    def install_yarn
-      version = settings[:nvm_yarn_version]
-      return remote.run "npm i -g yarn@#{version.shellescape}" if version
-
-      logger.info "No :nvm_yarn_version specified; skipping yarn installation."
-    end
-
-    def node_installed?(version)
-      versions = remote.capture("nvm ls", raise_on_error: false)
-      if versions.include?("v#{version}")
-        logger.info("Node #{version} is already installed.")
-        return true
-      end
-      false
-    end
-  end
-end

data/lib/tomo/plugin/nvm.rb

@@ -1,14 +0,0 @@
-require_relative "nvm/tasks"
-
-module Tomo::Plugin
-  module Nvm
-    extend Tomo::PluginDSL
-
-    defaults bashrc_path: ".bashrc",
-             nvm_version: "0.34.0",
-             nvm_node_version: nil,
-             nvm_yarn_version: nil
-
-    tasks Tomo::Plugin::Nvm::Tasks
-  end
-end