MuranoCLI 3.0.0 → 3.0.1

data/lib/MrMurano/Passwords.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.08.17 /coding: utf-8
+# Last Modified: 2017.08.23 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -32,12 +32,6 @@ module MrMurano
       return unless @path.exist?
       @path.chmod(0o600)
       @path.open('rb') do |io|
-        # 2017-07-01: Rubocop suggests using safe_load.
-        #  https://ruby-doc.org/stdlib-2.1.0/libdoc/psych/rdoc/Psych.html#method-c-load
-        #  https://ruby-doc.org/stdlib-2.1.0/libdoc/psych/rdoc/Psych.html#method-c-safe_load
-        # 2017-07-05: Oh, I don't think safe_load exists in Ruby 2 or 2.2...
-        #@data = YAML.safe_load(io)
-        # rubocop:disable Security/YAMLLoad
         @data = YAML.load(io)
       end
     end
@@ -87,6 +81,12 @@ module MrMurano
       return unless @data.is_a?(Hash)
       hd = @data[host]
       return unless !hd.nil? && hd.is_a?(Hash)
+      if $cfg['tool.dry']
+        MrMurano::Verbose.whirly_interject do
+          say(%(--dry: Not removing password for #{fancy_ticks("#{user}@#{host}")}))
+        end
+        return
+      end
       @data[host].delete(user) if hd.key?(user)
     end
 

data/lib/MrMurano/ReCommander.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.08.16 /coding: utf-8
+# Last Modified: 2017.08.23 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -7,7 +7,6 @@
 
 require 'optparse'
 require 'MrMurano/optparse'
-
 require 'MrMurano/verbosing'
 
 module MrMurano
@@ -50,6 +49,8 @@ module Commander
     # A command sets prompt_if_logged_off if it
     # is okay to ask the user for their password.
     attr_accessor :prompt_if_logged_off
+    # A command sets subcmdgrouphelp if it's help.
+    attr_accessor :subcmdgrouphelp
 
     def verify_arg_count!(args, max_args=0, mandatory=[])
       if !max_args.nil? && max_args.zero?
@@ -126,38 +127,180 @@ module Commander
 
     alias old_parse_global_options parse_global_options
     def parse_global_options
+      # User can specify, e.g., status.options, to set options for specific commands.
       defopts = ($cfg["#{active_command.name}.options"] || '').split
       @args.push(*defopts)
-      begin
-        old_parse_global_options
-      rescue OptionParser::MissingArgument => err
-        if err.message.start_with?('missing argument:')
-          puts err.message
-        else
-          MrMurano::Verbose.error(
-            "There was a problem interpreting the options: ‘#{err.message}’"
-          )
+      help_hack
+      parse_global_options_real
+    end
+
+    def parse_global_options_real
+      old_parse_global_options
+    rescue OptionParser::MissingArgument => err
+      if err.message.start_with?('missing argument:')
+        puts err.message
+      else
+        err_msg = MrMurano::Verbose.fancy_ticks(err.message)
+        MrMurano::Verbose.error(
+          "There was a problem interpreting the options: #{err_msg}"
+        )
+      end
+      exit 2
+    end
+
+    # 2017-08-22: Commander's help infrastructure is either really weak,
+    # or we did something elsewhere that seriously cripples it. In any
+    # case, this fixes all its quirks.
+    def help_hack
+      do_help = fix_args
+      show_alias_help_maybe! if do_help
+    end
+
+    def help_opts
+      %w[-h --help help].freeze
+    end
+
+    def vers_opts
+      %w[-v --version].freeze
+    end
+
+    def fix_args
+      # If `murano --help` is specified, let rb-commander handle it.
+      # But if `murano command --help` is specified, don't let cmdr
+      # handle it, otherwise it just shows the command description,
+      # but not any of the subcommands (our SubCmdGroupContext code).
+      # Note: not checking help_opts here, which includes 'help', because
+      #   'help' might really be a command argument (e.g., a solution name).
+      # Note: `murano -v`'s active_command is 'help'.
+      do_help = (@args & %w[-h --help]).any? || active_command.name == 'help'
+      if do_help
+        # If there are options in addition to --help, then Commander
+        # runs the command! So remove all options.
+        #
+        # E.g., this shows the help for usage:
+        #   $ murano --help usage
+        # but if a flag is added, the command gets run, e.g.,
+        #   $ murano usage --id 1234 --help
+        # runs the usage command.
+        #
+        # I [lb] walked the code and it looks like when Commander tries to
+        # validate the args, it doesn't like the --id flag (maybe because
+        # the "help" command is being used to validate, and it does not
+        # define any options?). Then it removes the --id switch (after the
+        # --help switch was previously removed) and tries the command *again*
+        # (in gems/commander-4.4.3/lib/commander/runner.rb, look for the
+        # comment, "Remove the offending args and retry"). So in the example
+        # given above, `murano usage --id 1234 --help`, both the `--id` flag
+        # and `--help` flag are moved from @args, and then `murano usage 1234`
+        # is executed (and args are not validated by Commander but merely passed
+        # to the command action, so `usage` gets args=['1234']). Whadda wreck.
+        reject_next = false
+        @args.reject! do |arg|
+          reject = false
+          if reject_next
+            reject = true
+            reject_next = false
+          elsif arg.start_with?('-') && !help_opts.include?(arg) && !vers_opts.include?(arg)
+            reject = true
+            # See if the next argument should also be consumed.
+            arg_opts = @options.select do |opt|
+              if arg =~ /^-[^-]/
+                # Single char abbrev: look for exact match.
+                opt[:switches].include?(arg)
+              else
+                # Long switch: Commander matches abbrevs of longs...
+                opt[:switches].any? { |oarg| oarg =~ /^#{arg}/ }
+              end
+            end
+            if arg =~ /^--/
+              exact = arg_opts.select do |opt|
+                opt[:switches].include?(arg) || opt[:switches].any? do |sw|
+                  sw.start_with?(arg + ' ')
+                end
+              end
+              arg_opts = exact unless exact.empty?
+            end
+            if arg_opts.length > 1
+              # MAYBE/2017-08-23: Always do this check, not just for help.
+              ambig = MrMurano::Verbose.fancy_ticks(arg)
+              match = arg_opts.map do |opt|
+                opt[:switches].map { |sw| MrMurano::Verbose.fancy_ticks(sw) }.join('|')
+              end
+              match = match.flatten
+              if match.length > 1
+                match[-1] = "and #{match[-1]}"
+              end
+              match = match.join(', ')
+              MrMurano::Verbose.error("Ambiguous option: #{ambig} matches: #{match}")
+              exit 2
+            elsif arg_opts.length == 1
+              if arg_opts.first[:switches].any? { |opt| opt.start_with?('--') && opt.include?(' ') }
+                # There's a space in the --long setting, e.g., '--config KEY=VAL',
+                # so we know there's an argument following.
+                reject_next = true
+              end
+            end
+          end
+          reject
         end
-        exit 2
       end
+      @purargs = @args - help_opts
+      return do_help if active_command.name == 'help'
+      # Any command other than `murano help` or `murano --help`.
+      return do_help if !do_help || active_command.name.include?(' ')
+      # This is a single-word command, e.g., 'link', not 'link list',
+      #   as in `murano link --help`, not `murano link list --help`.
+      # Positional parameters break Commander. E.g.,
+      #   $ murano --help config application.id
+      #   invalid command. Use --help for more information
+      # so remove any remaining --options and use the first term.
+      @args -= help_opts
+      @args = @args[0..0]
+      # Add back in the --help if the command is not a subcommand help.
+      @args.push('--help') unless active_command.subcmdgrouphelp
+      do_help
     end
 
-    # Weird. --help doesn't work if other flags also specified.
-    # E.g., this shows the help for usage:
-    #   $ murano --help usage
-    # but if a flag is added, the command gets run, e.g.,
-    #   $ murano usage --id 1234 --help
-    # ignores the --help and runs the usage command.
-    # ([lb] walked the code and it looks like when Commander tries to
-    # validate the args, it doesn't like the --id flag (maybe because
-    # the "help" command is being used to validate?). Then it removes
-    # the --id flags (after --help was previously removed) and tries
-    # the command *again* (in gems/commander-4.4.3/lib/commander/runner.rb,
-    # look for the comment, "Remove the offending args and retry").
-    #
-    # 2017-06-14: [lb] tried to override run! here to show help correctly
-    # in this use case, but I could not get it to work. Oh, well... a
-    # minor annoyance; just live with it, I guess.
+    def show_alias_help_maybe!
+      return unless alias?(command_name_from_args) || (active_command.name == 'help' && @args.length > 1)
+      # Why, oh why, Commander, do you flake out on aliases?
+      # E.g.,
+      #   $ murano product --help
+      #   invalid command. Use --help for more information
+      # Though it sometimes work, like with:
+      #   $ murano --help product device enable
+      # but only because Commander shows help for the 'device' command.
+      # I.e., this doesn't work: `murano product push --help`
+      # So we'll just roll our own help for aliases!
+      @args -= help_opts
+      cli_cmd = MrMurano::Verbose.fancy_ticks(@purargs.join(' '))
+      if active_command.name == 'help'
+        arg_cmd = @args.join(' ')
+      else
+        arg_cmd = command_name_from_args
+      end
+      mur_msg = ''
+      if @aliases[arg_cmd].nil?
+        matches = @aliases.keys.find_all { |key| key.start_with?('arg_cmd') }
+        matches = @aliases.keys.find_all { |key| key.start_with?(@args[0]) } if matches.empty?
+        unless matches.empty?
+          matches = matches.map { |match| MrMurano::Verbose.fancy_ticks(match) }
+          matches = matches.sort.join(', ')
+          mur_msg = %(The #{cli_cmd} command includes: #{matches})
+        end
+      else
+        mur_cmd = []
+        mur_cmd += [active_command.name] if active_command.name != 'help'
+        mur_cmd += @aliases[arg_cmd] unless @aliases[arg_cmd].empty?
+        mur_cmd = mur_cmd.join(' ')
+        #mur_cmd = active_command.name if mur_cmd.empty?
+        mur_cmd = MrMurano::Verbose.fancy_ticks(mur_cmd)
+        mur_msg = %(The #{cli_cmd} command is really: #{mur_cmd})
+      end
+      return if mur_msg.empty?
+      puts mur_msg
+      exit 0
+    end
   end
 end
 

data/lib/MrMurano/Setting.rb

@@ -1,3 +1,10 @@
+# Last Modified: 2017.08.20 /coding: utf-8
+# frozen_string_literal: true
+
+# Copyright © 2016-2017 Exosite LLC.
+# License: MIT. See LICENSE.txt.
+#  vim:tw=0:ts=2:sw=2:et:ai
+
 require 'MrMurano/verbosing'
 
 module MrMurano
@@ -18,50 +25,41 @@ module MrMurano
     def mapservice(service)
       service = service.to_s.downcase
       SERVICE_MAP.each_pair do |k, v|
-        if service == k.downcase || service == v.downcase
-          return v
-        end
+        return v if [k.downcase, v.downcase].include? service
       end
-      return service.sub(/(.)(.*)/){"#{$1.upcase}#{$2.downcase}"}
+      # rubocop:disable Style/PerlBackrefs: "Avoid the use of Perl-style backrefs."
+      # Because of the upcase, we cannot just call, e.g.,
+      #   service.sub(/(.)(.*)/, "\\1\\2")
+      service.sub(/(.)(.*)/) { "#{$1.upcase}#{$2.downcase}" }
     end
 
     def read(service, setting)
-      begin
-        debug %{Looking up class "MrMurano::#{mapservice(service)}::Settings"}
-        gb = Object::const_get("MrMurano::#{mapservice(service)}::Settings").new
-        meth = setting.to_sym
-        debug %{Looking up method "#{meth}"}
-        if gb.respond_to?(meth)
-          return gb.__send__(meth)
-        else
-          error "Unknown setting '#{setting}' on '#{service}'"
-        end
-      rescue NameError => e
-        error "No Settings on \"#{service}\""
-        if $cfg['tool.debug'] then
-          error e.message
-          error e.to_s
-        end
+      debug %(Looking up class "MrMurano::#{mapservice(service)}::Settings")
+      gb = Object.const_get("MrMurano::#{mapservice(service)}::Settings").new
+      meth = setting.to_sym
+      debug %(Looking up method "#{meth}")
+      return gb.__send__(meth) if gb.respond_to?(meth)
+      error "Unknown setting '#{setting}' on '#{service}'"
+    rescue NameError => e
+      error %(No Settings on "#{service}")
+      if $cfg['tool.debug']
+        error e.message
+        error e.to_s
       end
     end
 
     def write(service, setting, value)
-      begin
-        debug %(Looking up class "MrMurano::#{mapservice(service)}::Settings")
-        gb = Object::const_get("MrMurano::#{mapservice(service)}::Settings").new
-        meth = "#{setting}=".to_sym
-        debug %(Looking up method "#{meth}")
-        if gb.respond_to? meth then
-          return gb.__send__(meth, value)
-        else
-          error "Unknown setting '#{setting}' on '#{service}'"
-        end
-      rescue NameError => e
-        error %(No Settings on "#{service}")
-        if $cfg['tool.debug'] then
-          error e.message
-          error e.to_s
-        end
+      debug %(Looking up class "MrMurano::#{mapservice(service)}::Settings")
+      gb = Object.const_get("MrMurano::#{mapservice(service)}::Settings").new
+      meth = "#{setting}=".to_sym
+      debug %(Looking up method "#{meth}")
+      return gb.__send__(meth, value) if gb.respond_to? meth
+      error "Unknown setting '#{setting}' on '#{service}'"
+    rescue NameError => e
+      error %(No Settings on "#{service}")
+      if $cfg['tool.debug']
+        error e.message
+        error e.to_s
       end
     end
 
@@ -74,9 +72,11 @@ module MrMurano
       result = {}
       ::MrMurano.constants.each do |maybe|
         begin
-          gb = Object::const_get("MrMurano::#{maybe}::Settings")
-          result[maybe] = gb.instance_methods(false).select{|i| i.to_s[-1] != '='}
+          gb = Object.const_get("MrMurano::#{maybe}::Settings")
+          result[maybe] = gb.instance_methods(false).reject { |i| i.to_s[-1] == '=' }
+        # rubocop:disable Lint/HandleExceptions: Do not suppress exceptions."
         rescue
+          # EXPLAIN/2017-08-20: When/Why does this happen?
         end
       end
       result
@@ -86,5 +86,3 @@ module MrMurano
   end
 end
 
-#  vim: set ai et sw=2 ts=2 :
-

data/lib/MrMurano/Solution-ServiceConfig.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.08.17 /coding: utf-8
+# Last Modified: 2017.08.22 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -70,6 +70,7 @@ module MrMurano
     end
 
     def remove(id)
+      return unless remove_item_allowed(id)
       delete("/#{id}")
     end
 

data/lib/MrMurano/Solution-Services.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.08.18 /coding: utf-8
+# Last Modified: 2017.08.23 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -54,6 +54,7 @@ module MrMurano
 
     # ??? remove
     def remove(name)
+      return unless remove_item_allowed(name)
       delete('/' + name)
     end
 
@@ -69,6 +70,9 @@ module MrMurano
         raise 'no file' unless thereitem.script
         script = thereitem.script
       end
+
+      script = config_vars_decode(script)
+
       localpath = Pathname.new(localpath) unless localpath.is_a?(Pathname)
       name = mkname(thereitem)
       pst = thereitem.to_h.merge(
@@ -79,10 +83,18 @@ module MrMurano
         name: name,
       )
       debug "f: #{localpath} >> #{pst.reject { |k, _| k == :script }.to_json}"
+      therealias = mkalias(thereitem)
+      upload_script(therealias, name, localpath, pst)
+    end
+
+    def upload_script(therealias, name, localpath, pst)
       # Try PUT. If 404, then POST.
       # I.e., PUT if not exists, else POST to create.
       updated_at = nil
-      put('/' + mkalias(thereitem), pst) do |request, http|
+
+      return unless upload_item_allowed(therealias)
+
+      put('/' + therealias, pst) do |request, http|
         response = http.request(request)
         isj, jsn = isJSON(response.body)
         # ORDER: An HTTPNoContent is also a HTTPSuccess, so the latter comes first.
@@ -181,8 +193,6 @@ module MrMurano
       cache_file = $cfg.file_at(cache_file_name)
       if cache_file.file?
         cache_file.open('r+') do |io|
-          # FIXME/2017-07-02: "Security/YAMLLoad: Prefer using YAML.safe_load over YAML.load."
-          # rubocop:disable Security/YAMLLoad
           cache = YAML.load(io)
           cache = {} unless cache
           io.rewind
@@ -205,7 +215,6 @@ module MrMurano
       return nil unless cache_file.file?
       ret = nil
       cache_file.open('r') do |io|
-        # FIXME/2017-07-02: "Security/YAMLLoad: Prefer using YAML.safe_load over YAML.load."
         cache = YAML.load(io)
         return nil unless cache
         if cache.key?(local_path.to_s)
@@ -250,7 +259,6 @@ module MrMurano
     end
 
     def initialize(sid=nil)
-      # FIXME/VERIFY/2017-07-02: Check that products do not have Modules.
       @solntype = 'application.id'
       super
       @uriparts << :module
@@ -307,14 +315,14 @@ module MrMurano
       root = root.expand_path
       if path.basename.sub(/\.lua$/i, '').to_s.include?('.')
         warning(
-          "WARNING: Do not use periods in filenames. Rename: ‘#{path.basename}’"
+          "WARNING: Do not use periods in filenames. Rename: #{fancy_ticks(path.basename)}"
         )
       end
       path.dirname.ascend do |ancestor|
         break if ancestor == root
         if ancestor.basename.to_s.include?('.')
           warning(
-            "WARNING: Do not use periods in directory names. Rename: ‘#{ancestor.basename}’"
+            "WARNING: Do not use periods in directory names. Rename: #{fancy_ticks(ancestor.basename)}"
           )
         end
       end
@@ -349,7 +357,12 @@ module MrMurano
       attr_accessor :event
       # @return [String] For device2 events, the type of event.
       attr_accessor :type
+      # @return [String] Service alias, e.g., "{product.id}"
+      attr_accessor :svc_alias
       # @return [Boolean] True if local phantom item via eventhandler.undeletable.
+      #                   I.e., the file does not exist locally and is the
+      #                   empty string on the server, so locally considered
+      #                   empty string, too.
       attr_accessor :phantom
     end
 
@@ -373,6 +386,10 @@ module MrMurano
       [remote[:service], remote[:event]].join('_')
     end
 
+    def synckey(item)
+      "#{item[:service]}_#{item[:event]}"
+    end
+
     def list(call=nil, data=nil, &block)
       ret = get(call, data, &block)
       return [] unless ret.is_a?(Hash) && !ret.key?(:error)
@@ -386,9 +403,36 @@ module MrMurano
         toss
       end
       items.map { |item| EventHandlerItem.new(item) }
-        # MAYBE/2017-08-17:
-        #   items.map! ...
-        #   sort_by_name(items)
+      # MAYBE/2017-08-17:
+      #   items.map! ...
+      #   sort_by_name(items)
+    end
+
+    def resolve_config_var_usage!(there, local)
+      # Substitute '{product.id}' for the actual product.id if a corresponding
+      # local file does not exist, or if the local file already uses the alias.
+      encode_items = {}
+      local.each do |item|
+        encode_items[item.service] = {} if encode_items[item.service].nil?
+        encode_items[item.service][item.event] = item.svc_alias
+      end
+      there.map! do |item|
+        if (
+          !encode_items[item.service].nil? &&
+          !encode_items[item.service][item.event].nil?
+        )
+          svc_alias = encode_items[item.service][item.event]
+        else
+          # There's no corresponding local item.
+          _encoded, svc_alias = encode_config_var(item.service)
+        end
+        svc_alias = nil if svc_alias == item.service
+        unless svc_alias.nil?
+          item.svc_alias = svc_alias
+          item.name.sub!($cfg[svc_alias], "{#{svc_alias}}")
+        end
+        item
+      end
     end
 
     def skip?(item, skiplist)
@@ -400,15 +444,19 @@ module MrMurano
 
     def cmp_svc_evt(item, svc_evt)
       service, event = svc_evt.split('.', 2)
+      svc_match = (
+        service == item[:service] ||
+        (!item[:svc_alias].to_s.empty? && service == item[:svc_alias])
+      )
       if event.nil? || item[:event] == '*'
-        service == item[:service]
+        svc_match
       else
         # rubocop:disable Style/IfInsideElse
         #svc_evt == "#{item[:service]}.#{item[:event]}"
         if service == '*'
           event == item[:event]
         else
-          service == item[:service] && event == item[:event]
+          svc_match && event == item[:event]
         end
       end
     end
@@ -462,35 +510,33 @@ module MrMurano
         # @match_header finds a service and an event string, e.g., "--EVENT svc evt\n"
         md = @match_header.match(line)
         if !md.nil?
-          # FIXME/2017-08-09: device2.event is now in the skiplist,
-          #   but some tests have a "device2 data_in" script, which
-          #   gets changed to "device2.event" here and then uploaded
-          #   (note that skiplist does not apply to local items).
-          #   You can test this code via:
-          #     rspec ./spec/cmd_syncdown_spec.rb
-          #   which has a fixture with device2.data_in specified.
-          #   QUESTION: Does writing device2.event do anything?
-          #     You cannot edit that handler from the web UI...
-          #     - Should we change the test?
-          #     - Should we get rid of this device2 hack?
-          if md[:service] == 'device2'
-            event_event = 'event'
-            event_type = md[:event]
-            # FIXME/CONFIRM/2017-07-02: 'data_in' was the old event name? It's now 'event'?
-            #   Want this?:
-            #     event_type = 'event' if event_type == 'data_in'
-          else
-            event_event = md[:event]
-            event_type = nil
-          end
-          # header line.
+          service, config_var = decode_config_var(md[:service])
+          event_event, event_type = resolve_event_type(service, md[:event])
+          # Header line.
+          svc_alias = config_var if service != md[:service]
           cur = EventHandlerItem.new(
-            service: md[:service],
-            event: event_event,
-            type: event_type,
+            #name
             local_path: path,
-            line: lineno,
+            #id
             script: line,
+            line: lineno,
+            #line_end
+            #diff
+            #selected
+            #synckey
+            #synctype
+            #type
+            #updated_at
+            #dup_count
+            #alias
+            #updated_at
+            #created_at
+            #solution_id
+            service: service,
+            event: event_event,
+            type: event_type,
+            #phantom
+            svc_alias: svc_alias,
           )
         elsif !cur.nil? && !cur[:script].nil?
           # 2017-07-02: Frozen string literal: change << to +=
@@ -501,24 +547,27 @@ module MrMurano
       cur[:line_end] = lineno unless cur.nil?
 
       # If cur is nil here, then we need to do a :legacy check.
-      if cur.nil? && $project['services.legacy'].is_a?(Hash)
-        spath = path.relative_path_from(from)
-        debug "No headers: #{spath}"
-        service, event = $project['services.legacy'][spath.to_s]
-        debug "Legacy lookup #{spath} => [#{service}, #{event}]"
-        unless service.nil? || event.nil?
-          warning %(Event in #{spath} missing header, but has legacy support.)
-          warning %(Please add the header "--#EVENT #{service} #{event}")
-          cur = EventHandlerItem.new(
-            service: service,
-            event: event,
-            type: nil,
-            local_path: path,
-            line: 0,
-            line_end: lineno,
-            script: path.read, # FIXME: ick, fix this.
-          )
-        end
+      to_remote_item_legacy_check(cur, path, from, lineno)
+    end
+
+    def to_remote_item_legacy_check(cur, path, from, lineno)
+      return cur unless cur.nil? && $project['services.legacy'].is_a?(Hash)
+      spath = path.relative_path_from(from)
+      debug "No headers: #{spath}"
+      service, event = $project['services.legacy'][spath.to_s]
+      debug "Legacy lookup #{spath} => [#{service}, #{event}]"
+      unless service.nil? || event.nil?
+        warning %(Event in #{spath} missing header, but has legacy support.)
+        warning %(Please add the header "--#EVENT #{service} #{event}")
+        cur = EventHandlerItem.new(
+          service: service,
+          event: event,
+          type: nil,
+          local_path: path,
+          line: 0,
+          line_end: lineno,
+          script: path.read, # FIXME: ick, fix this.
+        )
       end
       cur
     end
@@ -529,13 +578,99 @@ module MrMurano
       md = pattern_pattern.match(pattern)
       return false if md.nil?
       debug "match pattern: '#{md[:service]}' '#{md[:event]}'"
-      return false unless md[:service].empty? || item[:service].casecmp(md[:service]).zero?
+      if (
+        !md[:service].empty? &&
+        !item[:service].casecmp(md[:service]).zero? &&
+        (item[:svc_alias].to_s.empty? || !item[:svc_alias].casecmp(md[:service]).zero?)
+      )
+        return false
+      end
       return false unless md[:event].empty? || item[:event].casecmp(md[:event]).zero?
-      true # Both match (or are empty.)
+      true # Both match (or both empty).
     end
 
-    def synckey(item)
-      "#{item[:service]}_#{item[:event]}"
+    def config_vars_decode(script)
+      config_vars_translate(script, method(:decode_config_var))
+    end
+
+    def config_vars_encode(script)
+      config_vars_translate(script, method(:encode_config_var))
+    end
+
+    def config_vars_translate(script, codec)
+      new_script = ''
+      # Replace the service with a {config.variable} if appropriate.
+      script.lines.each do |line|
+        # @match_header finds a service and an event string, e.g., "--EVENT svc evt\n"
+        md = @match_header.match(line)
+        unless md.nil?
+          service, _config_var = codec.call(md[:service])
+          line = line.gsub(
+            /--#EVENT (?<service>\S+) (?<event>\S+)/,
+            "--#EVENT #{service} \\k<event>"
+          )
+        end
+        new_script += line
+      end
+      new_script
+    end
+
+    def decode_config_var(term)
+      decoded = term
+      config_var = nil
+      # Try to match svc against a {config.variable}.
+      mat = /^\{([^\.}]+)\.([^\.}]+)\}$/.match(term)
+      unless mat.nil?
+        # User specified a config value, e.g., "--#EVENT {product.id} event".
+        config_var = "#{mat[1]}.#{mat[2]}"
+        decoded = $cfg[config_var]
+        if decoded.nil?
+          warning "Config value not found for variable: #{fancy_ticks(term)}"
+          # The platform should complain about file not found,
+          # and we'll process everything else.
+          decoded = term
+          config_var = nil
+        end
+      end
+      [decoded, config_var]
+    end
+
+    def encode_config_var(term)
+      encoded = term
+      config_var = nil
+      # MEH/2017-08-22: For now, only matching against one config var.
+      #   Maybe in the future we'd want to examine all the config vars?
+      # MAGIC_STRING: {config.variable} substitution.
+      if term == $cfg['product.id']
+        encoded = '{product.id}'
+        config_var = 'product.id'
+      end
+      [encoded, config_var]
+    end
+
+    def resolve_event_type(service, event)
+      # FIXME/2017-08-09: device2.event is now in the skiplist,
+      #   but some tests have a "device2 data_in" script, which
+      #   gets changed to "device2.event" here and then uploaded
+      #   (note that skiplist does not apply to local items).
+      #   You can test this code via:
+      #     rspec ./spec/cmd_syncdown_spec.rb
+      #   which has a fixture with device2.data_in specified.
+      #   QUESTION: Does writing device2.event do anything?
+      #     You cannot edit that handler from the web UI...
+      #     - Should we change the test?
+      #     - Should we get rid of this device2 hack?
+      if service == 'device2'
+        event_event = 'event'
+        event_type = event
+        # FIXME/CONFIRM/2017-07-02: 'data_in' was the old event name? It's now 'event'?
+        #   Want this?:
+        #     event_type = 'event' if event_type == 'data_in'
+      else
+        event_event = event
+        event_type = nil
+      end
+      [event_event, event_type]
     end
 
     def resurrect_undeletables(localbox, therebox)