MuranoCLI 3.0.7 → 3.0.8

data/.trustme.vim

@@ -23,8 +23,27 @@
 "  autocmd BufWritePost <buffer> silent !./.trustme.sh &
 "augroup END
 
+" NOTE: The tags path cannot be relative.
 autocmd BufRead *.rb set tags=/exo/clients/exosite/exosite-murcli/tags
 
 "echomsg 'Calling trustme.sh'
-silent !./.trustme.sh &
+"echomsg "g:DUBS_TRUST_ME_ON_SAVE: " . g:DUBS_TRUST_ME_ON_SAVE
+"silent !./.trustme.sh &
+"silent !/exo/clients/exosite/exosite-murcli/.trustme.sh &
+
+" If you open from project.vim (via the magic in=""),
+" then neither of these globals will have been set
+" by dubs_edit_juice.vim.
+if !exists("g:DUBS_TRUST_ME_ON_FILE")
+  let g:DUBS_TRUST_ME_ON_FILE = '<project.vim>'
+endif
+if !exists("g:DUBS_TRUST_ME_ON_SAVE")
+  let g:DUBS_TRUST_ME_ON_SAVE = 0
+endif
+
+let s:cmd = '!' .
+  \ ' DUBS_TRUST_ME_ON_FILE=' . g:DUBS_TRUST_ME_ON_FILE .
+  \ ' DUBS_TRUST_ME_ON_SAVE=' . g:DUBS_TRUST_ME_ON_SAVE .
+  \ ' /exo/clients/exosite/exosite-murcli/.trustme.sh &'
+silent exec s:cmd
 

data/Gemfile

@@ -1,9 +1,9 @@
-# Last Modified: 2017.09.12 /coding: utf-8
+# Copyright © 2016-2017 Exosite LLC. All Rights Reserved
+# License: PROPRIETARY. See LICENSE.txt.
 # frozen_string_literal: true
 
-# Copyright © 2016-2017 Exosite LLC.
-# License: MIT. See LICENSE.txt.
-#  vim:tw=0:ts=2:sw=2:et:ai
+# vim:tw=0:ts=2:sw=2:et:ai
+# Unauthorized copying of this file is strictly prohibited.
 
 source 'http://rubygems.org'
 
@@ -12,7 +12,8 @@ source 'http://rubygems.org'
 gem 'certified', '1.0.0'
 gem 'commander', '~> 4.4.3'
 gem 'dotenv', '~> 2.1.1'
-#gem 'eventmachine', '~> 1.2.3'
+gem 'eventmachine', '~> 1.2.5'
+gem 'faye-websocket', '~> 0.10.7'
 gem 'highline', '~> 1.7.8'
 gem 'http-form_data', '~> 1.0.3'
 gem 'inflecto'
@@ -44,6 +45,7 @@ group :test do
   gem 'rubocop', '~> 0.49.1'
   gem 'simplecov', require: false
   gem 'webmock', '~> 2.3.0'
+  gem 'websocket-driver', '~> 0.7.0'
   #gem 'vcr'
   gem 'yard'
 end

data/LICENSE.txt

@@ -1,19 +1,18 @@
-Copyright (c) 2016-2017 Exosite
+Copyright © 2016-2017 Exosite LLC.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of this
-software and associated documentation files (the "Software"), to deal in the
-Software without restriction, including without limitation the rights to use, copy,
-modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
-and to permit persons to whom the Software is furnished to do so, subject to the
-following conditions:
+All Rights Reserved.
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+This software contains proprietary and confidential information of
+Exosite LLC.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
-CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
-OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+By accepting transfer of this copy, Recipient agrees to retain this
+software in confidence, to prevent disclosure to others, and to make
+no use of this software other than that for which it was delivered.
+
+This is an unpublished copyrighted work of Exosite LLC.
+
+Except as permitted by federal law, 17 U.S. Code § 117, copying is
+strictly prohibited.
+
+Exosite LLC. 275 Market St Suite 535, Minneapolis, MN 55405
 

data/MuranoCLI.gemspec

@@ -1,9 +1,9 @@
-# Last Modified: 2017.09.12 /coding: utf-8
+# Copyright © 2016-2017 Exosite LLC. All Rights Reserved
+# License: PROPRIETARY. See LICENSE.txt.
 # frozen_string_literal: true
 
-# Copyright © 2016-2017 Exosite LLC.
-# License: MIT. See LICENSE.txt.
-#  vim:tw=0:ts=2:sw=2:et:ai
+# vim:tw=0:ts=2:sw=2:et:ai
+# Unauthorized copying of this file is strictly prohibited.
 
 $LOAD_PATH.push File.expand_path('../lib', __FILE__)
 require_relative 'lib/MrMurano/version.rb'
@@ -53,7 +53,8 @@ explicitly specifying the version. For instance,
   #   Ignoring eventmachine-1.2.3 because its extensions are not built.
   #     Try: gem pristine eventmachine --version 1.2.3
   #   This might be because 'json' was also being complained about.
-  #s.add_runtime_dependency('eventmachine', '~> 1.2.3')
+  s.add_runtime_dependency('eventmachine', '~> 1.2.5')
+  s.add_runtime_dependency('faye-websocket', '~> 0.10.7')
   s.add_runtime_dependency('highline', '~> 1.7.8')
   s.add_runtime_dependency('http-form_data', '~> 1.0.3')
   s.add_runtime_dependency('inflecto')
@@ -85,6 +86,7 @@ explicitly specifying the version. For instance,
   s.add_development_dependency('rubocop', '~> 0.49.1')
   s.add_development_dependency('simplecov')
   s.add_development_dependency('webmock', '~> 2.3.0')
+  s.add_development_dependency('websocket-driver', '~> 0.7.0')
   # maybe? s.add_development_dependency('vcr', '~> ???')
   s.add_development_dependency('yard')
 

data/Rakefile

@@ -1,9 +1,9 @@
-# Last Modified: 2017.08.29 /coding: utf-8
+# Copyright © 2016-2017 Exosite LLC. All Rights Reserved
+# License: PROPRIETARY. See LICENSE.txt.
 # frozen_string_literal: true
 
-# Copyright © 2016-2017 Exosite LLC.
-# License: MIT. See LICENSE.txt.
-#  vim:tw=0:ts=2:sw=2:et:ai
+# vim:tw=0:ts=2:sw=2:et:ai
+# Unauthorized copying of this file is strictly prohibited.
 
 require 'bundler/gem_tasks'
 require 'shellwords'
@@ -50,7 +50,7 @@ end
 
 desc 'Tail the CI build file and the curl file'
 task :tail do
-  sh %(tail -F .rake_build.out curldebug.out)
+  sh %(tail -F .trustme.log curldebug.out)
 end
 
 desc 'display remind of how to release'

data/bin/murano

@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby
-# Last Modified: 2017.09.12 /coding: utf-8
+# Copyright © 2016-2017 Exosite LLC. All Rights Reserved
 # frozen_string_literal: true
 
-# Copyright © 2016-2017 Exosite LLC.
-# License: MIT. See LICENSE.txt.
-#  vim:tw=0:ts=2:sw=2:et:ai
+# License: PROPRIETARY. See LICENSE.txt.
+# Unauthorized copying of this file is strictly prohibited.
+# vim:tw=0:ts=2:sw=2:et:ai
 
 require 'MrMurano/Commander-Entry'
 

data/lib/MrMurano/Account.rb

@@ -1,14 +1,12 @@
-# Last Modified: 2017.09.21 /coding: utf-8
+# Copyright © 2016-2017 Exosite LLC. All Rights Reserved
+# License: PROPRIETARY. See LICENSE.txt.
 # frozen_string_literal: true
 
-# Copyright © 2016-2017 Exosite LLC.
-# License: MIT. See LICENSE.txt.
-#  vim:tw=0:ts=2:sw=2:et:ai
+# vim:tw=0:ts=2:sw=2:et:ai
+# Unauthorized copying of this file is strictly prohibited.
 
-require 'date'
 require 'json'
 require 'net/http'
-require 'pathname'
 require 'uri'
 require 'yaml'
 require 'MrMurano/hash'
@@ -31,6 +29,7 @@ module MrMurano
 
     def initialize
       @token = nil
+      @twofactor_token = nil
     end
 
     def host
@@ -42,7 +41,7 @@ module MrMurano
     end
 
     def endpoint(path)
-      URI('https://' + host + '/api:1/' + path.to_s)
+      URI($cfg['net.protocol'] + '://' + host + '/api:1/' + path.to_s)
     end
 
     # ---------------------------------------------------------------------
@@ -219,6 +218,7 @@ Or set your password with `murano password set <username>`.
 
       # First, delete/invalidate the remote token.
       unless twoftoken.to_s.empty?
+        verbose 'Removing two-factor token.'
         @suppress_error = true
         delete('token/' + twoftoken)
         # The response is nil if the token was not recognized, otherwise it's
@@ -235,6 +235,8 @@ Or set your password with `murano password set <username>`.
         pwd_file.remove(net_host, user_name) unless token_delete_only
         pwd_file.remove(net_host, user_name + '/twofactor')
         pwd_file.save
+      else
+        verbose 'Skipping password scrub: need both net.host and user.name to remove.'
       end
 
       clear_from_config(net_host, user_name) unless token_delete_only
@@ -249,7 +251,10 @@ Or set your password with `murano password set <username>`.
       # 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)
+      unless (user_net_host == net_host) && (user_user_name == user_name)
+        verbose 'Skipping config scrub: net.host and/or user.name do not match.'
+        return
+      end
       $cfg.set('user.name', nil, :user)
       $cfg.set('business.id', nil, :user)
       $cfg.set('business.name', nil, :user)

data/lib/MrMurano/Business.rb

@@ -1,15 +1,13 @@
-# Last Modified: 2017.09.20 /coding: utf-8
+# Copyright © 2016-2017 Exosite LLC. All Rights Reserved
+# License: PROPRIETARY. See LICENSE.txt.
 # frozen_string_literal: true
 
-# Copyright © 2016-2017 Exosite LLC.
-# License: MIT. See LICENSE.txt.
-#  vim:tw=0:ts=2:sw=2:et:ai
+# vim:tw=0:ts=2:sw=2:et:ai
+# Unauthorized copying of this file is strictly prohibited.
 
-require 'date'
 require 'inflecto'
 require 'json'
 require 'net/http'
-require 'pathname'
 require 'rainbow'
 require 'uri'
 require 'yaml'
@@ -109,7 +107,7 @@ module MrMurano
 
     def self.missing_business_id_msg
       %(
-business ID not specified. For hints: #{MrMurano::EXE_NAME} business --help
+        business ID not specified. For hints: #{MrMurano::EXE_NAME} business --help
       ).strip
     end
 
@@ -183,6 +181,7 @@ business ID not specified. For hints: #{MrMurano::EXE_NAME} business --help
               nil
             else
               showHttpError(request, response)
+              nil
             end
           end
 

data/lib/MrMurano/Commander-Entry.rb

@@ -1,9 +1,9 @@
-# Last Modified: 2017.09.12 /coding: utf-8
+# Copyright © 2016-2017 Exosite LLC. All Rights Reserved
+# License: PROPRIETARY. See LICENSE.txt.
 # frozen_string_literal: true
 
-# Copyright © 2016-2017 Exosite LLC.
-# License: MIT. See LICENSE.txt.
-#  vim:tw=0:ts=2:sw=2:et:ai
+# vim:tw=0:ts=2:sw=2:et:ai
+# Unauthorized copying of this file is strictly prohibited.
 
 require 'commander/import'
 require 'dotenv'
@@ -66,7 +66,7 @@ unless ARGV.include? '--skip-plugins'
         require plugin.to_s
       #rescue Exception => err
       rescue StandardError => err
-        $stderr.puts "Failed to load plugin at #{plugin} because #{err}"
+        warn "Failed to load plugin at #{plugin} because #{err}"
       end
     end
   end

data/lib/MrMurano/Config-Migrate.rb

@@ -1,9 +1,9 @@
-# Last Modified: 2017.08.20 /coding: utf-8
+# Copyright © 2016-2017 Exosite LLC. All Rights Reserved
+# License: PROPRIETARY. See LICENSE.txt.
 # frozen_string_literal: true
 
-# Copyright © 2016-2017 Exosite LLC.
-# License: MIT. See LICENSE.txt.
-#  vim:tw=0:ts=2:sw=2:et:ai
+# vim:tw=0:ts=2:sw=2:et:ai
+# Unauthorized copying of this file is strictly prohibited.
 
 require 'fileutils'
 require 'pathname'

data/lib/MrMurano/Config.rb

@@ -1,9 +1,9 @@
-# Last Modified: 2017.09.20 /coding: utf-8
+# Copyright © 2016-2017 Exosite LLC. All Rights Reserved
+# License: PROPRIETARY. See LICENSE.txt.
 # frozen_string_literal: true
 
-# Copyright © 2016-2017 Exosite LLC.
-# License: MIT. See LICENSE.txt.
-#  vim:tw=0:ts=2:sw=2:et:ai
+# vim:tw=0:ts=2:sw=2:et:ai
+# Unauthorized copying of this file is strictly prohibited.
 
 require 'highline'
 require 'inifile'
@@ -27,6 +27,8 @@ module MrMurano
     #   mask values of the same keys in the lower scopes.
     CFG_SCOPES = %i[internal specified env project user defaults].freeze
 
+    CFG_HOST_BIZAPI = 'bizapi.hosted.exosite.io'
+
     ConfigFile = Struct.new(:kind, :path, :data) do
       def load
         return if kind == :internal
@@ -149,7 +151,8 @@ module MrMurano
       set('tool.fullerror', false, :defaults)
       set('tool.outformat', 'best', :defaults)
 
-      set('net.host', 'bizapi.hosted.exosite.io', :defaults)
+      set('net.host', CFG_HOST_BIZAPI, :defaults)
+      set('net.protocol', 'https', :defaults)
 
       set('location.base', @project_dir, :defaults) unless @project_dir.nil?
       set('location.files', 'files', :defaults)
@@ -414,7 +417,7 @@ module MrMurano
         else
           # *.blah query
           path.data.each do |ini|
-            path.data[ini].keys.each do |skey|
+            path.data[ini].each_key do |skey|
               next unless ikey == '*' || skey == ikey
               kvid = "#{ini}.#{skey}"
               next if seen[kvid]
@@ -580,6 +583,24 @@ module MrMurano
         @curlfile_f = nil
       end
     end
+
+    # To set a different protocol://host, i.e., for local developing.
+    def set_net_host(url_or_host, scope=:internal)
+      return if url_or_host.nil?
+      if url_or_host.to_s.empty?
+        $cfg.set('net.protocol', 'https', scope)
+        $cfg.set('net.host', CFG_HOST_BIZAPI, scope)
+        return
+      end
+      protocol_or_host, host_maybe = url_or_host.split('://', 2)
+      if !host_maybe.nil?
+        $cfg.set('net.protocol', protocol_or_host, scope)
+        $cfg.set('net.host', host_maybe, scope)
+      else
+        $cfg.set('net.protocol', 'https', scope)
+        $cfg.set('net.host', protocol_or_host, scope)
+      end
+    end
   end
 
   class ConfigError < StandardError

data/lib/MrMurano/Content.rb

@@ -1,9 +1,9 @@
-# Last Modified: 2017.09.11 /coding: utf-8
+# Copyright © 2016-2017 Exosite LLC. All Rights Reserved
+# License: PROPRIETARY. See LICENSE.txt.
 # frozen_string_literal: true
 
-# Copyright © 2016-2017 Exosite LLC.
-# License: MIT. See LICENSE.txt.
-#  vim:tw=0:ts=2:sw=2:et:ai
+# vim:tw=0:ts=2:sw=2:et:ai
+# Unauthorized copying of this file is strictly prohibited.
 
 require 'uri'
 require 'cgi'
@@ -43,7 +43,7 @@ module MrMurano
       # @return URI: The full URI for this enpoint.
       def endpoint(path='')
         super
-        parts = ['https:/', $cfg['net.host'], 'api:1'] + @uriparts
+        parts = [$cfg['net.protocol'] + ':/', $cfg['net.host'], 'api:1'] + @uriparts
         s = parts.map(&:to_s).join('/')
         URI(s + path.to_s)
       end

data/lib/MrMurano/Exchange-Element.rb

@@ -1,9 +1,9 @@
-# Last Modified: 2017.09.27 /coding: utf-8
+# Copyright © 2016-2017 Exosite LLC. All Rights Reserved
+# License: PROPRIETARY. See LICENSE.txt.
 # frozen_string_literal: true
 
-# Copyright © 2016-2017 Exosite LLC.
-# License: MIT. See LICENSE.txt.
-#  vim:tw=0:ts=2:sw=2:et:ai
+# vim:tw=0:ts=2:sw=2:et:ai
+# Unauthorized copying of this file is strictly prohibited.
 
 module MrMurano
   class ExchangeElement

data/lib/MrMurano/Exchange.rb

@@ -1,9 +1,9 @@
-# Last Modified: 2017.09.27 /coding: utf-8
+# Copyright © 2016-2017 Exosite LLC. All Rights Reserved
+# License: PROPRIETARY. See LICENSE.txt.
 # frozen_string_literal: true
 
-# Copyright © 2016-2017 Exosite LLC.
-# License: MIT. See LICENSE.txt.
-#  vim:tw=0:ts=2:sw=2:et:ai
+# vim:tw=0:ts=2:sw=2:et:ai
+# Unauthorized copying of this file is strictly prohibited.
 
 require 'MrMurano/Exchange-Element'
 

data/lib/MrMurano/Gateway.rb

@@ -1,13 +1,14 @@
-# Last Modified: 2017.09.11 /coding: utf-8
+# Copyright © 2016-2017 Exosite LLC. All Rights Reserved
+# License: PROPRIETARY. See LICENSE.txt.
 # frozen_string_literal: true
 
-# Copyright © 2016-2017 Exosite LLC.
-# License: MIT. See LICENSE.txt.
-#  vim:tw=0:ts=2:sw=2:et:ai
+# vim:tw=0:ts=2:sw=2:et:ai
+# Unauthorized copying of this file is strictly prohibited.
 
 require 'http/form_data'
 require 'json-schema'
 require 'net/http'
+require 'pathname'
 require 'uri'
 require 'MrMurano/hash'
 require 'MrMurano/http'
@@ -42,7 +43,7 @@ module MrMurano
       # @return URI: The full URI for this enpoint.
       def endpoint(path='')
         super
-        parts = ['https:/', $cfg['net.host'], 'api:1'] + @uriparts
+        parts = [$cfg['net.protocol'] + ':/', $cfg['net.host'], 'api:1'] + @uriparts
         s = parts.map(&:to_s).join('/')
         URI(s + path.to_s)
       end
@@ -168,11 +169,12 @@ module MrMurano
       end
 
       def syncup_after
-        super
+        num_synced = super
         if !@there.empty?
           if !$cfg['tool.dry']
-            sync_update_progress('Updating product resources')
+            sync_update_progress('Updating remote product resources')
             upload_all(@there)
+            num_synced += 1
           else
             MrMurano::Verbose.whirly_interject do
               say('--dry: Not updating resources')
@@ -184,6 +186,7 @@ module MrMurano
           end
         end
         @there = nil
+        num_synced
       end
 
       ###################################################
@@ -234,12 +237,14 @@ module MrMurano
       end
 
       def syncdown_after(local)
-        super
-        resources_write(local)
+        num_synced = super
+        num_synced += resources_write(local)
         @here = nil
+        num_synced
       end
 
       def resources_write(file_path)
+        num_synced = 0
         # User can blow away specs/ directory if they want; we'll just make
         # a new one. [This code somewhat copy-paste from make_directory.]
         basedir = file_path
@@ -263,16 +268,22 @@ module MrMurano
           return
         end
 
+        sync_update_progress('Updating local product resources')
+
         file_path.open('wb') do |io|
           # convert array to hash
           res = {}
           @here.each do |value|
             key = value[:alias]
-            res[key] = Hash.transform_keys_to_strings(value.reject { |k, _v| k == :alias })
+            res[key] = Hash.transform_keys_to_strings(
+              value.reject { |k, _v| k == :alias }
+            )
           end
           ohash = ordered_hash(res)
           io.write ohash.to_yaml
         end
+
+        num_synced + 1
       end
 
       def diff_item_write(io, _merged, local, remote)
@@ -397,7 +408,7 @@ module MrMurano
             props[:auth][:expire] = Integer(opts[:expire])
           rescue ArgumentError
             # Callers should prevent this, so ugly raise is okay.
-            raise ':expire option is not a valid number: #{fancy_ticks(opts[:expire])}'
+            raise ":expire option is not a valid number: #{fancy_ticks(opts[:expire])}"
           end
         end
         unless opts[:type].nil?