MuranoCLI 3.2.0.beta.9 → 3.2.1.pre.beta.3

data/lib/MrMurano/SyncUpDown-Item.rb

@@ -51,8 +51,10 @@ module MrMurano
       # @example Initializing with an Item
       #  item = Item.new(:name => 'get')
       #  Item.new(item)
-      def initialize(hsh={})
-        hsh.each_pair { |k, v| self[k] = v }
+      def initialize(hash={})
+        hash.each_pair do |key, val|
+          self[key] = val
+        end
       end
 
       def as_inst(key)
@@ -102,7 +104,7 @@ module MrMurano
 
       # @return [Hash{Symbol=>Object}] A hash that represents this Item
       def to_h
-        Hash[instance_variables.map { |k| [as_sym(k), instance_variable_get(k)] }]
+        Hash[instance_variables.sort.map { |k| [as_sym(k), instance_variable_get(k)] }]
       end
 
       # Adds the contents of item to self.
@@ -153,25 +155,38 @@ module MrMurano
         dup.reject!(&block)
       end
 
+      # Scrub local, non-BizAPI/Pegasus attrs from Item (before uploading).
+      def reject_ephemeral!
+        reject do |attr_key, _|
+          [
+            # Server-siders:
+            #  :name,
+            #  :script,
+            :local_path,
+            :id,
+            :line_beg,
+            :line_end,
+            :header,
+            :diff,
+            :selected,
+            :synckey,
+            :synctype,
+            :updated_at,
+            :dup_count,
+          ].include? attr_key
+        end
+      end
+
       # For unit testing.
       include Comparable
       def <=>(other)
         # rubocop:disable Style/RedundantSelf: Redundant self detected.
-        #   MAYBE/2017-07-18: Permanently disable Style/RedundantSelf?
         self.to_h <=> other.to_h
       end
 
       def location_friendly(show_type: false, full_path: false)
-        if !@local_path.nil?
-          desc = @local_path
-          desc = desc.relative_path_from(Pathname.pwd) unless full_path
-          desc = desc.to_s
-          desc = "#{desc}:#{@line_beg}" if !@line_beg.nil? && @line_beg > 0
-          desc = "#{desc}-#{@line_end}" if !@line_end.nil? && @line_end > 0
-        else
-          desc = @synckey
-        end
-        desc += ' [phantom]' if @phantom
+        desc = location_path_and_line(full_path: full_path)
+        desc += ' [phantom]' if defined?(@phantom) && @phantom
         return desc unless show_type
         unless @pp_desc.to_s.empty? || (@pp_desc == @synckey)
           desc += " (#{@pp_desc})"
@@ -180,6 +195,23 @@ module MrMurano
         desc += " [#{@method} #{@path}]" if (@method && @path)
         desc
       end
+
+      def location_path_and_line(full_path: false)
+        if !defined?(@local_path) || @local_path.nil?
+          @synckey
+        else
+          desc = @local_path
+          desc = desc.relative_path_from(Pathname.pwd) unless full_path
+          desc = desc.to_s
+          if defined?(@line_beg) && !@line_beg.nil? && @line_beg > 0
+            desc = "#{desc}:#{@line_beg}"
+          end
+          if defined?(@line_end) && !@line_end.nil? && @line_end > 0
+            desc = "#{desc}-#{@line_end}"
+          end
+          desc
+        end
+      end
     end
   end
 end

data/lib/MrMurano/SyncUpDown.rb

@@ -48,7 +48,7 @@ module MrMurano
       # :nocov:
     end
 
-    def remove_lite(itemkey, _thereitem, _modify=false)
+    def remove_or_clear(itemkey, _thereitem, _modify=false)
       remove(itemkey)
     end
 
@@ -88,13 +88,14 @@ module MrMurano
     # @param root [Pathname,String] Root path for this resource type from config files
     # @param path [Pathname,String] Path to local item
     # @return [Item] hash of the details for the remote item for this path
-    def to_remote_item(root, path)
+    def to_remote_items(root, path)
       # This mess brought to you by Windows short path names.
       path = Dir.glob(path.to_s).first
       root = Dir.glob(root.to_s).first
       path = Pathname.new(path)
       root = Pathname.new(root)
-      Item.new(name: path.realpath.relative_path_from(root.realpath).to_s)
+      item = Item.new(name: path.realpath.relative_path_from(root.realpath).to_s)
+      [item]
     end
 
     ##
@@ -120,7 +121,7 @@ module MrMurano
     # @param item [Item] listing details for the item.
     # @return [Pathname] path to save (or merge) remote item into
     def tolocalpath(into, item)
-      return item[:local_path] unless item.local_path.nil?
+      return item[:local_path] unless item[:local_path].nil?
       itemkey = @itemkey.to_sym
       name = tolocalname(item, itemkey)
       raise "Bad key(#{itemkey}) for #{item}" if name.nil?
@@ -188,9 +189,12 @@ module MrMurano
       local.dirname.mkpath
       local.open('wb') do |io|
         # Do not modify remote content when diffing, e.g., do not add #ENDPOINT header.
-        untainted = options[:diff]
+        untainted = options[:diff] || false
         fetch(id, untainted) do |chunk|
-          io.write config_vars_encode chunk
+          # First chunk may be header, if not part of script.
+          # Second chunk (only only chunk), is script (which may include header).
+          encoded = is_tmp && chunk || config_vars_encode(chunk)
+          io.write(encoded)
         end
       end
       update_mtime(local, item)
@@ -405,7 +409,6 @@ module MrMurano
     # @param from [Pathname] Directory of items to scan
     # @return [Array<Item>] Items found
     def localitems(from)
-      # TODO: Profile this.
       debug "#{self.class}: Getting local items from:\n  #{from}"
       search_in = from.to_s
       sf = searchFor.map { |i| ::File.join(search_in, i) }
@@ -416,14 +419,15 @@ module MrMurano
       # about duplicate resources. I [lb] think this problem has existed
       # but was exacerbated by the change to support sub-directory scripts
       # (Nested Lua support).
-      items = Dir[*sf].uniq.flatten.compact.reject do |path|
+      files = Dir[*sf].collect { |path| File.absolute_path(path) }
+      files = files.uniq.flatten.compact.reject do |path|
         if ::File.directory?(path)
           true
         else
           ignoring.any? { |pattern| ignore?(path, pattern) }
         end
       end
-      items = items.map do |path|
+      items = files.map do |path|
         # Do not resolve symlinks, just relative paths (. and ..),
         # otherwise it makes nested Lua support tricky, because
         # symlinks might be outside the root item path, and then
@@ -433,24 +437,22 @@ module MrMurano
         else
           rpath = Pathname.new(path).expand_path
         end
-        item = to_remote_item(from, rpath)
-        if item.is_a?(Array)
-          item.compact.map do |itm|
-            itm[:local_path] = rpath
-            itm
-          end
-        elsif !item.nil?
+        files_items = to_remote_items(from, rpath)
+        files_items.compact.map do |item|
           item[:local_path] = rpath
           item
         end
       end
-      #items = items.flatten.compact.sort_by!(&:local_path)
-      #debug "#{self.class}: items:\n  #{items.map(&:local_path).join("\n  ")}"
-      items = items.flatten.compact.sort_by { |it| it[:local_path] }
+      items = items.flatten.compact.sort_by { |item| item[:local_path] }
+      debug_print_localitems(items)
+      sort_by_name(items)
+    end
+
+    def debug_print_localitems(items)
+      return unless $cfg['tool.debug']
       loci = items.map { |it| it.location_friendly(full_path: true) }
       item_list = loci.sort.join("\n  ")
       debug "#{self.class}: localitems' matches:\n  #{item_list}"
-      sort_by_name(items)
     end
 
     def ignore?(path, pattern)

data/lib/MrMurano/Webservice-Endpoint.rb

@@ -25,8 +25,20 @@ module MrMurano
         attr_accessor :path
         # @return [String] Acceptable Content-Type for this endpoint
         attr_accessor :content_type
-        # ???? What is this?
+        # NOTE: We do not use use_basic_auth internally, but it's passed from
+        # the server, so the code actually indirectly sees it in `def []=`.
         attr_accessor :use_basic_auth
+
+        def reject_ephemeral!
+          super.reject do |attr_key, _|
+            [
+              # Server-siders:
+              #  :method,
+              #  :path,
+              #  :content_type,
+            ].include? attr_key
+          end
+        end
       end
 
       def initialize
@@ -170,12 +182,12 @@ module MrMurano
         name
       end
 
-      def to_remote_item(_from, path)
+      def to_remote_items(_from, path)
         # Path could be have multiple endpoints in side, so a loop.
-        items = []
         path = Pathname.new(path) unless path.is_a? Pathname
+        items = []
         cur = nil
-        lineno = 1
+        lineno = 0
         path.readlines.each do |line|
           lineno += 1
           md = @match_header.match(line)
@@ -183,20 +195,8 @@ module MrMurano
             # header line.
             cur[:line_end] = lineno - 1 unless cur.nil?
             items << cur unless cur.nil?
-            # VERIFY/2017-07-03: The syncdown test is revealing a
-            #   problem with casing. The original file has a lowercase
-            #   HTTP verb, e.g., "post". This is what syncup uploaded.
-            #   But on murano status, the local route's method is upcased
-            #   in memory, so the status command says the route is diff.
-            #   But on murano diff, MurCLI makes two local temp files
-            #   to execute the diff, and it also upcases the method in
-            #   both files, so the diff runs clean!
-            #   2017-07-03: (lb): Adding upcase; and recreating header.
-            #   2018-06-11: (lb): Added :exclude_header to deal with
-            #     service side missing header. Which isn't an error, per se.
             script_header = "--#ENDPOINT #{md[:method].upcase} #{md[:path]}"
             script_header += " #{md[:ctype]}" unless md[:ctype].to_s.empty?
-            script_header += "\n"
             cur = RouteItem.new(
               method: md[:method].upcase,
               path: md[:path],
@@ -211,8 +211,10 @@ module MrMurano
             cur[:script] += line
           end
         end
-        cur[:line_end] = lineno unless cur.nil?
-        items << cur unless cur.nil?
+        unless cur.nil?
+          cur[:line_end] = lineno
+          items << cur
+        end
         items
       end
 

data/lib/MrMurano/Webservice-File.rb

@@ -34,6 +34,19 @@ module MrMurano
         attr_accessor :md5
         # @return [Integer] Size in bytes of the stored file.
         attr_accessor :size
+
+        def reject_ephemeral!
+          super.reject do |attr_key, _|
+            [
+              # Server-siders:
+              #  :path,
+              #  :mime_type,
+              :checksum,
+              :md5,
+              :size,
+            ].include? attr_key
+          end
+        end
       end
 
       def initialize
@@ -212,36 +225,63 @@ module MrMurano
       # @param root [Pathname,String] Root path for this resource type from config files
       # @param path [Pathname,String] Path to local item
       # @return [Item] hash of the details for the remote item for this path
-      def to_remote_item(from, path)
-        item = super(from, path)
-        name = item[:name]
+      def to_remote_items(from, path)
+        items = super(from, path)
+
+        name = items[0][:name]
         name = '/' if name == $cfg['files.default_page']
         name = "/#{name}" unless name.chars.first == '/'
 
-        mime = MIME::Types.type_for(path.to_s)[0] || MIME::Types['application/octet-stream'][0]
+        mime = MIME::Types.type_for(path.to_s)[0]
+        mime ||= MIME::Types['application/octet-stream'][0]
+
+        file_size = path.size
 
         # FIXME/2018-04-13: (lb): When did platform switch from SHA1 to MD5?
         #   Leaving this dead code block as a reminder to verify the new
         #   behavior is the intended behavior.
         xsum_is_sha1 = false
         if xsum_is_sha1
-          # It does not actually take the SHA1 of the file.
-          # It first converts the file to hex, then takes the SHA1 of that string
-          #xsum = Digest::SHA1.file(path.to_s).hexdigest
-          xsum = Digest::SHA1.new
-          path.open('rb:ASCII-8BIT') do |io|
-            # rubocop:disable Lint/AssignmentInCondition
-            # "Assignment in condition - you probably meant to use ==."
-            while chunk = io.read(1_048_576)
-              xsum << Digest.hexencode(chunk)
-            end
-          end
+          digobj = remote_item_checksum_sha1(path)
         else
-          xsum = Digest::MD5.file(path.to_s)
+          # MD5 of the empty string is not empty (it's d41d8cd98f00b204e9800998ecf8427e)
+          # but BizAPI (or Pegasus; whomever) sends an empty string for an empty file.
+          if file_size.zero?
+            checksum = ''
+            digobj = nil
+          else
+            digobj = remote_item_checksum_md5(path)
+          end
         end
-        debug "Checking #{name} (#{mime.simplified} #{xsum.hexdigest})"
 
-        FileItem.new(path: name, mime_type: mime.simplified, checksum: xsum.hexdigest)
+        checksum = digobj.hexdigest unless digobj.nil?
+        debug "Checking #{name} (#{mime.simplified} #{checksum})"
+
+        item = FileItem.new(
+          path: name,
+          mime_type: mime.simplified,
+          checksum: checksum,
+          size: file_size,
+        )
+        [item]
+      end
+
+      def remote_item_checksum_sha1(path)
+        # NOTE: It does not actually take the SHA1 of the file. It first
+        #  converts the file to hex, then takes the SHA1 of that string.
+        xsum = Digest::SHA1.new
+        path.open('rb:ASCII-8BIT') do |io|
+          # rubocop:disable Lint/AssignmentInCondition
+          #  "Assignment in condition - you probably meant to use ==."
+          while chunk = io.read(1_048_576)
+            xsum << Digest.hexencode(chunk)
+          end
+        end
+        xsum
+      end
+
+      def remote_item_checksum_md5(path)
+        Digest::MD5.file(path.to_s)
       end
 
       # @param item [FileItem] The item to get a key from
@@ -254,8 +294,11 @@ module MrMurano
       # @param item_a [FileItem]
       # @param item_b [FileItem]
       def docmp(item_a, item_b)
-        (item_a[:mime_type] != item_b[:mime_type] ||
-        item_a[:checksum] != item_b[:checksum])
+        (
+          item_a[:mime_type] != item_b[:mime_type] ||
+          item_a[:checksum] != item_b[:checksum] ||
+          item_a[:size] != item_b[:size]
+        )
       end
     end
 

data/lib/MrMurano/commands/business.rb

@@ -30,6 +30,13 @@ If you need to set the business ID, try some of the following:
   Add the ID to the user config:    #{MrMurano::EXE_NAME} config business.id <ID> --user
   Setup a project interactively:    #{MrMurano::EXE_NAME} init
 
+- Working with enterprise network child businesses:
+  Get a list of child business IDs:       #{MrMurano::EXE_NAME} network children
+  Specify the child ID explicitly         #{MrMurano::EXE_NAME} <cmd> --config business.child=<ID>
+  Add the child ID to a project config:   #{MrMurano::EXE_NAME} config business.child <ID>
+  Add the child ID to the user config:    #{MrMurano::EXE_NAME} config business.child <ID> --user
+
+
   ).strip
   c.project_not_required = true
   c.subcmdgrouphelp = true
@@ -162,6 +169,9 @@ arguments. For example,
   ).strip
   c.project_not_required = true
 
+  # Add --network option
+  c.option('--network')
+
   cmd_table_output_add_options(c)
 
   c.action do |args, options|
@@ -181,6 +191,9 @@ Find business by name or ID.
 
   cmd_table_output_add_options(c)
 
+  # Add --network option
+  c.option('--network')
+
   # Add --business/-id/-name options.
   cmd_option_business_pickers(c)
 
@@ -325,7 +338,7 @@ def cmd_business_find_businesses(acc, args, options)
   end
 
   MrMurano::Verbose.whirly_start 'Looking for businesses...'
-  bizz = acc.businesses(bid: bid, name: name, fuzzy: fuzzy)
+  bizz = acc.businesses(bid: bid, name: name, fuzzy: fuzzy, options: options)
   MrMurano::Verbose.whirly_stop
 
   bizz

data/lib/MrMurano/commands/child.rb

@@ -0,0 +1,148 @@
+# Copyright © 2016-2017 Exosite LLC. All Rights Reserved
+# License: PROPRIETARY. See LICENSE.txt.
+# frozen_string_literal: true
+
+# vim:tw=0:ts=2:sw=2:et:ai
+# Unauthorized copying of this file is strictly prohibited.
+
+require 'MrMurano/ReCommander'
+
+# *** Base network command help
+# ------------------------------
+command :child do |c|
+  c.syntax = %(murano child)
+  c.summary = %(About child)
+  c.description = %(Commands for working with enterprise business network children.)
+  c.project_not_required = true
+  c.subcmdgrouphelp = true
+  c.action do |_args, _options|
+    ::Commander::UI.enable_paging unless $cfg['tool.no-page']
+    say MrMurano::SubCmdGroupHelp.new(c).get_help
+  end
+end
+
+# View Network Child Business
+command 'child show' do |c|
+  c.syntax = %(murano child show)
+  c.summary = %(View details about a child business in a business network.)
+  c.description = %(
+    View details about a child businesses in a business network.
+  ).strip
+  c.example %(
+    View details about a child business using the parent bizid and child bizid from the config
+  ).strip, 'murano child show'
+  c.example %(
+    View details about a child business in a business network using a passed in business.id and business.child
+  ).strip, 'murano child show -c business.id=<PARENT_BUSINESS_ID> -c business.child=<CHILD_BUSINESS_ID>'
+  c.project_not_required = true
+
+  c.action do |_args, _options|
+    show_child
+  end
+
+  def show_child
+    biz = MrMurano::Business.new
+    biz.must_business_id!
+    biz.must_child!
+    MrMurano::Verbose.whirly_start 'Fetching network child business...'
+    business_network = biz.get_business_network(biz.bid)
+    all_child_businesses = biz.view_child_businesses(biz.bid)
+    child_business = all_child_businesses.select { |child_biz| child_biz[:bizid] == biz.cid }[0]
+    MrMurano::Verbose.whirly_stop
+
+    puts('Business Network Name: ' + business_network[:name])
+    puts('Child Business ID: ' + child_business[:bizid])
+    puts('Child Business Name: ' + child_business[:name])
+
+    table = Terminal::Table.new
+    table.title = 'Members'
+    table.add_row %w[role email]
+    table.add_separator
+
+    child_business[:members].each do |member|
+      table.add_row [
+        member[:role],
+        member[:email],
+      ]
+    end
+    puts table
+
+    return unless all_child_businesses.nil?
+    MrMurano::Verbose.error 'Error fetching network child businesses.'
+    exit 1
+  end
+end
+
+# Add a Member to a Network Child Business
+command 'child add' do |c|
+  c.syntax = %(murano child add <NEW_MEMBER_EMAIL>)
+  c.summary = %(Add a member to a network child business.)
+  c.description = %(
+    Add a member to a network child business.
+  ).strip
+  c.example %(
+    Add a member to a child business using the parent bizid and child bizid from the config
+  ).strip, 'murano child add <NEW_MEMBER_EMAIL>'
+  c.example %(
+    Add a member to a child business using a passed in business.id and business.child
+  ).strip, 'murano child add <NEW_MEMBER_EMAIL> -c business.id=<PARENT_BUSINESS_ID> -c business.child=<CHILD_BUSINESS_ID>'
+  c.project_not_required = true
+
+  c.action do |args, _options|
+    if args.empty?
+      MrMurano::Verbose.error('Please include a new member email.')
+      exit 1
+    end
+    add_member_to_child_business(args)
+  end
+
+  def add_member_to_child_business(args)
+    new_member_email = args[0]
+    biz = MrMurano::Business.new
+    biz.must_business_id!
+    biz.must_child!
+    MrMurano::Verbose.whirly_start 'Adding member to child business...'
+    response = biz.add_member_to_child_business(biz.bid, biz.cid, new_member_email)
+    MrMurano::Verbose.whirly_stop
+    return unless response.nil?
+    MrMurano::Verbose.error 'Error adding member to child business.'
+    exit(1)
+  end
+end
+
+# Remove a Member from a Network Child Business
+command 'child remove' do |c|
+  c.syntax = %(murano child remove <MEMBER_EMAIL>)
+  c.summary = %(Remove a member from a network child business.)
+  c.description = %(
+    Remove a member from a network child business.
+  ).strip
+  c.example %(Remove a member from a child business using the parent bizid and child bizid from the config
+  ).strip, 'murano child remove <MEMBER_EMAIL>'
+  c.example %(
+    Remove a member from a child business using a passed in business.id and business.child
+  ).strip, 'murano child remove <MEMBER_EMAIL> -c business.id=<PARENT_BUSINESS_ID> -c business.child=<CHILD_BUSINESS_ID>'
+  c.project_not_required = true
+
+  c.action do |args, _options|
+    if args.empty?
+      MrMurano::Verbose.error('Please include a member email.')
+      exit 1
+    end
+    remove_member_from_child_business(args)
+  end
+
+  def remove_member_from_child_business(args)
+    member_email = args[0]
+    biz = MrMurano::Business.new
+    biz.must_business_id!
+    biz.must_child!
+    MrMurano::Verbose.whirly_start 'Removing member from child business...'
+    response = biz.remove_member_from_child_business(biz.bid, biz.cid, member_email)
+    MrMurano::Verbose.whirly_stop
+    return unless response.nil?
+    MrMurano::Verbose.error 'Error removing member from child business.'
+    exit(1)
+  end
+end
+