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

data/lib/MrMurano/commands/element.rb

@@ -185,7 +185,8 @@ class ElementCmd
       # And account for the middle column split.
       width_taken += ' | '.length
       width_taken += flatkeys.max_by(&:length).length
-      term_width, _rows = HighLine::SystemExtensions.terminal_size
+      term_width = MrMurano::Pretties::TERM_WIDTH
+      term_width = 80 unless term_width != 0
       width_avail = term_width - width_taken
     end
     width_avail

data/lib/MrMurano/commands/globals.rb

@@ -5,6 +5,9 @@
 # vim:tw=0:ts=2:sw=2:et:ai
 # Unauthorized copying of this file is strictly prohibited.
 
+require 'highline'
+require 'rainbow'
+
 require 'MrMurano/verbosing'
 require 'MrMurano/Config'
 require 'MrMurano/variegated/TruthyFalsey'

data/lib/MrMurano/commands/network.rb

@@ -12,7 +12,8 @@ require 'MrMurano/ReCommander'
 command :network do |c|
   c.syntax = %(murano network)
   c.summary = %(About network)
-  c.description = %(Commands for working with enterprise business networks.)
+  c.description = %(Commands for working with enterprise business networks.
+  Note: See 'Murano child' commands for working with network child businesses)
   c.project_not_required = true
   c.subcmdgrouphelp = true
   c.action do |_args, _options|
@@ -22,23 +23,25 @@ command :network do |c|
 end
 
 # View a business network
-command 'network view' do |c|
-  c.syntax = %(murano network view)
+command 'network show' do |c|
+  c.syntax = %(murano network show)
   c.summary = %(View an enterprise business network)
   c.description = %(
 View business network belonging to an enterprise parent business.
   ).strip
-  c.example %('View a business network using the config file's business.id),
-            %('murano network view')
-  c.example %('View a business network using a passed in business.id),
-            %('murano network view -c business.id=<BUSINESS_ID>')
+  c.example %(
+    View a business network using the config file's business.id
+  ).strip, 'murano network show'
+  c.example %(
+    View a business network using a passed in business.id
+  ).strip, 'murano network show -c business.id=<BUSINESS_ID>'
   c.project_not_required = true
   c.action do |_args, _options|
-    view_business_network
+    show_business_network
   end
 end
 
-def view_business_network
+def show_business_network
   biz = MrMurano::Business.new
   biz.must_business_id!
   MrMurano::Verbose.whirly_start(
@@ -48,19 +51,9 @@ def view_business_network
   MrMurano::Verbose.whirly_stop
 
   must_business_network!(business_network)
-  table = Terminal::Table.new
-  table.add_row [
-    'Network Name',
-    'Child Business Tier',
-    'Child Business Price',
-  ]
-  table.add_separator
-  table.add_row [
-    business_network[:name],
-    business_network[:tier][:id],
-    business_network[:tier][:price],
-  ]
-  puts table
+  puts('Network Name: ' + business_network[:name])
+  puts('Child Business Tier: ' + business_network[:tier][:id])
+  puts('Child Business Price: ' + business_network[:tier][:price].to_s)
 end
 
 def must_business_network!(business_network)
@@ -78,7 +71,7 @@ def must_business_network!(business_network)
       'Error with business network.'
     )
   end
-  exit(1)
+  exit 1
 end
 
 # Configure/Update a business network
@@ -88,15 +81,17 @@ command 'network configure' do |c|
   c.description = %(
 Configure or update the name of an enterprise business network.
   ).strip
-  c.example %('Configure a business network using the config file's business.id),
-            %('murano network configure <NETWORK_NAME>')
-  c.example %('Configure a business network using a passed in business.id),
-            %('murano network configure <NETWORK_NAME> -c business.id=<BUSINESS_ID>')
+  c.example %(
+    Configure a business network using the config file's business.id
+  ).strip, 'murano network configure <NETWORK_NAME>'
+  c.example %(
+    Configure a business network using a passed in business.id
+  ).strip, 'murano network configure <NETWORK_NAME> -c business.id=<BUSINESS_ID>'
   c.project_not_required = true
 
   c.action do |args, _options|
     if args.empty?
-      MrMurano::Verbose.error('Please include a network name.')
+      MrMurano::Verbose.error 'Please include a network name.'
       exit 1
     end
     configure_business_network(args)
@@ -110,11 +105,135 @@ Configure or update the name of an enterprise business network.
     response = biz.configure_business_network(biz.bid, network_name)
     MrMurano::Verbose.whirly_stop
     return unless response.nil?
-    MrMurano::Verbose.error('Error configuring business network.')
-    exit(1)
+    MrMurano::Verbose.error 'Error configuring business network.'
+    exit 1
   end
 end
 
-# TODO: Network child business commands:
-#   - View, create, delete child businesses.
-#   - Add member to business network child.
+# View All Network Children
+command 'network children' do |c|
+  c.syntax = %(murano network children)
+  c.summary = %(View all of the child businesses in a business network.)
+  c.description = %(
+    View all of the child businesses in a business network.
+  ).strip
+  c.example %(
+    View all of the child businesses in a business network
+  ).strip, 'murano network children'
+  c.example %(
+    View all of the child businesses in a business network using a passed in business.id
+  ).strip, 'murano network children -c business.id=<PARENT_BUSINESS_ID>'
+  c.project_not_required = true
+
+  c.action do |_args, _options|
+    view_child_businesses
+  end
+
+  def view_child_businesses
+    biz = MrMurano::Business.new
+    biz.must_business_id!
+    MrMurano::Verbose.whirly_start 'Fetching network child businesses...'
+    business_network = biz.get_business_network(biz.bid)
+    child_businesses = biz.view_child_businesses(biz.bid)
+    MrMurano::Verbose.whirly_stop
+
+    table = Terminal::Table.new
+    table.title = 'Business Network Name: ' + business_network[:name]
+    table.add_row [
+      'Child Business ID',
+      'Child Business Name',
+      'Email',
+      'Contact',
+      'Number of Members',
+    ]
+    table.add_separator
+
+    child_businesses.each do |child|
+      table.add_row [
+        child[:bizid],
+        child[:name],
+        child[:email],
+        child[:contact],
+        child[:members].length,
+      ]
+    end
+    puts table
+
+    return unless child_businesses.nil?
+    MrMurano::Verbose.error 'Error fetching network child businesses.'
+    exit 1
+  end
+end
+
+# Create Business Network Child Business
+command 'network new' do |c|
+  c.syntax = %(murano network new <CHILD_BUSINESS_NAME>)
+  c.summary = %(Create a new child business.)
+  c.description = %(Create a new child business.)
+  c.example %(
+    Create a new network child business using the config file's parent business.id
+  ).strip, 'murano network new <CHILD_BUSINESS_NAME>'
+  c.example %(
+    Create a new network child business using a passed in parent business.id
+  ).strip, 'murano network new <CHILD_BUSINESS_NAME> -c business.id=<PARENT_BUSINESS_ID>'
+  c.project_not_required = true
+
+  c.action do |args, _options|
+    if args.empty?
+      MrMurano::Verbose.error 'Please include a child business name.'
+      exit 1
+    end
+    add_child_business(args)
+  end
+
+  def add_child_business(args)
+    child_biz_name = args[0]
+    biz = MrMurano::Business.new
+    biz.must_business_id!
+    MrMurano::Verbose.whirly_start 'Creating network child business...'
+    response = biz.add_network_child_business(biz.bid, child_biz_name)
+
+    MrMurano::Verbose.whirly_stop
+    return unless response.nil?
+    MrMurano::Verbose.error 'Error creating network child business.'
+    exit 1
+  end
+end
+
+# Delete Business Network Child Business
+command 'network delete' do |c|
+  c.syntax = %(murano network delete <CHILD_BUSINESS_ID>)
+  c.summary = %(Delete a child business.)
+  c.description = %(
+    Delete child business.
+  ).strip
+  c.example %(
+    Delete a network child business using the config file's parent business.id
+  ).strip, 'murano network delete <CHILD_BUSINESS_ID>'
+  c.example %(
+    Delete a network child business using a passed in parent business.id
+  ).strip, 'murano network delete <CHILD_BUSINESS_ID> -c business.id=<PARENT_BUSINESS_ID>'
+  c.project_not_required = true
+
+  c.action do |args, _options|
+    if args.empty?
+      MrMurano::Verbose.error 'Please include a child business ID.'
+      exit 1
+    end
+    delete_child_business(args)
+  end
+
+  def delete_child_business(args)
+    child_biz_id = args[0]
+    biz = MrMurano::Business.new
+    biz.must_business_id!
+    MrMurano::Verbose.whirly_start 'Deleting network child business...'
+    response = biz.delete_child_business(biz.bid, child_biz_id)
+    MrMurano::Verbose.whirly_stop
+    return unless response.nil?
+    MrMurano::Verbose.error 'Error deleting network child business.'
+    exit 1
+  end
+end
+
+

data/lib/MrMurano/commands/sync.rb

@@ -17,7 +17,7 @@ def sync_add_options(cmd, locale)
   cmd.option '--ignore-errors', %(Don't die on sync errors)
 end
 
-def syncdown_files(options, args=nil)
+def syncdown_files(options, args=[])
   args = [] if args.nil?
   num_synced = 0
   MrMurano::SyncRoot.instance.each_filtered(options) do |_name, _type, klass, desc|
@@ -76,7 +76,7 @@ alias_command 'pull product', 'syncdown', '--no-delete', '--type', 'product'
 alias_command 'application pull', 'syncdown', '--no-delete', '--type', 'application'
 alias_command 'product pull', 'syncdown', '--no-delete', '--type', 'product'
 
-def syncup_files(options, args=nil)
+def syncup_files(options, args=[])
   MrMurano::SyncRoot.instance.each_filtered(options) do |_name, _type, klass, desc|
     MrMurano::Verbose.whirly_msg "Syncing #{Inflecto.pluralize(desc)}..."
     sol = klass.new

data/lib/MrMurano/commands.rb

@@ -11,6 +11,7 @@
 #     murano completion > docs/completions/murano_completion-bash
 #require 'MrMurano/commands/completion'
 
+require 'MrMurano/commands/child'
 require 'MrMurano/commands/business'
 require 'MrMurano/commands/config'
 require 'MrMurano/commands/content'

data/lib/MrMurano/verbosing.rb

@@ -53,6 +53,17 @@ module MrMurano
       whirly_interject { warn(HighLine.color(msg, :red)) }
     end
 
+    def assert(condition, msg='')
+      MrMurano::Verbose.assert(condition, msg)
+    end
+
+    def self.assert(condition, msg='')
+      return if condition
+      msg = "Assertion raised! #{caller[1]}\n" + msg
+      whirly_interject { warn(HighLine.color(msg, :red)) }
+      raise msg
+    end
+
     ## Output tabular data
     # +data+:: Data to write. Preferably a Hash with :headers and :rows
     # +ios+:: Output stream to write to, if nil, then use $stdout
@@ -64,7 +75,7 @@ module MrMurano
       MrMurano::Verbose.tabularize(data, ios)
     end
 
-    def self.tabularize(data, ios=nil)
+    def self.tabularize(data, ios=nil, no_quotes: false)
       fmt = $cfg['tool.outformat']
       ios = $stdout if ios.nil?
       cols = nil
@@ -93,7 +104,7 @@ module MrMurano
           ios,
           headers: cols,
           write_headers: !cols.empty?,
-          force_quotes: true
+          force_quotes: !no_quotes,
         ) do |csv|
           # MAYBE/2017-07-02: Does shover operator work on frozen string literals?
           rows.each { |v| csv << v }

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.0.beta.9'
+  VERSION = '3.2.1.pre.beta.3'
   EXE_NAME = File.basename($PROGRAM_NAME)
   SIGN_UP_URL = 'https://exosite.com/signup/'
 end

data/spec/Account_spec.rb

@@ -6,6 +6,8 @@
 # Unauthorized copying of this file is strictly prohibited.
 
 require 'highline/import'
+require 'webmock'
+
 require 'MrMurano/version'
 require 'MrMurano/Account'
 require 'MrMurano/Config'
@@ -16,6 +18,7 @@ require 'HttpAuthed_spec'
 
 RSpec.describe MrMurano::Account, 'token' do
   include_context 'WORKSPACE'
+
   before(:example) do
     $cfg = MrMurano::Config.new
     $cfg.load
@@ -32,6 +35,9 @@ RSpec.describe MrMurano::Account, 'token' do
     # using user.name from test runner's ~/.murano/config.
     $cfg.unload(:env)
 
+    # Reset the Net::HTTP object, which was configured with the old net.host, etc.
+    MrMurano::HttpAuthed.instance.http_reset
+
     stub_request_email_password
 
     $project = MrMurano::ProjectFile.new
@@ -42,14 +48,12 @@ RSpec.describe MrMurano::Account, 'token' do
 
   after(:example) do
     @acc.token_reset
+    WebMock.reset!
   end
 
   context 'Get login info' do
     before(:example) do
-      @pswd = instance_double('MrMurano::Passwords')
-      allow(@pswd).to receive(:load).and_return(nil)
-      allow(@pswd).to receive(:save).and_return(nil)
-      allow(MrMurano::Passwords).to receive(:new).and_return(@pswd)
+      @pswd = create_instance_double_passwords
     end
 
     it 'Asks for nothing' do
@@ -66,7 +70,9 @@ RSpec.describe MrMurano::Account, 'token' do
       $cfg['user.name'] = nil
       expect($terminal).to receive(:ask).once.and_return('bob')
       expect(@acc).to receive(:error).once
-      expect($cfg).to receive(:set).with('user.name', 'bob', :user).once.and_call_original
+      expect($cfg).to receive(:set).with(
+        'user.name', 'bob', :user,
+      ).once.and_call_original
       expect(@pswd).to receive(:get).once.and_return('built')
 
       ret = @acc.login_info
@@ -76,7 +82,9 @@ RSpec.describe MrMurano::Account, 'token' do
     it 'Asks for password' do
       @acc.credentials_reset
       $cfg['user.name'] = 'bob'
-      expect(@pswd).to receive(:get).with('bizapi.hosted.exosite.io', 'bob').once.and_return(nil)
+      expect(@pswd).to receive(:get).with(
+        'bizapi.hosted.exosite.io', 'bob',
+      ).once.and_return(nil)
       expect(@acc).to receive(:error).once
       expect($terminal).to receive(:ask).once.and_return('dog')
       $cfg['auth.persist-basic'] = true
@@ -107,6 +115,9 @@ RSpec.describe MrMurano::Account, 'token' do
 
       ret = @acc.token
       expect(ret).to eq('ABCDEFGHIJKLMNOP')
+
+      # Remove all stub_request mocks.
+      WebMock.reset!
     end
 
     it 'gets an error' do
@@ -115,10 +126,14 @@ RSpec.describe MrMurano::Account, 'token' do
         .to_return(status: 401, body: {}.to_json)
 
       # Note that we stub out error and warning so nothing gets output.
-      expect(MrMurano::HttpAuthed.instance).to receive(:error).exactly(3).times.and_return(nil)
+      expect(
+        MrMurano::HttpAuthed.instance
+      ).to receive(:error).exactly(3).times.and_return(nil)
       # The warning is about ENV['MURANO_PASSWORD'] specifying the password.
       expect(MrMurano::HttpAuthed.instance).to receive(:warning).once.and_return(nil)
       expect { @acc.token }.to raise_error(SystemExit).and output(//).to_stderr
+
+      WebMock.reset!
     end
 
     it 'uses existing token' do
@@ -147,13 +162,21 @@ RSpec.describe MrMurano::Account do
     $cfg['business.id'] = 'XYZxyz'
     $cfg['product.id'] = 'XYZ'
     $cfg['user.name'] = 'BoB@place.net'
+
+    # Reset the Net::HTTP object, which was configured with the old net.host, etc.
+    MrMurano::HttpAuthed.instance.http_reset
+
+    # Reset the Http mocks (probably not necessary).
+    WebMock.reset!
     stub_request_email_password
 
     @acc = MrMurano::Account.new
     MrMurano::HttpAuthed.instance.instance_variable_set(:@token_biz, 'TTTTTTTTTT')
   end
+
   after(:example) do
     ENV['MURANO_CONFIGFILE'] = @saved_cfg
+    WebMock.reset!
   end
 
   it 'initializes' do
@@ -172,8 +195,10 @@ RSpec.describe MrMurano::Account do
           role: 'admin',
           name: 'MPS', },
       ]
-      stub_request(:get, 'https://bizapi.hosted.exosite.io/api:1/user/BoB@place.net/membership/')
-        .to_return(body: bizlist)
+      stub_request(
+        :get,
+        'https://bizapi.hosted.exosite.io/api:1/user/BoB@place.net/membership/',
+      ).to_return(body: bizlist)
 
       buslist = []
       buslist << MrMurano::Business.new(bizlist[0])
@@ -181,8 +206,11 @@ RSpec.describe MrMurano::Account do
 
       $cfg['user.name'] = 'BoB@place.net'
       stub_request_email_password
+
       ret = @acc.businesses
       expect(ret).to eq(buslist)
+
+      WebMock.reset!
     end
 
     it 'asks for account when missing' do
@@ -194,8 +222,10 @@ RSpec.describe MrMurano::Account do
           role: 'admin',
           name: 'MPS', },
       ]
-      stub_request(:get, 'https://bizapi.hosted.exosite.io/api:1/user/BoB@place.net/membership/')
-        .to_return(body: bizlist)
+      stub_request(
+        :get,
+        'https://bizapi.hosted.exosite.io/api:1/user/BoB@place.net/membership/',
+      ).to_return(body: bizlist)
 
       buslist = []
       buslist << MrMurano::Business.new(bizlist[0])
@@ -209,6 +239,8 @@ RSpec.describe MrMurano::Account do
 
       ret = @acc.businesses
       expect(ret).to eq(buslist)
+
+      WebMock.reset!
     end
   end
 end