tomo 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3709b7fde6da1f50f3f23f1b002e0ac0a6d674d48b29d3ebe25870aa4fa6c52f
-  data.tar.gz: ad3f15ea1ce2dd522b3d8db8063d019db71e734433a0423beed4e754ffbe5995
+  metadata.gz: 79cfaa19c379a5d143b07102f521a707495a89446b4c08a9048b11ee212585b6
+  data.tar.gz: 180a8b7e1a7812e7a71b8c9b0dd1c8c9607ac81a5e025de7e685de86dca534d8
 SHA512:
-  metadata.gz: 92e4db85ca0f4c31ccf11f291ba4c1afc1712df118235128e385ff119033f2898f9f1c81e57d961defbbca7cfa9498970811806de50086388a3758d6eda060c9
-  data.tar.gz: 45c1c79d1167e47591e4cea373b93d06136bb62bf54d1f3e2d8d6d7a6f6c2c20956f38d3c0fb051869f5e27800b8571f9e853dd39e24e7e82f352c345c4f2356
+  metadata.gz: 737d43b6ab7ca31529ec9c1c3cc7ea98c87af44cc7c7324c36287e536afc0b95313a77ec989295f7f3998ad4eb7acc9b41e2e128d2dceb78c93e4f3c6d529a71
+  data.tar.gz: e704de839bac059e668f0aa43433cddadd46e2bf2978e6f49d135da3c9d9deb5a63e3f5660bdbf286f3b49f7263201d73a8e24c16986f526179bed4574deaef9

data/lib/tomo/runtime/settings_interpolation.rb

@@ -7,75 +7,33 @@ module Tomo
 
       def initialize(settings)
         @settings = symbolize(settings)
-        @deprecation_warnings = []
       end
 
       def call
         hash = Hash[settings.keys.map { |name| [name, fetch(name)] }]
         dump_settings(hash) if Tomo.debug?
-        print_deprecation_warnings
         hash
       end
 
       private
 
-      attr_reader :settings, :deprecation_warnings
+      attr_reader :settings
 
-      # rubocop:disable Metrics/AbcSize
       def fetch(name, stack=[])
         raise_circular_dependency_error(name, stack) if stack.include?(name)
         value = settings.fetch(name)
         return value unless value.is_a?(String)
 
-        value.gsub(/%{(\w+)}|%<(\w+)>/) do
-          token = Regexp.last_match[1] || Regexp.last_match[2]
-          deprecation_warnings << name if Regexp.last_match[2]
-
-          fetch(token.to_sym, stack + [name])
+        value.gsub(/%{(\w+)}/) do
+          fetch(Regexp.last_match[1].to_sym, stack + [name])
         end
       end
-      # rubocop:enable Metrics/AbcSize
 
       def raise_circular_dependency_error(name, stack)
         dependencies = [*stack, name].join(" -> ")
         raise "Circular dependency detected in settings: #{dependencies}"
       end
 
-      # rubocop:disable Metrics/AbcSize
-      # rubocop:disable Metrics/MethodLength
-      def print_deprecation_warnings
-        return if deprecation_warnings.empty?
-
-        examples = ""
-        deprecation_warnings.uniq.each do |name|
-          sett = settings[name].inspect
-          old_syntax = sett.gsub(
-            /%<(\w+)>/,
-            Colors.red("%<") + '\1' + Colors.red(">")
-          )
-          new_syntax = sett.gsub(
-            /%<(\w+)>/,
-            Colors.green("%{") + '\1' + Colors.green("}")
-          )
-
-          examples << "\n:#{name}\n\n"
-          examples << "  Replace:   set #{name}: #{old_syntax}\n"
-          examples << "  with this: set #{name}: #{new_syntax}\n"
-        end
-
-        Tomo.logger.warn <<~WARNING
-          There are settings using the deprecated %<...> interpolation syntax.
-          #{examples}
-          #{Colors.red('The %<...> syntax will not work in future versions of tomo.')}
-
-        WARNING
-
-        # Make sure people see the warning!
-        sleep 5
-      end
-      # rubocop:enable Metrics/AbcSize
-      # rubocop:enable Metrics/MethodLength
-
       def symbolize(hash)
         hash.each_with_object({}) do |(key, value), symbolized|
           symbolized[key.to_sym] = value

data/lib/tomo/runtime/unknown_task_error.rb

@@ -9,14 +9,27 @@ module Tomo
           To see a list of all available tasks, run #{blue('tomo tasks')}.
         ERROR
 
-        # TODO: suggest "did you forget to add the <abc> plugin?"
+        sugg = spelling_suggestion || missing_plugin_suggestion
+        error << sugg if sugg
+        error
+      end
 
+      private
+
+      def spelling_suggestion
         sugg = Error::Suggestions.new(
           dictionary: known_tasks,
           word: unknown_task
         )
-        error << sugg.to_console if sugg.any?
-        error
+        sugg.to_console if sugg.any?
+      end
+
+      def missing_plugin_suggestion
+        unknown_plugin = unknown_task[/\A(.+?):/, 1]
+        known_plugins = known_tasks.map { |t| t.split(":").first }.uniq
+        return if unknown_plugin.nil? || known_plugins.include?(unknown_plugin)
+
+        "\nDid you forget to install the #{blue(unknown_plugin)} plugin?"
       end
     end
   end

data/lib/tomo/version.rb

@@ -1,3 +1,3 @@
 module Tomo
-  VERSION = "0.12.0".freeze
+  VERSION = "0.13.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tomo
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Matt Brictson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-13 00:00:00.000000000 Z
+date: 2019-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -150,7 +150,11 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.5.1
-description: 
+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
+  set of defaults, but is easily extensible via a well-documented plugin system. Unlike
+  other Ruby-based deployment tools, tomo’s friendly command-line interface and task
+  system do not rely on Rake.
 email:
 - opensource@mattbrictson.com
 executables: