MuranoCLI 3.0.4 → 3.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec3cf38c4b880ec614977a7f6d95fc8b5ac69e68
-  data.tar.gz: 41b0bf32389f080867f13df0906262881ebad5ed
+  metadata.gz: 73e2f9256da32058214bb3f721407d9fd480b951
+  data.tar.gz: 947a9c30a1632fae14e8c5e1560a52050bc0748b
 SHA512:
-  metadata.gz: 9053361d890f83cf9037bfd811bac313b1893df69daf88a13b5dab2a744c01239c7f19fb49428b1949fb578a8d50ab11a61a3033b8d1dd65f202b706de0cd116
-  data.tar.gz: af31c49ad0e42dc9a6e6eb4a6953b591b98b58c2547377e9b7e0e8d3ae53fad38256c1c72a699cdb8e18a6848ef489234cbf7408c8739cbc318e0a99f407a2c4
+  metadata.gz: 770f834abc53c64993f18fff880379b6ebb2ed24905fb662a856e66b103ac8d36cca955fa893fd9cca8a355cbbe39f08c38a71153450680fa1e8e8c5b493935f
+  data.tar.gz: 5f6ccacfaa8a60c09c8e551bbb17844266e5ddb7156f52b701b470c07faaff24fe5203c81b790580f8c3876f110667e4cef2530b815996a0ebda5027838ae247

data/{.agignore → .ignore}

@@ -7,10 +7,12 @@ report/
 .rspec_examples.txt
 Gemfile.lock
 .bundle/
+tags
 
 # 2017-05-12: Testing!
 *.out
 .rake_build.out
+curldebug.out
 
 rspec-*.html
 *.rspec.html

data/.trustme.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Last Modified: 2017.08.16
+# Last Modified: 2017.09.20
 # vim:tw=0:ts=2:sw=2:et:norl:spell
 
 # WHAT: A Continuous Integration (CI) script for kicking the build
@@ -171,6 +171,19 @@ function rspec_it() {
 # business as you do when developing.
 #rspec_it
 
+function ctags_it() {
+  annoucement "CTAGS IT"
+  ctags -R \
+    --exclude=coverage \
+    --exclude=docs \
+    --exclude=pkg \
+    --exclude=report \
+    --exclude=spec \
+    --verbose=yes
+  /bin/ls -la tags >> ${OUT_FILE}
+}
+ctags_it
+
 time_n=$(date +%s.%N)
 time_elapsed=$(echo "$time_n - $time_0" | bc -l)
 annoucement "DONE!"

data/.trustme.vim

@@ -23,6 +23,8 @@
 "  autocmd BufWritePost <buffer> silent !./.trustme.sh &
 "augroup END
 
+autocmd BufRead *.rb set tags=/exo/clients/exosite/exosite-murcli/tags
+
 "echomsg 'Calling trustme.sh'
 silent !./.trustme.sh &
 

data/README.markdown

@@ -1,10 +1,5 @@
 # Murano Command Line Interface (CLI)
 
-[![Gem
-Version](https://badge.fury.io/rb/MuranoCLI.svg)](https://badge.fury.io/rb/MuranoCLI)
-[![Build Status](https://travis-ci.org/exosite/MuranoCLI.svg?branch=master)](https://travis-ci.org/exosite/MuranoCLI)
-[![Inline docs](http://inch-ci.org/github/exosite/MuranoCLI.svg?branch=master)](http://inch-ci.org/github/exosite/MuranoCLI)
-
 Do more from the command line with [Murano](https://exosite.com/platform/).
 
 MuranoCLI interacts with Murano and makes different tasks easier.

data/lib/MrMurano/Account.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.08.22 /coding: utf-8
+# Last Modified: 2017.09.21 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -55,6 +55,7 @@ Or set your password with `murano password set <username>`.
 
     def login_info
       warned_once = false
+
       if user.empty?
         prologue = 'No Murano user account found.'
         unless $cfg.prompt_if_logged_off
@@ -70,9 +71,8 @@ Or set your password with `murano password set <username>`.
         $project.refresh_user_name
         MrMurano::Verbose.whirly_unpause
       end
-      pwd_path = $cfg.file_at('passwords', :user)
-      pwd_file = MrMurano::Passwords.new(pwd_path)
-      pwd_file.load
+
+      pwd_file = pwd_file_load
       user_pass = pwd_file.get(host, user)
       if user_pass.nil?
         prologue = "No Murano password found for #{user}."
@@ -85,19 +85,42 @@ Or set your password with `murano password set <username>`.
         error(%(#{prologue} #{LOGIN_NOTICE}).strip) unless warned_once
         user_pass = ask('Password: ') { |q| q.echo = '*' }
         pwd_file.set(host, user, user_pass)
+        pwd_file.set(host, user + '/twofactor', nil)
         pwd_file.save
         MrMurano::Verbose.whirly_unpause
+      else
+        @twofactor_token = token_twofactor_lookup(pwd_file)
       end
-      creds = {
+
+      {
         email: user,
         password: user_pass,
       }
-      creds
+    end
+
+    def pwd_file_load
+      pwd_path = $cfg.file_at('passwords', :user)
+      pwd_file = MrMurano::Passwords.new(pwd_path)
+      pwd_file.load
+      pwd_file
+    end
+
+    def token_twofactor_lookup(pwd_file)
+      twoftoken = pwd_file.lookup(host, user + '/twofactor')
+      if twoftoken.to_s.empty?
+        nil
+      elsif twoftoken !~ /^[a-fA-F0-9]+$/
+        warning "Malformed twofactor token: #{twoftoken}"
+        nil
+      else
+        twoftoken
+      end
     end
 
     # ---------------------------------------------------------------------
 
     def token
+      return '' if defined?(@logging_on) && @logging_on
       token_fetch if @token.to_s.empty?
       @token
     end
@@ -107,32 +130,139 @@ Or set your password with `murano password set <username>`.
     end
 
     def token_fetch
-      # Cannot have token call token, so cannot use Http::workit.
-      uri = endpoint('token/')
-      request = Net::HTTP::Post.new(uri)
-      request['User-Agent'] = "MrMurano/#{MrMurano::VERSION}"
-      request.content_type = 'application/json'
-      curldebug(request)
-      #request.basic_auth(username(), password())
-      request.body = JSON.generate(login_info)
+      @logging_on = true
+      creds = login_info
+      @token = nil
+
+      # If 2fa token found, verify it works.
+      unless @twofactor_token.nil?
+        get('token/' + @twofactor_token) do |request, http|
+          http.request(request) do |response|
+            if response.is_a?(Net::HTTPSuccess)
+              # response.body is, e.g., "{\"email\":\"xxx@yyy.zzz\",\"ttl\":172800}"
+              @token = @twofactor_token
+            end
+          end
+        end
+        unless @token.nil?
+          @logging_on = false
+          return
+        end
+        @twofactor_token = nil
+      end
 
       MrMurano::Verbose.whirly_start('Logging in...')
-      response = http.request(request)
+      post('token/', creds) do |request, http|
+        http.request(request) do |response|
+          reply = JSON.parse(response.body, json_opts)
+          if response.is_a?(Net::HTTPSuccess)
+            @token = reply[:token]
+          elsif response.is_a?(Net::HTTPConflict) && reply[:message] == 'twofactor'
+            MrMurano::Verbose.whirly_interject do
+              # Prompt user for emailed code.
+              token_twofactor_fetch(creds)
+            end
+          else
+            showHttpError(request, response)
+            error 'Check to see if username and password are correct.'
+            unless ENV['MURANO_PASSWORD'].to_s.empty?
+              pwd_path = $cfg.file_at('passwords', :user)
+              warning "NOTE: MURANO_PASSWORD specifies the password; it was not read from #{pwd_path}"
+            end
+          end
+        end
+      end
       MrMurano::Verbose.whirly_stop
+      @logging_on = false
+    end
 
-      case response
-      when Net::HTTPSuccess
-        token = JSON.parse(response.body, json_opts)
-        @token = token[:token]
-      else
-        showHttpError(request, response)
-        error 'Check to see if username and password are correct.'
-        unless ENV['MURANO_PASSWORD'].to_s.empty?
-          pwd_path = $cfg.file_at('passwords', :user)
-          warning "NOTE: MURANO_PASSWORD specifies the password; it was not read from #{pwd_path}"
-        end
-        @token = nil
+    def token_twofactor_fetch(creds)
+      error 'Two-factor Authentication'
+      warning 'A verification code has been sent to your email.'
+      code = ask('Please enter the code here to continue: ').strip
+      unless code =~ /^[a-fA-F0-9]+$/
+        error 'Expected token to contain only numbers and hexadecimal letters.'
+        exit 1
+      end
+      MrMurano::Verbose.whirly_start('Verifying code...')
+
+      path = 'key/' + code
+
+      response = get(path)
+      # Response is, e.g., {
+      #   purpose: "twofactor",
+      #   status: "exists",
+      #   email: "xxx@yyy.zzz",
+      #   bizid: null,
+      #   businessName: null, }
+      return if response.nil?
+
+      response = post(path, password: creds[:password])
+      # Response is, e.g., { "token": "..." }
+      return if response.nil?
+
+      @twofactor_token = response[:token]
+      pwd_file = pwd_file_load
+      pwd_file.set(host, user + '/twofactor', @twofactor_token)
+      pwd_file.save
+      @token = @twofactor_token
+      MrMurano::Verbose.whirly_stop
+
+      warning 'Please run `murano logout --token` to clear your two-factor token when finished.'
+    end
+
+    def logout(token_delete_only)
+      @logging_on = true
+
+      pwd_file = pwd_file_load
+      twoftoken = token_twofactor_lookup(pwd_file)
+
+      # First, delete/invalidate the remote token.
+      unless twoftoken.to_s.empty?
+        @suppress_error = true
+        delete('token/' + twoftoken)
+        # The response is nil if the token was not recognized, otherwise it's
+        # {}. We don't really care, since we're going to forget our copy of
+        # the token, anyway.
+        @suppress_error = false
+      end
+
+      net_host = verify_set('net.host')
+      user_name = verify_set('user.name')
+      if net_host && user_name
+        pwd_file = MrMurano::Passwords.new
+        pwd_file.load
+        pwd_file.remove(net_host, user_name) unless token_delete_only
+        pwd_file.remove(net_host, user_name + '/twofactor')
+        pwd_file.save
+      end
+
+      clear_from_config(net_host, user_name) unless token_delete_only
+
+      @logging_on = false
+    end
+
+    def clear_from_config(net_host, user_name)
+      user_net_host = $cfg.get('net.host', :user)
+      user_net_host = $cfg.get('net.host', :defaults) if user_net_host.nil?
+      user_user_name = $cfg.get('user.name', :user)
+      # Only clear user name from the user config if the net.host
+      # or user.name did not come from a different config, like the
+      # --project config.
+      return unless (user_net_host == net_host) && (user_user_name == user_name)
+      $cfg.set('user.name', nil, :user)
+      $cfg.set('business.id', nil, :user)
+      $cfg.set('business.name', nil, :user)
+    end
+
+    def verify_set(cfg_key)
+      cfg_val = $cfg.get(cfg_key)
+      if cfg_val.to_s.empty?
+        cfg_val = nil
+        cfg_key_q = MrMurano::Verbose.fancy_ticks(cfg_key)
+        MrMurano::Verbose.warning("No config key #{cfg_key_q}: no password to delete")
       end
+      cfg_val
     end
 
     # ---------------------------------------------------------------------

data/lib/MrMurano/Business.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.09.11 /coding: utf-8
+# Last Modified: 2017.09.20 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -109,12 +109,7 @@ module MrMurano
 
     def self.missing_business_id_msg
       %(
-Missing Business ID.
-Call `#{MrMurano::EXE_NAME} business list` to get a list of business IDs.
-Set the ID temporarily using --config business.id=<ID>
-or add to the project config using \`#{MrMurano::EXE_NAME} config business.id <ID>\`
-or add to the user config using \`#{MrMurano::EXE_NAME} config business.id <ID> --user\`
-or set it interactively using \`#{MrMurano::EXE_NAME} init\`
+business ID not specified. For hints: #{MrMurano::EXE_NAME} business --help
       ).strip
     end
 

data/lib/MrMurano/Config.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.08.31 /coding: utf-8
+# Last Modified: 2017.09.20 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -301,7 +301,7 @@ module MrMurano
         if the_cmd.name != 'help' && !the_cmd.project_not_required && !@project_exists
           error %(The "#{the_cmd.name}" command only works in a Murano project.)
           say INVALID_PROJECT_HINT
-          # Note that commnander-rb uses an at_exit hook, which we hack around.
+          # Note that commander-rb uses an at_exit hook, which we hack around.
           @runner.command_exit = 1
           false
         end

data/lib/MrMurano/Exchange-Element.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.08.31 /coding: utf-8
+# Last Modified: 2017.09.27 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -9,37 +9,44 @@ module MrMurano
   class ExchangeElement
     include HashInit
 
-    # The meta is the element hash returned from the platform,
-    # i.e., all of the other attrs in a Hash.
-    attr_reader :meta
+    # *** BizAPI members.
 
-    # The Exchange Element's Business ID context.
-    attr_accessor :bizid
+    # These members are a copy of and ordered according to
+    # (the moving target known as) BizAPI. See:
+    #
+    #   <bizapi>/lib/api/route/exchange/schemas/element.js::elementWithoutId
+    #
+    # But really what's returned is what's in the Mongo store, ha!
 
     # The Exchange Element's Element ID.
+    # [lb] tempted to say :element_id, but keep it matchy, in spite of #linter.
     attr_accessor :elementId
-    #attr_accessor :element_id
 
-    # The Purchase ID is nil unless the user has added/purchased this element.
-    attr_accessor :purchaseId
-    #attr_accessor :purchase_id
-
-    # The <bizId>/exchange/ endpoint returns a list of flat dictionaries.
-    # The <bizId>/purchase/ endpoint, on the other hand, puts the remaining
-    #   items in an object under an "element" key.
+    # The Exchange Element's Business ID context.
+    attr_accessor :bizid
 
-    # The type is one of: download
+    # The type is one of: download | product | application | contactSales
+    #   though BizAPI 'list' command also accepts: service
     attr_accessor :type
-    #attr_accessor :action_type
 
     # The friendly, descriptive name of the Exchange Element.
     attr_accessor :name
 
-    # FIXME/EXPLAIN: Is this what the Lua code calls the service?
-    attr_accessor :apiServiceName
-
     # The image associated with the Exchange Element; not used by the CLI.
     attr_accessor :image
+    # Contains ancestors:
+    #   :thumbnail
+    #     :url
+    #     :filename
+    #     :color
+    #     :type
+    #     :size
+    #   :detail
+    #     :url
+    #     :filename
+    #     :color
+    #     :type
+    #     :size
 
     # The short description describing the Exchange Element.
     attr_accessor :description
@@ -47,19 +54,75 @@ module MrMurano
     # The long description describing the Exchange Element.
     attr_accessor :markdown
 
-    # The Murano business tiers to which this element applies.
-    # One or more of: ["free", "developer", "professional", "enterprise"]
-    attr_accessor :tiers
+    # The source associated with the Exchange Element; not currently used.
+    attr_accessor :source
+    # Contains ancestors:
+    #   :from
+    #     - One of: service | github | attachment | url
+    #   :name
+    #   :url
+    #   :token
 
-    # Tags used to describe the Exchange Element.
+    # Array of tags used to describe the Exchange Element.
     attr_accessor :tags
 
+    # The attachment associated with 'attachment' sources; not currently used.
+    attr_accessor :attachment
+    # Contains ancestors:
+    #   :download
+    #     :url
+    #     :filename
+    #     :type
+    #     :size
+
+    # The contact the user wrote for with the Exchange Element; not currently used.
+    attr_accessor :contact
+
+    # The specs the user wrote for the Exchange Element; not currently used.
+    attr_accessor :specs
+
+    # The active value is boolean; not currently used.
+    attr_accessor :active
+
+    # The access associated with the Exchange Element; not currently used.
+    #   One of: public | private | network.
+    attr_accessor :access
+
+    # "approval" is not really documented. Code shows values: pending | approved.
+    attr_accessor :approval
+
+    # *** Values returned from BizAPI but defined specially.
+
+    # The Purchase ID is nil unless the user has added/purchased this element.
+    attr_accessor :purchaseId
+    #attr_accessor :purchase_id
+
+    # The <bizId>/exchange/ endpoint returns a list of flat dictionaries.
+    # The <bizId>/purchase/ endpoint, on the other hand, puts the remaining
+    #   items in an object under an "element" key.
+
+    # FIXME/EXPLAIN: Is this what the Lua code calls the service?
+    attr_accessor :apiServiceName
+
+    # The Murano business tiers to which this element applies.
+    # Zero or more of: ["free", "developer", "professional", "enterprise"]
+    # NOTE: The 'tiers' values appears to be returned directly from Mongo DB.
+    #   Specifically, BizAPI sets tiers = [] on new elements, but for global
+    #   elements (in bootstrap/db/element.json), tiers is non-empty. [lb]
+    attr_accessor :tiers
+
     # Actions associated with the Exchange Element.
     attr_accessor :actions
     # The actions is an array with one dict element with:
     #  'url', 'type' (e.g., 'download), and 'primary' (bool).
 
-    # MurCLI-only: Based on purchaseId and tiers, state of Element in Business.
+    # *** Internal Murano CLI variables (i.e., not in BizAPI).
+
+    # The meta is the Hash of the Exchange Element returned from the platform.
+    attr_reader :meta
+
+    # Based on purchaseId and tiers, state of Element in Business. One of:
+    #   :available | :upgrade | :added
     attr_accessor :statusable
 
     ELEM_KEY_TRANSLATE = {
@@ -68,6 +131,7 @@ module MrMurano
     }.freeze
 
     def initialize(*hash)
+      @show_errors = $cfg['tool.verbose']
       hash = [hash] unless hash.is_a? Array
       camel_cased = {}
       hash.first.each do |key, val|

data/lib/MrMurano/Exchange.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.08.31 /coding: utf-8
+# Last Modified: 2017.09.27 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -24,7 +24,21 @@ module MrMurano
     end
 
     def fetch_type(part)
-      whirly_start('Fetching Elements...')
+      # [lb] not super happy about mixing presentation with other logic
+      # but this is quick and dirty.
+      case part
+      when '/element/'
+        qualifier = 'All'
+      when '/purchase/'
+        qualifier = 'Purchased'
+      else
+        raise 'Unexpected error'
+      end
+      whirly_start("Fetching #{qualifier} Elements...")
+
+      # FIXME/2017-09-27: Support Pagination. BizAPI accepts four settings:
+      #                     type, offset, limit, and select.
+      #                   <bizapi>/lib/api/route/exchange/schemas/element.js
       ret = get('exchange/' + bid + part) do |request, http|
         response = http.request(request)
         case response
@@ -50,14 +64,23 @@ module MrMurano
       lookp = {}
       # Get the user's Business metadata, including their Business tier.
       overview if @ometa.nil?
+      elems = fetch_elements(lookp)
+      fetch_purchased(lookp)
+      prepare_elements(elems, **opts)
+    end
+
+    def fetch_elements(lookp)
       # Fetch the list of Elements, including Added, Available, and Upgradeable.
       items = fetch_type('/element/')
       # Prepare a lookup of the Elements.
-      elems = items.map do |meta|
+      items.map do |meta|
         elem = MrMurano::ExchangeElement.new(meta)
         lookp[elem.elementId] = elem
         elem
       end
+    end
+
+    def fetch_purchased(lookp)
       # Fetch the list of Purchased elements.
       items = fetch_type('/purchase/')
       # Update the list of all Elements to indicate which have been purchased.
@@ -67,8 +90,8 @@ module MrMurano
           elem.purchaseId = meta[:purchaseId]
           # Sanity check.
           meta[:element].each do |key, val|
-            next if elem.send(key) == val
-            warning(
+            next if verify_purchase_vs_element(elem, key, val)
+            verbose(
               'Unexpected: Exchange Purchase element meta differs: ' \
               "key: #{key} / elem: #{elem.send(key)} / purchase: #{val}"
             )
@@ -77,7 +100,13 @@ module MrMurano
           warning("Unexpected: No Element found for Exchange Purchase: elementId: #{meta[:elementId]}")
         end
       end
-      prepare_elements(elems, **opts)
+    end
+
+    def verify_purchase_vs_element(elem, key, val)
+      elem.send(key) == val
+    rescue NoMethodError
+      verbose("Unexpected: Exchange Element missing key found in Purchase Element: #{key}")
+      true
     end
 
     def prepare_elements(elems, filter_id: nil, filter_name: nil, filter_fuzzy: nil)

data/lib/MrMurano/Passwords.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.08.23 /coding: utf-8
+# Last Modified: 2017.09.20 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -69,6 +69,10 @@ module MrMurano
         ).strip
         return ENV['MR_PASSWORD']
       end
+      lookup(host, user)
+    end
+
+    def lookup(host, user)
       return nil unless @data.is_a?(Hash)
       return nil unless @data.key?(host)
       return nil unless @data[host].is_a?(Hash)

data/lib/MrMurano/SyncUpDown.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.09.12 /coding: utf-8
+# Last Modified: 2017.09.21 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -665,6 +665,8 @@ module MrMurano
     # @param options [Hash, Commander::Command::Options] Options on operation
     # @param selected [Array<String>] Filters for _matcher
     def syncup(options={}, selected=[])
+      return 0 unless api_id?
+
       options = elevate_hash(options)
       options[:asdown] = false
 
@@ -727,6 +729,8 @@ module MrMurano
     # @param options [Hash, Commander::Command::Options] Options on operation
     # @param selected [Array<String>] Filters for _matcher
     def syncdown(options={}, selected=[])
+      return 0 unless api_id?
+
       options = elevate_hash(options)
       options[:asdown] = true
       options[:skip_missing_warning] = true

data/lib/MrMurano/commands/business.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.09.11 /coding: utf-8
+# Last Modified: 2017.09.20 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -20,6 +20,16 @@ command :business do |c|
   c.summary = %(About business)
   c.description = %(
 Commands for working with businesses.
+
+If you need to set the business ID, try some of the following:
+
+- Get a list of Business IDs:       #{MrMurano::EXE_NAME} business list
+
+- 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
+
   ).strip
   c.project_not_required = true
   c.subcmdgrouphelp = true

data/lib/MrMurano/commands/cors.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.08.16 /coding: utf-8
+# Last Modified: 2017.09.13 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -19,11 +19,38 @@ Set the CORS with `murano cors set`.
   ).strip
   c.project_not_required = true
 
+  c.example %(
+    Output CORS parameters in an ASCII table.
+  ).strip, 'murano cors'
+
+  c.example %(
+    Output CORS parameters as JSON.
+  ).strip, 'murano cors --json'
+
+  c.example %(
+    Output CORS parameters in Yaml.
+  ).strip, 'murano cors --yaml'
+
+  c.example %(
+    Output CORS parameters as comma-separated values.
+  ).strip, 'murano cors --csv'
+
+  c.example %(
+    Output CORS parameters pretty-printed as a Ruby Hash.
+  ).strip, 'murano cors --pp'
+
   c.action do |args, _options|
     c.verify_arg_count!(args)
     sol = MrMurano::Webservice::Cors.new
     ret = sol.fetch
-    sol.outf ret
+    sol.outf(ret) do |obj, ios|
+      # Called if tool.outformat is 'best' or 'csv' (not 'json', 'yaml', or 'pp').
+      headers = obj.keys.sort
+      row = []
+      headers.each { |key| row << obj[key] }
+      rows = [row]
+      sol.tabularize({ headers: headers, rows: rows }, ios)
+    end
   end
 end
 

data/lib/MrMurano/commands/exchange.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.08.31 /coding: utf-8
+# Last Modified: 2017.09.20 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -62,6 +62,7 @@ Element status:
     cmd_defaults_id_and_name(options)
 
     xchg = MrMurano::Exchange.new
+    xchg.must_business_id!
 
     elems, available, purchased = find_elements(xchg, options, args[0])
     if options.added.nil?
@@ -169,7 +170,7 @@ def cmd_exchange_header_and_elems(elems, options)
       # Calculate the width of each column except the last (:description).
       headers[0..-2].each do |key|
         elem_with_max = elems.max { |a, b| a.send(key).length <=> b.send(key).length }
-        width_taken += elem_with_max.send(key).length
+        width_taken += elem_with_max.send(key).length unless elem_with_max.nil?
         width_taken += ' | '.length
       end
       width_taken += ' | '.length
@@ -233,6 +234,7 @@ Add an Exchange Element to your Business.
     cmd_defaults_id_and_name(options)
 
     xchg = MrMurano::Exchange.new
+    xchg.must_business_id!
 
     # If the user specifies filter_id, we could try to fetch that Element
     # directly (e.g., by calling exchange/<bizId>/element/<elemId>),

data/lib/MrMurano/commands/login.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.08.23 /coding: utf-8
+# Last Modified: 2017.09.21 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -42,43 +42,16 @@ it will remove that user's password from the password file.
 Essentially, this command is the same as:
 
   murano password delete <username>
+  murano password delete <username>/twofactor
   murano config --unset --user user.name
   ).strip
   c.project_not_required = true
 
-  c.action do |args, _options|
-    c.verify_arg_count!(args)
-
-    net_host = verify_set('net.host')
-    user_name = verify_set('user.name')
-    if net_host && user_name
-      psd = MrMurano::Passwords.new
-      psd.load
-      psd.remove(net_host, user_name)
-      psd.save
-    end
-
-    user_net_host = $cfg.get('net.host', :user)
-    user_net_host = $cfg.get('net.host', :defaults) if user_net_host.nil?
-    user_user_name = $cfg.get('user.name', :user)
-    if (user_net_host == net_host) && (user_user_name == user_name)
-      # Only clear user name from the user config if the net.host
-      # or user.name did not come from a different config, like the
-      # --project config.
-      $cfg.set('user.name', nil, :user)
-      $cfg.set('business.id', nil, :user)
-      $cfg.set('business.name', nil, :user)
-    end
-  end
+  c.option '--token', 'Remove just the two-factor token'
 
-  def verify_set(cfg_key)
-    cfg_val = $cfg.get(cfg_key)
-    if cfg_val.to_s.empty?
-      cfg_val = nil
-      cfg_key_q = MrMurano::Verbose.fancy_ticks(cfg_key)
-      MrMurano::Verbose.warning("No config key #{cfg_key_q}: no password to delete")
-    end
-    cfg_val
+  c.action do |args, options|
+    c.verify_arg_count!(args)
+    MrMurano::Account.instance.logout(options.token)
   end
 end
 

data/lib/MrMurano/commands/usage.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.08.16 /coding: utf-8
+# Last Modified: 2017.09.20 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -10,15 +10,16 @@ require 'MrMurano/Solution'
 
 command :usage do |c|
   c.syntax = %(murano usage)
-  c.summary = %(Get usage info for solution(s))
+  c.summary = %(Get usage info for the Application and Product)
   c.description = %(
-Get usage info for solution(s).
+Get usage info for the Application and Product.
   ).strip
+  c.project_not_required = true
 
   # Add flag: --type [application|product|all].
   cmd_add_solntype_pickers(c)
 
-  c.option '--[no-]all', 'Show usage for all Solutions in Business, not just Project'
+  c.option '--[no-]all', 'Show usage for all Solutions in Business'
   c.option(
     '--[no-]header', %(Output solution descriptions (default: true))
   )

data/lib/MrMurano/hash.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.09.07 /coding: utf-8
+# Last Modified: 2017.09.27 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -113,7 +113,7 @@ module HashInit
     hash.first.each do |key, val|
       if respond_to? key
         send("#{key}=", val)
-      else
+      elsif defined?(@show_errors) && @show_errors
         $stderr.puts %(HashInit: missing hash key "#{key}")
       end
     end

data/lib/MrMurano/http.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.08.24 /coding: utf-8
+# Last Modified: 2017.09.20 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -108,7 +108,7 @@ module MrMurano
       # 2017-08-14: MrMurano::Account overrides the token method, and
       # it doesn't exit if no token, and then we end up here.
       ensure_token! token
-      request['Authorization'] = 'token ' + token
+      request['Authorization'] = 'token ' + token unless token.to_s.empty?
       request['User-Agent'] = "MrMurano/#{MrMurano::VERSION}"
       request
     end

data/lib/MrMurano/version.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.09.13 /coding: utf-8
+# Last Modified: 2017.09.28 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -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.0.4'
+  VERSION = '3.0.5'
   EXE_NAME = File.basename($PROGRAM_NAME)
   SIGN_UP_URL = 'https://exosite.com/signup/'
 end

data/spec/Account_spec.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.09.12 /coding: utf-8
+# Last Modified: 2017.09.21 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -45,6 +45,7 @@ RSpec.describe MrMurano::Account, 'token' do
     it 'Asks for nothing' do
       $cfg['user.name'] = 'bob'
       expect(@pswd).to receive(:get).once.and_return('built')
+      expect(@pswd).to receive(:lookup).once.and_return(nil)
 
       ret = @acc.login_info
       expect(ret).to eq(email: 'bob', password: 'built')
@@ -56,6 +57,7 @@ RSpec.describe MrMurano::Account, 'token' do
       expect(@acc).to receive(:error).once
       expect($cfg).to receive(:set).with('user.name', 'bob', :user).once.and_call_original
       expect(@pswd).to receive(:get).once.and_return('built')
+      expect(@pswd).to receive(:lookup).once.and_return(nil)
 
       ret = @acc.login_info
       expect(ret).to eq(email: 'bob', password: 'built')
@@ -67,6 +69,7 @@ RSpec.describe MrMurano::Account, 'token' do
       expect(@acc).to receive(:error).once
       expect($terminal).to receive(:ask).once.and_return('dog')
       expect(@pswd).to receive(:set).once.with('bizapi.hosted.exosite.io', 'bob', 'dog')
+      expect(@pswd).to receive(:set).once.with('bizapi.hosted.exosite.io', 'bob/twofactor', nil)
       # 2017-07-31: login_info may exit unless the command okays prompting for the password.
       #   (If we don't set this, login_info exits, which we'd want to
       #   catch with

data/spec/Content_spec.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.09.13 /coding: utf-8
+# Last Modified: 2017.09.20 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -11,6 +11,14 @@ require 'MrMurano/Content'
 require 'MrMurano/SyncRoot'
 require '_workspace'
 
+# rubocop:disable Style/HashSyntax
+# - 'Use the new Ruby 1.9 hash syntax.'
+#   E.g.,
+#     :'x-amz-meta-name' => 'Solutionfile.json',
+#   because quoted string keys, e.g.,
+#     'x-amz-meta-name': 'Solutionfile.json',
+#   are not supported in Ruby 2.0.
+
 RSpec.describe MrMurano::Content::Base do
   include_context 'WORKSPACE'
   before(:example) do

data/spec/cmd_syncdown_application_spec.rb

@@ -0,0 +1,124 @@
+# Last Modified: 2017.09.28 /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 'fileutils'
+require 'open3'
+require 'pathname'
+require 'cmd_common'
+
+# NOTE: This file is a copy of, and subset of, cmd_syncdown_both_spec.rb.
+
+RSpec.describe 'murano single sync', :cmd, :needs_password do
+  include_context 'CI_CMD'
+
+  before(:example) do
+    @applctn_name = rname('syncdownTestApp')
+    out, err, status = Open3.capture3(
+      capcmd('murano', 'application', 'create', @applctn_name, '--save')
+    )
+    expect(err).to eq('')
+    soln_id = out
+    expect(soln_id.chomp).to match(/^[a-zA-Z0-9]+$/)
+    expect(status.exitstatus).to eq(0)
+  end
+
+  after(:example) do
+    out, err, status = Open3.capture3(
+      capcmd('murano', 'solution', 'delete', '-y', @applctn_name)
+    )
+    expect(out).to eq('')
+    expect(err).to eq('')
+    expect(status.exitstatus).to eq(0)
+  end
+
+  context 'without ProjectFile' do
+    before(:example) do
+      FileUtils.cp_r(File.join(@testdir, 'spec/fixtures/syncable_content/.'), '.')
+      FileUtils.move('assets', 'files')
+      FileUtils.cp_r(File.join(@testdir, 'spec/fixtures/syncable_conflict/.'), '.')
+    end
+
+    it 'syncdown' do
+      out, err, status = Open3.capture3(capcmd('murano', 'syncup'))
+      out_lines = out.lines.map { |line| strip_fancy(line) }
+      expect(out_lines).to match_array(
+        [
+          "Adding item table_util\n",
+          a_string_starting_with('Updating item '),
+          "Updating item user_account\n",
+          "Adding item POST_/api/fire\n",
+          "Adding item PUT_/api/fire/{code}\n",
+          "Adding item DELETE_/api/fire/{code}\n",
+          "Adding item GET_/api/onfire\n",
+          "Adding item /icon.png\n",
+          "Adding item /\n",
+          "Adding item /js/script.js\n",
+        ]
+      )
+
+      expect(err).to eq('')
+      expect(status.exitstatus).to eq(0)
+
+      FileUtils.rm_r(%w[files modules routes services])
+      expect(Dir['**/*']).to eq([])
+
+      out, err, status = Open3.capture3(capcmd('murano', 'syncdown'))
+      out_lines = out.lines.map { |line| strip_fancy(line) }
+      expect(out_lines).to match_array(
+        [
+          "Adding item table_util\n",
+          # 2017-08-08: This says updating now because timer.timer is undeletable.
+          #"Adding item timer_timer\n",
+          "Updating item timer_timer\n",
+          "Adding item POST_/api/fire\n",
+          "Adding item DELETE_/api/fire/{code}\n",
+          "Adding item PUT_/api/fire/{code}\n",
+          "Adding item GET_/api/onfire\n",
+          "Adding item /js/script.js\n",
+          "Adding item /icon.png\n",
+          "Adding item /\n",
+        ]
+      )
+      expect(err).to eq('')
+      expect(status.exitstatus).to eq(0)
+
+      after = Dir['**/*'].sort
+      expect(after).to include(
+        'files',
+        'files/icon.png',
+        'files/index.html',
+        'files/js',
+        'files/js/script.js',
+        'modules',
+        'modules/table_util.lua',
+        'routes',
+        'routes/api-fire-{code}.delete.lua',
+        'routes/api-fire-{code}.put.lua',
+        'routes/api-fire.post.lua',
+        'routes/api-onfire.get.lua',
+        'services',
+        'services/timer_timer.lua',
+      )
+
+      # A status should show no differences.
+      out, err, status = Open3.capture3(capcmd('murano', 'status'))
+      expect(err).to eq('')
+      expect(out.lines).to match(
+        [
+          "Nothing new locally\n",
+          "Nothing new remotely\n",
+          "Nothing that differs\n",
+          "Items without a solution:\n",
+          " - R  Resource\n",
+          " - I  Interface\n",
+        ]
+      )
+      expect(status.exitstatus).to eq(0)
+    end
+  end
+end
+

data/spec/{cmd_syncdown_spec.rb → cmd_syncdown_both_spec.rb}

@@ -1,4 +1,4 @@
-# Last Modified: 2017.09.12 /coding: utf-8
+# Last Modified: 2017.09.25 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -15,14 +15,18 @@ RSpec.describe 'murano syncdown', :cmd, :needs_password do
 
   before(:example) do
     @product_name = rname('syncdownTestPrd')
-    out, err, status = Open3.capture3(capcmd('murano', 'product', 'create', @product_name, '--save'))
+    out, err, status = Open3.capture3(
+      capcmd('murano', 'product', 'create', @product_name, '--save')
+    )
     expect(err).to eq('')
     soln_id = out
     expect(soln_id.chomp).to match(/^[a-zA-Z0-9]+$/)
     expect(status.exitstatus).to eq(0)
 
     @applctn_name = rname('syncdownTestApp')
-    out, err, status = Open3.capture3(capcmd('murano', 'application', 'create', @applctn_name, '--save'))
+    out, err, status = Open3.capture3(
+      capcmd('murano', 'application', 'create', @applctn_name, '--save')
+    )
     expect(err).to eq('')
     soln_id = out
     expect(soln_id.chomp).to match(/^[a-zA-Z0-9]+$/)
@@ -31,7 +35,9 @@ RSpec.describe 'murano syncdown', :cmd, :needs_password do
     out, err, status = Open3.capture3(capcmd('murano', 'assign', 'set'))
     #expect(out).to a_string_starting_with("Linked product #{@product_name}")
     olines = out.lines
-    expect(strip_fancy(olines[0])).to eq("Linked '#{@product_name}' to '#{@applctn_name}'\n")
+    expect(strip_fancy(olines[0])).to eq(
+      "Linked '#{@product_name}' to '#{@applctn_name}'\n"
+    )
     expect(olines[1]).to eq("Created default event handler\n")
     expect(err).to eq('')
     expect(status.exitstatus).to eq(0)
@@ -40,12 +46,16 @@ RSpec.describe 'murano syncdown', :cmd, :needs_password do
   after(:example) do
     # VERIFY/2017-07-03: Skipping assign unset. Murano will clean up, right?
 
-    out, err, status = Open3.capture3(capcmd('murano', 'solution', 'delete', '-y', @applctn_name))
+    out, err, status = Open3.capture3(
+      capcmd('murano', 'solution', 'delete', '-y', @applctn_name)
+    )
     expect(out).to eq('')
     expect(err).to eq('')
     expect(status.exitstatus).to eq(0)
 
-    out, err, status = Open3.capture3(capcmd('murano', 'solution', 'delete', '--yes', @product_name))
+    out, err, status = Open3.capture3(
+      capcmd('murano', 'solution', 'delete', '--yes', @product_name)
+    )
     expect(out).to eq('')
     expect(err).to eq('')
     expect(status.exitstatus).to eq(0)
@@ -56,8 +66,10 @@ RSpec.describe 'murano syncdown', :cmd, :needs_password do
       FileUtils.cp_r(File.join(@testdir, 'spec/fixtures/syncable_content/.'), '.')
       FileUtils.move('assets', 'files')
       #FileUtils.mkpath('specs')
-      #FileUtils.copy(File.join(@testdir, 'spec/fixtures/product_spec_files/lightbulb.yaml'),
-      #  'specs/resources.yaml')
+      #FileUtils.copy(
+      #  File.join(@testdir, 'spec/fixtures/product_spec_files/lightbulb.yaml'),
+      #  'specs/resources.yaml'
+      #)
       # 2017-07-03: So long as this command does not syncdown first, these
       # two files -- that conflict in name with what's on the platform --
       # won't be a problem (but would be if we synceddown first).
@@ -143,7 +155,8 @@ RSpec.describe 'murano syncdown', :cmd, :needs_password do
         'routes/api-fire-{code}.put.lua',
         'routes/api-fire.post.lua',
         'routes/api-onfire.get.lua',
-        # 2017-07-03: services/ would not exist if we did not include fixtures/syncable_conflict/.
+        # 2017-07-03: services/ would not exist if we did not include
+        #   fixtures/syncable_conflict/.
         'services',
         # 2017-07-13: No longer syncing device2_event; is internal to platform.
         #'services/device2_event.lua',

data/spec/cmd_syncup_spec.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.09.12 /coding: utf-8
+# Last Modified: 2017.09.20 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -82,7 +82,7 @@ RSpec.describe 'murano syncup', :cmd, :needs_password do
       # Windows is insane:
       #   "Adding item ........................Administrator.AppData.Local.Temp.2.d20170913-3860-pgji6g.project.modules.table_util\n"
       #expect(outl[5]).to eq("Adding item table_util\n")
-      expect(outl[5]).to start_with("Adding item ")
+      expect(outl[5]).to start_with('Adding item ')
       expect(outl[5]).to end_with("table_util\n")
       #expect(outl[6]).to eq("Updating item c3juj9vnmec000000_event\n")
       # The order isn't always consistent, so just do start_with.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: MuranoCLI
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.0.5
 platform: ruby
 authors:
 - Michael Conrad Tadpol Tilstra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-13 00:00:00.000000000 Z
+date: 2017-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: certified
@@ -405,8 +405,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".agignore"
 - ".gitignore"
+- ".ignore"
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
@@ -542,7 +542,8 @@ files:
 - spec/cmd_setting_application_spec.rb
 - spec/cmd_setting_product_spec.rb
 - spec/cmd_status_spec.rb
-- spec/cmd_syncdown_spec.rb
+- spec/cmd_syncdown_application_spec.rb
+- spec/cmd_syncdown_both_spec.rb
 - spec/cmd_syncup_spec.rb
 - spec/cmd_usage_spec.rb
 - spec/fixtures/.mrmuranorc