MuranoCLI 3.0.1 → 3.0.2

data/lib/MrMurano/commands/sync.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.08.16 /coding: utf-8
+# Last Modified: 2017.09.07 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -13,6 +13,7 @@ def sync_add_options(c, locale)
   c.option '--[no-]delete', %(Don't delete things from #{locale})
   c.option '--[no-]create', %(Don't create things on #{locale})
   c.option '--[no-]update', %(Don't update things on #{locale})
+  c.option '--ignore-errors', %(Don't die on sync errors)
 end
 
 def syncdown_files(options, args=nil)

data/lib/MrMurano/commands/timeseries.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.08.22 /coding: utf-8
+# Last Modified: 2017.09.11 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -11,7 +11,7 @@ require 'MrMurano/Solution-ServiceConfig'
 
 module MrMurano
   class Timeseries < ServiceConfig
-    def initialize(sid=nil)
+    def initialize(api_id=nil)
       # FIXME/2017-07-03: What soln types have timeseries?
       @solntype = 'application.id'
       super

data/lib/MrMurano/commands/tsdb.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.08.22 /coding: utf-8
+# Last Modified: 2017.09.11 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -13,7 +13,7 @@ require 'MrMurano/SubCmdGroupContext'
 module MrMurano
   module ServiceConfigs
     class Tsdb < ServiceConfig
-      def initialize(sid=nil)
+      def initialize(api_id=nil)
         # FIXME/2017-07-03: What soln types have TSDBs?
         @solntype = 'application.id'
         super

data/lib/MrMurano/hash.rb

@@ -1,11 +1,11 @@
-# Last Modified: 2017.08.20 /coding: utf-8
+# Last Modified: 2017.09.07 /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 'orderedhash'
+require 'MrMurano/orderedhash'
 
 class Hash
   # From:
@@ -73,9 +73,10 @@ def elevate_hash(hsh)
   end
   # build a hash where the default is 'false' instead of 'nil'
   Hash.new(false).merge(Hash.transform_keys_to_symbols(hsh))
-  # 2017-08-16: Weird: [lb] seeing the Hash behave differently
-  #   after feeding through this function. Unknown keys would
-  #   return nil before, but after, return false.
+  # 2017-09-07: Note that after elevate_hash, the Hash returns
+  #   false on unknown keys. This is because of the parameter to
+  #   new: Hash.new(false). Unknown keys would return nil before,
+  #   but after, they return false. E.g.,
   #
   #   (byeebug) options
   #   {:delete=>false, :create=>true, :update=>false}
@@ -89,8 +90,6 @@ def elevate_hash(hsh)
   #   false
   #   (byeebug) options
   #   {:delete=>false, :create=>true, :update=>false, :fff=>nil}
-  #
-  #   Work around is to test with hash.key?
 end
 
 ##
@@ -108,3 +107,16 @@ def ensure_array(item)
   end
 end
 
+module HashInit
+  def initialize(*hash)
+    return unless hash.length == 1 && hash.first.is_a?(Hash)
+    hash.first.each do |key, val|
+      if respond_to? key
+        send("#{key}=", val)
+      else
+        $stderr.puts %(HashInit: missing hash key "#{key}")
+      end
+    end
+  end
+end
+

data/lib/MrMurano/http.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.08.20 /coding: utf-8
+# Last Modified: 2017.08.24 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -84,7 +84,17 @@ module MrMurano
       if !defined?(@http) || @http.nil?
         @http = Net::HTTP.new(uri.host, uri.port)
         @http.use_ssl = true
-        @http.start
+        begin
+          @http.start
+        rescue SocketError => err
+          # E.g., "error: Failed to open TCP connection to true:443
+          #        (Hostname not known: true)."
+          error %(Net socket error: #{err.message})
+          exit 2
+        rescue StandardError => err
+          error %(Net request failed: #{err.message})
+          exit 2
+        end
       end
       @http
     end

data/lib/MrMurano/orderedhash.rb

@@ -0,0 +1,200 @@
+
+# AUTHOR
+#    jan molic /mig/at/1984/dot/cz/
+#
+# DESCRIPTION
+#    Hash with preserved order and some array-like extensions
+#    Public domain. 
+#
+# THANKS
+#    Andrew Johnson for his suggestions and fixes of Hash[],
+#    merge, to_a, inspect and shift
+class OrderedHash < ::Hash
+    attr_accessor :order
+
+    class << self
+        def [] *args
+          hsh = OrderedHash.new
+          if Hash === args[0]
+            hsh.replace args[0]
+          elsif (args.size % 2) != 0
+            raise ArgumentError, "odd number of elements for Hash"
+          else
+            0.step(args.size - 1, 2) do |a|
+              b = a + 1
+              hsh[args[a]] = args[b]
+            end
+          end
+          hsh
+        end
+    end
+    def initialize(*a, &b)
+      super
+      @order = []
+    end
+    def store_only a,b
+        store a,b
+    end
+    alias orig_store store    
+    def store a,b
+        @order.push a unless has_key? a
+        super a,b
+    end
+    alias []= store
+    def == hsh2
+        return false if @order != hsh2.order
+        super hsh2
+    end
+    def clear
+        @order = []
+        super
+    end
+    def delete key
+        @order.delete key
+        super
+    end
+    def each_key
+        @order.each { |k| yield k }
+        self
+    end
+    def each_value
+        @order.each { |k| yield self[k] }
+        self
+    end
+    def each
+        @order.each { |k| yield k,self[k] }
+        self
+    end
+    alias each_pair each    
+    def delete_if
+        @order.clone.each { |k| 
+            delete k if yield(k)
+        }
+        self
+    end
+    def values
+        ary = []
+        @order.each { |k| ary.push self[k] }
+        ary
+    end
+    def keys
+        @order
+    end
+    def first
+      {@order.first => self[@order.first]}
+    end
+    def last
+      {@order.last => self[@order.last]}
+    end
+    def invert
+        hsh2 = Hash.new    
+        @order.each { |k| hsh2[self[k]] = k }
+        hsh2
+    end
+    def reject &block
+        self.dup.delete_if(&block)
+    end
+    def reject! &block
+        hsh2 = reject(&block)
+        self == hsh2 ? nil : hsh2
+    end
+    def replace hsh2
+        @order = hsh2.keys 
+        super hsh2
+    end
+    def shift
+        key = @order.first
+        key ? [key,delete(key)] : super
+    end
+    def unshift k,v
+        unless self.include? k
+            @order.unshift k
+            orig_store(k,v)
+            true
+        else
+            false
+        end
+    end
+    def push k,v
+        unless self.include? k
+            @order.push k
+            orig_store(k,v)
+            true
+        else
+            false
+        end
+    end
+    def pop
+        key = @order.last
+        key ? [key,delete(key)] : nil
+    end
+    def to_a
+        ary = []
+        each { |k,v| ary << [k,v] }
+        ary
+    end
+    def to_s
+        self.to_a.to_s
+    end
+    def inspect
+        ary = []
+        each {|k,v| ary << k.inspect + "=>" + v.inspect}
+        '{' + ary.join(", ") + '}'
+    end
+    def update hsh2
+        hsh2.each { |k,v| self[k] = v }
+        self
+    end
+    alias :merge! update
+    def merge hsh2
+        self.dup update(hsh2)
+    end
+    def select
+        ary = []
+        each { |k,v| ary << [k,v] if yield k,v }
+        ary
+    end
+    def class
+      Hash
+    end
+    def __class__
+      OrderedHash
+    end
+
+    attr_accessor "to_yaml_style"
+    def yaml_inline= bool
+      if respond_to?("to_yaml_style")
+        self.to_yaml_style = :inline
+      else
+        unless defined? @__yaml_inline_meth
+          @__yaml_inline_meth =
+            lambda {|opts|
+              YAML::quick_emit(object_id, opts) {|emitter|
+                emitter << '{ ' << map{|kv| kv.join ': '}.join(', ') << ' }'
+              }
+            }
+          class << self
+            def to_yaml opts = {}
+              begin
+                @__yaml_inline ? @__yaml_inline_meth[ opts ] : super
+              rescue
+                @to_yaml_style = :inline
+                super
+              end
+            end
+          end
+        end
+      end
+      @__yaml_inline = bool
+    end
+    def yaml_inline!() self.yaml_inline = true end
+
+    def each_with_index
+      @order.each_with_index { |k, index| yield k, self[k], index }
+      self
+    end
+end # class OrderedHash
+
+def OrderedHash(*a, &b)
+  OrderedHash.new(*a, &b)
+end

data/lib/MrMurano/spec_commander.rb

@@ -0,0 +1,98 @@
+#!/usr/bin/env ruby
+# Last Modified: 2017.08.30 /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 'commander/import'
+require 'dotenv'
+require 'English'
+require 'highline'
+require 'pathname'
+#require 'pp'
+require 'rainbow'
+require 'rubygems'
+require 'MrMurano'
+require 'MrMurano/Config'
+require 'MrMurano/ProjectFile'
+
+# DEVs: Store environs in an .env file that gets loaded here. Alternatively,
+#   run a Bash or similar script before you start developing.
+Dotenv.load
+
+# Don't drop traces on ^C.
+# EXPLAIN/2017-06-30: [lb] not sure what "drop traces" means.
+#   What happens if we don't trap Ctrl-C?
+# NOTE: The second parameter is either a string, or a command or block to
+#   call or run. Ruby honors certain special strings, like 'EXIT':
+#   "If the command is “EXIT”, the script will be terminated by the signal."
+#   Per https://ruby-doc.org/core-2.2.0/Signal.html
+Signal.trap('INT', 'EXIT')
+
+program :version, MrMurano::VERSION
+
+program :description, %(
+  Manage Applications and Products in Exosite's Murano
+).strip
+
+# If being piped, e.g.,
+#   murano command ... | ...
+# or
+#   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.include?('--no-progress')
+
+default_command :help
+
+# Look for plug-ins.
+pgds = [
+  Pathname.new(Dir.home) + '.mrmurano' + 'plugins',
+  Pathname.new(Dir.home) + '.murano' + 'plugins',
+]
+# Add plugin dirs from configs
+# This is run before the command line options are parsed, so need to check old way.
+unless ARGV.include? '--skip-plugins'
+  pgds << Pathname.new(ENV['MR_MURANO_PLUGIN_DIR']) if ENV.key? 'MR_MURANO_PLUGIN_DIR'
+  pgds << Pathname.new(ENV['MURANO_PLUGIN_DIR']) if ENV.key? 'MURANO_PLUGIN_DIR'
+  pgds.each do |path|
+    next unless path.exist?
+    path.each_child do |plugin|
+      next if plugin.directory?
+      next unless plugin.readable?
+      next if plugin.basename.fnmatch('.*') # don't read anything starting with .
+      begin
+        require plugin.to_s
+      #rescue Exception => err
+      rescue StandardError => err
+        $stderr.puts "Failed to load plugin at #{plugin} because #{err}"
+      end
+    end
+  end
+end
+
+# Look for .murano/config files.
+$cfg = MrMurano::Config.new(::Commander::Runner.instance)
+$cfg.load
+$cfg.validate_cmd
+
+# Look for a (legacy) Solutionfile.json.
+$project = MrMurano::ProjectFile.new
+$project.load
+
+# The Commander defaults to paged help.
+# The user can disable with --no-page, e.g.,
+#   alias murano='murano --no-page'
+# We define this here and not in globals.rb because
+#   `murano --help` does not cause globals.rb to be sourced.
+paging = nil
+paging = true if ARGV.include?('--page')
+paging = false if ARGV.include?('--no-page')
+unless paging.nil?
+  program :help_paging, paging
+  $cfg['tool.no-page'] = !paging
+end
+# else, commander defaults to paging.
+

data/lib/MrMurano/verbosing.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.08.23 /coding: utf-8
+# Last Modified: 2017.08.28 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -104,7 +104,7 @@ module MrMurano
 
     ## Format and print the object
     # Handles many of the raw 'unpolished' formats.
-    def outf(obj, ios=nil, &_block)
+    def outf(obj, ios=nil)
       fmt = $cfg['tool.outformat']
       ios = $stdout if ios.nil?
       case fmt

data/lib/MrMurano/version.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.
@@ -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.1'
+  VERSION = '3.0.2'
   EXE_NAME = File.basename($PROGRAM_NAME)
   SIGN_UP_URL = 'https://exosite.com/signup/'
 end