MuranoCLI 3.0.1 → 3.0.2

data/Rakefile

@@ -1,4 +1,4 @@
-# Last Modified: 2017.08.15 /coding: utf-8
+# Last Modified: 2017.08.29 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -48,6 +48,11 @@ task :echo do
   puts built_gem
 end
 
+desc 'Tail the CI build file and the curl file'
+task :tail do
+  sh %(tail -F .rake_build.out curldebug.out)
+end
+
 desc 'display remind of how to release'
 task :release_reminder do
   reminder = %(

data/bin/murano

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# Last Modified: 2017.08.23 /coding: utf-8
+# Last Modified: 2017.08.30 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -43,7 +43,7 @@ program :description, %(
 #   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.push('--no-progress') unless $stdout.tty? || ARGV.include?('--no-progress')
 
 default_command :help
 

data/docs/completions/murano_completion-bash

@@ -10,6 +10,10 @@ __app_switches=(
     --configfile
     --curl
     --dry
+    --csv
+    --json
+    --yaml
+    --pp
     --exclude-scopes
     --no-page
     --no-plugins
@@ -78,6 +82,7 @@ function _murano () {
         devices
         diff
         domain
+        exchange
         find
         gwe
         help
@@ -163,6 +168,9 @@ function _murano () {
         (domain)
           __murano-domain "$cmd1" "$cmd2" "${used_switches[@]}"
         ;;
+        (exchange)
+          __murano-exchange "$cmd1" "$cmd2" "${used_switches[@]}"
+        ;;
         (find)
           __murano-find "$cmd1" "$cmd2" "${used_switches[@]}"
         ;;
@@ -1398,6 +1406,91 @@ function __murano-domain () {
   COMPREPLY=($(compgen -W '${comp_list[@]}' -- "${last}"))
 }
 
+# Completion for subcommand: "exchange".
+function __murano-exchange () {
+  local subcmd1="$1"
+  local subcmd2="$2"
+  #local subcmdn="$3"
+  local used_switches="${@:3}"
+  local last="${COMP_WORDS[COMP_CWORD]}"
+  local len=$(($COMP_CWORD - 1))
+
+  local -a more_switches
+
+  local -a comp_list
+
+  #>&2 echo -e "\nsubcmd1=$subcmd1 / subcmd2=$subcmd2 / last=$last / len=$len"
+  #>&2 echo "used_switches=$used_switches"
+  #>&2 echo "more_switches=$more_switches"
+
+  # NOTE: Not doing anything special for ${subcmd2}.
+  #       Are there sub-sub-commands we shoud list?
+  if [[ -z ${subcmd1} || ${len} -eq 1 ]]; then
+    comp_list=(
+      add
+      buy
+      list
+      purchase
+    )
+  else
+    case $subcmd1 in
+      (add)
+      more_switches=(
+        {--trace}
+      )
+      ;;
+      (buy)
+      more_switches=(
+        {--trace}
+      )
+      ;;
+      (list)
+      more_switches=(
+        {--trace}
+      )
+      ;;
+      (purchase)
+      more_switches=(
+        {--trace}
+      )
+      ;;
+    esac
+  fi
+
+  # Add unused application-wide flags.
+  local idx
+  for ((idx = 0; idx < ${#__app_switches[@]}; idx++)); do
+    local switch=${__app_switches[$idx]}
+    if ! contains_element "$switch" "${used_switches[@]}"; then
+      comp_list+=("$switch")
+    fi
+  done
+  # Add unused subcommand flags.
+  for ((idx = 0; idx < ${#more_switches[@]}; idx++)); do
+    local switch=${more_switches[$idx]}
+    comp_list+=("$switch")
+  done
+
+  # If there are only --flags, <TAB> will put the common prefix,
+  # "--", but maybe the user doesn't want to add a flag after all.
+  if [[ -z ${last} ]]; then
+    local flags_only=true
+    for ((idx = 0; idx < ${#comp_list[@]}; idx++)); do
+      local switch=${comp_list[$idx]}
+      if [[ ${switch} != --* ]]; then
+        flags_only=false
+        break
+      fi
+    done
+    if ${flags_only}; then
+      # Use two Unicode en spaces to prevent compgen from prefixing "--".
+      comp_list+=("	 ")
+    fi
+  fi
+
+  COMPREPLY=($(compgen -W '${comp_list[@]}' -- "${last}"))
+}
+
 # Completion for subcommand: "find".
 function __murano-find () {
   local subcmd1="$1"

data/lib/MrMurano.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.08.16 /coding: utf-8
+# Last Modified: 2017.08.29 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -9,27 +9,44 @@
 # individual files include all the files they need.
 
 require 'MrMurano/version'
-require 'MrMurano/verbosing'
+
 require 'MrMurano/hash'
 require 'MrMurano/http'
+require 'MrMurano/makePretty'
+#require 'MrMurano/optparse'
+require 'MrMurano/progress'
+require 'MrMurano/verbosing'
 
 require 'MrMurano/Config'
+require 'MrMurano/Config-Migrate'
 require 'MrMurano/ProjectFile'
 
 require 'MrMurano/Account'
 require 'MrMurano/Business'
+require 'MrMurano/Exchange'
+require 'MrMurano/Exchange-Element'
+require 'MrMurano/Passwords'
 
 require 'MrMurano/Content'
 require 'MrMurano/Gateway'
+require 'MrMurano/Keystore'
+require 'MrMurano/Mock'
 require 'MrMurano/Setting'
+require 'MrMurano/SolutionId'
 require 'MrMurano/Solution'
 require 'MrMurano/Solution-Services'
 require 'MrMurano/Solution-ServiceConfig'
 require 'MrMurano/Solution-Users'
+require 'MrMurano/Webservice'
 require 'MrMurano/Webservice-Cors'
 require 'MrMurano/Webservice-Endpoint'
 require 'MrMurano/Webservice-File'
 
+require 'MrMurano/SyncAllowed'
+require 'MrMurano/SyncRoot'
+require 'MrMurano/SyncUpDown'
+
+require 'MrMurano/SubCmdGroupContext'
 require 'MrMurano/ReCommander'
 require 'MrMurano/commands'
 

data/lib/MrMurano/Business.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.08.23 /coding: utf-8
+# Last Modified: 2017.09.11 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -26,12 +26,11 @@ module MrMurano
     include Http
     include Verbose
 
-    #attr_accessor :bid
-    #attr_accessor :name
-    attr_accessor :role
-    attr_reader :meta
     attr_writer :bid
     attr_writer :name
+    attr_accessor :role
+    attr_reader :meta
+    attr_reader :ometa
 
     def initialize(data=nil)
       @bid = nil
@@ -39,6 +38,7 @@ module MrMurano
       @valid = false
       @user_bizes = {}
       self.meta = data unless data.nil?
+      @ometa = nil
     end
 
     def valid?
@@ -155,7 +155,7 @@ or set it interactively using \`#{MrMurano::EXE_NAME} init\`
       whirly_stop
       @valid = !data.nil?
       @name = data[:name] if @valid
-      @valid
+      @ometa = data
     end
 
     # ---------------------------------------------------------------------
@@ -166,7 +166,7 @@ or set it interactively using \`#{MrMurano::EXE_NAME} init\`
     #ALLOWED_TYPES = [:domain, :onepApi, :dataApi, :application, :product,].freeze
     ALLOWED_TYPES = %i[application product].freeze
 
-    def solutions(type: :all, sid: nil, name: nil, fuzzy: nil, invalidate: false)
+    def solutions(type: :all, api_id: nil, name: nil, fuzzy: nil, invalidate: false)
       debug "Getting all solutions of type #{type}"
       must_business_id!
 
@@ -201,16 +201,17 @@ or set it interactively using \`#{MrMurano::EXE_NAME} init\`
 
       solz = @user_bizes[type].dup
 
-      match_sid = ensure_array(sid)
+      match_api_id = ensure_array(api_id)
       match_name = ensure_array(name)
       match_fuzzy = ensure_array(fuzzy)
-      if match_sid.any? || match_name.any? || match_fuzzy.any?
+      if match_api_id.any? || match_name.any? || match_fuzzy.any?
         solz.select! do |sol|
           (
-            match_sid.include?(sol[:apiId]) ||
+            match_api_id.include?(sol[:apiId]) ||
             match_name.include?(sol[:name]) ||
             match_fuzzy.any? do |term|
-              sol[:name] =~ /#{Regexp.escape(term)}/i || sol[:apiId] =~ /#{Regexp.escape(term)}/i
+              sol[:name] =~ /#{Regexp.escape(term)}/i || \
+                sol[:apiId] =~ /#{Regexp.escape(term)}/i
             end
           )
         end
@@ -224,7 +225,9 @@ or set it interactively using \`#{MrMurano::EXE_NAME} init\`
           MrMurano::Product.new(meta)
         else
           warning("Unexpected solution type: #{meta[:type]}")
-          warning('* Please enable Murano for this business') if meta[:type].to_sym == :dataApi
+          if meta[:type].to_sym == :dataApi
+            warning('* Please enable Murano for this business')
+          end
           MrMurano::Solution.new(meta)
         end
       end
@@ -241,14 +244,14 @@ or set it interactively using \`#{MrMurano::EXE_NAME} init\`
     def solution_from_type!(type)
       type = type.to_s.to_sym
       raise "Unknown type(#{type})" unless type.to_s.empty? || ALLOWED_TYPES.include?(type)
-      sid = MrMurano::Solution::INVALID_SID
+      api_id = MrMurano::Solution::INVALID_API_ID
       if type == :application
-        sol = MrMurano::Application.new(sid)
+        sol = MrMurano::Application.new(api_id)
       elsif type == :product
-        sol = MrMurano::Product.new(sid)
+        sol = MrMurano::Product.new(api_id)
       else
         #raise "Unexpected path: Unrecognized type #{fancy_ticks(type)}"
-        sol = MrMurano::Solution.new(sid)
+        sol = MrMurano::Solution.new(api_id)
       end
       sol.biz = self
       sol
@@ -312,7 +315,7 @@ or set it interactively using \`#{MrMurano::EXE_NAME} init\`
         error("Unexpected: Solution ID not returned: #{resp}")
         exit 1
       end
-      sol.sid = resp[:id]
+      sol.api_id = resp[:id]
       sol.affirm_valid
       # 2017-06-29: The code used to hunt for the solution ID, because
       #   POST business/<bizid>/solution/ used to not return anything,
@@ -333,11 +336,11 @@ or set it interactively using \`#{MrMurano::EXE_NAME} init\`
       #    exit 3
       #  end
       #  sol.meta = ret.first
-      #  if sol.sid.to_s.empty? then
+      #  if sol.api_id.to_s.empty? then
       #    error("New solution created for #{fancy_ticks(sol.name)} missing ID?: #{ret}")
       #    exit 3
       #  end
-      #  sol.sid = sid
+      #  sol.api_id = api_id
       #end
       sol
     end

data/lib/MrMurano/Config.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.08.23 /coding: utf-8
+# Last Modified: 2017.08.31 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -280,23 +280,33 @@ module MrMurano
       true
     end
 
-    def validate_cmd
+    INVALID_PROJECT_HINT = %(
+      Please change to a project directory, or run `murano init` to create a new project.
+    ).strip
+
+    def validate_cmd(cmd=nil)
+      return unless validate_cmd_business_and_project(cmd)
+      migrate_old_config(@project_dir)
+      migrate_old_config(Pathname.new(Dir.home))
+    end
+
+    def validate_cmd_business_and_project(cmd)
       # Most commands should be run from within a Murano project (sub-)directory.
       # If user is running a project command not within a project directory,
       # we'll print a message now and exit the app from run_active_command later.
       unless @runner.nil?
-        the_cmd = @runner.active_command
-        unless the_cmd.name == 'help' || the_cmd.project_not_required || @project_exists
+        the_cmd = @runner.active_command if cmd.nil?
+        the_cmd = command(cmd) if the_cmd.nil?
+        the_cmd.project_not_required = false unless defined?(the_cmd.project_not_required)
+        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 %(Please change to a project directory, or run `murano init` to create a new project.)
+          say INVALID_PROJECT_HINT
           # Note that commnander-rb uses an at_exit hook, which we hack around.
           @runner.command_exit = 1
-          return
+          false
         end
       end
-
-      migrate_old_config(@project_dir)
-      migrate_old_config(Pathname.new(Dir.home))
+      true
     end
 
     def self.fix_modes(path)

data/lib/MrMurano/Content.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.08.23 /coding: utf-8
+# Last Modified: 2017.09.11 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -29,9 +29,9 @@ module MrMurano
 
       def initialize
         @solntype = 'product.id'
-        @uriparts_sidex = 1
-        init_sid!
-        @uriparts = [:service, @sid, :content, :item]
+        @uriparts_apidex = 1
+        init_api_id!
+        @uriparts = [:service, @api_id, :content, :item]
         @itemkey = :id
         #@locationbase = $cfg['location.base']
         @location = nil

data/lib/MrMurano/Exchange-Element.rb

@@ -0,0 +1,99 @@
+# Last Modified: 2017.08.31 /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
+
+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
+
+    # The Exchange Element's Business ID context.
+    attr_accessor :bizid
+
+    # The Exchange Element's Element ID.
+    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 type is one of: download
+    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
+
+    # The short description describing the Exchange Element.
+    attr_accessor :description
+
+    # 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
+
+    # Tags used to describe the Exchange Element.
+    attr_accessor :tags
+
+    # 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.
+    attr_accessor :statusable
+
+    ELEM_KEY_TRANSLATE = {
+      #type: :action_type,
+      #elementId: :element_id,
+    }.freeze
+
+    def initialize(*hash)
+      hash = [hash] unless hash.is_a? Array
+      camel_cased = {}
+      hash.first.each do |key, val|
+        if ELEM_KEY_TRANSLATE[key].nil?
+          camel_cased[key] = val
+        else
+          camel_cased[ELEM_KEY_TRANSLATE[key]] = val
+        end
+      end
+      super camel_cased
+      @meta = hash.first
+      #@meta = camel_cased
+    end
+
+    def status
+      case statusable
+      when :available
+        'available'
+      when :upgrade
+        'available*'
+      when :added
+        'added'
+      else
+        statusable.to_s
+      end
+    end
+  end
+end
+