tomo 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43daca76a8f7fc58c99f3365f71d6ef1349643879d5237f9be63fcf956a1a238
-  data.tar.gz: 5a37ebc5429e0feb93fd2591fd268ee0544de08145a950d3f3f37bab50b9a58e
+  metadata.gz: 4f17c4f644a912a79bac63de1bf2bd3d27d87e3bbe58ffdb63e1ee1ffaea160c
+  data.tar.gz: cc22d62f9bd02f647197a7d691c005a5ddf095141f40c12a8af3ea211fd41c04
 SHA512:
-  metadata.gz: 06f34c6c9d0ea370e6fc3cd1095874b53b423edae499b88f8ed7789ee308bbacd69324fadcab590b3e264ebdaf4093129708358744f6e9ded69ef7c7432b8c71
-  data.tar.gz: 605619d1fc09d99eee6c244adba219cd263c0b00d4975f06a3ea1110699a0a0f64cf5226be1a69ff80491906c9e51e35da2be2a8ef2fffc683b214ffee5fd770
+  metadata.gz: 52e06ed4c55e3d1630108802847c04235b1d48ee26225c1e78207931311333c00003c50e5a204aeb2a6752f9013bd3e2610436f2cc65222ea46bdb08513fbeea
+  data.tar.gz: f898fbf717712c309d5c30431fe6a30c71263c1139a4426ad573e8354506cc69dbfba3b443ff100dd1ce35b67c7c837b17d468698ba12a25762e6455cba07859

data/README.md

@@ -111,7 +111,7 @@ Out of the box, tomo will:
 Whereas `tomo setup` is typically run once, you can use `tomo deploy` every time you want to deploy a new version of your app. The deploy command will sequentially run the [deploy](https://tomo-deploy.com/configuration#deployblock) list of tasks specified in `.tomo/config.rb`. You can customize this list to meet the needs of your app. By default, tomo runs these tasks:
 
 1. Create a release (using the [git:create_release](https://tomo-deploy.com/plugins/git#gitcreate_release) task)
-2. Build the project (e.g. [bundler:install](https://tomo-deploy.com/plugins/bundler#bundlerinstall), [rails:assets_precompile](../plugins/rails.md#railsassets_precompile))
+2. Build the project (e.g. [bundler:install](https://tomo-deploy.com/plugins/bundler#bundlerinstall), [rails:assets_precompile](https://tomo-deploy.com/plugins/rails#railsassets_precompile))
 3. Migrate data to the meet the requirements of the new release (e.g. [rails:db_migrate](https://tomo-deploy.com/plugins/rails#railsdb_migrate))
 4. Make the new release the "current" one ([core:symlink_current](https://tomo-deploy.com/plugins/core#coresymlink_current))
 5. Restart the app to use the new current release (e.g. [puma:restart](https://tomo-deploy.com/plugins/puma#pumarestart))

data/lib/tomo/paths.rb

@@ -29,6 +29,8 @@ module Tomo
     end
 
     def path(setting)
+      return nil if settings[setting].nil?
+
       path = settings.fetch(setting).to_s.gsub(%r{//+}, "/")
       Path.new(path)
     end

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

@@ -1,9 +1,27 @@
+require "yaml"
+
 module Tomo::Plugin::Bundler
   class Tasks < Tomo::TaskLibrary
+    CONFIG_SETTINGS = %i[
+      bundler_deployment
+      bundler_gemfile
+      bundler_jobs
+      bundler_path
+      bundler_retry
+      bundler_without
+    ].freeze
+    private_constant :CONFIG_SETTINGS
+
+    def config
+      configuration = settings_to_configuration
+      remote.mkdir_p paths.bundler_config.dirname
+      remote.write(text: YAML.dump(configuration), to: paths.bundler_config)
+    end
+
     def install
-      return if remote.bundle?("check", *check_options) && !dry_run?
+      return if remote.bundle?("check") && !dry_run?
 
-      remote.bundle("install", *install_options)
+      remote.bundle("install")
     end
 
     def clean
@@ -23,31 +41,19 @@ module Tomo::Plugin::Bundler
 
     private
 
-    def version_setting
-      settings[:bundler_version]
-    end
-
-    def check_options
-      gemfile = settings[:bundler_gemfile]
-      path = paths.bundler
+    def settings_to_configuration
+      CONFIG_SETTINGS.each_with_object({}) do |key, config|
+        next if settings[key].nil?
 
-      options = []
-      options.push("--gemfile", gemfile) if gemfile
-      options.push("--path", path) if path
-      options
+        entry_key = "BUNDLE_#{key.to_s.sub(/^bundler_/, '').upcase}"
+        entry_value = settings.fetch(key)
+        entry_value = entry_value.join(":") if entry_value.is_a?(Array)
+        config[entry_key] = entry_value.to_s
+      end
     end
 
-    def install_options
-      jobs = settings[:bundler_jobs]
-      without = settings[:bundler_without]
-      flags = settings[:bundler_install_flags]
-
-      options = check_options.dup
-      options.push("--jobs", jobs) if jobs
-      options.push("--without", without) if without
-      options.push(flags) if flags
-
-      options.flatten
+    def version_setting
+      settings[:bundler_version]
     end
 
     def extract_bundler_ver_from_lockfile

data/lib/tomo/plugin/bundler.rb

@@ -8,11 +8,13 @@ module Tomo::Plugin
     tasks Tomo::Plugin::Bundler::Tasks
     helpers Tomo::Plugin::Bundler::Helpers
 
-    defaults bundler_install_flags: ["--deployment"],
-             bundler_gemfile:       nil,
-             bundler_jobs:          "4",
-             bundler_path:          "%<shared_path>/bundle",
-             bundler_version:       nil,
-             bundler_without:       %w[development test]
+    defaults bundler_config_path: ".bundle/config",
+             bundler_deployment:  true,
+             bundler_gemfile:     nil,
+             bundler_jobs:        "4",
+             bundler_path:        "%<shared_path>/bundle",
+             bundler_retry:       "3",
+             bundler_version:     nil,
+             bundler_without:     %w[development test]
   end
 end

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

@@ -60,9 +60,12 @@ module Tomo::Plugin::Core
 
     # rubocop:disable Metrics/AbcSize
     def log_revision
+      ref = remote.release[:ref]
+      revision = remote.release[:revision]
+
       message = remote.release[:deploy_date].to_s
-      message << " - #{remote.release[:revision] || '<unknown>'}"
-      message << " (#{remote.release[:branch] || '<unknown>'})"
+      message << " - #{revision || '<unknown>'}"
+      message << " (#{ref})" if ref && revision && !revision.start_with?(ref)
       message << " deployed by #{remote.release[:deploy_user] || '<unknown>'}"
       message << "\n"
 

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

@@ -15,24 +15,45 @@ module Tomo::Plugin::Git
       end
     end
 
+    # rubocop:disable Metrics/MethodLength
     def create_release
-      configure_git_attributes
       remote.chdir(paths.git_repo) do
         remote.git("remote update --prune")
-        remote.mkdir_p(paths.release)
+      end
+
+      store_release_info
+      configure_git_attributes
+      remote.mkdir_p(paths.release)
+
+      remote.chdir(paths.git_repo) do
         remote.git(
-          "archive #{branch.shellescape} | "\
+          "archive #{ref.shellescape} | "\
           "tar -x -f - -C #{paths.release.shellescape}"
         )
       end
-      store_release_info
     end
+    # rubocop:enable Metrics/MethodLength
     # rubocop:enable Metrics/AbcSize
 
     private
 
-    def branch
-      settings[:git_branch]
+    def ref
+      require_setting :git_ref if settings[:git_branch].nil?
+
+      warn_if_ref_overrides_branch
+      settings[:git_ref] || settings[:git_branch]
+    end
+
+    def warn_if_ref_overrides_branch
+      return if defined?(@ref_override_warning)
+      return unless settings[:git_ref] && settings[:git_branch]
+
+      logger.warn(
+        ":git_ref (#{settings[:git_ref]}) and "\
+        ":git_branch (#{settings[:git_branch]}) are both specified. "\
+        "Ignoring :git_branch."
+      )
+      @ref_override_warning = true
     end
 
     def set_origin_url
@@ -57,13 +78,14 @@ module Tomo::Plugin::Git
       log = remote.chdir(paths.git_repo) do
         remote.git(
           'log -n1 --date=iso --pretty=format:"%H/%cd/%ae" '\
-          "#{branch.shellescape}",
+          "#{ref.shellescape} --",
           silent: true
         ).stdout.strip
       end
 
       sha, date, email = log.split("/", 3)
-      remote.release[:branch] = branch
+      remote.release[:branch] = ref if ref == settings[:git_branch]
+      remote.release[:ref] = ref
       remote.release[:author] = email
       remote.release[:revision] = sha
       remote.release[:revision_date] = date

data/lib/tomo/plugin/git.rb

@@ -13,6 +13,7 @@ module Tomo::Plugin
              git_repo_path:  "%<deploy_to>/git_repo",
              git_exclusions: [],
              git_env:        { GIT_SSH_COMMAND: "ssh -o PasswordAuthentication=no -o StrictHostKeyChecking=no" },
+             git_ref:        nil,
              git_url:        nil
     # rubocop:enable Metrics/LineLength
   end

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

@@ -29,7 +29,6 @@ set env_vars: {
   SECRET_KEY_BASE: :prompt
 }
 set linked_dirs: %w[
-  .bundle
   log
   node_modules
   public/assets
@@ -47,6 +46,7 @@ setup do
   run "nodenv:install"
   run "rbenv:install"
   run "bundler:upgrade_bundler"
+  run "bundler:config"
   run "bundler:install"
   run "rails:db_create"
   run "rails:db_schema_load"

data/lib/tomo/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tomo
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Matt Brictson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-23 00:00:00.000000000 Z
+date: 2019-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -306,7 +306,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: A simple SSH-based deployment tool, built for Rails