MrMurano 1.11.3 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3834a5056532662031cc184d66b913ff77d516f
-  data.tar.gz: 4185017027496ed440bb23d0c84bf39ea44ecb9e
+  metadata.gz: 5435dfba3b558c2de067fc23c0f3dddce44b826f
+  data.tar.gz: 5472c934c6ab6920ea86a5a774f1790e04028d59
 SHA512:
-  metadata.gz: 4587f4ee92cc776f1b7284a6a0da7992fc15ba180b48aa6178345eec23b6ff5843d153de20eade090d45be464f9c9d38daae28f8f2f4a9f3e9baafd23deb5d91
-  data.tar.gz: 7420fae6e4e16eb99c122f05dd45efc6c49980c9dc346b97023d61603cdda7c7e7e28b628a733966d592d4aa919d3742b6e0ad267d79cc0877b00ef2a7ddc071
+  metadata.gz: 18b2a24e1703142195cdb729d58136e8a49bd1237ec209e272b7345d58e4d70001e14807b39b498f59f98b6fa9e159b5f76dc4ccc647aa223484351ecad26c0a
+  data.tar.gz: 7e754ef2e1b9de17d40f74837bc518da249ec65bdd29e63c041edf1da16fce9a26ccb9d27aa8e45b71c84e8d01332b8164fa044da523213b9045bb8e87d95cb6

data/.gitignore

@@ -12,6 +12,7 @@ xcuserdata
 Pods/
 pkg/
 report/
+coverage/
 
 .mrmurano/
 .mrmuranorc

data/Gemfile

@@ -15,6 +15,8 @@ group :test do
   gem 'rake', '~> 10.1.1'
   gem 'rspec', '~> 3.5'
   gem 'webmock', '~> 2.1.0'
+  gem 'simplecov', :require => false
+  gem 'coderay', :require => false
 end
 
 group :windows do

data/README.markdown

@@ -2,6 +2,7 @@
 
 [![Gem Version](https://badge.fury.io/rb/MrMurano.svg)](https://badge.fury.io/rb/MrMurano)
 [![Build Status](https://travis-ci.org/tadpol/MrMurano.svg?branch=master)](https://travis-ci.org/tadpol/MrMurano)
+[![Inline docs](http://inch-ci.org/github/exosite/MrMurano.svg?branch=master)](http://inch-ci.org/github/exosite/MrMurano)
 
 Do more from the command line with [Murano](https://exosite.com/platform/)
 
@@ -64,6 +65,16 @@ Your `PATH` may need to be updated to find the installed `mr` command.  See the
 [Ruby Gem FAQ](http://guides.rubygems.org/faqs/#user-install).  In short, you need
 to add the output of `ruby -rubygems -e 'puts Gem.user_dir'` to your `PATH`.
 
+### Windows Install
+
+The MrMurano gem will install on Windows.  There is also a single Windows binary
+Setup installer availible in [releases](https://github.com/exosite/MrMurano/releases)
+
+You can install Ruby on Windows with [RubyInstaller](http://rubyinstaller.org).
+You might run into a [known SSL cert issue](http://guides.rubygems.org/ssl-certificate-update/).
+If so follow the steps there to update the certs.
+
+
 ## Features
 
 ### Logs
@@ -105,7 +116,7 @@ cat >> .mrmurano.prod <<EOF
 id=CCCCCCCC
 EOF
 
-cat >> .env <<EOF
+cat > .env <<EOF
 MR_CONFIGFILE=.mrmurano.dev
 EOF
 ```
@@ -156,10 +167,6 @@ following commands:
 
 Call them with `--help` for details.
 
-### ZSH tab completion
-
-Basic completion support for zsh.
-
 ### Sub-directories
 
 For the endpoints, modules, and eventhandlers directories. The can contain both
@@ -214,12 +221,3 @@ MrMurano also uses [bundler](http://bundler.io).
 
 When submitting pull requests, please do them against the develop branch.
 
-## Windows
-
-The MrMurano gem will install on Windows.
-
-You can install Ruby on Windows with [RubyInstaller](http://rubyinstaller.org).
-You might run into a [known SSL cert issue](http://guides.rubygems.org/ssl-certificate-update/).
-If so follow the steps there to update the certs.
-
-

data/Rakefile

@@ -46,14 +46,14 @@ task :gemit do
     sh %{git checkout v#{mrt}}
     Rake::Task[:build].invoke
     Rake::Task[:bob].invoke
-    Rake::Task['push::gem'].invoke
+    Rake::Task['push:gem'].invoke
     sh %{git checkout develop}
 end
 
 namespace :push do
     desc 'Push gem up to RubyGems'
     task :gem do
-        sh %{gem push pkg/MrMurano-#{Bundler::GemHelper.gemspec.version}.gem}
+        sh %{gem push #{builtGem}}
     end
 
     namespace :github do

data/TODO.taskpaper

@@ -28,8 +28,8 @@ Endpoints:
 	- Add directory support like in modules @done(2016-07-26)
 
 Files:
-	- Add ignore patterns to config @done(2016-12-20)
 	- Switch to mime-types v3 @pri(low)
+	- Add ignore patterns to config @done(2016-12-20)
 	- Figure out how to make the hexed-sha checksum faster. @done(2016-09-23)
 	- Fix upload. @done(2016-08-01)
 	- Files won't update, they always delete then add. @done(2016-07-28)
@@ -56,7 +56,8 @@ Timeseries:
 
 Product:
 	- Add option for progress bar when uploading content files.
-	- Support multiple products.
+	- Support multiple products. @done(2017-01-05)
+	Won't do.  Future will be one-to-one.
 	Think about how this would work.  There is the syncing of the resoruces, and then
 	some of the commands that use product.id.
 	- Auto convert exoline spec files into murano spec files on upload? @done(2016-10-27)
@@ -68,8 +69,6 @@ Service Device:
 	- 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
-	It is internally hardcoded to be -s, -a, -m, -e right now.
 	- 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.
@@ -80,6 +79,8 @@ Config:
 
 	Plus things like 1Password, LastPass, KeePass, and others.
 
+	- Add config sync.bydefault to set which things sync{up,down} by default @done(2017-01-05)
+	It is internally hardcoded to be -s, -a, -m, -e right now.
 	- 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)
@@ -88,6 +89,7 @@ SyncUpDown:
 	- Document the hash keys for an item. @pri(high)
 	Also consider turning that hash into a Struct
 	- Allow specifying local files to limit actions to.
+	This is one the command line.  The idea being to sync just one file.
 
 SolutionBase:
 	- All network traffic is serialized. Make some parallel.
@@ -98,8 +100,8 @@ SolutionBase:
 	- Rebuild how local names and paths are computed from remote items. @done(2016-07-27)
 
 Windows:
-	- Need to test with http://rubyinstaller.org on Windows. @pri(high)
-	- Look into http://ocra.rubyforge.org for building an exec. @pri(high)
+	- Need to test with http://rubyinstaller.org on Windows. @pri(high) @done(2016-12-21)
+	- Look into http://ocra.rubyforge.org for building an exec. @pri(high) @done(2016-12-21)
 
 Bundles:
 	- Revisit this idea. Its complexity may not be worth its value.

data/docs/demo.md

@@ -0,0 +1,109 @@
+
+
+# Every sub-command will --help
+
+# Start anew
+- Clone project: `git clone https://github.com/tadpol/GWE-Multitool.git demo01`
+- `cd demo01`
+
+- Pick a bussiness: `mr business list`
+- Set it: `mr config business.id ZZZZZZZZZ`
+
+- Create a product: `mr product create myawesomeproduct`
+- Save the result: `mr config product.id YYYYYYYYY`
+
+- Set the product definition: `mr config product.spec gwe-multitool.yaml`
+- Set the directory to look for specs. `mr config location.specs spec`
+- Sync the product definition up: `mr syncup -V --specs`
+
+- Create a solution: `mr solution create myawesomesolution`
+- Save the result: `mr config solution.id XXXXXX`
+- Assign the product to the solution: `mr assign set`
+
+# What got configured?
+`mr config --dump`
+
+
+
+
+
+
+# <voice type='orc'>Work Work</voice>
+
+- What is going to change? `mr status`
+- Sync solution code up: `mr syncup -V`
+
+- Change a file
+- What is going to change? `mr status`
+- Details of change: `mr diff`
+
+
+
+
+# Devices
+- Add a real device: `mr product device enable 42:42:42:42:42:42`
+- !!!cheet and activate by hand: `mr product device activate 42:42:42:42:42:42`
+- Which resources are there? `mr product spec pull`
+- What did the device write to that one resource?
+  `mr product device read 42:42:42:42:42:42 update_interval`
+- `mr product device write 42:42:42:42:42:42 update_interval 300`
+
+
+
+# Multiple configs
+Because Developing, Staging, Production.
+
+Set addition config file to load with `MR_CONFIGFILE`
+
+Also supports '.env'
+
+
+
+
+# Device Content Area
+
+See GWE.
+
+
+
+
+
+# Debugging
+
+## Logs
+- `mr logs`
+- `mr logs --follow`
+
+
+
+
+
+
+## Keystore
+### What is in the Keystore?
+`mr keystore list`
+
+### Write and Read a Key
+- `mr keystore set test greebled`
+- `mr keystore get test`
+
+### Write to a Set
+- `mr keystore command sadd myset greebled`
+Or any other supported Redis command.
+
+### Remove just the ones with 'socketmap'
+`mr keystore list | grep socketmap | xargs -L1 mr keystore delete`
+
+
+
+
+## TSDB
+
+- `mr tsdb list metrics`
+- `mr tsdb list tags`
+- `mr tsdb query @sn=1 temp0`
+- `mr tsdb query @sn=1 temp0 --limit=4`
+- `mr tsdb query @sn=1 --limit=10 -c outformat=csv --epoch ms`
+
+
+

data/lib/MrMurano/Account.rb

@@ -65,7 +65,7 @@ module MrMurano
       host = $cfg['net.host']
       user = $cfg['user.name']
       if user.nil? then
-        say_error("No Murano user account found; please login")
+        error("No Murano user account found; please login")
         user = ask("User name: ")
         $cfg.set('user.name', user, :user)
       end
@@ -74,7 +74,7 @@ module MrMurano
       pf.load
       pws = pf.get(host, user)
       if pws.nil? then
-        say_error("Couldn't find password for #{user}")
+        error("Couldn't find password for #{user}")
         pws = ask("Password:  ") { |q| q.echo = "*" }
         pf.set(host, user, pws)
         pf.save
@@ -108,12 +108,15 @@ module MrMurano
           showHttpError(request, response)
           error "Check to see if username and password are correct."
           @@token = nil
-          raise response
         end
       end
       @@token
     end
 
+    def token_reset(value=nil)
+      @@token = value
+    end
+
     def businesses
       get('user/' + $cfg['user.name'] + '/membership/')
     end

data/lib/MrMurano/Config.rb

@@ -9,7 +9,6 @@ module MrMurano
     #  env         from ENV['MR_CONFIGFILE']
     #  project     .mrmuranorc at project dir
     #  user        .mrmuranorc at $HOME
-    #  system      .mrmuranorc at /etc
     #  defaults    Internal hardcoded defaults
     #
     ConfigFile = Struct.new(:kind, :path, :data) do
@@ -34,12 +33,10 @@ module MrMurano
     attr :paths
     attr_reader :projectDir
 
-    CFG_SCOPES=%w{internal specified env project private user system defaults}.map{|i| i.to_sym}.freeze
+    CFG_SCOPES=%w{internal specified env project user defaults}.map{|i| i.to_sym}.freeze
     CFG_FILE_NAME = '.mrmuranorc'.freeze
-    CFG_PRVT_NAME = '.mrmuranorc.private'.freeze # Going away.
     CFG_DIR_NAME = '.mrmurano'.freeze
     CFG_ALTRC_NAME = '.mrmurano/config'.freeze
-    CFG_SYS_NAME = '/etc/mrmuranorc'.freeze # Going away.
 
     def initialize
       @paths = []
@@ -55,19 +52,13 @@ module MrMurano
       end
       @projectDir = findProjectDir()
       unless @projectDir.nil? then
-        if (@projectDir + CFG_PRVT_NAME).exist? then
-          say_warning "!!! Using .mrmuranorc.private is deprecated"
-        end
-        @paths << ConfigFile.new(:private, @projectDir + CFG_PRVT_NAME)
         @paths << ConfigFile.new(:project, @projectDir + CFG_FILE_NAME)
         fixModes(@projectDir + CFG_DIR_NAME)
+      else
+        @paths << ConfigFile.new(:project, Pathname.new(Dir.home) + CFG_FILE_NAME)
       end
       @paths << ConfigFile.new(:user, Pathname.new(Dir.home) + CFG_FILE_NAME)
       fixModes(Pathname.new(Dir.home) + CFG_DIR_NAME)
-      if Pathname.new(CFG_SYS_NAME).exist? then
-        say_warning "!!! Using #{CFG_SYS_NAME} is deprecated"
-        @paths << ConfigFile.new(:system, Pathname.new(CFG_SYS_NAME))
-      end
       @paths << ConfigFile.new(:defaults, nil, IniFile.new())
 
 
@@ -89,6 +80,8 @@ module MrMurano
       set('location.cors', 'cors.yaml', :defaults)
       set('location.specs', 'specs', :defaults)
 
+      set('sync.bydefault', SyncRoot.bydefault.join(' '), :defaults)
+
       set('files.default_page', 'index.html', :defaults)
       set('files.searchFor', '**/*', :defaults)
       set('files.ignoring', '', :defaults)
@@ -105,7 +98,11 @@ module MrMurano
 
       set('product.spec', 'resources.yaml', :defaults)
 
-      set('diff.cmd', 'diff -u', :defaults)
+      if Gem.win_platform? then
+        set('diff.cmd', 'fc', :defaults)
+      else
+        set('diff.cmd', 'diff -u', :defaults)
+      end
     end
 
     ## Find the root of this project Directory.
@@ -119,10 +116,10 @@ module MrMurano
     # - .git/
     def findProjectDir()
       result=nil
-      fileNames=[CFG_FILE_NAME, CFG_PRVT_NAME, CFG_ALTRC_NAME]
+      fileNames=[CFG_FILE_NAME, CFG_ALTRC_NAME]
       dirNames=[CFG_DIR_NAME]
-      home = Pathname.new(Dir.home)
-      pwd = Pathname.new(Dir.pwd)
+      home = Pathname.new(Dir.home).realpath
+      pwd = Pathname.new(Dir.pwd).realpath
       return nil if home == pwd
       pwd.dirname.ascend do |i|
         break unless result.nil?
@@ -174,8 +171,6 @@ module MrMurano
         root = @projectDir + CFG_DIR_NAME
       when :user
         root = Pathname.new(Dir.home) + CFG_DIR_NAME
-      when :system
-        root = nil
       when :defaults
         root = nil
       end
@@ -259,25 +254,6 @@ module MrMurano
 
   end
 
-  ##
-  # IF none of -same, then -same; else just the ones listed.
-  def self.checkSAME(opt)
-    unless opt.files or opt.endpoints or opt.modules or
-        opt.eventhandlers or opt.roles or opt.users or opt.spec then
-      opt.files = true
-      opt.endpoints = true
-      opt.modules = true
-      opt.eventhandlers = true
-    end
-    if opt.all then
-      opt.files = true
-      opt.endpoints = true
-      opt.modules = true
-      opt.eventhandlers = true
-      opt.roles = true
-      opt.users = true
-    end
-  end
 end
 
 #  vim: set ai et sw=2 ts=2 :

data/lib/MrMurano/Product-1P-Device.rb

@@ -31,6 +31,8 @@ module MrMurano
         offset += 50
       end
 
+      raise "Identifier Not Found: #{sn}" if found.empty?
+
       @sn_rid = found.first[:rid]
       @sn_rid
     end

data/lib/MrMurano/Product-Resources.rb

@@ -114,7 +114,7 @@ module MrMurano
         remove(item[:rid])
       end
       r = create(item[:alias], item[:format])
-      raise "Create Failed: #{r}" unless r.nil?
+      raise "Create Failed: #{r}" unless r.empty?
     end
 
     ## Use alias for doing sync compares
@@ -134,11 +134,11 @@ module MrMurano
       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}"
+        warning "Skipping missing #{from.to_s}"
         return []
       end
       unless from.file? then
-        say_warning "Cannot read from #{from.to_s}"
+        warning "Cannot read from #{from.to_s}"
         return []
       end
 
@@ -149,6 +149,7 @@ module MrMurano
       if here.kind_of?(Hash) and here.has_key?('resources') then
         here['resources'].map{|i| Hash.transform_keys_to_symbols(i)}
       else
+        warning "Unexpected data in #{from.to_s}"
         []
       end
     end
@@ -205,7 +206,7 @@ module MrMurano
     ##
     # True if itemA and itemB are different
     def docmp(itemA, itemB)
-      itemA[:alias] == itemB[:alias] and itemA[:format] == itemB[:format]
+      itemA[:alias] != itemB[:alias] or itemA[:format] != itemB[:format]
     end
 
   end

data/lib/MrMurano/Product.rb

@@ -217,8 +217,7 @@ module MrMurano
               end
             end
           else
-            showHttpError(request, response)
-            raise resp
+            showHttpError(request, resp)
           end
         end
         nil
@@ -256,6 +255,7 @@ module MrMurano
 
   ##
   # This is not applicable to Murano.  Remove?
+  # :nocov:
   class ProductModel < ProductBase
     def initialize
       super
@@ -329,7 +329,6 @@ module MrMurano
         return response.body
       else
         showHttpError(request, response)
-        raise response
       end
     end
 
@@ -354,6 +353,7 @@ module MrMurano
     end
 
   end
+  # :nocov:
 
 end
 #  vim: set ai et sw=2 ts=2 :

data/lib/MrMurano/Solution-File.rb

@@ -37,8 +37,7 @@ module MrMurano
               end
             end
           else
-            showHttpError(request, response)
-            raise resp
+            showHttpError(request, resp)
           end
         end
         nil

data/lib/MrMurano/Solution-ServiceConfig.rb

@@ -6,6 +6,7 @@ module MrMurano
     def initialize
       super
       @uriparts << 'serviceconfig'
+      @scid = nil
     end
 
     def list
@@ -57,6 +58,14 @@ module MrMurano
 
   end
 
+  ## This is only used for debugging and deciphering APIs.
+  #
+  # There was once a plan for using this to automagically map commands into
+  # services by reading their schema.  That plan had too much magic and was too
+  # fragile for real use.
+  #
+  # A much better UI/UX happens with human intervention.
+  # :nocov:
   class Services < SolutionBase
     def initialize
       super
@@ -100,8 +109,9 @@ module MrMurano
       calls
     end
   end
+  # :nocov:
 
-
+  # Device config interface for the assign commands.
   class SC_Device < ServiceConfig
     def initialize
       super

data/lib/MrMurano/Solution-Services.rb

@@ -12,11 +12,15 @@ module MrMurano
   class ServiceBase < SolutionBase
 
     def mkalias(remote)
+      # :nocov:
       raise "Needs to be implemented in child"
+      # :nocov:
     end
 
     def mkname(remote)
+      # :nocov:
       raise "Needs to be implemented in child"
+      # :nocov:
     end
 
     def list
@@ -106,6 +110,7 @@ module MrMurano
       if cacheFile.file? then
         cacheFile.open('r+') do |io|
           cache = YAML.load(io)
+          cache = {} unless cache
           io.rewind
           cache[local_path.to_s] = entry
           io << cache.to_yaml
@@ -127,6 +132,7 @@ module MrMurano
       ret = nil
       cacheFile.open('r') do |io|
         cache = YAML.load(io)
+        return nil unless cache
         if cache.has_key?(local_path.to_s) then
           entry = cache[local_path.to_s]
           debug("For #{local_path}:")
@@ -199,6 +205,7 @@ module MrMurano
       @uriparts << 'eventhandler'
       @itemkey = :alias
       @location = $cfg['location.eventhandlers']
+      @match_header = /--#EVENT (?<service>\S+) (?<event>\S+)/
     end
 
     def mkalias(remote)
@@ -259,14 +266,24 @@ module MrMurano
 
     def toRemoteItem(from, path)
       path = Pathname.new(path) unless path.kind_of? Pathname
-      aheader = path.readlines().first
-      md = /--#EVENT (\S+) (\S+)/.match(aheader)
-      if md.nil? then
-        rp = path.relative_path_from(Pathname.new(Dir.pwd))
-        say_warning "Not an Event handler: #{rp}"
-        return nil
+      cur = nil
+      lineno=0
+      path.readlines().each do |line|
+        md = @match_header.match(line)
+        if not md.nil? then
+          # header line.
+          cur = {:service=>md[:service],
+                 :event=>md[:event],
+                 :local_path=>path,
+                 :line=>lineno,
+                 :script=>line}
+        elsif not cur.nil? and not cur[:script].nil? then
+          cur[:script] << line
+        end
+        lineno += 1
       end
-      {:service=>md[1], :event=>md[2]}
+      cur[:line_end] = lineno unless cur.nil?
+      cur
     end
 
     def synckey(item)

data/lib/MrMurano/Solution-Users.rb

@@ -54,7 +54,7 @@ module MrMurano
       end
     end
 
-    def removelocal(dest, item)
+    def removelocal(local, item)
       # needs to append/merge with file
       # for now, we'll read, modify, write
       here = []
@@ -78,11 +78,11 @@ module MrMurano
     def localitems(from)
       from = Pathname.new(from) unless from.kind_of? Pathname
       if not from.exist? then
-        say_warning "Skipping missing #{from.to_s}"
+        warning "Skipping missing #{from.to_s}"
         return []
       end
       unless from.file? then
-        say_warning "Cannot read from #{from.to_s}"
+        warning "Cannot read from #{from.to_s}"
         return []
       end
 
@@ -106,6 +106,7 @@ module MrMurano
   SyncRoot.add('roles', Role, 'R', %{Roles})
 
   # …/user
+  # :nocov:
   class User < UserBase
     def initialize
       super
@@ -116,7 +117,7 @@ module MrMurano
     # @param modify Bool: True if item exists already and this is changing it
     def upload(local, remote, modify)
       # TODO figure out APIs for updating users.
-      say_warning "Updating Users isn't working currently."
+      warning "Updating Users isn't working currently."
       # post does work if the :password field is set.
     end
 
@@ -124,6 +125,7 @@ module MrMurano
       item[:email]
     end
   end
+  # :nocov:
   SyncRoot.add('users', User, 'U', %{Users})
 end
 #  vim: set ai et sw=2 ts=2 :