MuranoCLI 2.2.4 → 3.0.0

data/lib/MrMurano/Keystore.rb

@@ -0,0 +1,48 @@
+# 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
+
+module MrMurano
+  class Keystore < ServiceConfig
+    def initialize(sid=nil)
+      # FIXME/2017-07-03: Do products have a keystore service? What about other soln types?
+      @solntype = 'application.id'
+      super
+      @service_name = 'keystore'
+    end
+
+    def keyinfo
+      call(:info)
+    end
+
+    def listkeys
+      ret = call(:list)
+      ret[:keys]
+    end
+
+    def getkey(key)
+      ret = call(:get, :post, key: key)
+      ret[:value]
+    end
+
+    def setkey(key, value)
+      call(:set, :post, key: key, value: value)
+    end
+
+    def delkey(key)
+      call(:delete, :post, key: key)
+    end
+
+    def command(key, cmd, args)
+      call(:command, :post, key: key, command: cmd, args: args)
+    end
+
+    def clearall
+      call(:clear, :post, {})
+    end
+  end
+end
+

data/lib/MrMurano/Passwords.rb

@@ -0,0 +1,103 @@
+# 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/http'
+require 'MrMurano/verbosing'
+require 'MrMurano/Config'
+require 'MrMurano/Solution'
+
+module MrMurano
+  # The Passwords class manages an end user's Murano user name and password.
+  class Passwords
+    include Verbose
+
+    def initialize(path=nil)
+      path = $cfg.file_at('passwords', :user) if path.nil?
+      path = Pathname.new(path) unless path.is_a?(Pathname)
+      @path = path
+      @data = nil
+    end
+
+    def load
+      return unless @path.exist?
+      @path.chmod(0o600)
+      @path.open('rb') do |io|
+        # 2017-07-01: Rubocop suggests using safe_load.
+        #  https://ruby-doc.org/stdlib-2.1.0/libdoc/psych/rdoc/Psych.html#method-c-load
+        #  https://ruby-doc.org/stdlib-2.1.0/libdoc/psych/rdoc/Psych.html#method-c-safe_load
+        # 2017-07-05: Oh, I don't think safe_load exists in Ruby 2 or 2.2...
+        #@data = YAML.safe_load(io)
+        # rubocop:disable Security/YAMLLoad
+        @data = YAML.load(io)
+      end
+    end
+
+    def save
+      if $cfg['tool.dry']
+        say '--dry: Not saving config'
+        return
+      end
+      @path.dirname.mkpath unless @path.dirname.exist?
+      @path.open('wb') do |io|
+        io << @data.to_yaml
+      end
+      @path.chmod(0o600)
+    end
+
+    def set(host, user, pass)
+      unless @data.is_a?(Hash)
+        @data = { host => { user => pass } }
+        return
+      end
+      hd = @data[host]
+      if hd.nil? || !hd.is_a?(Hash)
+        @data[host] = { user => pass }
+        return
+      end
+      @data[host][user] = pass
+    end
+
+    def get(host, user)
+      return ENV['MURANO_PASSWORD'] unless ENV['MURANO_PASSWORD'].to_s.empty?
+      unless ENV['MR_PASSWORD'].nil?
+        warning %(
+          Using deprecated environment variable, "MR_PASSWORD". Please rename to "MURANO_PASSWORD"
+        ).strip
+        return ENV['MR_PASSWORD']
+      end
+      return nil unless @data.is_a?(Hash)
+      return nil unless @data.key?(host)
+      return nil unless @data[host].is_a?(Hash)
+      return nil unless @data[host].key?(user)
+      @data[host][user]
+    end
+
+    ## Remove the password for a user.
+    def remove(host, user)
+      return unless @data.is_a?(Hash)
+      hd = @data[host]
+      return unless !hd.nil? && hd.is_a?(Hash)
+      @data[host].delete(user) if hd.key?(user)
+    end
+
+    ## Get all hosts and usernames. Does not return passwords.
+    def list
+      ret = {}
+      @data.each_pair { |key, value| ret[key] = value.keys } unless @data.nil?
+      ret
+      # MAYBE/2017-08-17:
+      #   sort_by_name(ret)
+    end
+  end
+end
+

data/lib/MrMurano/ProjectFile.rb

@@ -1,3 +1,13 @@
+# Last Modified: 2017.08.18 /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 'yaml'
 require 'json-schema'
 require 'pathname'
@@ -5,14 +15,21 @@ require 'MrMurano/verbosing'
 require 'MrMurano/Config'
 require 'MrMurano/hash'
 
+# FIXME/EXPLAIN/2017-06-30: Is a project file a legacy construct?
+#   I believe MurCLI currently stores config in .murano/config,
+#   and it uses a known set of directories for storing Murano
+#   things. Is a solution file just a way to specify your own
+#   paths to things? Is there any reason to prefer using a
+#   solution file to not using one?
+
 module MrMurano
   ##
-  # A Project File that describes details about a project that is synced into
-  # Murano
+  # A Project File that describes details about a project that is
+  # synced into Murano.
   class ProjectFile
     include Verbose
 
-    attr_reader :usingProjectfile, :usingSolutionfile
+    attr_reader :using_projectfile, :using_solutionfile
 
     # Methods that are common to various internal structs.
     module PrjStructCommonMethods
@@ -22,29 +39,29 @@ module MrMurano
       #
       # @param obj [Hash] Data to load in
       def load(obj)
-        self.members.reject{|key| [:legacy].include? key}.each do |key|
-          self[key] = obj[key] if obj.has_key? key
+        members.reject { |key| [:legacy].include? key }.each do |key|
+          self[key] = obj[key] if obj.key?(key)
         end
-        self.members.select{|k| [:include, :exclude].include? k}.each do |key|
-          self[key] = [self[key]] unless self[key].kind_of? Array
+        members.select { |k| %i[include exclude].include? k }.each do |key|
+          self[key] = [self[key]] unless self[key].nil? || self[key].is_a?(Array)
         end
       end
 
       ## Returns a sparse hash of the data in self
       # @return [Hash] Just the non-nil members of this
       def save
-        ret={}
-        self.members.reject{|key| [:legacy].include? key}.each do |key|
+        ret = {}
+        members.reject { |key| [:legacy].include? key }.each do |key|
           ret[key] = self[key] unless self[key].nil?
         end
         ret
       end
     end
 
-    # The contents of this is explictily not just a nest of hashes and arrays.
+    # The contents of this is explicitly not just a nest of hashes and arrays.
     # To keep expectations in check, there is a set number of known keys.
-    # This should also help by keeping the file format seperate from the internal
-    # lookups.  Hopefully, this will avoid (or at least minimize) changes to the
+    # This should also help by keeping the file format separate from the internal
+    # lookups. Hopefully, this will avoid (or at least minimize) changes to the
     # file format affecting all kinds of code.
     PrjMeta = Struct.new(:name, :summary, :description, :authors, :version, :source, :dependencies) do
       include PrjStructCommonMethods
@@ -74,33 +91,26 @@ module MrMurano
       ## Returns a sparse hash of the data in self
       # @return [Hash] Just the non-empty members of this
       def save
-        ret={}
-        self.members.each do |key|
+        ret = {}
+        members.each do |key|
           value = self[key].save
           ret[key] = value unless value.empty?
         end
         ret
       end
+
+      # rubocop:disable Style/AccessorMethodName: "Do not prefix reader method names with get_."
       def get_binding
-        binding()
+        binding
       end
     end
 
-    def initialize()
-      @usingProjectfile = false
-      @usingSolutionfile = false
-      @prjFile = nil
-      tname = $cfg['location.base'].basename.to_s.gsub(/[^A-Za-z0-9]/, '')
+    def initialize
+      @using_projectfile = false
+      @using_solutionfile = false
+      @prj_file = nil
       @data = PrfFile.new(
-        PrjMeta.new(
-          tname,
-          "One line summary of #{tname}",
-          "In depth description of #{tname}\n\nWith lots of details.",
-          [$cfg['user.name']],
-          "1.0.0",
-          nil,
-          nil
-        ),
+        new_meta,
         PrjFiles.new,
         PrjModules.new,
         PrjEndpoints.new,
@@ -109,11 +119,29 @@ module MrMurano
       )
     end
 
+    def new_meta
+      tname = $cfg['location.base'].basename.to_s.gsub(/[^A-Za-z0-9]/, '')
+      PrjMeta.new(
+        tname,
+        "One line summary of #{tname}",
+        "In depth description of #{tname}\n\nWith lots of details.",
+        [$cfg['user.name']],
+        '1.0.0',
+        nil,
+        nil
+      )
+    end
+
+    def refresh_user_name
+      @data.info = new_meta
+    end
+
     # Get the current Project file
     # @return [Pathname] PAth to current project file.
     def project_file
-      @prjFile
+      @prj_file
     end
+
     # Get a binding to the data for building the example ProjectFile
     def data_binding
       @data.get_binding
@@ -122,13 +150,13 @@ module MrMurano
     # Get a value for a key.
     # Keys are 'section.key'
     def get(key)
-      raise "Empty key" if key.empty?
+      raise 'Empty key' if key.empty?
       section, ikey = key.split('.')
-      raise "Missing dot" if ikey.nil? and section == key
-      raise "Missing key" if ikey.nil? and section != key
+      raise 'Missing dot' if ikey.nil? && section == key
+      raise 'Missing key' if ikey.nil? && section != key
       ret = @data[section.to_sym][ikey.to_sym]
       return default_value_for(key) if ret.nil?
-      return ret
+      ret
     end
     alias [] get
 
@@ -139,31 +167,46 @@ module MrMurano
     # All of these are currently stored in $cfg, but under different names.
     def default_value_for(key)
       keymap = {
+        # The left-side is the SolutionFile key;
+        # the right-side is the $cfg key.
+
         'assets.location' => 'location.files',
         'assets.include' => 'files.searchFor',
         'assets.exclude' => 'files.ignoring',
+
         'assets.default_page' => 'files.default_page',
+
         'modules.location' => 'location.modules',
         'modules.include' => 'modules.searchFor',
         'modules.exclude' => 'modules.ignoring',
+
         'routes.location' => 'location.endpoints',
         'routes.include' => 'endpoints.searchFor',
         'routes.exclude' => 'endpoints.ignoring',
+
         'routes.cors' => 'location.cors',
+
         'services.location' => 'location.eventhandlers',
         'services.include' => 'eventhandler.searchFor',
         'services.exclude' => 'eventhandler.ignoring',
-        'resources.location' => 'location.specs',
+
+        'resources.location' => 'location.resources',
+        # EXPLAIN/2017-07-05: [lb] not finding either resources.include
+        # nor product.spec used anywhere.
         'resources.include' => 'product.spec',
         'resources.exclude' => 'product.ignoring',
       }.freeze
-      needSplit = %r{.*\.(searchFor|ignoring)$}.freeze
-      return nil unless keymap.has_key? key
-      # *.{include,exclude} want arrays returned. But what they map to is
-      # strings.
+      need_split = /.*\.(searchFor|ignoring)$/
+      return nil unless keymap.key? key
+      # *.{include,exclude} want arrays returned.
+      # But what they map to is strings.
       cfg_key = keymap[key]
-      ret = ($cfg[cfg_key] or '')
-      ret = ret.split() if cfg_key =~ needSplit
+      ret = ($cfg[cfg_key] || '')
+      # split uses $; when no delimiter is specified.
+      #   In Ruby, $; is $FS or $FIELD_SEPARATOR.
+      #   It defaults to nil, which splits on whitespace.
+      #   https://ruby-doc.org/stdlib-2.3.3/libdoc/English/rdoc/English.html
+      ret = ret.split if cfg_key =~ need_split
       ret
     end
 
@@ -204,41 +247,42 @@ module MrMurano
       return 0 if possible.empty? # this is ok.
 
       warning "Multiple possible Project files! #{possible}" if possible.count > 1
-      @prjFile = Pathname.new(possible.first)
+      @prj_file = Pathname.new(possible.first)
 
       data = nil
       begin
-        data = YAML.load_file(@prjFile.to_s)
-      rescue Exception => e
+        data = YAML.load_file(@prj_file.to_s)
+      #rescue Exception => e
+      rescue StandardError => e
         error "Load error; #{e}"
         pp e
         return -3
       end
-      if data.nil? then
-        error "Failed to load #{@prjFile}"
+      if data.nil?
+        error "Failed to load #{@prj_file}"
         return -2
       end
-      unless data.kind_of?(Hash) then
-        error "Bad format in #{@prjFile}"
+      unless data.is_a?(Hash)
+        error "Bad format in #{@prj_file}"
         return -4
       end
 
       data = Hash.transform_keys_to_symbols(data)
 
-      # get format version; little different for older format.
-      if @prjFile.basename.to_s == "Solutionfile.json" then
-        fmtvers = (data[:version] or '0.2.0')
+      # Get format version; little different for older format.
+      if @prj_file.basename.to_s == 'Solutionfile.json'
+        fmtvers = (data[:version] || '0.2.0')
       else
-        fmtvers = (data[:formatversion] or '1.0.0')
+        fmtvers = (data[:formatversion] || '1.0.0')
       end
 
-      methodname = "load_#{fmtvers.gsub(/\./, '_')}".to_sym
+      methodname = "load_#{fmtvers.tr('.', '_')}".to_sym
       debug "Will try to #{methodname}"
-      if respond_to? methodname then
+      if respond_to? methodname
         errorlist = __send__(methodname, data)
-        unless errorlist.empty? then
-          error %{Project file #{@prjFile} not valid.}
-          errorlist.each{|er| error er}
+        unless errorlist.empty?
+          error %(Project file #{@prj_file} not valid.)
+          errorlist.each { |er| error er }
           return -5
         end
       else
@@ -252,21 +296,21 @@ module MrMurano
     # @param dest [Hash,Struct] Destination to save value in
     # @param dkey [String,Symbol] Key in destination to save to
     def ifset(src, skey, dest, dkey)
-      dest[dkey] = src[skey] if src.has_key? skey
+      dest[dkey] = src[skey] if src.key? skey
     end
 
     # Load data in the 1.0.0 format.
     # @param data [Hash] the data to load
     # @return [Array] An array of validation errors in the data
     def load_1_0_0(data)
-      schemaPath = Pathname.new(::File.dirname(__FILE__)) + 'schema/pf-v1.0.0.yaml'
-      schema = YAML.load_file(schemaPath.to_s)
+      schema_path = Pathname.new(::File.dirname(__FILE__)) + 'schema/pf-v1.0.0.yaml'
+      schema = YAML.load_file(schema_path.to_s)
       v = JSON::Validator.fully_validate(schema, data)
       return v unless v.empty?
-      @usingProjectfile = true
+      @using_projectfile = true
 
       @data.each_pair do |key, str|
-        str.load(data[key]) if data.has_key? key
+        str.load(data[key]) if data.key? key
       end
 
       []
@@ -278,27 +322,27 @@ module MrMurano
     # @param data [Hash] the data to load
     # @return [Array] An array of validation errors in the data
     def load_0_2_0(data)
-      schemaPath = Pathname.new(::File.dirname(__FILE__)) + 'schema/sf-v0.2.0.yaml'
-      schema = YAML.load_file(schemaPath.to_s)
+      schema_path = Pathname.new(::File.dirname(__FILE__)) + 'schema/sf-v0.2.0.yaml'
+      schema = YAML.load_file(schema_path.to_s)
       v = JSON::Validator.fully_validate(schema, data)
       return v unless v.empty?
-      @usingSolutionfile = true
+      @using_solutionfile = true
 
       ifset(data, :default_page, @data[:assets], :default_page)
       ifset(data, :file_dir, @data[:assets], :location)
 
       @data[:routes].location = '.'
-      @data[:routes][:include] = [data[:custom_api]] if data.has_key? :custom_api
+      @data[:routes][:include] = [data[:custom_api]] if data.key? :custom_api
       ifset(data, :cors, @data[:routes], :cors)
 
-      if data.has_key? :modules then
+      if data.key? :modules
         @data[:modules].location = '.'
         @data[:modules][:include] = data[:modules].values
       end
 
-      if data.has_key? :event_handler then
+      if data.key? :event_handler
         @data[:services].location = '.'
-        evd = data[:event_handler].values.map{|e| e.values}.flatten
+        evd = data[:event_handler].values.map(&:values).flatten
         @data[:services].include = evd
         @data.services.legacy = store_legacy_service_handlers(data[:event_handler])
       end
@@ -320,27 +364,27 @@ module MrMurano
     # @param data [Hash] the data to load
     # @return [Array] An array of validation errors in the data
     def load_0_3_0(data)
-      schemaPath = Pathname.new(::File.dirname(__FILE__)) + 'schema/sf-v0.3.0.yaml'
-      schema = YAML.load_file(schemaPath.to_s)
+      schema_path = Pathname.new(::File.dirname(__FILE__)) + 'schema/sf-v0.3.0.yaml'
+      schema = YAML.load_file(schema_path.to_s)
       v = JSON::Validator.fully_validate(schema, data)
       return v unless v.empty?
-      @usingSolutionfile = true
+      @using_solutionfile = true
 
       ifset(data, :default_page, @data[:assets], :default_page)
       ifset(data, :assets, @data[:assets], :location)
 
       @data[:routes].location = '.'
-      @data[:routes][:include] = [data[:routes]] if data.has_key? :routes
+      @data[:routes][:include] = [data[:routes]] if data.key? :routes
       ifset(data, :cors, @data[:routes], :cors)
 
-      if data.has_key? :modules then
+      if data.key? :modules
         @data[:modules].location = '.'
         @data[:modules][:include] = data[:modules].values
       end
 
-      if data.has_key? :services then
+      if data.key? :services
         @data[:services].location = '.'
-        evd = data[:services].values.map{|e| e.values}.flatten
+        evd = data[:services].values.map(&:values).flatten
         @data[:services].include = evd
         @data.services.legacy = store_legacy_service_handlers(data[:services])
       end
@@ -350,7 +394,5 @@ module MrMurano
     alias load_0_3 load_0_3_0
     alias load_0 load_0_3_0
   end
-
-
 end
-#  vim: set ai et sw=2 ts=2 :
+