MuranoCLI 3.2.0.beta.9 → 3.2.1.pre.beta.3

data/lib/MrMurano/Account.rb

@@ -16,7 +16,7 @@ module MrMurano
     include AccountBase
     include Verbose
 
-    def businesses(bid: nil, name: nil, fuzzy: nil)
+    def businesses(bid: nil, name: nil, fuzzy: nil, options: 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?
@@ -29,6 +29,77 @@ module MrMurano
       # 2017-06-30: The data for each message contains a :bizid, :role, and :name.
       #   :role is probably generally "owner".
 
+      if (options && options.network)
+        # add network information and sort list
+        bizes = add_businesses_network(bizes)
+        match_bid_name_fuzzy!(bizes, bid, name, fuzzy)
+      else
+        # Sort results.
+        match_bid_name_fuzzy!(bizes, bid, name, fuzzy)
+        bizes.sort_by!(&:name)
+      end
+    end
+
+    # ---------------------------------------------------------------------
+
+    def add_businesses_network(bizes)
+      # Get network information
+      bizes_without_network = []
+      bizes_unconfigured = []
+      bizes_in_network = []
+      all_bizes = []
+
+      MrMurano::Verbose.whirly_start 'Fetching Network Information...'
+      bizes.each do |biz|
+        biz[:network] = ''
+        biz[:network_relationship] = ''
+        business_tier = get('business/' + biz[:bizid] + '/tier')
+        network_enabled = business_tier[:features][:network]
+
+        if network_enabled # Parents of business networks
+          add_network_info_parent!(biz, bizes_in_network, bizes_unconfigured)
+        else # check if the biz is a child of a network
+          maybe_add_network_info_child!(biz, bizes_without_network, bizes_in_network)
+        end
+      end
+      MrMurano::Verbose.whirly_stop
+
+      # Assemble the master list so that confgured networks are on top, followed
+      # by unconfigured networks, followed by non-network businesses
+      all_bizes.concat(bizes_in_network.sort_by! { |biz| biz[:network] })
+      all_bizes.concat(bizes_unconfigured.sort_by! { |biz| biz[:name] })
+      all_bizes.concat(bizes_without_network.sort_by! { |biz| biz[:name] })
+    end
+
+    # ---------------------------------------------------------------------
+    def add_network_info_parent!(biz, bizes_in_network, bizes_unconfigured)
+      biz[:network_relationship] = 'parent'
+      network_name = get('business/' + biz[:bizid] + '/network')[:name]
+      if network_name
+        biz[:network] = network_name
+        bizes_in_network.push(biz)
+      else
+        biz[:network] = '--Not configured yet--'
+        bizes_unconfigured.push(biz)
+      end
+    end
+
+    # ---------------------------------------------------------------------
+    def maybe_add_network_info_child!(biz, bizes_without_network, bizes_in_network)
+      owner = get('business/' + biz[:bizid] + '/owner')
+      if owner.empty?
+        biz[:network] = 'N/A'
+        bizes_without_network.push(biz)
+      else
+        biz[:network_relationship] = 'child'
+        biz[:network] = owner[:network][:name]
+        bizes_in_network.push(biz)
+      end
+    end
+
+    # ---------------------------------------------------------------------
+    # helper for filtering businesses when using the find command
+    def match_bid_name_fuzzy!(bizes, bid, name, fuzzy)
       match_bid = ensure_array(bid)
       match_name = ensure_array(name)
       match_fuzzy = ensure_array(fuzzy)
@@ -47,9 +118,6 @@ module MrMurano
       end
 
       bizes.map! { |meta| MrMurano::Business.new(meta) }
-
-      # Sort results.
-      bizes.sort_by!(&:name)
     end
 
     # ---------------------------------------------------------------------

data/lib/MrMurano/Business.rb

@@ -48,6 +48,11 @@ module MrMurano
       $cfg['business.id'].to_s
     end
 
+    def cid
+      return @cid unless @cid.to_s.empty?
+      $cfg['business.child'].to_s
+    end
+
     def name
       return @name unless @name.to_s.empty?
       $cfg['business.name'].to_s
@@ -89,12 +94,22 @@ module MrMurano
       raise MrMurano::ConfigError.new(Business.missing_business_id_msg) if bid.to_s.empty?
     end
 
+    def must_child!
+      raise MrMurano::ConfigError.new(Business.missing_child_msg) if cid.to_s.empty?
+    end
+
     def self.missing_business_id_msg
       %(
         business ID not specified. For hints: #{MrMurano::EXE_NAME} business --help
       ).strip
     end
 
+    def self.missing_child_msg
+      %(
+        network child business ID not specified. For hints: #{MrMurano::EXE_NAME} business --help
+      ).strip
+    end
+
     def pretty_name_and_id
       "#{fancy_ticks(Rainbow(name).underline)} <#{bid}>"
     end
@@ -112,6 +127,9 @@ module MrMurano
     #end
 
     def overview(&block)
+      # TODO: (PL) - The overview endpoint has been split up into smaller
+      # endpoints that should be used instead of this one
+      #
       # Here are all the goodies that the overview endpoint returns:
       #  {:name=>"XXX", :email=>"XXX", :contact=>"XXX",
       #   :billing=>{
@@ -373,7 +391,6 @@ module MrMurano
         end
       end
     end
-    # ---------------------------------------------------------------------
 
     # ---------------------------------------------------------------------
 
@@ -390,6 +407,130 @@ module MrMurano
         end
       end
     end
+
+    # ---------------------------------------------------------------------
+
+    def view_child_businesses(bid)
+      return nil unless check_if_biz_network_capable(bid) == true
+      get('business/' + bid + '/network/business/') do |request, http|
+        response = http.request(request)
+        case response
+        when Net::HTTPSuccess
+          workit_response(response)
+        else
+          showHttpError(request, response)
+          nil
+        end
+      end
+    end
+
+    # ---------------------------------------------------------------------
+
+    def add_network_child_business(bid, name)
+      return nil unless check_if_biz_network_capable(bid) == true
+      post('business/' + bid + '/network/business/', name: name) do |request, http|
+        response = http.request(request)
+        case response
+        when Net::HTTPSuccess
+          workit_response(response)
+        when Net::HTTPConflict #409 limit reached
+          MrMurano::Verbose.error(
+            'You have reached your limit of child businesses in your network.'
+          )
+          nil
+        else
+          showHttpError(request, response)
+          nil
+        end
+      end
+    end
+
+    # ---------------------------------------------------------------------
+
+    def delete_child_business(bid, child_business_id)
+      return nil unless check_if_biz_network_capable(bid) == true
+      delete(
+        'business/' +
+        bid +
+        '/network/business/' +
+        child_business_id
+      ) do |request, http|
+        response = http.request(request)
+        case response
+        when Net::HTTPSuccess
+          workit_response(response)
+        else
+          showHttpError(request, response)
+          nil
+        end
+      end
+    end
+
+    # ---------------------------------------------------------------------
+
+    def add_member_to_child_business(bid, child_business_id, new_member_email)
+      return nil unless check_if_biz_network_capable(bid)
+      member_in_parent_biz = check_if_member_is_in_biz(bid, new_member_email)
+      unless (member_in_parent_biz)
+        MrMurano::Verbose.error(
+          'User is not a member of the parent business.'
+        )
+        return nil
+      end
+      member_in_child_biz = check_if_member_is_in_biz(child_business_id, new_member_email)
+      if (member_in_child_biz)
+        MrMurano::Verbose.error(
+          'User is already a member of the child business.'
+        )
+        return nil
+      end
+      put(
+        'business/' +
+        bid +
+        '/network/business/' +
+        child_business_id +
+        '/member/' +
+        new_member_email
+      ) do |request, http|
+        response = http.request(request)
+        case response
+        when Net::HTTPSuccess
+          workit_response(response)
+        else
+          showHttpError(request, response)
+          nil
+        end
+      end
+    end
+
+    # ---------------------------------------------------------------------
+
+    def remove_member_from_child_business(bid, child_business_id, member_email)
+      return nil unless check_if_biz_network_capable(bid)
+      member_in_child_biz = check_if_member_is_in_biz(child_business_id, member_email)
+      unless (member_in_child_biz)
+        MrMurano::Verbose.error(
+          'User is not a member of the child business.'
+        )
+        return nil
+      end
+      delete(
+        'business/' +
+        child_business_id +
+        '/member/' +
+        member_email
+      ) do |request, http|
+        response = http.request(request)
+        case response
+        when Net::HTTPSuccess
+          workit_response(response)
+        else
+          showHttpError(request, response)
+          nil
+        end
+      end
+    end
+
     # ---------------------------------------------------------------------
 
     def check_if_biz_network_capable(bid)
@@ -398,7 +539,7 @@ module MrMurano
         case tier_response
         when Net::HTTPSuccess
           parsed_response = workit_response(tier_response)
-          if parsed_response[:network] != true
+          if parsed_response[:features][:network] != true
             MrMurano::Verbose.error(
               'Your business does not have access to business network features. Please upgrade your business.'
             )
@@ -413,6 +554,26 @@ module MrMurano
       end
     end
 
+    # ---------------------------------------------------------------------
+
+    def check_if_member_is_in_biz(business_id, email)
+      get('business/' + business_id + '/member/') do |request, http|
+        response = http.request(request)
+        case response
+        when Net::HTTPSuccess
+          parsed_response = workit_response(response)
+          if (parsed_response.none? { |m| m[:email] == email })
+            false
+          else
+            true
+          end
+        else
+          showHttpError(request, response)
+          nil
+        end
+      end
+    end
+
     def self.must_not_be_managed!
       # Check that the solution(s) are not managed.
       # NOTE: BizAPI only tells us 'managed' via the business/<bizid>/solutions

data/lib/MrMurano/Commander-Entry.rb

@@ -10,7 +10,6 @@ require 'English'
 require 'highline'
 require 'murano-cli-commander/import'
 require 'pathname'
-#require 'pp'
 require 'rainbow'
 require 'rubygems'
 require 'MrMurano'
@@ -84,7 +83,7 @@ $cfg = MrMurano::Config.new(::Commander::Runner.instance)
 $cfg.load
 $cfg.validate_cmd
 
-# Look for a (legacy) Solutionfile.json.
+# Look for a Solutionfile.json.
 $project = MrMurano::ProjectFile.new
 $project.load
 

data/lib/MrMurano/Config.rb

@@ -230,7 +230,6 @@ module MrMurano
       set_defaults_location_newstyle('location.endpoints', 'routes', 'endpoints')
     end
 
-    # rubocop:disable Style/MethodName: Use snake_case for method names.
     def set_defaults_location_newstyle(key, formerly, currently)
       if @project_dir && !@project_dir.join(formerly).exist?
         set(key, currently, :defaults)
@@ -253,7 +252,7 @@ module MrMurano
     def set_defaults_endpoints
       set('endpoints.searchFor', %w[
         {,../endpoints}/*.lua
-        {,../endpoints}s/*/*.lua
+        {,../endpoints}/*/*.lua
       ].join(' '), :defaults)
       set('endpoints.ignoring', %w[
         *_test.lua
@@ -295,6 +294,8 @@ module MrMurano
         timer.timer
         tsdb.exportJob
         user.account
+        config.service
+        config.status
       ].join(' '), :defaults)
     end
 
@@ -336,8 +337,12 @@ module MrMurano
       # Set these so that @known_keys is updated.
       set('user.name', nil, :defaults)
       set('business.id', nil, :defaults)
+      set('business.child', nil, :defaults)
       set('application.id', nil, :defaults)
-      set('solution.id', nil, :defaults)
+      set('product.id', nil, :defaults)
+      set('business.name', nil, :defaults)
+      set('application.name', nil, :defaults)
+      set('product.name', nil, :defaults)
     end
 
     ## Find the root of this project Directory.
@@ -395,19 +400,15 @@ module MrMurano
       # 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 if the_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 INVALID_PROJECT_HINT
-          # Note that commander-rb uses an at_exit hook, which we hack around.
-          @runner.command_exit = 1
-          false
-        end
-      end
-      true
+      return if @runner.nil?
+      the_cmd = @runner.active_command if the_cmd.nil?
+      the_cmd = command(cmd) if the_cmd.nil?
+      the_cmd.project_not_required = false unless defined?(the_cmd.project_not_required)
+      return 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 commander-rb uses an at_exit hook, which we hack around.
+      @runner.command_exit = 1
     end
 
     def self.fix_modes(path)
@@ -501,7 +502,7 @@ module MrMurano
     def get(key, scope=CFG_SCOPES)
       scope = [scope] unless scope.is_a? Array
       paths = @paths.select { |p| scope.include? p.kind }
-      paths.reject { |p| @exclude_scopes.include? p.kind }
+      paths.reject! { |p| @exclude_scopes.include? p.kind }
 
       section, ikey = key.split('.')
       paths.each do |path|
@@ -693,7 +694,7 @@ module MrMurano
       locat = ''
 
       scope_q = fancy_ticks(scope)
-      scope_l = "Scope: #{scope_l}\n\n"
+      scope_l = "Scope: #{scope_q}\n\n"
       locat += Rainbow(scope_l).bright.underline
 
       cfg_paths = @paths.select { |p| p.kind == scope }

data/lib/MrMurano/Content.rb

@@ -83,7 +83,9 @@ module MrMurano
         # ?type=
         sha256 = Digest::SHA256.new
         sha256.file(local_path.to_s)
-        mime = MIME::Types.type_for(local_path.to_s)[0] || MIME::Types['application/octet-stream'][0]
+
+        mime = MIME::Types.type_for(local_path.to_s)[0]
+        mime ||= MIME::Types['application/octet-stream'][0]
 
         params = {
           sha256: sha256.hexdigest,
@@ -97,7 +99,8 @@ module MrMurano
         ret = get("/#{CGI.escape(name)}/upload?#{URI.encode_www_form(params)}")
         debug "POST instructions: #{ret}"
         raise "Method isn't POST!!!" unless ret.is_a?(Hash) && ret[:method] == 'POST'
-        raise "EncType isn't multipart/form-data" unless ret[:enctype] == 'multipart/form-data'
+        is_form_data = ret[:enctype] == 'multipart/form-data'
+        raise "EncType isn't multipart/form-data" unless is_form_data
 
         uri = URI(ret[:url])
         request = Net::HTTP::Post.new(uri)
@@ -128,8 +131,8 @@ module MrMurano
         end
 
         return if $cfg['tool.dry']
-        Net::HTTP.start(uri.host, uri.port, use_ssl: true) do |ihttp|
-          response = ihttp.request(request)
+        Net::HTTP.start(uri.host, uri.port, use_ssl: true) do |http|
+          response = http.request(request)
           case response
           # rubocop:disable Lint/EmptyWhen
           # "Avoid when branches without a body."
@@ -160,28 +163,32 @@ module MrMurano
         ret = get("/#{CGI.escape(name)}/download")
         debug "GET instructions: #{ret}"
         raise "Method isn't GET!!!" unless ret.is_a?(Hash) && ret[:method] == 'GET'
-
         uri = URI(ret[:url])
         request = Net::HTTP::Get.new(uri)
         request['User-Agent'] = "MrMurano/#{MrMurano::VERSION}"
+        download_curldebug(request)
+        download_send(uri, request, &block)
+      end
 
-        if $cfg['tool.curldebug']
-          a = []
-          a << %(curl -s)
-          a << %(-H 'User-Agent: #{request['User-Agent']}')
-          a << %(-X #{request.method})
-          a << %('#{request.uri}')
-          if $cfg.curlfile_f.nil?
-            puts a.join(' ')
-          else
-            $cfg.curlfile_f << a.join(' ') + "\n\n"
-            $cfg.curlfile_f.flush
-          end
+      def download_curldebug(request)
+        return unless $cfg['tool.curldebug']
+        args = []
+        args << %(curl -s)
+        args << %(-H 'User-Agent: #{request['User-Agent']}')
+        args << %(-X #{request.method})
+        args << %('#{request.uri}')
+        if $cfg.curlfile_f.nil?
+          puts args.join(' ')
+        else
+          $cfg.curlfile_f << args.join(' ') + "\n\n"
+          $cfg.curlfile_f.flush
         end
+      end
 
+      def download_send(uri, request, &block)
         return if $cfg['tool.dry']
-        Net::HTTP.start(uri.host, uri.port, use_ssl: true) do |ihttp|
-          ihttp.request(request) do |response|
+        Net::HTTP.start(uri.host, uri.port, use_ssl: true) do |http|
+          http.request(request) do |response|
             case response
             when Net::HTTPSuccess
               if block_given?