MuranoCLI 3.2.1.pre.beta.4 → 3.2.1.pre.beta.5

data/lib/MrMurano/commands/business.rb

@@ -21,22 +21,48 @@ command :business do |c|
   c.description = %(
 Commands for working with businesses.
 
-If you need to set the business ID, try some of the following:
+Getting and Setting the Business ID
+-----------------------------------
 
-- Get a list of Business IDs:       #{MrMurano::EXE_NAME} business list
+- Get a list of Business IDs:
 
-- Specify the ID explictly:         #{MrMurano::EXE_NAME} <cmd> --config business.id=<ID>
-  Add the ID to a project config:   #{MrMurano::EXE_NAME} config business.id <ID>
-  Add the ID to the user config:    #{MrMurano::EXE_NAME} config business.id <ID> --user
-  Setup a project interactively:    #{MrMurano::EXE_NAME} init
+    #{MrMurano::EXE_NAME} business list
 
-- 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
+- Specify the Business ID at runtime:
 
+    #{MrMurano::EXE_NAME} <cmd> --config business.id=<ID>
 
+  Add the Business ID to a project config:
+
+    #{MrMurano::EXE_NAME} config business.id <ID>
+
+  Add the Business ID to the user config:
+
+    #{MrMurano::EXE_NAME} config business.id <ID> --user
+
+  Setup a project interactively (choose the Business ID from a list):
+
+    #{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
@@ -55,6 +81,8 @@ def cmd_table_output_add_options(c)
   # MAYBE/2017-08-15: Rename to --id-only.
   c.option '--idonly', 'Only return the IDs'
   c.option '--[no-]brief', 'Show fewer fields: show only IDs and names'
+  c.option '--network', 'Fetch and show Business Network details'
+  c.option '--detailed', 'Fetch and show all Business information'
   # MAYBE/2017-08-17: Move -o option to globals.rb and apply to all commands.
   c.option '-o', '--output FILE', 'Download to file instead of STDOUT'
 end
@@ -103,7 +131,9 @@ end
 
 command 'business list' do |c|
   c.syntax = %(murano business list [--options])
-  c.summary = %(List businesses)
+  # (lb): Use leading space so there's more than one space in --help
+  #   after the command name.
+  c.summary = %( List businesses)
   c.description = %(
 List businesses.
 
@@ -169,9 +199,6 @@ 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|
@@ -183,17 +210,16 @@ alias_command 'businesses list', 'business list'
 
 command 'business find' do |c|
   c.syntax = %(murano business find [--options] [<name-or-ID,...>])
-  c.summary = %(Find business by name or ID)
+  # (lb): Use leading space so there's more than one space in --help
+  #   after the command name.
+  c.summary = %( Find business by name or ID)
   c.description = %(
-Find business by name or ID.
+    Find business by name or ID.
   ).strip
   c.project_not_required = true
 
   cmd_table_output_add_options(c)
 
-  # Add --network option
-  c.option('--network')
-
   # Add --business/-id/-name options.
   cmd_option_business_pickers(c)
 
@@ -211,6 +237,128 @@ Find business by name or ID.
   end
 end
 
+command 'business show' do |c|
+  c.syntax = %(murano business show)
+  # (lb): Use leading space so there's more than one space in --help
+  #   after the command name.
+  c.summary = %( Show information about the active Business)
+  c.description = %(
+    Show details about the active Business.
+  ).strip
+  c.project_not_required = true
+
+  c.action do |args, options|
+    c.verify_arg_count!(args)
+
+    options.network = true
+    options.detailed = true
+
+    biz = MrMurano::Business.new
+    biz.must_business_id!
+
+    MrMurano::Verbose.whirly_start 'Fetching business details...'
+    biz.overview(detailed: true, networks: true)
+    MrMurano::Verbose.whirly_stop
+
+    acc = MrMurano::Account.new
+    cmd_business_output_businesses(acc, [biz], options)
+  end
+end
+
+command 'business members' do |c|
+  c.syntax = %(murano business members)
+  # (lb): Use leading space so there's more than one space in --help
+  #   after the command name.
+  c.summary = %( Show Business members)
+  c.description = %(
+    Show Business members.
+  ).strip
+  c.project_not_required = true
+
+  c.action do |args, options|
+    c.verify_arg_count!(args)
+
+    biz = MrMurano::Business.new
+    biz.must_business_id!
+
+    MrMurano::Verbose.whirly_start 'Fetching business members...'
+    members = biz.fetch_member
+    MrMurano::Verbose.whirly_stop
+
+    acc = MrMurano::Account.new
+    cmd_business_output_members(acc, members, options)
+  end
+end
+
+command 'business set name' do |c|
+  c.syntax = %(murano business set name <name>)
+  # (lb): Use leading space so there's more than one space in --help
+  #   after the command name.
+  c.summary = %( Change Business name)
+  c.description = %(
+    Change Business name.
+  ).strip
+  c.project_not_required = true
+
+  c.action do |args, _options|
+    c.verify_arg_count!(args, 1, ['Missing <Business name>'])
+    new_name = args[0]
+
+    biz = MrMurano::Business.new
+    biz.must_business_id!
+
+    MrMurano::Verbose.whirly_start 'Setting Business name...'
+    biz.name = new_name
+    MrMurano::Verbose.whirly_stop
+  end
+end
+
+command 'business set email' do |c|
+  c.syntax = %(murano business set email <name>)
+  # (lb): Use leading space so there's more than one space in --help
+  #   after the command name.
+  c.summary = %( Change Business billing email)
+  c.description = %(
+    Change Business billing email.
+  ).strip
+  c.project_not_required = true
+
+  c.action do |args, _options|
+    c.verify_arg_count!(args, 1, ['Missing <billing email>'])
+    new_email = args[0]
+
+    biz = MrMurano::Business.new
+    biz.must_business_id!
+
+    MrMurano::Verbose.whirly_start 'Setting Business billing email...'
+    biz.email = new_email
+    MrMurano::Verbose.whirly_stop
+  end
+end
+
+command 'business set contact' do |c|
+  c.syntax = %(murano business set contact <contact>)
+  # (lb): Use leading space so there's more than one space in --help
+  #   after the command name.
+  c.summary = %( Change Business billing contact)
+  c.description = %(
+    Change Business billing contact.
+  ).strip
+  c.project_not_required = true
+
+  c.action do |args, _options|
+    c.verify_arg_count!(args, 1, ['Missing <billing contact>'])
+    new_contact = args[0]
+
+    biz = MrMurano::Business.new
+    biz.must_business_id!
+
+    MrMurano::Verbose.whirly_start 'Setting Business billing contact...'
+    biz.contact = new_contact
+    MrMurano::Verbose.whirly_stop
+  end
+end
+
 # *** Business actions helpers
 # ----------------------------
 
@@ -338,7 +486,13 @@ 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, options: options)
+  bizz = acc.businesses(
+    bid: bid,
+    name: name,
+    fuzzy: fuzzy,
+    detailed: options.detailed,
+    networks: options.network
+  )
   MrMurano::Verbose.whirly_stop
 
   bizz
@@ -360,12 +514,22 @@ def cmd_business_header_and_bizz(bizz, options)
       case hdr
       when :bizid
         0
-      when :role
-        1
       when :name
+        1
+      when :tier
         2
-      else
+      when :contact
         3
+      when :email
+        4
+      when :role
+        5
+      when :network_relationship
+        6
+      when :network_name
+        7
+      else
+        8
       end
     end
     bizz = bizz.map { |biz| headers.map { |key| biz.meta[key] } }
@@ -392,3 +556,46 @@ def cmd_business_output_businesses(acc, bizz, options)
   io.close unless io.nil?
 end
 
+def cmd_business_members_header(members)
+  # (lb): Skip: :membership, which is just the bizid and role
+  #   regurgitated (and it's also deprecated).
+  culled = members.dup.each { |member| member.delete(:membership) }
+
+  # Sort by role, then email.
+  culled.sort_by! { |member| [member[:role], member[:email]] }
+
+  headers = (culled[0] && culled[0].keys) || []
+  headers.sort_by! do |hdr|
+    case hdr
+    when :role
+      0
+    when :email
+      1
+    when :name
+      2
+    when :pending
+      3
+    else
+      4
+    end
+  end
+  culled = culled.map { |member| headers.map { |key| member[key] } }
+
+  [headers, culled]
+end
+
+def cmd_business_output_members(acc, members, options)
+  headers, members = cmd_business_members_header(members)
+  io = File.open(options.output, 'w') if options.output
+  acc.outf(members, io) do |dd, ios|
+    acc.tabularize(
+      {
+        headers: headers.map(&:to_s),
+        rows: dd,
+      },
+      ios,
+    )
+  end
+  io.close unless io.nil?
+end
+

data/lib/MrMurano/commands/child.rb

@@ -43,7 +43,7 @@ command 'child show' do |c|
   def show_child
     biz = MrMurano::Business.new
     biz.must_business_id!
-    biz.must_child!
+    biz.must_child_id!
     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)
@@ -100,7 +100,7 @@ command 'child add' do |c|
     new_member_email = args[0]
     biz = MrMurano::Business.new
     biz.must_business_id!
-    biz.must_child!
+    biz.must_child_id!
     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
@@ -136,7 +136,7 @@ command 'child remove' do |c|
     member_email = args[0]
     biz = MrMurano::Business.new
     biz.must_business_id!
-    biz.must_child!
+    biz.must_child_id!
     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

data/lib/MrMurano/commands/element.rb

@@ -6,6 +6,7 @@
 # Unauthorized copying of this file is strictly prohibited.
 
 require 'highline'
+require 'json'
 require 'pathname'
 require 'tempfile'
 require 'tty-editor'

data/lib/MrMurano/commands/settings.rb

@@ -96,6 +96,8 @@ If a sub-key doesn't exist, that entire path will be created as dicts.
   c.option '--bool', %(Set Value type to boolean)
   c.option '--num', %(Set Value type to number)
   c.option '--string', %(Set Value type to string (this is default))
+  # (lb): Ha! The global --json shadows this one! So this option serves
+  # just for showing up in the --help. In the action, we'll kludge this.
   c.option '--json', %(Value is parsed as JSON)
   c.option '--array', %(Set Value type to array of strings)
   c.option '--dict', %(Set Value type to a dictionary of strings)
@@ -123,6 +125,11 @@ If a sub-key doesn't exist, that entire path will be created as dicts.
       append: false,
       merge: false,
     )
+    # (lb): As mentioned above, above the option, there are two --json options,
+    # one global (for --json output), and the one here. The global option is
+    # handled by lib/MrMurano/commands/globals.rb, and then it's removed from
+    # args. So do a bit of deducing here.
+    options.json = $cfg['tool.outformat'] == 'json'
 
     service, pref = args.shift.split('.')
     subkey = args.shift

data/lib/MrMurano/http.rb

@@ -76,9 +76,7 @@ module MrMurano
     end
 
     # (lb): Ideally, we'd refactor and these wouldn't be static class methods.
-    def self.curldebug_after(request, response)
-      @http_complete = [] unless defined? @http_complete
-      @http_complete.push([request, response])
+    def self.curldebug_after(_request, response)
       return response unless $cfg['tool.curldebug'] && $cfg['tool.curlfancy']
       MrMurano::Http.curldebug_elapsed
       if response.nil?

data/lib/MrMurano/progress.rb

@@ -85,7 +85,7 @@ module MrMurano
       # Note that Whirly adds '...', so add its length, too.
       # rubocop:disable Performance/FixedSize
       #   Do not compute the size of statically sized objects.
-      @whirly_cols = @whirly_msg.length + '...'.length
+      @whirly_cols = strip_color(@whirly_msg).length + '...'.length
     end
 
     def whirly_stop(force: false)
@@ -125,7 +125,7 @@ module MrMurano
         # Clear the line.
         Whirly.configure(status: ' ' * @whirly_cols)
         Whirly.configure(status: @whirly_msg)
-        @whirly_cols = @whirly_msg.length + '...'.length
+        @whirly_cols = strip_color(@whirly_msg).length + '...'.length
       end
     end
 
@@ -149,6 +149,16 @@ module MrMurano
       yield
       whirly_unpause
     end
+
+    # (lb): MAYBE: Move strip_color to a string helper module...
+    #   like lib/MrMurano/variegated/...?
+    def self.strip_color(str)
+      str.gsub(/\e\[[;0-9]+m/, '')
+    end
+
+    def strip_color(str)
+      MrMurano::Progress.strip_color(str)
+    end
   end
 end
 

data/lib/MrMurano/verbosing.rb

@@ -59,7 +59,7 @@ module MrMurano
 
     def self.assert(condition, msg='')
       return if condition
-      msg = "Assertion raised! #{caller[1]}\n" + msg
+      msg = "Assertion raised! #{caller(1..1)}\n" + msg
       whirly_interject { warn(HighLine.color(msg, :red)) }
       raise msg
     end
@@ -214,18 +214,18 @@ module MrMurano
     def dump_output_file(obj, outf, fmt, **opts)
       case fmt
       when :json
-        dump_file_json(obj, outf, **opts)
+        MrMurano::Verbose.dump_file_json(obj, outf, **opts)
       when :yaml
-        dump_file_yaml(obj, outf)
+        MrMurano::Verbose.dump_file_yaml(obj, outf)
       when :plain
-        dump_file_plain(obj, outf)
+        MrMurano::Verbose.dump_file_plain(obj, outf)
       else
         error_file_format!(fmt)
       end
       outf.flush
     end
 
-    def dump_file_json(obj, outf, pretty: false)
+    def self.dump_file_json(obj, outf, pretty: false)
       if pretty
         outf.write(JSON.pretty_generate(obj))
       else
@@ -233,11 +233,11 @@ module MrMurano
       end
     end
 
-    def dump_file_yaml(obj, outf)
+    def self.dump_file_yaml(obj, outf)
       YAML.dump(obj, outf)
     end
 
-    def dump_file_plain(obj, outf)
+    def self.dump_file_plain(obj, outf)
       outf.write(obj)
     end
 

data/lib/MrMurano/version.rb

@@ -26,7 +26,7 @@ module MrMurano
   #     '3.0.0-beta.2' is changed to '3.0.0.pre.beta.2'
   #   which breaks our build (which expects the version to match herein).
   #   So stick to using the '.pre.X' syntax, which ruby/gems knows.
-  VERSION = '3.2.1.pre.beta.4'
+  VERSION = '3.2.1.pre.beta.5'
   EXE_NAME = File.basename($PROGRAM_NAME)
   SIGN_UP_URL = 'https://exosite.com/signup/'
 end

data/spec/Account_spec.rb

@@ -38,6 +38,14 @@ RSpec.describe MrMurano::Account, 'token' do
     # Reset the Net::HTTP object, which was configured with the old net.host, etc.
     MrMurano::HttpAuthed.instance.http_reset
 
+    # (lb): 2018-08-09: With the new snapshot infrastructure, the token gets saved
+    # to the snapshot after the example runs. However, for examples that expect to
+    # start with no token, running the snapshot loads the token even though it should
+    # not be loaded. To work around that, delete the token here. (I have a feeling
+    # there's a better way to handle this, but I'm not sure offhand; this works for
+    # now, so going with it!)
+    ENV.delete('MURANO_TOKEN')
+
     stub_request_email_password
 
     $project = MrMurano::ProjectFile.new
@@ -153,6 +161,7 @@ end
 
 RSpec.describe MrMurano::Account do
   include_context 'WORKSPACE'
+
   before(:example) do
     @saved_cfg = ENV['MURANO_CONFIGFILE']
     ENV['MURANO_CONFIGFILE'] = nil

data/spec/ProjectFile_spec.rb

@@ -43,16 +43,12 @@ RSpec.describe MrMurano::ProjectFile do
           expect(@pjf).to receive(
             :default_value_for
           ).with('assets.location').and_return('here')
-          expect(@pjf.get(
-            'assets.location'
-          )).to eq('here')
+          expect(@pjf.get('assets.location')).to eq('here')
 
           expect(@pjf).to receive(
             :default_value_for
           ).with('assets.include').and_return(['here'])
-          expect(@pjf.get(
-            'assets.include'
-          )).to eq(['here'])
+          expect(@pjf.get('assets.include')).to eq(['here'])
 
           expect(@pjf).to receive(
             :default_value_for
@@ -168,9 +164,11 @@ RSpec.describe MrMurano::ProjectFile do
           expect($cfg).to receive(:get).with(
             'endpoints.searchFor'
           ).and_return('beef and potatoes')
-          expect(@pjf.default_value_for(
-            'routes.include'
-          )).to eq(%w[beef and potatoes])
+          expect(
+            @pjf.default_value_for(
+              'routes.include'
+            )
+          ).to eq(%w[beef and potatoes])
         end
       end
     end

data/spec/Webservice-File_spec.rb

@@ -261,6 +261,7 @@ RSpec.describe MrMurano::Webservice::File do
 
     it 'gets item' do
       prj = Pathname.new(@project_dir).realpath
+      just_some_text = %(Just some text)
       want = [
         MrMurano::Webservice::File::FileItem.new(
           path: '/files/one.text',
@@ -270,7 +271,7 @@ RSpec.describe MrMurano::Webservice::File do
           #checksum: 'd1af3dadf08479a1d43b282f95d61dda8efda5e7'
           #   You can calculate this with `md5sum one.text`
           checksum: 'e9ea4a5be73a09f541ad0b611083f0df',
-          size: %(Just some text).length,
+          size: just_some_text.length,
         ),
       ]
       ret = @srv.to_remote_items(prj, @lp)

data/spec/cmd_business_spec.rb

@@ -24,7 +24,7 @@ RSpec.describe 'murano business', :cmd, :needs_password do
       expect(err).to eq('')
       olines = out.lines
       expect(olines[0]).to match(/^(\+-+){3}\+$/)
-      expect(olines[1]).to match(/^\| bizid\s+\| role\s+\| name\s+\|$/)
+      expect(olines[1]).to match(/^\| bizid\s+\| name\s+\| role\s+\|$/)
       expect(olines[2]).to match(/^(\+-+){3}\+$/)
       expect(olines[-1]).to match(/^(\+-+){3}\+$/)
     end