MrMurano 1.11.3 → 1.12.0

data/lib/MrMurano/SyncUpDown.rb

@@ -1,6 +1,7 @@
 require 'pathname'
 require 'tempfile'
 require 'shellwords'
+require 'open3'
 require 'MrMurano/Config'
 require 'MrMurano/hash'
 
@@ -10,23 +11,52 @@ module MrMurano
     Syncable = Struct.new(:name, :class, :type, :desc, :bydefault) do
     end
 
+    ##
+    # Add a new entry to syncable things
+    # +name+:: The name to use for the long option
+    # +klass+:: The class to instanciate from
+    # +type+:: Single letter for short option and status listing
+    # +desc+:: Summary of what this syncs.
+    # +bydefault+:: Is this part of the default sync group
+    #
+    # returns nil
     def self.add(name, klass, type, desc, bydefault=false)
       @@syncset = [] unless defined?(@@syncset)
       @@syncset << Syncable.new(name.to_s, klass, type, desc, bydefault)
+      nil
     end
 
+    ##
+    # Remove all syncables.
     def self.reset()
       @@syncset = []
     end
 
+    ##
+    # Get the list of default syncables.
+    # returns array of names
+    def self.bydefault
+      @@syncset.select{|a| a.bydefault }.map{|a| a.name}
+    end
+
+    ##
+    # Iterate over all syncables
+    # +block+:: code to run on each
     def self.each(&block)
       @@syncset.each{|a| yield a.name, a.type, a.class }
     end
 
+    ##
+    # Iterate over all syncables with option arguments.
+    # +block+:: code to run on each
     def self.each_option(&block)
       @@syncset.each{|a| yield "-#{a.type.downcase}", "--[no-]#{a.name}", a.desc}
     end
 
+    ##
+    # Iterate over just the selected syncables.
+    # +opt+:: Options hash of which to select from
+    # +block+:: code to run on each
     def self.each_filtered(opt, &block)
       self.checkSAME(opt)
       @@syncset.each do |a|
@@ -38,13 +68,18 @@ module MrMurano
 
     ## Adjust options based on all or none
     # If none are selected, select the bydefault ones.
+    #
+    # +opt+:: Options hash of which to select from
+    #
+    # returns nil
     def self.checkSAME(opt)
       if opt[:all] then
         @@syncset.each {|a| opt[a.name.to_sym] = true }
       else
         any = @@syncset.select {|a| opt[a.name.to_sym] or opt[a.type.to_sym]}
         if any.empty? then
-          @@syncset.select{|a| a.bydefault }.each{|a| opt[a.name.to_sym] = true}
+          bydef = $cfg['sync.bydefault'].split
+          @@syncset.select{|a| bydef.include? a.name }.each{|a| opt[a.name.to_sym] = true}
         end
       end
 
@@ -72,7 +107,9 @@ module MrMurano
     #
     # @param itemkey String: The identifying key for this item
     def remove(itemkey)
+      # :nocov:
       raise "Forgotten implementation"
+      # :nocov:
     end
 
     ## Upload local item to remote
@@ -83,7 +120,9 @@ module MrMurano
     # @param item Hash: The item details to upload
     # @param modify Bool: True if item exists already and this is changing it
     def upload(src, item, modify)
+      # :nocov:
       raise "Forgotten implementation"
+      # :nocov:
     end
 
     ##
@@ -112,7 +151,7 @@ module MrMurano
     def toRemoteItem(root, path)
       path = Pathname.new(path) unless path.kind_of? Pathname
       root = Pathname.new(root) unless root.kind_of? Pathname
-      {:name => path.relative_path_from(root).to_s}
+      {:name => path.realpath.relative_path_from(root.realpath).to_s}
     end
 
     ##
@@ -166,8 +205,7 @@ module MrMurano
     # @param item Hash: The item to download
     def download(local, item)
       if item[:bundled] then
-        say_warning "Not downloading into bundled item #{synckey(item)}"
-        # FIXME don't use say_warning
+        warning "Not downloading into bundled item #{synckey(item)}"
         return
       end
       local.dirname.mkpath
@@ -275,7 +313,7 @@ module MrMurano
           ::File.fnmatch(i,p)
         end
       end.map do |path|
-        path = Pathname.new(path)
+        path = Pathname.new(path).realpath
         item = toRemoteItem(from, path)
         if item.kind_of?(Array) then
           item.compact.map{|i| i[:local_path] = path; i}
@@ -289,31 +327,32 @@ module MrMurano
     #######################################################################
     # Methods that provide the core status/syncup/syncdown
 
+    ##
+    # Take a hash or something (a Commander::Command::Options) and return a hash
+    #
     def elevate_hash(hsh)
-      if hsh.kind_of?(Hash) then
-        hsh = Hash.transform_keys_to_symbols(hsh)
-        hsh.define_singleton_method(:method_missing) do |mid,*args|
-          if mid.to_s.match(/^(.+)=$/) then
-            self[$1.to_sym] = args.first
-          else
-            self[mid]
-          end
-        end
+      # Commander::Command::Options stripped all of the methods from parent
+      # objects. I have not nice thoughts about that.
+      begin
+        hsh = hsh.__hash__
+      rescue NoMethodError
+        # swallow this.
       end
-      hsh
+      # build a hash where the default is 'false' instead of 'nil'
+      Hash.new(false).merge(Hash.transform_keys_to_symbols(hsh))
     end
     private :elevate_hash
 
     def syncup(options={})
       options = elevate_hash(options)
       itemkey = @itemkey.to_sym
-      options.asdown=false
+      options[:asdown] = false
       dt = status(options)
       toadd = dt[:toadd]
       todel = dt[:todel]
       tomod = dt[:tomod]
 
-      if options.delete then
+      if options[:delete] then
         todel.each do |item|
           verbose "Removing item #{item[:synckey]}"
           unless $cfg['tool.dry'] then
@@ -321,7 +360,7 @@ module MrMurano
           end
         end
       end
-      if options.create then
+      if options[:create] then
         toadd.each do |item|
           verbose "Adding item #{item[:synckey]}"
           unless $cfg['tool.dry'] then
@@ -329,7 +368,7 @@ module MrMurano
           end
         end
       end
-      if options.update then
+      if options[:update] then
         tomod.each do |item|
           verbose "Updating item #{item[:synckey]}"
           unless $cfg['tool.dry'] then
@@ -341,14 +380,14 @@ module MrMurano
 
     def syncdown(options={})
       options = elevate_hash(options)
-      options.asdown = true
+      options[:asdown] = true
       dt = status(options)
       into = @locationbase + @location ###
       toadd = dt[:toadd]
       todel = dt[:todel]
       tomod = dt[:tomod]
 
-      if options.delete then
+      if options[:delete] then
         todel.each do |item|
           verbose "Removing item #{item[:synckey]}"
           unless $cfg['tool.dry'] then
@@ -357,7 +396,7 @@ module MrMurano
           end
         end
       end
-      if options.create then
+      if options[:create] then
         toadd.each do |item|
           verbose "Adding item #{item[:synckey]}"
           unless $cfg['tool.dry'] then
@@ -366,7 +405,7 @@ module MrMurano
           end
         end
       end
-      if options.update then
+      if options[:update] then
         tomod.each do |item|
           verbose "Updating item #{item[:synckey]}"
           unless $cfg['tool.dry'] then
@@ -398,10 +437,10 @@ module MrMurano
         download(Pathname.new(trmt.path), item)
 
         cmd = $cfg['diff.cmd'].shellsplit
-        cmd << trmt.path
-        cmd << tlcl.path
+        cmd << trmt.path.gsub(::File::SEPARATOR, ::File::ALT_SEPARATOR || ::File::SEPARATOR)
+        cmd << tlcl.path.gsub(::File::SEPARATOR, ::File::ALT_SEPARATOR || ::File::SEPARATOR)
 
-        IO.popen(cmd) {|io| df = io.read }
+        df, _ = Open3.capture2e(*cmd)
       ensure
         trmt.close
         trmt.unlink
@@ -434,7 +473,7 @@ module MrMurano
       todel = []
       tomod = []
       unchg = []
-      if options.asdown then
+      if options[:asdown] then
         todel = (herebox.keys - therebox.keys).map{|key| herebox[key] }
         toadd = (therebox.keys - herebox.keys).map{|key| therebox[key] }
       else
@@ -446,7 +485,7 @@ module MrMurano
         mrg = herebox[key].reject{|k,v| k==itemkey}
         mrg = therebox[key].merge(mrg)
         if docmp(herebox[key], therebox[key]) then
-          mrg[:diff] = dodiff(mrg) if options.diff
+          mrg[:diff] = dodiff(mrg) if options[:diff]
           tomod << mrg
         else
           unchg << mrg

data/lib/MrMurano/commands/config.rb

@@ -6,13 +6,16 @@ command :config do |c|
   You can get, set, or query config options with this command.  All config
   options are in a 'section.key' format.  There is also a layer of scopes
   that the keys can be saved in.
+
+  If section is left out, then key is assumed to be in the 'tool' section.
+
   }
 
   c.example %{See what the current combined config is}, 'mr config --dump'
   c.example %{Query a value}, 'mr config solution.id'
   c.example %{Set a new value; writing to the project config file}, 'mr config solution.id XXXXXXXX'
   c.example %{Set a new value; writing to the user config file}, 'mr config --user user.name my@email.address'
-  c.example %{Unset a value in a configfile. (lower scopes will become visible if set)},
+  c.example %{Unset a value in a configfile. (lower scopes will become visible when unset)},
     'mr config diff.cmd --unset'
 
 

data/lib/MrMurano/commands/exportImport.rb

@@ -119,6 +119,8 @@ command 'config import' do |c|
         if routes == '' then
           acc.verbose "No endpoints to import"
         elsif File.dirname(routes) == '.' then
+          # TODO: don't need to move this anymore.
+          # Can set location.endpoints and endpoints.searchFor instead.
           acc.warning "Routes file #{File.basename(routes)} not in endpoints directory"
           if options.move then
             acc.warning "Moving it to #{$cfg['location.endpoints']}"
@@ -142,6 +144,7 @@ command 'config import' do |c|
           end
         end
 
+        # TODO: change this to take advantage of searchFor
         def update_or_stop(paths, cfgkey, what, acc=MrMurano::Account.new)
           crd = Dir.common_root(paths)
           acc.debug "crd => #{crd}"

data/lib/MrMurano/hash.rb

@@ -3,12 +3,14 @@
 class Hash
   #take keys of hash and transform those to a symbols
   def self.transform_keys_to_symbols(value)
+    return value.map{|v| Hash.transform_keys_to_symbols(v)} if value.is_a?(Array)
     return value if not value.is_a?(Hash)
     hash = value.inject({}){|memo,(k,v)| memo[k.to_sym] = Hash.transform_keys_to_symbols(v); memo}
     return hash
   end
   #take keys of hash and transform those to strings
   def self.transform_keys_to_strings(value)
+    return value.map{|v| Hash.transform_keys_to_strings(v)} if value.is_a?(Array)
     return value if not value.is_a?(Hash)
     hash = value.inject({}){|memo,(k,v)| memo[k.to_s] = Hash.transform_keys_to_strings(v); memo}
     return hash

data/lib/MrMurano/http.rb

@@ -70,7 +70,7 @@ module MrMurano
         request.each_capitalized{|k,v| puts "> #{k}: #{v}"}
         if request.body.nil? then
         else
-          puts " > #{request.body[0..156]}"
+          puts ">> #{request.body[0..156]}"
         end
         puts "Got #{response.code} #{response.message}"
         response.each_capitalized{|k,v| puts "< #{k}: #{v}"}
@@ -87,7 +87,8 @@ module MrMurano
       else
         resp << jsn
       end
-      say_error resp
+      # assuming verbosing was included.
+      error resp
     end
 
     def workit(request, &block)
@@ -106,7 +107,6 @@ module MrMurano
           end
         else
           showHttpError(request, response)
-          raise response
         end
       end
     end

data/lib/MrMurano/verbosing.rb

@@ -34,8 +34,8 @@ module MrMurano
     def tabularize(data, ios=nil)
       fmt = $cfg['tool.outformat']
       ios = $stdout if ios.nil?
-      cols = []
-      rows = [[]]
+      cols = nil
+      rows = nil
       title = nil
       if data.kind_of?(Hash) then
         cols = data[:headers] if data.has_key?(:headers)
@@ -53,12 +53,18 @@ module MrMurano
         return
       end
       if fmt =~ /csv/i then
+        cols = [] if cols.nil?
+        rows = [[]] if rows.nil?
         CSV(ios, :headers=>cols, :write_headers=>(not cols.empty?)) do |csv|
           rows.each{|v| csv << v}
         end
       else
         # table.
-        ios.puts Terminal::Table.new :title=>title, :headings=>cols, :rows=>rows
+        table = Terminal::Table.new
+        table.title = title unless title.nil?
+        table.headings = cols unless cols.nil?
+        table.rows = rows unless rows.nil?
+        ios.puts table
       end
     end
 

data/lib/MrMurano/version.rb

@@ -1,4 +1,4 @@
 module MrMurano
-  VERSION = '1.11.3'.freeze
+  VERSION = '1.12.0'.freeze
 end
 

data/spec/Account_spec.rb

@@ -1,8 +1,112 @@
 require 'MrMurano/version'
 require 'MrMurano/Config'
 require 'MrMurano/Account'
+require 'highline/import'
+require '_workspace'
+
+RSpec.describe MrMurano::Account, "token" do
+  include_context "WORKSPACE"
+  before(:example) do
+    $cfg = MrMurano::Config.new
+    $cfg.load
+    $cfg['net.host'] = 'bizapi.hosted.exosite.io'
+    $cfg['business.id'] = 'XYZxyz'
+    $cfg['product.id'] = 'XYZ'
+
+    @acc = MrMurano::Account.new
+  end
+
+  after(:example) do
+    @acc.token_reset
+  end
+
+  context "Get login info" do
+    before(:example) do
+      @pswd = instance_double("MrMurano::Passwords")
+      allow(@pswd).to receive(:load).and_return(nil)
+      allow(@pswd).to receive(:save).and_return(nil)
+      allow(MrMurano::Passwords).to receive(:new).and_return(@pswd)
+    end
+
+    it "Asks for nothing" do
+      $cfg['user.name'] = "bob"
+      expect(@pswd).to receive(:get).once.and_return("built")
+
+      ret = @acc._loginInfo
+      expect(ret).to eq({
+        :email => "bob", :password=>"built"
+      })
+    end
+
+    it "Asks for user name" do
+      $cfg['user.name'] = nil
+      expect($terminal).to receive(:ask).once.and_return('bob')
+      expect(@acc).to receive(:error).once
+      expect($cfg).to receive(:set).with('user.name', 'bob', :user).once.and_call_original
+      expect(@pswd).to receive(:get).once.and_return("built")
+
+      ret = @acc._loginInfo
+      expect(ret).to eq({
+        :email => "bob", :password=>"built"
+      })
+    end
+
+    it "Asks for password" do
+      $cfg['user.name'] = "bob"
+      expect(@pswd).to receive(:get).with('bizapi.hosted.exosite.io','bob').once.and_return(nil)
+      expect(@acc).to receive(:error).once
+      expect($terminal).to receive(:ask).once.and_return('dog')
+      expect(@pswd).to receive(:set).once.with('bizapi.hosted.exosite.io','bob','dog')
+
+      ret = @acc._loginInfo
+      expect(ret).to eq({
+        :email => "bob", :password=>"dog"
+      })
+    end
+  end
+
+  context "token" do
+    before(:example) do
+      allow(@acc).to receive(:_loginInfo).and_return({:email=>'bob',:password=>'v'})
+    end
+
+    it "gets a token" do
+      stub_request(:post, "https://bizapi.hosted.exosite.io/api:1/token/").
+        with(:body => {:email=>'bob', :password=>'v'}.to_json).
+        to_return(body: {:token=>"ABCDEFGHIJKLMNOP"}.to_json )
+
+      ret = @acc.token
+      expect(ret).to eq("ABCDEFGHIJKLMNOP")
+    end
+
+    it "gets an error" do
+      stub_request(:post, "https://bizapi.hosted.exosite.io/api:1/token/").
+        with(:body => {:email=>'bob', :password=>'v'}.to_json).
+        to_return(status: 401, body: {}.to_json )
+
+      expect(@acc).to receive(:error).twice.and_return(nil)
+      ret = @acc.token
+      expect(ret).to be_nil
+    end
+
+    it "uses existing token" do
+      @acc.token_reset("quxx")
+      ret = @acc.token
+      expect(ret).to eq("quxx")
+    end
+
+    it "uses existing token, even with new instance" do
+      @acc.token_reset("quxx")
+      acc = MrMurano::Account.new
+      ret = acc.token
+      expect(ret).to eq("quxx")
+    end
+
+  end
+end
 
 RSpec.describe MrMurano::Account do
+  include_context "WORKSPACE"
   before(:example) do
     $cfg = MrMurano::Config.new
     $cfg.load