MuranoCLI 2.2.4 → 3.0.0

data/lib/MrMurano.rb

@@ -1,3 +1,13 @@
+# Last Modified: 2017.08.16 /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
+
+# 2017-07-01: This ordered list hacks around having
+# individual files include all the files they need.
+
 require 'MrMurano/version'
 require 'MrMurano/verbosing'
 require 'MrMurano/hash'
@@ -7,15 +17,19 @@ require 'MrMurano/Config'
 require 'MrMurano/ProjectFile'
 
 require 'MrMurano/Account'
+require 'MrMurano/Business'
+
+require 'MrMurano/Content'
+require 'MrMurano/Gateway'
+require 'MrMurano/Setting'
 require 'MrMurano/Solution'
-require 'MrMurano/Solution-Endpoint'
-require 'MrMurano/Solution-File'
 require 'MrMurano/Solution-Services'
-require 'MrMurano/Solution-Users'
 require 'MrMurano/Solution-ServiceConfig'
-require 'MrMurano/Product'
-require 'MrMurano/Product-1P-Device'
-require 'MrMurano/Product-Resources'
+require 'MrMurano/Solution-Users'
+require 'MrMurano/Webservice-Cors'
+require 'MrMurano/Webservice-Endpoint'
+require 'MrMurano/Webservice-File'
 
-#require 'MrMurano/ReCommander'
+require 'MrMurano/ReCommander'
 require 'MrMurano/commands'
+

data/lib/MrMurano/Account.rb

@@ -1,221 +1,206 @@
-require 'uri'
-require 'net/http'
-require 'json'
+# Last Modified: 2017.08.17 /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 'date'
+require 'json'
+require 'net/http'
 require 'pathname'
+require 'uri'
 require 'yaml'
-require 'MrMurano/Config'
+require 'MrMurano/hash'
 require 'MrMurano/http'
 require 'MrMurano/verbosing'
+require 'MrMurano/Business'
+require 'MrMurano/Config'
+require 'MrMurano/Passwords'
+require 'MrMurano/Solution'
 
 module MrMurano
-  class Passwords
+  class Account
+    # The tool only works for a single user. To avoid fetching the
+    # token multiple times (and to avoid having to pass an Account
+    # object around), we make the class a singleton.
+    include Singleton
+
+    include Http
     include Verbose
-    def initialize(path=nil)
-      path = $cfg.file_at('passwords', :user) if path.nil?
-      path = Pathname.new(path) unless path.kind_of? Pathname
-      @path = path
-      @data = nil
-    end
-    def load()
-      if @path.exist? then
-        @path.chmod(0600)
-        @path.open('rb') do |io|
-          @data = YAML.load(io)
-        end
-      end
-    end
-    def save()
-      @path.dirname.mkpath unless @path.dirname.exist?
-      @path.open('wb') do |io|
-        io << @data.to_yaml
-      end
-      @path.chmod(0600)
-    end
-    def set(host, user, pass)
-      unless @data.kind_of? Hash then
-        @data = {host=>{user=>pass}}
-        return
-      end
-      hd = @data[host]
-      if hd.nil? or not hd.kind_of?(Hash) then
-        @data[host] = {user=>pass}
-        return
-      end
-      @data[host][user] = pass
-      return
+
+    def initialize
+      @token = nil
     end
-    def get(host, user)
-      return ENV['MURANO_PASSWORD'] unless ENV['MURANO_PASSWORD'].nil?
-      unless ENV['MR_PASSWORD'].nil? then
-        warning %{Using depercated ENV "MR_PASSWORD", please rename to "MURANO_PASSWORD"}
-        return ENV['MR_PASSWORD']
-      end
-      return nil unless @data.kind_of? Hash
-      return nil unless @data.has_key? host
-      return nil unless @data[host].kind_of? Hash
-      return nil unless @data[host].has_key? user
-      return @data[host][user]
+
+    def host
+      $cfg['net.host'].to_s
     end
 
-    ## Remove the password for a user
-    def remove(host, user)
-      if @data.kind_of? Hash then
-        hd = @data[host]
-        if not hd.nil? and hd.kind_of?(Hash) then
-          if hd.has_key? user then
-            @data[host].delete user
-          end
-        end
-      end
+    def user
+      $cfg['user.name'].to_s
     end
 
-    ## Get all hosts and usernames. (does not return the passwords)
-    def list
-      ret = {}
-      @data.each_pair{|key,value| ret[key] = value.keys} unless @data.nil?
-      ret
+    def endpoint(path)
+      URI('https://' + host + '/api:1/' + path.to_s)
     end
-  end
 
-  class Account
-    include Http
-    include Verbose
+    # ---------------------------------------------------------------------
 
-    def endPoint(path)
-      URI('https://' + $cfg['net.host'] + '/api:1/' + path.to_s)
-    end
+    LOGIN_ADVICE = %(
+Please login using `murano login` or `murano init`.
+Or set your password with `murano password set <username>`.
+    ).strip
+    LOGIN_NOTICE = 'Please login.'
 
-    def _loginInfo
-      host = $cfg['net.host']
-      user = $cfg['user.name']
-      if user.nil? or user.empty? then
-        error("No Murano user account found; please login")
-        user = ask("User name: ")
-        $cfg.set('user.name', user, :user)
+    def login_info
+      warned_once = false
+      if user.empty?
+        prologue = 'No Murano user account found.'
+        unless $cfg.prompt_if_logged_off
+          MrMurano::Verbose.whirly_stop
+          error("#{prologue}\n#{LOGIN_ADVICE}")
+          exit 2
+        end
+        MrMurano::Verbose.whirly_pause
+        error("#{prologue} #{LOGIN_NOTICE}")
+        warned_once = true
+        username = ask('User name: ')
+        $cfg.set('user.name', username, :user)
+        $project.refresh_user_name
+        MrMurano::Verbose.whirly_unpause
       end
-      pff = $cfg.file_at('passwords', :user)
-      pf = Passwords.new(pff)
-      pf.load
-      pws = pf.get(host, user)
-      if pws.nil? then
-        error("Couldn't find password for #{user}")
-        pws = ask("Password:  ") { |q| q.echo = "*" }
-        pf.set(host, user, pws)
-        pf.save
+      pwd_path = $cfg.file_at('passwords', :user)
+      pwd_file = MrMurano::Passwords.new(pwd_path)
+      pwd_file.load
+      user_pass = pwd_file.get(host, user)
+      if user_pass.nil?
+        prologue = "No Murano password found for #{user}."
+        unless $cfg.prompt_if_logged_off
+          MrMurano::Verbose.whirly_stop
+          error("#{prologue}\n#{LOGIN_ADVICE}")
+          exit 2
+        end
+        MrMurano::Verbose.whirly_pause
+        error(%(#{prologue} #{LOGIN_NOTICE}).strip) unless warned_once
+        user_pass = ask('Password: ') { |q| q.echo = '*' }
+        pwd_file.set(host, user, user_pass)
+        pwd_file.save
+        MrMurano::Verbose.whirly_unpause
       end
-      {
-        :email => $cfg['user.name'],
-        :password => pws
+      creds = {
+        email: user,
+        password: user_pass,
       }
+      creds
     end
 
-    # Store the token in a class variable so that we only fetch it once per run
-    # session of this tool
-    @@token = nil
+    # ---------------------------------------------------------------------
+
     def token
-      if @@token.nil? then
-        # Cannot have token call token, so cannot use 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(_loginInfo)
-
-        response = http.request(request)
-        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."
-          @@token = nil
-        end
-      end
-      @@token
+      token_fetch if @token.to_s.empty?
+      @token
     end
 
     def token_reset(value=nil)
-      @@token = value
-    end
-
-    def new_account(email, name, company="")
-      post('key/', {
-        :email=>email,
-        :name=>name,
-        :company=>company,
-        :source=>'signup',
-      })
-    end
-
-    def reset_account(email)
-      post('key/', { :email=>email, :source=>'reset' })
+      @token = value
+    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)
+
+      MrMurano::Verbose.whirly_start('Logging in...')
+      response = http.request(request)
+      MrMurano::Verbose.whirly_stop
+
+      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 "BEWARE: The password used was from MURANO_PASSWORD, not from #{pwd_path}"
+        end
+        @token = nil
+      end
     end
 
-    def accept_account(token, password)
-      post("key/#{token}", {:password=>password})
-    end
+    # ---------------------------------------------------------------------
+
+    def businesses(bid: nil, name: nil, fuzzy: nil)
+      # Ask user for name and password, if not saved to config and password files.
+      login_info if user.empty?
+      raise 'Missing user?!' if user.empty?
+
+      MrMurano::Verbose.whirly_start 'Fetching Businesses...'
+      bizes = get('user/' + user + '/membership/')
+      MrMurano::Verbose.whirly_stop
+      return [] unless bizes.is_a?(Array) && bizes.any?
+
+      # 2017-06-30: The data for each message contains a :bizid, :role, and :name.
+      #   :role is probably generally "owner".
+
+      match_bid = ensure_array(bid)
+      match_name = ensure_array(name)
+      match_fuzzy = ensure_array(fuzzy)
+      if match_bid.any? || match_name.any? || match_fuzzy.any?
+        bizes.select! do |biz|
+          (
+            match_bid.include?(biz[:bizid]) ||
+            match_name.include?(biz[:name]) ||
+            match_termy.any? do |term|
+              biz[:name] =~ /#{Regexp.escape(term)}/i || biz[:bizid] =~ /#{Regexp.escape(term)}/i
+            end
+          )
+        end
+      end
 
-    def businesses
-      _loginInfo if $cfg['user.name'].nil?
-      get('user/' + $cfg['user.name'] + '/membership/')
-    end
+      bizes.map! { |meta| MrMurano::Business.new(meta) }
 
-    def new_business(name)
-      post('business/', {:name=>name})
+      # Sort results.
+      bizes.sort_by!(&:name)
     end
 
-    def delete_business(id)
-      delete("business/#{id}")
-    end
+    # ---------------------------------------------------------------------
 
-    def has_projects?(id)
-      ret = get("business/#{id}/overview")
-      return false unless ret.kind_of? Hash
-      return false unless ret.has_key? :tier
-      tier = ret[:tier]
-      return false unless tier.kind_of? Hash
-      return false unless tier.has_key? :enableProjects
-      return tier[:enableProjects]
-    end
+    # 2017-07-05: [lb] notes that the remaining methods are not called.
+    #   (Tilstra might be calling these via the _qb plugin.)
 
-    def products
-      raise "Missing Business ID" if $cfg['business.id'].nil?
-      get('business/' + $cfg['business.id'] + '/product/')
+    def new_account(email, name, company='')
+      # this is a kludge.  If we're gonna support this, do it better.
+      @token = ''
+      post('key/', email: email, name: name, company: company, source: 'signup')
     end
 
-    ## Create a new product in the current business
-    def new_product(name, type='onepModel')
-      raise "Missing Business ID" if $cfg['business.id'].nil?
-      post('business/' + $cfg['business.id'] + '/product/', {:label=>name, :type=>type})
+    def reset_account(email)
+      post('key/', email: email, source: 'reset')
     end
 
-    def delete_product(modelId)
-      raise "Missing Business ID" if $cfg['business.id'].nil?
-      delete('business/' + $cfg['business.id'] + '/product/' + modelId)
+    def accept_account(token, password)
+      # this is a kludge.  If we're gonna support this, do it better.
+      @token = ''
+      post("key/#{token}", password: password)
     end
 
-    def solutions
-      raise "Missing Business ID" if $cfg['business.id'].nil?
-      get('business/' + $cfg['business.id'] + '/solution/')
-    end
+    # ---------------------------------------------------------------------
 
-    ## Create a new solution
-    def new_solution(name, type='dataApi')
-      raise "Missing Business ID" if $cfg['business.id'].nil?
-      raise "Solution name must be a valid domain name component" unless name.match(/^[a-zA-Z0-9]([-a-zA-Z0-9]{0,61}[a-zA-Z0-9]{0,1}|[a-zA-Z0-9]{0,62})$/)
-      post('business/' + $cfg['business.id'] + '/solution/', {:label=>name, :type=>type})
+    def new_business(name)
+      post('business/', name: name)
     end
 
-    def delete_solution(apiId)
-      raise "Missing Business ID" if $cfg['business.id'].nil?
-      delete('business/' + $cfg['business.id'] + '/solution/' + apiId)
+    def delete_business(id)
+      delete("business/#{id}")
     end
-
   end
 end
 
-#  vim: set ai et sw=2 ts=2 :

data/lib/MrMurano/Business.rb

@@ -0,0 +1,381 @@
+# Last Modified: 2017.08.16 /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 'date'
+require 'inflecto'
+require 'json'
+require 'net/http'
+require 'pathname'
+require 'rainbow'
+require 'uri'
+require 'yaml'
+require 'MrMurano/hash'
+require 'MrMurano/http'
+require 'MrMurano/verbosing'
+require 'MrMurano/Config'
+require 'MrMurano/Solution'
+require 'MrMurano/Passwords'
+
+module MrMurano
+  # The Business class represents an end user's solutions.
+  class Business
+    include Http
+    include Verbose
+
+    #attr_accessor :bid
+    #attr_accessor :name
+    attr_accessor :role
+    attr_reader :meta
+    attr_writer :bid
+    attr_writer :name
+
+    def initialize(data=nil)
+      @bid = nil
+      @name = nil
+      @valid = false
+      @user_bizes = {}
+      self.meta = data unless data.nil?
+    end
+
+    def valid?
+      @valid
+    end
+
+    def bid
+      return @bid unless @bid.to_s.empty?
+      $cfg['business.id'].to_s
+    end
+
+    def name
+      return @name unless @name.to_s.empty?
+      $cfg['business.name'].to_s
+    end
+
+    def bizid
+      bid
+    end
+
+    def ==(other)
+      other.class == self.class && other.state == state
+    end
+
+    protected
+
+    def state
+      [bid, name, @valid, @user_bizes]
+    end
+
+    public
+
+    # Consume data returned from Account::businesses.
+    def meta=(data)
+      @valid = !data.nil?
+      return unless @valid
+      @bid = data[:bizid]
+      @name = data[:name]
+      @role = data[:role]
+      @meta = data
+    end
+
+    def write(scope=:project)
+      $cfg.set('business.id', bid, scope)
+      $cfg.set('business.name', name, scope)
+      self
+    end
+
+    # MAYBE: Check that ADC is enabled on the business. If not, tell
+    #   user to run Murano 2.x. [lb] is not sure which value from
+    #   Murano to check. Is it :enableMurano or :enableProjects?
+    #   See the overview method.
+    #def adc_compat_check
+    #  unless $cfg['business.id'].nil?
+    #    unless projects?($cfg['business.id'])
+    #      # This is 3.x which does not support projects!
+    #      warning('!'*80)
+    #      warning "Your business requires Murano CLI 2.x"
+    #      warning "Some features may not work correctly."
+    #      warning('!'*80)
+    #    end
+    #  end
+    #end
+
+    def must_business_id!
+      raise MrMurano::ConfigError.new(Business.missing_business_id_msg) if bid.to_s.empty?
+    end
+
+    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\`
+      ).strip
+    end
+
+    def pretty_name_and_id
+      "‘#{Rainbow(name).underline}’ <#{bid}>"
+    end
+
+    # ---------------------------------------------------------------------
+
+    #def projects?(id)
+    #  ret = get("business/#{id}/overview")
+    #  return false unless ret.is_a?(Hash)
+    #  return false unless ret.key?(:tier)
+    #  tier = ret[:tier]
+    #  return false unless tier.is_a?(Hash)
+    #  return false unless tier.key?(:enableProjects)
+    #  tier[:enableProjects]
+    #end
+
+    def overview(&block)
+      # Here are all the goodies that the overview endpoint returns:
+      #  {:name=>"XXX", :email=>"XXX", :contact=>"XXX",
+      #   :billing=>{
+      #     :terms=>0, :balance=>0, :overdue=>0},
+      #   :tier=>{
+      #     :name=>"Community", :id=>"free", :price=>0, :users=>nil, :domains=>0,
+      #     :ssl=>false, :rebrand=>false, :billing=>false, :multisolution=>true,
+      #     :phonesupport=>false, :supportLevel=>"Community", :servicesTier=>"Core",
+      #     :onboarding=>{}, :enableMurano=>true, :enableProjects=>true},
+      #   :accountManager=>{
+      #     :name=>"", :email=>"", :phone=>""},
+      #   :accountLimits=>{
+      #     :teamMembers=>1, :solutionApis=>1, :productModels=>1,
+      #     :perModelDevices=>10, :perApiUsers=>10}, :lineitems=>[]}
+      # EXPLAIN/2017-06-30: Which value(s) tell us if ADC is enabled?
+      whirly_start('Fetching Business...')
+      data = get("business/#{bid}/overview", &block)
+      whirly_stop
+      @valid = !data.nil?
+      @name = data[:name] if @valid
+      @valid
+    end
+
+    # ---------------------------------------------------------------------
+
+    # 2017-06-30: In ADC-enabled Murano, there are now just 2 solution types.
+    # LATER: This'll change in the future; Murano will support arbitrary
+    #   solution types.
+    #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)
+      debug "Getting all solutions of type #{type}"
+      must_business_id!
+
+      type = type.to_sym
+      raise "Unknown type(#{type})" unless type == :all || ALLOWED_TYPES.include?(type)
+
+      # Cache the result since sometimes both products() and applications() are called.
+      if invalidate || @user_bizes[type].nil?
+        if invalidate || @user_bizes[:all].nil?
+          got = get('business/' + bid + '/solution/') do |request, http|
+            response = http.request(request)
+            case response
+            when Net::HTTPSuccess
+              workit_response(response)
+            when Net::HTTPForbidden # 403
+              # FIXME/CONFIRM/2017-07-13: Is this really what platform
+              # says when business has no solutions? I do not remember
+              # seeing this before... [lb]
+              nil
+            else
+              showHttpError(request, response)
+            end
+          end
+
+          @user_bizes[:all] = got || []
+        end
+
+        if invalidate || @user_bizes[type].nil?
+          @user_bizes[type] = @user_bizes[:all].select { |i| i[:type] == type.to_s }
+        end
+      end
+
+      solz = @user_bizes[type].dup
+
+      match_sid = ensure_array(sid)
+      match_name = ensure_array(name)
+      match_fuzzy = ensure_array(fuzzy)
+      if match_sid.any? || match_name.any? || match_fuzzy.any?
+        solz.select! do |sol|
+          (
+            match_sid.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
+            end
+          )
+        end
+      end
+
+      solz.map! do |meta|
+        case meta[:type].to_sym
+        when :application
+          MrMurano::Application.new(meta)
+        when :product
+          MrMurano::Product.new(meta)
+        else
+          warning("Unexpected solution type: #{meta[:type]}")
+          warning('* Please enable Murano for this business') if meta[:type].to_sym == :dataApi
+          MrMurano::Solution.new(meta)
+        end
+      end
+
+      sort_solutions!(solz)
+    end
+
+    def sort_solutions!(solz)
+      solz.sort_by!(&:name)
+      solz.sort_by! { |sol| ALLOWED_TYPES.index(sol.type) }
+    end
+
+    ## Given a type (:application or :product), return a Solution instance.
+    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
+      if type == :application
+        sol = MrMurano::Application.new(sid)
+      elsif type == :product
+        sol = MrMurano::Product.new(sid)
+      else
+        #raise "Unexpected path: Unrecognized type ‘#{type}’"
+        sol = MrMurano::Solution.new(sid)
+      end
+      sol.biz = self
+      sol
+    end
+
+    ## Create a new solution in the current business
+    def new_solution!(name, type)
+      must_business_id!
+      sol = solution_from_type!(type)
+      sol.set_name!(name)
+      if $cfg['tool.dry']
+        say "--dry: Not creating solution #{name}"
+        return nil
+      end
+      whirly_start 'Creating solution...'
+      resp = post(
+        'business/' + bid + '/solution/',
+        label: sol.name,
+        type: sol.type,
+      ) do |request, http|
+        response = http.request(request)
+        MrMurano::Verbose.whirly_stop
+        if response.is_a?(Net::HTTPSuccess)
+          workit_response(response)
+        else
+          MrMurano::Verbose.error(
+            "Unable to create #{sol.type_name}: ‘#{sol.name}’"
+          )
+          ok = false
+          if response.is_a?(Net::HTTPConflict)
+            _isj, jsn = isJSON(response.body)
+            if jsn[:message] == 'limit'
+              ok = true
+              MrMurano::Verbose.error(
+                "You've reached your limit of #{Inflecto.pluralize(sol.type.to_s)}."
+              )
+            else
+              ok = false
+            end
+          end
+          showHttpError(request, response) unless ok
+          # Hard stop.
+          exit 1
+          nil
+        end
+      end
+      whirly_stop
+      new_solution_prepare!(sol, resp)
+    end
+
+    def new_solution_prepare!(sol, resp)
+      if resp.nil?
+        error("Create #{sol.type_name} failed: Request failed")
+        exit 1
+      end
+      unless resp.is_a?(Hash)
+        error("Create #{sol.type_name} failed: Unexpected response: #{resp}")
+        exit 1
+      end
+      if resp[:id].to_s.empty?
+        error("Unexpected: Solution ID not returned: #{resp}")
+        exit 1
+      end
+      sol.sid = 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,
+      #   but now it returns the solution ID.
+      # FIXME: Delete this eventually, once you verify the new behavior.
+      #if false
+      #  # Create doesn't return anything, so go looking for it.
+      #  MrMurano::Verbose.whirly_start('Verifying solution...')
+      #  invalidate_cache = true
+      #  ret = solutions(sol.type, invalidate_cache).select do |meta|
+      #    meta[:name] == sol.name || meta[:domain] =~ /#{sol.name}\./i
+      #  end
+      #  MrMurano::Verbose.whirly_stop
+      #  if ret.count > 1
+      #    warning("Found more than 1 matching solution: #{ret}")
+      #  elsif ret.count.zero?
+      #    error("Unable to verify solution created for ‘#{sol.name}’: #{ret}")
+      #    exit 3
+      #  end
+      #  sol.meta = ret.first
+      #  if sol.sid.to_s.empty? then
+      #    error("New solution created for ‘#{sol.name}’ missing ID?: #{ret}")
+      #    exit 3
+      #  end
+      #  sol.sid = sid
+      #end
+      sol
+    end
+
+    def delete_solution(sid)
+      must_business_id!
+      delete('business/' + bid + '/solution/' + sid)
+    end
+
+    # ---------------------------------------------------------------------
+
+    def products(**options)
+      solutions(type: :product, **options)
+    end
+
+    ## Create a new product in the current business
+    def new_product(name, type=:product)
+      new_solution!(name, type)
+    end
+
+    def delete_product(sid)
+      delete_solution(sid)
+    end
+
+    # ---------------------------------------------------------------------
+
+    def applications(**options)
+      solutions(type: :application, **options)
+    end
+
+    ## Create a new application in the current business
+    def new_application(name, type=:application)
+      new_solution!(name, type)
+    end
+
+    def delete_application(sid)
+      delete_solution(sid)
+    end
+  end
+end
+