MuranoCLI 3.0.2 → 3.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ea22792f25e5418a7687bbffaad2bf0b14f2c28
-  data.tar.gz: cbb94dd03d104a310c3f34c85381f1ce2dd455ff
+  metadata.gz: ec3cf38c4b880ec614977a7f6d95fc8b5ac69e68
+  data.tar.gz: 41b0bf32389f080867f13df0906262881ebad5ed
 SHA512:
-  metadata.gz: 728ee381c09f8e361d368a2971f8a031e17900186f114ddda941085eafa5ed7f921be17d57347a1051eab0348c0a9e8965858bcf1e8aefee2d8796c6b988f103
-  data.tar.gz: c81a425d2122475db3ecccee78389df533ed4f0dd050d086cea6418e65361c2b804f363d3143e6f074176916cbd78b66bcbc99c1fe6a85e7a6f494d47aef5d99
+  metadata.gz: 9053361d890f83cf9037bfd811bac313b1893df69daf88a13b5dab2a744c01239c7f19fb49428b1949fb578a8d50ab11a61a3033b8d1dd65f202b706de0cd116
+  data.tar.gz: af31c49ad0e42dc9a6e6eb4a6953b591b98b58c2547377e9b7e0e8d3ae53fad38256c1c72a699cdb8e18a6848ef489234cbf7408c8739cbc318e0a99f407a2c4

data/.rubocop.yml

@@ -1,4 +1,4 @@
-# Last Modified: 2017.08.31 /coding: utf-8
+# Last Modified: 2017.09.12 /coding: utf-8
 # Copyright © 2016-2017 Exosite LLC.
 # License: MIT. See LICENSE.txt.
 #  vim:tw=0:ts=2:sw=2:et:ai
@@ -28,8 +28,6 @@ Layout/TrailingBlankLines:
 Lint/ScriptPermission:
   Exclude:
     - 'bin/murano'
-    # Also the rspec shim-link:
-    - 'lib/MrMurano/spec_commander.rb'
 
 # "Assignment Branch Condition size for XXX is too high."
 # http://wiki.c2.com/?AbcMetric
@@ -121,6 +119,7 @@ Style/FileName:
     - 'lib/MrMurano/makePretty.rb'
     - 'lib/MrMurano/Account.rb'
     - 'lib/MrMurano/Business.rb'
+    - 'lib/MrMurano/Commander-Entry.rb'
     - 'lib/MrMurano/Config-Migrate.rb'
     - 'lib/MrMurano/Config.rb'
     - 'lib/MrMurano/Content.rb'
@@ -146,6 +145,34 @@ Style/FileName:
     - 'lib/MrMurano/Webservice-Endpoint.rb'
     - 'lib/MrMurano/Webservice-File.rb'
     - 'lib/MrMurano/Webservice.rb'
+    - 'spec/Account-Passwords_spec.rb'
+    - 'spec/Account_spec.rb'
+    - 'spec/Business_spec.rb'
+    - 'spec/ConfigFile_spec.rb'
+    - 'spec/ConfigMigrate_spec.rb'
+    - 'spec/Config_spec.rb'
+    - 'spec/Content_spec.rb'
+    - 'spec/GatewayBase_spec.rb'
+    - 'spec/GatewayDevice_spec.rb'
+    - 'spec/GatewayResource_spec.rb'
+    - 'spec/GatewaySettings_spec.rb'
+    - 'spec/Http_spec.rb'
+    - 'spec/MakePretties_spec.rb'
+    - 'spec/Mock_spec.rb'
+    - 'spec/ProjectFile_spec.rb'
+    - 'spec/Setting_spec.rb'
+    - 'spec/Solution-ServiceConfig_spec.rb'
+    - 'spec/Solution-ServiceEventHandler_spec.rb'
+    - 'spec/Solution-ServiceModules_spec.rb'
+    - 'spec/Solution-UsersRoles_spec.rb'
+    - 'spec/Solution_spec.rb'
+    - 'spec/SyncRoot_spec.rb'
+    - 'spec/SyncUpDown_spec.rb'
+    - 'spec/Verbosing_spec.rb'
+    - 'spec/Webservice-Cors_spec.rb'
+    - 'spec/Webservice-Endpoint_spec.rb'
+    - 'spec/Webservice-File_spec.rb'
+    - 'spec/Webservice-Setting_spec.rb'
 
 # FIXME/2017-06-30: We should fix this one... put $cfg in MrMurano class.
 # "Do not introduce global variables."
@@ -243,65 +270,9 @@ AllCops:
     # 2017-08-16: Ug.
     - 'lib/MrMurano/optparse.rb'
     #
-    # 2017-08-29: A hack for rspec.
-    #- 'lib/Murano/spec_commander.rb'
-    #
     # 2017-08-30: Ug. Loading orderedhash spits out warning gobbled by rspec fails test.
     - 'lib/MrMurano/orderedhash.rb'
     #
     # The spec_helper is a generated file; don't care.
     - 'spec/spec_helper.rb'
-    #
-    # 2017-07-25: It's probably not worth our time to lint the spec tests.
-    # 2017-07-31: 7735 offenses in the Spec tests -- not worth it to fix!!
-    #- 'spec/**/*'
-    - 'spec/Account-Passwords_spec.rb'
-    - 'spec/Account_spec.rb'
-    - 'spec/Business_spec.rb'
-    - 'spec/ConfigFile_spec.rb'
-    - 'spec/ConfigMigrate_spec.rb'
-    - 'spec/Config_spec.rb'
-    - 'spec/Content_spec.rb'
-    - 'spec/GatewayBase_spec.rb'
-    - 'spec/GatewayDevice_spec.rb'
-    - 'spec/GatewayResource_spec.rb'
-    - 'spec/GatewaySettings_spec.rb'
-    - 'spec/Http_spec.rb'
-    - 'spec/MakePretties_spec.rb'
-    - 'spec/Mock_spec.rb'
-    - 'spec/ProjectFile_spec.rb'
-    - 'spec/Setting_spec.rb'
-    - 'spec/Solution-ServiceConfig_spec.rb'
-    - 'spec/Solution-ServiceEventHandler_spec.rb'
-    - 'spec/Solution-ServiceModules_spec.rb'
-    - 'spec/Solution-UsersRoles_spec.rb'
-    - 'spec/Solution_spec.rb'
-    - 'spec/SyncRoot_spec.rb'
-    - 'spec/SyncUpDown_spec.rb'
-    - 'spec/Verbosing_spec.rb'
-    - 'spec/Webservice-Cors_spec.rb'
-    - 'spec/Webservice-Endpoint_spec.rb'
-    - 'spec/Webservice-File_spec.rb'
-    - 'spec/Webservice-Setting_spec.rb'
-    #- 'spec/_workspace.rb'
-    - 'spec/cmd_business_spec.rb'
-    #- 'spec/cmd_common.rb'
-    - 'spec/cmd_config_spec.rb'
-    - 'spec/cmd_content_spec.rb'
-    - 'spec/cmd_cors_spec.rb'
-    - 'spec/cmd_device_spec.rb'
-    - 'spec/cmd_domain_spec.rb'
-    #- 'spec/cmd_exchange_spec.rb'
-    #- 'spec/cmd_help_spec.rb'
-    - 'spec/cmd_init_spec.rb'
-    - 'spec/cmd_keystore_spec.rb'
-    - 'spec/cmd_link_spec.rb'
-    - 'spec/cmd_password_spec.rb'
-    - 'spec/cmd_setting_application_spec.rb'
-    - 'spec/cmd_setting_product_spec.rb'
-    - 'spec/cmd_status_spec.rb'
-    - 'spec/cmd_syncdown_spec.rb'
-    - 'spec/cmd_syncup_spec.rb'
-    - 'spec/cmd_usage_spec.rb'
-    #- 'spec/cmd_version_spec.rb'
 

data/Gemfile

@@ -1,4 +1,4 @@
-# Last Modified: 2017.08.30 /coding: utf-8
+# Last Modified: 2017.09.12 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -22,11 +22,15 @@ gem 'json-schema', '~> 2.7.0'
 gem 'mime-types', '~> 3.1'
 gem 'mime-types-data', '~> 3.2016.0521'
 #gem 'orderedhash', '~> 0.0.6'
+gem 'os', '~> 1.0.0'
 gem 'paint', '~> 2.0.0'
 # 2017-08-04: public_suffix 3.0.0 is for Ruby >= 2.1.
 #   It's included by json, so make sure it's the old one.
 gem 'public_suffix', '~> 2.0.5'
 gem 'rainbow', '~> 2.2.2'
+# LATER/2017-09-12: See MRMUR-160 and MRMUR-161:
+#   Windows build fails unless `rake` is packaged.
+gem 'rake', '~> 12.1.0'
 gem 'terminal-table', '~> 1.8.0'
 gem 'vine', '~> 0.4'
 gem 'whirly', '~> 0.2.4'
@@ -35,7 +39,7 @@ group :test do
   #gem 'bundler', '~> 1.7.6'
   gem 'byebug', '~> 9.0.6'
   gem 'coderay', require: false
-  gem 'rake', '~> 10.1.1'
+  #gem 'rake', '~> 10.1.1'
   gem 'rspec', '~> 3.5'
   gem 'rubocop', '~> 0.49.1'
   gem 'simplecov', require: false
@@ -45,6 +49,8 @@ group :test do
 end
 
 group :windows do
-  gem 'ocra', '~> 1.3.8'
+  # FIXME/2017-09-12: Pin to 1.3.8 until x86 issue is resolved:
+  #   https://github.com/larsch/ocra/issues/124
+  gem 'ocra', '1.3.8'
 end
 

data/MuranoCLI.gemspec

@@ -1,4 +1,4 @@
-# Last Modified: 2017.08.30 /coding: utf-8
+# Last Modified: 2017.09.12 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -63,6 +63,7 @@ explicitly specifying the version. For instance,
   s.add_runtime_dependency('mime-types', '~> 3.1')
   s.add_runtime_dependency('mime-types-data', '~> 3.2016.0521')
   #s.add_runtime_dependency('orderedhash', '~> 0.0.6')
+  s.add_runtime_dependency('os', '~> 1.0.0')
   s.add_runtime_dependency('paint', '~> 2.0.0')
   # 2017-08-04: public_suffix 3.0.0 is for Ruby >= 2.1.
   #   It's included by json, so make sure it's the old one.
@@ -71,11 +72,15 @@ explicitly specifying the version. For instance,
   s.add_runtime_dependency('terminal-table', '~> 1.8.0')
   s.add_runtime_dependency('vine', '~> 0.4')
   s.add_runtime_dependency('whirly', '~> 0.2.4')
+  # LATER/2017-09-12: See MRMUR-160 and MRMUR-161:
+  #   Windows build fails unless `rake` is packaged.
+  s.add_runtime_dependency('rake', '~> 12.1.0')
 
+  # `bundle install --with=test`
   s.add_development_dependency('bundler', '~> 1.7.6')
   s.add_development_dependency('byebug', '~> 9.0.6')
   #s.add_development_dependency('coderay', '~> ???')
-  s.add_development_dependency('rake', '~> 10.1.1')
+  #s.add_development_dependency('rake', '~> 12.1.0')
   s.add_development_dependency('rspec', '~> 3.5')
   s.add_development_dependency('rubocop', '~> 0.49.1')
   s.add_development_dependency('simplecov')
@@ -83,7 +88,9 @@ explicitly specifying the version. For instance,
   # maybe? s.add_development_dependency('vcr', '~> ???')
   s.add_development_dependency('yard')
 
-  # Windows:
-  s.add_development_dependency('ocra', '~> 1.3.8')
+  # `bundle install --with=windows`
+  # FIXME/2017-09-12: Pin to 1.3.8 until x86 issue is resolved:
+  #   https://github.com/larsch/ocra/issues/124
+  s.add_development_dependency('ocra', '1.3.8')
 end
 

data/bin/murano

@@ -1,98 +1,10 @@
 #!/usr/bin/env ruby
-# Last Modified: 2017.08.30 /coding: utf-8
+# Last Modified: 2017.09.12 /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 'commander/import'
-require 'dotenv'
-require 'English'
-require 'highline'
-require 'pathname'
-#require 'pp'
-require 'rainbow'
-require 'rubygems'
-require 'MrMurano'
-require 'MrMurano/Config'
-require 'MrMurano/ProjectFile'
-
-# DEVs: Store environs in an .env file that gets loaded here. Alternatively,
-#   run a Bash or similar script before you start developing.
-Dotenv.load
-
-# Don't drop traces on ^C.
-# EXPLAIN/2017-06-30: [lb] not sure what "drop traces" means.
-#   What happens if we don't trap Ctrl-C?
-# NOTE: The second parameter is either a string, or a command or block to
-#   call or run. Ruby honors certain special strings, like 'EXIT':
-#   "If the command is “EXIT”, the script will be terminated by the signal."
-#   Per https://ruby-doc.org/core-2.2.0/Signal.html
-Signal.trap('INT', 'EXIT')
-
-program :version, MrMurano::VERSION
-
-program :description, %(
-  Manage Applications and Products in Exosite's Murano
-).strip
-
-# If being piped, e.g.,
-#   murano command ... | ...
-# or
-#   VAR=$(murano command ...)
-# etc., then do not do progress.
-# TEST/2017-08-23: Does this work on Windows?
-ARGV.push('--no-progress') unless $stdout.tty? || ARGV.include?('--no-progress')
-
-default_command :help
-
-# Look for plug-ins.
-pgds = [
-  Pathname.new(Dir.home) + '.mrmurano' + 'plugins',
-  Pathname.new(Dir.home) + '.murano' + 'plugins',
-]
-# Add plugin dirs from configs
-# This is run before the command line options are parsed, so need to check old way.
-unless ARGV.include? '--skip-plugins'
-  pgds << Pathname.new(ENV['MR_MURANO_PLUGIN_DIR']) if ENV.key? 'MR_MURANO_PLUGIN_DIR'
-  pgds << Pathname.new(ENV['MURANO_PLUGIN_DIR']) if ENV.key? 'MURANO_PLUGIN_DIR'
-  pgds.each do |path|
-    next unless path.exist?
-    path.each_child do |plugin|
-      next if plugin.directory?
-      next unless plugin.readable?
-      next if plugin.basename.fnmatch('.*') # don't read anything starting with .
-      begin
-        require plugin.to_s
-      #rescue Exception => err
-      rescue StandardError => err
-        $stderr.puts "Failed to load plugin at #{plugin} because #{err}"
-      end
-    end
-  end
-end
-
-# Look for .murano/config files.
-$cfg = MrMurano::Config.new(::Commander::Runner.instance)
-$cfg.load
-$cfg.validate_cmd
-
-# Look for a (legacy) Solutionfile.json.
-$project = MrMurano::ProjectFile.new
-$project.load
-
-# The Commander defaults to paged help.
-# The user can disable with --no-page, e.g.,
-#   alias murano='murano --no-page'
-# We define this here and not in globals.rb because
-#   `murano --help` does not cause globals.rb to be sourced.
-paging = nil
-paging = true if ARGV.include?('--page')
-paging = false if ARGV.include?('--no-page')
-unless paging.nil?
-  program :help_paging, paging
-  $cfg['tool.no-page'] = !paging
-end
-# else, commander defaults to paging.
+require 'MrMurano/Commander-Entry'
 

data/lib/MrMurano.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.08.29 /coding: utf-8
+# Last Modified: 2017.09.12 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -50,3 +50,7 @@ require 'MrMurano/SubCmdGroupContext'
 require 'MrMurano/ReCommander'
 require 'MrMurano/commands'
 
+# LATER/2017-09-12: See MRMUR-160 and MRMUR-161:
+#   Windows build fails unless `rake` is packaged.
+require 'rake'
+

data/lib/MrMurano/{spec_commander.rb → Commander-Entry.rb}

@@ -1,5 +1,4 @@
-#!/usr/bin/env ruby
-# Last Modified: 2017.08.30 /coding: utf-8
+# Last Modified: 2017.09.12 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.

data/lib/MrMurano/Solution.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.09.11 /coding: utf-8
+# Last Modified: 2017.09.12 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -252,20 +252,17 @@ module MrMurano
           "but config says #{fancy_ticks(@name)}."
         )
       end
-      if !@meta[:name].to_s.empty?
-        # NOTE: Pre-ADC (a/k/a migrated) applications are not named, at least
-        # when you query the business/<bid>/solution/ endpoint. But when you
-        # call info_safe, which GETs the solution details, the name is
-        # the domain and contains dots, which is considered an illegal name!
-        if @meta[:name] != @meta[:domain]
-          set_name(@meta[:name])
-          unless @valid_name || type == :solution
-            warning(
-              "Unexpected: Server returned invalid name: #{fancy_ticks(@meta[:name])}"
-            )
-          end
-        end
-      end
+      return if @meta[:name].to_s.empty?
+      # NOTE: Pre-ADC (a/k/a migrated) applications are not named, at least
+      # when you query the business/<bid>/solution/ endpoint. But when you
+      # call info_safe, which GETs the solution details, the name is
+      # the domain and contains dots, which is considered an illegal name!
+      return if @meta[:name] == @meta[:domain]
+      set_name(@meta[:name])
+      return if @valid_name || type == :solution
+      warning(
+        "Unexpected: Server returned invalid name: #{fancy_ticks(@meta[:name])}"
+      )
     end
 
     def domain

data/lib/MrMurano/SolutionId.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.09.11 /coding: utf-8
+# Last Modified: 2017.09.12 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -64,10 +64,6 @@ module MrMurano
       @valid_api_id
     end
 
-    def api_id
-      @api_id
-    end
-
     def endpoint(_path='')
       # This is hopefully just a DEV error, and not something user will ever see!
       return unless @uriparts[@uriparts_apidex] == INVALID_API_ID

data/lib/MrMurano/SyncAllowed.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.08.23 /coding: utf-8
+# Last Modified: 2017.09.13 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -14,7 +14,7 @@ module MrMurano
     def sync_item_allowed(actioning, item_name)
       if $cfg['tool.dry']
         MrMurano::Verbose.whirly_interject do
-          say("--dry: Not #{actioning} item: #{fancy_ticks(item_name)}")
+          puts("--dry: Not #{actioning} item: #{fancy_ticks(item_name)}")
         end
         false
       else

data/lib/MrMurano/SyncUpDown.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.09.11 /coding: utf-8
+# Last Modified: 2017.09.12 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -10,6 +10,7 @@
 
 require 'inflecto'
 require 'open3'
+require 'os'
 require 'pathname'
 #require 'shellwords'
 require 'tempfile'
@@ -352,8 +353,10 @@ module MrMurano
         # This happens on Windows...
         require 'rbconfig'
         # Check the platform, e.g., "linux-gnu", or other.
-        is_windows = (RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/)
-        unless is_windows
+        #is_windows = (
+        #  RbConfig::CONFIG['host_os'] =~ /mswin|msys|mingw|cygwin|bccwin|wince|emc/
+        #)
+        unless OS.windows?
           msg = 'Unexpected: touch failed on non-Windows machine'
           $stderr.puts("#{msg} / host_os: #{RbConfig::CONFIG['host_os']} / err: #{err}")
         end

data/lib/MrMurano/progress.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.08.22 /coding: utf-8
+# Last Modified: 2017.09.12 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -7,6 +7,7 @@
 
 require 'highline'
 require 'inflecto'
+require 'os'
 require 'singleton'
 require 'whirly'
 
@@ -60,12 +61,20 @@ module MrMurano
     end
 
     def whirly_show
+      if $cfg['tool.ascii'] || OS.windows?
+        spinner = EXO_QUADRANTS_7
+        ansi_escape_mode = 'line'
+      else
+        spinner = EXO_QUADRANTS
+        ansi_escape_mode = 'restore'
+      end
       Whirly.start(
-        spinner: $cfg['tool.ascii'] && EXO_QUADRANTS_7 || EXO_QUADRANTS,
+        spinner: spinner,
         status: @whirly_msg,
         append_newline: false,
         #remove_after_stop: false,
         #stream: $stderr,
+        ansi_escape_mode: ansi_escape_mode,
       )
       @whirly_time = Time.now
       # The whitespace we add ends up getting picked up if you copy