MrMurano 1.11.1 → 1.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95bf8648f53078d3c49f35cd4d25204cfdb5559c
-  data.tar.gz: 74ac6624a8fe7eaa137662c305691d6a3c2ecea6
+  metadata.gz: 7952441f550b0a314943de0c8bf2ced3e496b406
+  data.tar.gz: 1e10b41f47a6fbb668bd75c78593094f44835923
 SHA512:
-  metadata.gz: 944bfff7054b56912e71214009bafbfb440925d74ed6c0c80360ada088b7e59095d7d5380ca56e1bec44489e5171c624acd6f281f035d9184c13d69bc4d86ac0
-  data.tar.gz: 03549c8a9849ad3df60831a2906bb7dfda7530aaec3972fb2894d12e2cac4677131dacf0a855d12a70eb8b0718910baaaa57f0f3e32589d196cbd7783ac8870c
+  metadata.gz: 9271fcc60621b98bdf94bf59392c473a952323eaf8d370d43542e5a88a6c91cc48d07e706a741c659c97f09c5d2bf509925ed158bf860f071189dac8fdc88a31
+  data.tar.gz: 98b2e10a2144ad74e0a6c55f2d7d05d773c2a31037a3ae11fc44a5f7c19c1e3362ac2ef3b28cfa98c590414fb7d0b358f4886c275dba1d411fb5e239a22cf08f

data/.travis.yml

@@ -3,3 +3,15 @@ rvm:
     - 2.0
     - 2.2
 
+before_deploy: "rake build"
+deploy:
+  provider: releases
+  api_key:
+    secure: oB28IBHoSQVgP0PtP1uc+cRMBNhqHCCfCCV+sLNspjCGJeIjhZ4lmLcMYSy8l0+TBWxmXl6VIQd6GbyEezbB5daA4+pxY/An0OpM649t29+QuMCK8iXrD8/HXfaUzY2CP5RP47GoC/5xyCwqv3EEUjFPEGhUb5hYc74kfe3nwBmhKliHFQpZvuDE0EHWTgcEOep+kf7O+3cVf7vJVddz+Vj05t1s6VCwhBQsbUvOV4/Jv7nhHa7q0UGoY9M7sTNpwgawFeMwqvtXxl8sVbiHPLm+u6vikSbVnSdyi7wlVAoe+DSkzmnVHYzMd/t1Io7kEiLEAyDyrlJPJYS+XTMqxQ/KUDJNhf/N2IJMW2vPA+6TjpxCqcdY4QwkLNb7JfFWgQb9X4UksAEQU24W6110+zPUGmbg37eM80OrsadTWy65IQbLJ0sFFhm8vu/e2i/3LadYscw6A0Tyc1JXgGfGKd0nqyAyKGLcSBw1+dwwzkyKNHWFAaLy5hAEKv2qZdVNrTtcLhJtuxv8VUuevd3gfT6FLOIN/XAyg71mSvC2BA12vzM6KkTPNIaSmUITDgEplT5cs5h8PZ4eRghpmnT2EA3k0O3p14Ng3eeACMImJYQRKWmU/yVWVo69VVH0GRfm5SWb6xlDLFXt/Mii1MPx9ruhC232wdRACoep18w1qUY=
+  file: "pkg/MrMurano-*.gem"
+  skip_cleanup: true
+  on:
+    repo: tadpol/MrMurano
+    tags: true
+    rvm: 2.2
+

data/README.markdown

@@ -29,7 +29,7 @@ Then deploy with `mr syncup`
 There are a few steps and pieces to getting a solution with a product up and
 running in Murano. Here is the list.
 
-- Pick a bussiness: `mr account --business`
+- Pick a business: `mr account --business`
 - Set it: `mr config business.id ZZZZZZZZZ`
 - Create a product: `mr product create myawesomeproduct`
 - Save the result: `mr config product.id YYYYYYYYY`

data/Rakefile

@@ -30,6 +30,9 @@ namespace :git do
         sh %{git push upstream master}
         sh %{git push upstream --tags}
     end
+
+    desc "Push to origin and upstream"
+    task :all => [:origin, :upstream]
 end
 
 task :gempush do

data/TODO.taskpaper

@@ -28,7 +28,7 @@ Endpoints:
 	- Add directory support like in modules @done(2016-07-26)
 
 Files:
-	- Add ignore patterns to config
+	- Add ignore patterns to config @done(2016-12-20)
 	- Switch to mime-types v3 @pri(low)
 	- Figure out how to make the hexed-sha checksum faster. @done(2016-09-23)
 	- Fix upload. @done(2016-08-01)
@@ -65,7 +65,7 @@ Product:
 	- Need to add way to set the product ID on a device eventhandler. @done(2016-08-01)
 
 Service Device:
-	- When listing and bussiness.id is missing, gracefully fall back to --idonly @done(2016-09-12)
+	- When listing and business.id is missing, gracefully fall back to --idonly @done(2016-09-12)
 
 Config:
 	- Add config tool.default_sync to set which things sync{up,down} by default
@@ -73,6 +73,13 @@ Config:
 	- Store passwords in system Keychain on system that have a Keychain.
 	mac OS does, various Linux desktops have a couple differnet ones.  Not sure about
 	Windows.
+	MacOS: https://github.com/xli/mac-keychain
+	Windows8+: https://msdn.microsoft.com/en-us/library/windows/apps/xaml/hh465069.aspx
+	Linux: https://en.wikipedia.org/wiki/GNOME_Keyring
+	       https://en.wikipedia.org/wiki/KWallet
+
+	Plus things like 1Password, LastPass, KeePass, and others.
+
 	- Add ENV['MR_CONFIGFILE'] path to file to load like --configfile @done(2016-09-22)
 	- Maybe add dotenv support. @done(2016-09-22)
 	- Think about adding dev,staging,prod system; how would that work? @done(2016-09-16)

data/bin/mr

@@ -31,8 +31,15 @@ global_option('-C', '--configfile FILE', %{Load additional configuration file})
 }
 global_option('-c', '--config KEY=VALUE', %{Set a single config key}) {|param|
   key, value = param.split('=', 2)
+  # a=b :> ["a","b"]
+  # a= :> ["a",""]
+  # a :> ["a"]
   raise "Bad config '#{param}'" if key.nil?
-  $cfg[key] = value
+  if value.nil? then
+    $cfg[key] = 'true'
+  else
+    $cfg[key] = value
+  end
 }
 
 default_command :help

data/lib/MrMurano/Account.rb

@@ -119,35 +119,35 @@ module MrMurano
     end
 
     def products
-      raise "Missing Bussiness ID" if $cfg['business.id'].nil?
+      raise "Missing Business ID" if $cfg['business.id'].nil?
       get('business/' + $cfg['business.id'] + '/product/')
     end
 
     ## Create a new product in the current business
     def new_product(name, type='onepModel')
-      raise "Missing Bussiness ID" if $cfg['business.id'].nil?
+      raise "Missing Business ID" if $cfg['business.id'].nil?
       post('business/' + $cfg['business.id'] + '/product/', {:label=>name, :type=>type})
     end
 
     def delete_product(modelId)
-      raise "Missing Bussiness ID" if $cfg['business.id'].nil?
+      raise "Missing Business ID" if $cfg['business.id'].nil?
       delete('business/' + $cfg['business.id'] + '/product/' + modelId)
     end
 
     def solutions
-      raise "Missing Bussiness ID" if $cfg['business.id'].nil?
+      raise "Missing Business ID" if $cfg['business.id'].nil?
       get('business/' + $cfg['business.id'] + '/solution/')
     end
 
     ## Create a new solution
     def new_solution(name, type='dataApi')
-      raise "Missing Bussiness ID" if $cfg['business.id'].nil?
+      raise "Missing Business ID" if $cfg['business.id'].nil?
       raise "Solution name must be lowercase" if name.match(/[A-Z]/)
       post('business/' + $cfg['business.id'] + '/solution/', {:label=>name, :type=>type})
     end
 
     def delete_solution(apiId)
-      raise "Missing Bussiness ID" if $cfg['business.id'].nil?
+      raise "Missing Business ID" if $cfg['business.id'].nil?
       delete('business/' + $cfg['business.id'] + '/solution/' + apiId)
     end
 

data/lib/MrMurano/Config.rb

@@ -103,6 +103,8 @@ module MrMurano
       set('modules.searchFor', '*.lua */*.lua', :defaults)
       set('modules.ignoring', '*_test.lua *_spec.lua .*', :defaults)
 
+      set('product.spec', 'resources.yaml', :defaults)
+
       set('diff.cmd', 'diff -u', :defaults)
     end
 

data/lib/MrMurano/Product-Resources.rb

@@ -132,6 +132,7 @@ module MrMurano
     ## Get a local list of items from the single file
     def localitems(from)
       from = Pathname.new(from) unless from.kind_of? Pathname
+      debug "#{self.class.to_s}: Getting local items from: #{from}"
       if not from.exist? then
         say_warning "Skipping missing #{from.to_s}"
         return []
@@ -173,6 +174,7 @@ module MrMurano
       end
       here << item.reject{|k,v| k==:synckey or k==:rid}
       here.map!{|i| Hash.transform_keys_to_strings(i)}
+      local.dirname.mkpath
       local.open('wb') do |io|
         io << {'resources'=>here}.to_yaml
       end

data/lib/MrMurano/Solution-Endpoint.rb

@@ -48,7 +48,7 @@ module MrMurano
         script.unshift rheader
       elsif md[:method] != ret[:method] or
             md[:path] != ret[:path] or
-            md[:content_type] != ret[:content_type] then
+            md[:ctype] != ret[:content_type] then
         # header is wrong.
         script[0] = rheader
       end

data/lib/MrMurano/SyncUpDown.rb

@@ -240,6 +240,8 @@ module MrMurano
         bitems = localitems(@locationbase + @location)
         # use synckey for quicker merging.
         bitems.each { |b| items[synckey(b)] = b }
+      else
+        warning "Skipping missing location #{@locationbase + @location}"
       end
 
       items.values
@@ -265,6 +267,7 @@ module MrMurano
     # @param from Pathname: Directory of items to scan
     # @return Array: of Hashes of item details
     def localitems(from)
+      debug "#{self.class.to_s}: Getting local items from: #{from}"
       searchIn = from.to_s
       sf = searchFor.map{|i| ::File.join(searchIn, i)}
       Dir[*sf].flatten.compact.reject do |p|

data/lib/MrMurano/commands/config.rb

@@ -16,7 +16,6 @@ command :config do |c|
     'mr config diff.cmd --unset'
 
 
-  c.option '--system', 'Use only the system config file. (/etc/mrmuranorc)'
   c.option '--user', 'Use only the config file in $HOME (.mrmuranorc)'
   c.option '--project', 'Use only the config file in the project (.mrmuranorc)'
   c.option '--env', 'Use only the config file from $MR_CONFIGFILE'
@@ -32,12 +31,11 @@ command :config do |c|
     elsif args.count == 0 then
       say_error "Need a config key"
     elsif args.count == 1 and not options.unset then
-      options.default :system=>false, :user=>false, :project=>false,
+      options.default :user=>false, :project=>false,
         :specified=>false, :env=>false
 
       # For read, if no scopes, than all. Otherwise just those specified
       scopes = []
-      scopes << :system if options.system
       scopes << :user if options.user
       scopes << :project if options.project
       scopes << :env if options.env
@@ -47,11 +45,10 @@ command :config do |c|
       say $cfg.get(args[0], scopes)
     else
 
-      options.default :system=>false, :user=>false, :project=>false,
+      options.default :user=>false, :project=>false,
         :specified=>false, :env=>false
       # For write, if scope is specified, only write to that scope.
       scope = :project
-      scope = :system if options.system
       scope = :user if options.user
       scope = :project if options.project
       scope = :env if options.env

data/lib/MrMurano/commands/init.rb

@@ -12,6 +12,7 @@ command :init do |c|
   c.action do |args, options|
     options.default :force=>false, :mkdirs=>true
     acc = MrMurano::Account.new
+    puts ''
 
     if Pathname.new(Dir.pwd).realpath == Pathname.new(Dir.home).realpath then
       acc.error "Cannot init a project in your HOME directory."
@@ -23,6 +24,8 @@ command :init do |c|
       exit 0 unless y =~ /^n/i
     end
 
+    say "Found project base directory at #{$cfg['location.base'].to_s}"
+    puts ''
 
     # If they have never logged in, then asking for the business.id will also ask
     # for their username and password.
@@ -101,6 +104,8 @@ command :init do |c|
     say "Ok, In business ID: #{$cfg['business.id']} using Solution ID: #{$cfg['solution.id']} with Product ID: #{$cfg['product.id']}"
 
     if options.mkdirs then
+      base = $cfg['location.base']
+      base = Pathname.new(base) unless base.kind_of? Pathname
       %w{
         location.files
         location.endpoints
@@ -110,6 +115,7 @@ command :init do |c|
       }.each do |cfgi|
         path = $cfg[cfgi]
         path = Pathname.new(path) unless path.kind_of? Pathname
+        path = base + path
         path.mkpath unless path.exist?
       end
       say "Default directories created"

data/lib/MrMurano/commands/tsdb.rb

@@ -184,6 +184,26 @@ Also, many date-time formats can be parsed and will be converted to microseconds
       io = File.open(options.output, 'w')
     end
     sol.outf sol.query(query) do |dd, ios|
+      # If aggregated, then we need to break up the columns. since each is now a
+      # hash of the aggregated functions
+      unless options.aggregate.nil? then
+        dd[:values].map! do |row|
+          row.map do |value|
+            if value.kind_of? Hash then
+              query[:aggregate].map{|qa| value[qa.to_sym]}
+            else
+              value
+            end
+          end.flatten
+        end
+        dd[:columns].map! do |col|
+          if col == 'time' then
+            col
+          else
+            query[:aggregate].map{|qa| "#{col}.#{qa.to_s}"}
+          end
+        end.flatten!
+      end
       sol.tabularize({
         :headers=>dd[:columns],
         :rows=>dd[:values]

data/lib/MrMurano/verbosing.rb

@@ -27,6 +27,10 @@ module MrMurano
       $stderr.puts HighLine.color(msg, :red)
     end
 
+    ## Output tabular data
+    # +data+:: Data to write. Preferably a Hash with :headers and :rows
+    # +ios+:: Output stream to write to, if nil, then use $stdout
+    # Output is either a nice visual table or CSV.
     def tabularize(data, ios=nil)
       fmt = $cfg['tool.outformat']
       ios = $stdout if ios.nil?
@@ -59,6 +63,7 @@ module MrMurano
     end
 
     ## Format and print the object
+    # Handles many of the raw 'unpolished' formats.
     def outf(obj, ios=nil, &block)
       fmt = $cfg['tool.outformat']
       ios = $stdout if ios.nil?

data/lib/MrMurano/version.rb

@@ -1,4 +1,4 @@
 module MrMurano
-  VERSION = '1.11.1'.freeze
+  VERSION = '1.11.2'.freeze
 end
 

data/spec/Account_spec.rb

@@ -19,7 +19,7 @@ RSpec.describe MrMurano::Account do
     expect(uri.to_s).to eq("https://bizapi.hosted.exosite.io/api:1/")
   end
 
-  it "lists bussiness" do
+  it "lists business" do
     bizlist = [{"bizid"=>"XXX","role"=>"admin","name"=>"MPS"},
                        {"bizid"=>"YYY","role"=>"admin","name"=>"MAE"}]
     stub_request(:get, "https://bizapi.hosted.exosite.io/api:1/user/BoB@place.net/membership/").
@@ -42,7 +42,7 @@ RSpec.describe MrMurano::Account do
 
   it "lists products; without biz.id" do
     allow($cfg).to receive(:get).with('business.id').and_return(nil)
-    expect { @acc.products }.to raise_error("Missing Bussiness ID")
+    expect { @acc.products }.to raise_error("Missing Business ID")
   end
 
   it "creates product" do
@@ -56,7 +56,7 @@ RSpec.describe MrMurano::Account do
 
   it "creates product; without biz.id" do
     allow($cfg).to receive(:get).with('business.id').and_return(nil)
-    expect { @acc.new_product("ONe") }.to raise_error("Missing Bussiness ID")
+    expect { @acc.new_product("ONe") }.to raise_error("Missing Business ID")
   end
 
   it "deletes product" do
@@ -69,7 +69,7 @@ RSpec.describe MrMurano::Account do
 
   it "deletes product; without biz.id" do
     allow($cfg).to receive(:get).with('business.id').and_return(nil)
-    expect { @acc.delete_product("ONe") }.to raise_error("Missing Bussiness ID")
+    expect { @acc.delete_product("ONe") }.to raise_error("Missing Business ID")
   end
 
 
@@ -93,7 +93,7 @@ RSpec.describe MrMurano::Account do
 
   it "lists solutions; without biz.id" do
     allow($cfg).to receive(:get).with('business.id').and_return(nil)
-    expect { @acc.solutions }.to raise_error("Missing Bussiness ID")
+    expect { @acc.solutions }.to raise_error("Missing Business ID")
   end
 
   it "creates solution" do
@@ -111,7 +111,7 @@ RSpec.describe MrMurano::Account do
 
   it "creates solution; without biz.id" do
     allow($cfg).to receive(:get).with('business.id').and_return(nil)
-    expect { @acc.new_solution("one") }.to raise_error("Missing Bussiness ID")
+    expect { @acc.new_solution("one") }.to raise_error("Missing Business ID")
   end
 
   it "deletes solution" do
@@ -124,7 +124,7 @@ RSpec.describe MrMurano::Account do
 
   it "deletes solution; without biz.id" do
     allow($cfg).to receive(:get).with('business.id').and_return(nil)
-    expect { @acc.delete_solution("one") }.to raise_error("Missing Bussiness ID")
+    expect { @acc.delete_solution("one") }.to raise_error("Missing Business ID")
   end
 
 end

data/spec/ProductResources_spec.rb

@@ -44,10 +44,10 @@ RSpec.describe MrMurano::ProductResources do
       expect(loc).to eq("magical.file")
     end
 
-    it "raises when no spec name" do
+    it "Uses default spec file name" do
       $cfg['product.spec'] = nil
       $cfg['product.id'] = nil
-      expect { @prd.location }.to raise_error("No spec file named; run `mr config product.spec <specfile>`")
+      expect(@prd.location).to eq('specs/resources.yaml')
     end
   end
 

data/spec/cmd_init_spec.rb

@@ -10,7 +10,7 @@ RSpec.describe 'mr init' do
     # this is in the project dir. Want to be in HOME
     Dir.chdir(ENV['HOME']) do
       out, err, status = Open3.capture3(capcmd('mr', 'init', '--trace'))
-      expect(out).to eq("")
+      expect(out).to eq("\n")
       expect(err).to eq("\e[31mCannot init a project in your HOME directory.\e[0m\n")
       expect(status.exitstatus).to eq(2)
     end
@@ -19,7 +19,7 @@ RSpec.describe 'mr init' do
   it "Asks to import if Solutionfile exists" do
     FileUtils.touch('Solutionfile.json')
     out, err, status = Open3.capture3(capcmd('mr', 'init', '--trace'), :stdin_data=>'y')
-    expect(out).to eq("A Solutionfile.json exists, Do you want exit and run `mr config import` instead? [yN]\n")
+    expect(out).to eq("\nA Solutionfile.json exists, Do you want exit and run `mr config import` instead? [yN]\n")
     expect(err).to eq("")
     expect(status.exitstatus).to eq(0)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: MrMurano
 version: !ruby/object:Gem::Version
-  version: 1.11.1
+  version: 1.11.2
 platform: ruby
 authors:
 - Michael Conrad Tadpol Tilstra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-13 00:00:00.000000000 Z
+date: 2016-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander