MuranoCLI 3.2.0.beta.5 → 3.2.0.beta.8

data/lib/MrMurano/commands/network.rb

@@ -0,0 +1,120 @@
+# 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 :network do |c|
+  c.syntax = %(murano network)
+  c.summary = %(About network)
+  c.description = %(Commands for working with enterprise business networks.)
+  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 a business network
+command 'network view' do |c|
+  c.syntax = %(murano network view)
+  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.project_not_required = true
+  c.action do |_args, _options|
+    view_business_network
+  end
+end
+
+def view_business_network
+  biz = MrMurano::Business.new
+  biz.must_business_id!
+  MrMurano::Verbose.whirly_start(
+    'Checking for configured business network...'
+  )
+  business_network = biz.get_business_network(biz.bid)
+  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
+end
+
+def must_business_network!(business_network)
+  return if !business_network.nil? && !business_network[:name].nil?
+  if business_network.nil?
+    MrMurano::Verbose.error(
+      'Error getting business network.'
+    )
+  elsif business_network[:name].nil?
+    MrMurano::Verbose.error(
+      'Business network is not configured.'
+    )
+  else
+    MrMurano::Verbose.error(
+      'Error with business network.'
+    )
+  end
+  exit(1)
+end
+
+# Configure/Update a business network
+command 'network configure' do |c|
+  c.syntax = %(murano network configure <NETWORK_NAME>)
+  c.summary = %(Configure enterprise business network name)
+  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.project_not_required = true
+
+  c.action do |args, _options|
+    if args.empty?
+      MrMurano::Verbose.error('Please include a network name.')
+      exit 1
+    end
+    configure_business_network(args)
+  end
+
+  def configure_business_network(args)
+    network_name = args[0]
+    biz = MrMurano::Business.new
+    biz.must_business_id!
+    MrMurano::Verbose.whirly_start 'Configuring/updating 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)
+  end
+end
+
+# TODO: Network child business commands:
+#   - View, create, delete child businesses.
+#   - Add member to business network child.

data/lib/MrMurano/commands/postgresql.rb

@@ -39,6 +39,7 @@ Query the relational database.
 
 Queries can include $# escapes that are filled from the --param option.
   ).strip
+  c.must_not_be_managed = true
 
   c.option '--param LIST', Array, %(Values to fill $# with)
   c.option '-f', '--file FILE', %(File of SQL commands)
@@ -122,6 +123,7 @@ format. Each file is a series of Postgres SQL commands.
 The current version of the migrations (last <level> ran) will be stored in an
 extra table in your database. (__murano_cli__.migrate_version)
   ).strip
+  c.must_not_be_managed = true
 
   c.option '--dir DIR', %(Directory where migrations live)
 

data/lib/MrMurano/commands/service.rb

@@ -201,6 +201,7 @@ class ServiceCmd
       Commands for working with Solution Services.
     ).strip
     cmd.project_not_required = true
+    cmd.must_not_be_managed = true
     cmd.subcmdgrouphelp = true
 
     cmd.action do |_args, _options|
@@ -218,6 +219,7 @@ class ServiceCmd
       Add a service to a solution.
     ).strip
     cmd.project_not_required = true
+    cmd.must_not_be_managed = true
 
     # FIXME/2018-03-21: See comment under command_service_delete:
     #   We need to add multi-solution support so by default this
@@ -290,6 +292,7 @@ class ServiceCmd
       Delete service from solution.
     ).strip
     cmd.project_not_required = true
+    cmd.must_not_be_managed = true
 
     # Add flag: --type [application|product|all].
     # FIXME/2018-03-21: The way the CLI works, it chooses all solutions
@@ -359,6 +362,7 @@ class ServiceCmd
       Get information about an added service.
     ).strip
     cmd.project_not_required = true
+    cmd.must_not_be_managed = true
 
     # Add flag: --type [application|product|all].
     cmd_add_solntype_pickers(cmd)
@@ -499,6 +503,7 @@ class ServiceCmd
       List all services previously added to a solution.
     ).strip
     cmd.project_not_required = true
+    cmd.must_not_be_managed = true
 
     # Add flag: --type [application|product|all].
     cmd_add_solntype_pickers(cmd)

data/lib/MrMurano/commands/settings.rb

@@ -33,6 +33,7 @@ command 'setting list' do |c|
 List which services and settings are available.
   ).strip
   c.project_not_required = true
+  c.must_not_be_managed = true
 
   c.action do |args, _options|
     c.verify_arg_count!(args)
@@ -55,6 +56,7 @@ command 'setting read' do |c|
   c.description = %(
 Read a setting on a Service.
   ).strip
+  c.must_not_be_managed = true
 
   c.option '-o', '--output FILE', String, %(File to save output to)
 
@@ -89,6 +91,7 @@ This always does a read-modify-write.
 
 If a sub-key doesn't exist, that entire path will be created as dicts.
   ).strip
+  c.must_not_be_managed = true
 
   c.option '--bool', %(Set Value type to boolean)
   c.option '--num', %(Set Value type to number)

data/lib/MrMurano/commands/show.rb

@@ -122,6 +122,7 @@ command 'show location' do |c|
 Show readable information about the current configuration.
   ).strip
   c.project_not_required = true
+  c.must_not_be_managed = true
 
   c.action do |args, _options|
     c.verify_arg_count!(args)

data/lib/MrMurano/commands/status.rb

@@ -74,6 +74,7 @@ Each item type also supports specific filters. These always start with #.
     cmd.syntax = %(murano status [--options] [filters])
     cmd.summary = %(Get the status of files)
     cmd.description = STATUS_CMD_DESCRIPTION
+    cmd.must_not_be_managed = true
 
     # Add flag: --type [application|product|all].
     cmd_add_solntype_pickers(cmd)

data/lib/MrMurano/commands/sync.rb

@@ -35,6 +35,7 @@ command :syncdown do |cmd|
   cmd.description = %(
 Sync project down from Murano.
   ).strip
+  cmd.must_not_be_managed = true
 
   # Add flag: --type [application|product|all].
   cmd_add_solntype_pickers(cmd)
@@ -90,6 +91,7 @@ command :syncup do |cmd|
   cmd.description = %(
 Sync project up into Murano.
   ).strip
+  cmd.must_not_be_managed = true
 
   # Add flag: --type [application|product|all].
   cmd_add_solntype_pickers(cmd)

data/lib/MrMurano/commands/timeseries.rb

@@ -43,6 +43,7 @@ instance in a solution. This allows for easier debugging, being able to
 quickly try out different queries or write test data.
   ).strip
   c.subcmdgrouphelp = true
+  c.must_not_be_managed = true
 
   c.action do |_args, _options|
     ::Commander::UI.enable_paging unless $cfg['tool.no-page']
@@ -58,6 +59,8 @@ This command is deprecated.
 
 Query the timeseries database.
   ).strip
+  c.must_not_be_managed = true
+
   c.option '-o', '--output FILE', %(Download to file instead of STDOUT)
   c.option '--[no-]json', %(Display results as raw json)
   c.option '--[no-]csv', %(Display results as CSV)
@@ -99,7 +102,10 @@ This command is deprecated.
 
 Write data into the timeseries database.
   ).strip
+  c.must_not_be_managed = true
+
   c.option '--[no-]json', %(Display results as raw json)
+
   c.action do |args, options|
     c.verify_arg_count!(args)
     options.defalts(json: false)
@@ -119,7 +125,10 @@ This command is deprecated.
 
 Execute a non-query command in the database.
   ).strip
+  c.must_not_be_managed = true
+
   c.option '--[no-]json', %(Display results as raw json)
+
   c.action do |args, options|
     # SKIP: c.verify_arg_count!(args)
     options.defalts(json: false)

data/lib/MrMurano/commands/tsdb.rb

@@ -77,6 +77,7 @@ Units are u (microseconds), ms (milliseconds), s (seconds)
 
 Also, many date-time formats can be parsed and will be converted to microseconds
   ).strip
+  c.must_not_be_managed = true
 
   c.option '--when TIMESTAMP', %(When this data happened (default: now))
   # TODO: add option to take data from STDIN.
@@ -131,6 +132,7 @@ Units are u (microseconds), ms (milliseconds), s (seconds)
 
 Also, many date-time formats can be parsed and will be converted to microseconds
   ).strip
+  c.must_not_be_managed = true
 
   c.option '--start_time TIMESTAMP', %(Start time range)
   c.option '--end_time TIMESTAMP', %(End time range; defaults to now)
@@ -321,6 +323,7 @@ command 'tsdb list tags' do |c|
   c.description = %(
 List tags.
   ).strip
+  c.must_not_be_managed = true
 
   c.option '--values', %(Include the known tag values)
 
@@ -354,6 +357,7 @@ command 'tsdb list metrics' do |c|
   c.description = %(
 List metrics.
   ).strip
+  c.must_not_be_managed = true
 
   c.action do |args, _options|
     c.verify_arg_count!(args)

data/lib/MrMurano/commands.rb

@@ -26,6 +26,7 @@ require 'MrMurano/commands/link'
 require 'MrMurano/commands/login'
 require 'MrMurano/commands/logs'
 require 'MrMurano/commands/mock'
+require 'MrMurano/commands/network'
 require 'MrMurano/commands/postgresql'
 require 'MrMurano/commands/password'
 require 'MrMurano/commands/settings'

data/lib/MrMurano/variegated/ruby_dig.rb

@@ -60,5 +60,16 @@ class HashDiggable < DumbDelegator
       value.dig_safe(*rest)
     end
   end
+
+  def deep_delete(key, *rest)
+    if rest.empty?
+      delete(key)
+    else
+      keys = [key] + rest[0..-2]
+      target = rest[-1]
+      value = dig_safe(*keys)
+      value.delete(target) if value.is_a? ::Hash
+    end
+  end
 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.0.beta.5'
+  VERSION = '3.2.0.beta.8'
   EXE_NAME = File.basename($PROGRAM_NAME)
   SIGN_UP_URL = 'https://exosite.com/signup/'
 end

data/spec/cmd_element_spec.rb

@@ -237,11 +237,11 @@ RSpec.describe 'murano element', :cmd, :needs_password do
 
     it 'as edit with too many fields specified' do
       stdout, stderr = murano_command_exits(
-        'element edit', '-e', "contact=#{rname}", '-e', 'markdown', 'MUR-6407'
+        'element edit', '-e', 'contact', '-e', 'markdown', 'MUR-6407'
       )
       expect(stdout).to eq('')
       expect(stderr).to eq(
-        %(Please specify at most one field when not specifing all field values.\n)
+        %(Please specify at most one field without a value.\n)
       )
     end
 

data/spec/fixtures/dumped_config

@@ -12,6 +12,7 @@ curlfancy = false
 no-page = false
 no-progress = false
 show-password = false
+skip-managed = false
 
 [net]
 host = bizapi.hosted.exosite.io

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: MuranoCLI
 version: !ruby/object:Gem::Version
-  version: 3.2.0.beta.5
+  version: 3.2.0.beta.8
 platform: ruby
 authors:
 - Michael Conrad Tadpol Tilstra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-01 00:00:00.000000000 Z
+date: 2018-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: certified
@@ -466,9 +466,6 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
-- ".trustme.plugin"
-- ".trustme.sh"
-- ".trustme.vim"
 - Gemfile
 - LICENSE.txt
 - MuranoCLI.gemspec
@@ -488,6 +485,9 @@ files:
 - dockers/docker-test.sh
 - dockers/gem-release.sh
 - docs/basic_example.rst
+- docs/ci/.trustme.plugin
+- docs/ci/.trustme.sh
+- docs/ci/.trustme.vim
 - docs/completions/murano_completion-bash
 - docs/demo.md
 - docs/develop.rst
@@ -546,6 +546,7 @@ files:
 - lib/MrMurano/commands/login.rb
 - lib/MrMurano/commands/logs.rb
 - lib/MrMurano/commands/mock.rb
+- lib/MrMurano/commands/network.rb
 - lib/MrMurano/commands/password.rb
 - lib/MrMurano/commands/postgresql.rb
 - lib/MrMurano/commands/service.rb