MrMurano 1.6.3 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a025c5dcac4ea0902844834d8a91fe8ddbef68d
-  data.tar.gz: d409283477356d621bb94b14e1a98a8a7c2ed7f8
+  metadata.gz: 08052f794adafafd1df94b8ddb72a1b604ead821
+  data.tar.gz: 4554d9ecf88eacc3af079263f10046b882fc4aa4
 SHA512:
-  metadata.gz: 6f00e7636e61805ebe1f92d36009ce0a4f0f8ccb227f896b4ba2ff11dbecdb5a15ac4106b016ab889fb85b078f4c830247faea69c7cab397a19c1288f189f751
-  data.tar.gz: a8bbe3938bce7d0ae4e876d916916823f793cbeac9dddcf3ba72359bb0d16994d2c3be5051046cb73c717ec23f1c341070266b320b31da8a9d5349f7d8a9f47d
+  metadata.gz: dbc7d9cabe0efaf8a613b39dc636c353aec46ec5d3bf6de7761be4f810b96ae547d4490b6e077c4c586999a00fff88da44111c8a04f51cd618ad746bcc90a8e7
+  data.tar.gz: fe92deb1e28bb05c11e7a5b274b89afe90b9c8ef1935c6f105cc842e36f657ec3776eb2d3101d4756997f1ae5d8523d575c65dc568675fc68377e08efd07f05a

data/.gitignore

@@ -4,8 +4,7 @@
 Icon
 *.sw[a-z]
 cookies
-.jiraProject
-.rpjProject
+.jiramulerc
 tags
 
 xcuserdata

data/Gemfile

@@ -3,12 +3,12 @@ source 'http://rubygems.org'
 #gemspec
 
 gem 'commander', '~> 4.4.0'
+gem 'highline', '~> 1.7.8'
 gem 'terminal-table', '~> 1.4.5'
 gem 'mime-types', '~> 1.25.1'
 gem 'mime-types-data', '~> 3.2016'
 gem 'inifile', '~> 3.0'
 gem 'http-form_data', '~> 1.0.1'
-gem 'rainbow', '~> 2.1.0'
 gem 'dotenv', '~> 2.1.1'
 
 group :test do

data/MrMurano.gemspec

@@ -25,12 +25,12 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.add_runtime_dependency('commander', '~> 4.4.0')
+  s.add_runtime_dependency('highline', '~> 1.7.8')
   s.add_runtime_dependency('terminal-table', '~> 1.4.5')
   s.add_runtime_dependency('mime-types', '~> 1.25.1')
   s.add_runtime_dependency('mime-types-data', '~> 3.2016')
   s.add_runtime_dependency('inifile', '~> 3.0')
   s.add_runtime_dependency('http-form_data', '~> 1.0.1')
-  s.add_runtime_dependency('rainbow', '~> 2.1.0')
   s.add_runtime_dependency('dotenv', '~> 2.1.1')
 
   s.add_development_dependency('bundler', '~> 1.7.6')

data/README.markdown

@@ -134,6 +134,10 @@ 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

data/TODO.taskpaper

@@ -1,8 +1,12 @@
 Readme:
 	- Add more walk-thrus of common actions. (create new solution, …)
-	- Look into using VCR for testing.
+	- Look into using VCR for testing. @pri(low)
 
 Commands:
+	- Errors and Warnings should get sent to STDERR @done(2016-11-03)
+	- Need a more consistent output format. 'pp' is still used in many places. @done(2016-11-03)
+	Maybe have a tool setting for output format? json, yaml, pp, csv, table ?
+	- Do we need rainbow since highline does ANSI color too? @done(2016-11-02)
 	- Status will show {modules,eventhandlers} have changes when they don’t. @done(2016-09-23)
 	- First time run needs to be smoothed out. @done(2016-08-09)
 	- Default for most commands should be -same @done(2016-08-02)
@@ -18,7 +22,7 @@ Endpoints:
 
 Files:
 	- Add ignore patterns to config
-	- Switch to mime-types v3
+	- 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)
 	- Files won't update, they always delete then add. @done(2016-07-28)
@@ -31,14 +35,18 @@ Users and Roles:
 	- Have hash keys in the yaml be strings not symbols. (don't start with colon) @done(2016-07-27)
 
 CORS:
-	- Get working with sync up/down.
+	- Get working with sync up/down. @done(2016-10-28)
 	- GET&PUT /cors data @done(2016-09-08)
 
+TSDB:
+	- Add support for new TSDB service. @pri(high)
+
 Timeseries:
 	- Add CSV output option. @done(2016-09-09)
 
 Product:
-	- Auto convert exoline spec files into murano spec files on upload?
+	- Auto convert exoline spec files into murano spec files on upload? @done(2016-10-27)
+	Not doing this. Convert is there if you need it.
 	- write alias command @done(2016-09-26)
 	- Need to add way to set the product ID on a device eventhandler. @done(2016-08-01)
 
@@ -57,7 +65,12 @@ SolutionBase:
 	- Add the --curl verbose option. @done(2016-08-12)
 	- 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)
+
 Bundles:
+	- Revisit this idea. Its complexity may not be worth its value.
 	- Test syncdown behavor.
 	- Work on design @done(2016-08-09)
 	Thinking of something like VIM bundles.  A directory of directories. Each with a

data/lib/MrMurano/Account.rb

@@ -6,6 +6,7 @@ require 'pathname'
 require 'yaml'
 require 'MrMurano/Config'
 require 'MrMurano/http'
+require 'MrMurano/verbosing'
 
 module MrMurano
   class Passwords
@@ -53,6 +54,7 @@ module MrMurano
 
   class Account
     include Http
+    include Verbose
 
     def endPoint(path)
       URI('https://' + $cfg['net.host'] + '/api:1/' + path.to_s)
@@ -62,7 +64,8 @@ module MrMurano
       host = $cfg['net.host']
       user = $cfg['user.name']
       if user.nil? then
-        user = ask("Account name: ")
+        say_error("No Murano user account found; please login")
+        user = ask("User name: ")
         $cfg.set('user.name', user, :user)
       end
       pff = $cfg.file_at('passwords', :user)
@@ -70,6 +73,7 @@ module MrMurano
       pf.load
       pws = pf.get(host, user)
       if pws.nil? then
+        say_error("Couldn't find password for #{user}")
         pws = ask("Password:  ") { |q| q.echo = "*" }
         pf.set(host, user, pws)
         pf.save

data/lib/MrMurano/Config.rb

@@ -71,6 +71,7 @@ module MrMurano
       set('tool.verbose', false, :defaults)
       set('tool.debug', false, :defaults)
       set('tool.dry', false, :defaults)
+      set('tool.outformat', 'best', :defaults)
 
       set('net.host', 'bizapi.hosted.exosite.io', :defaults)
 
@@ -81,6 +82,7 @@ module MrMurano
       set('location.eventhandlers', 'eventhandlers', :defaults)
       set('location.roles', 'roles.yaml', :defaults)
       set('location.users', 'users.yaml', :defaults)
+      set('location.cors', 'cors.yaml', :defaults)
 
       set('files.default_page', 'index.html', :defaults)
 
@@ -244,7 +246,7 @@ module MrMurano
   # 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 then
+        opt.eventhandlers or opt.roles or opt.users or opt.spec then
       opt.files = true
       opt.endpoints = true
       opt.modules = true

data/lib/MrMurano/Product-Resources.rb

@@ -0,0 +1,239 @@
+require 'MrMurano/Product'
+require 'MrMurano/SyncUpDown'
+
+module MrMurano
+
+  ## Manage the resources on a Product
+  #
+  # There isn't an okami-shim for most of this, it maps right over to 1P-RPC.
+  # Or better stated, that's all okami-shim is.
+  class ProductResources < ProductBase
+    include SyncUpDown
+
+    def initialize
+      super
+      @uriparts << :proxy
+      @uriparts << 'onep:v1'
+      @uriparts << :rpc
+      @uriparts << :process
+      @model_rid = nil
+
+      @itemkey = :rid # this is the key that is the identifier used by murano
+      @location = location
+    end
+
+    ## Get the location of the product spec file
+    def location
+      # If location.specs is defined, then all spec files are assume to be relative
+      # to that and location.base, otherwise they're relative to only location.base
+      #
+      # If there is a p-<product.id>.spec key, then that is the file name.
+      # Otherwise use product.spec
+
+      name = $cfg['product.spec']
+      prid = $cfg['product.id']
+      name = $cfg["p-#{prid}.spec"] unless prid.nil? or $cfg["p-#{prid}.spec"].nil?
+
+      unless $cfg['location.specs'].nil? then
+        name = File.join($cfg['location.specs'], name)
+      end
+      name
+    end
+
+    ## The model RID for this product.
+    def model_rid
+      return @model_rid unless @model_rid.nil?
+      prd = Product.new
+      data = prd.info
+      if data.kind_of?(Hash) and data.has_key?(:modelrid) then
+        @model_rid = data[:modelrid]
+      else
+        raise "Bad info; #{data}"
+      end
+      @model_rid
+    end
+
+    ## Do a 1P RPC call
+    #
+    # While this will take an array of calls, don't. Only pass one.
+    def do_rpc(calls)
+      calls = [calls] unless calls.kind_of?(Array)
+      r = post('', {
+        :auth=>{:client_id=>model_rid},
+        :calls=>calls
+      })
+      return r if not r.kind_of?(Array) or r.count < 1
+      r = r[0]
+      return r if not r.kind_of?(Hash) or r[:status] != 'ok'
+      r[:result]
+    end
+    private :do_rpc
+
+    ## Get 1P info about the prodcut
+    def info
+      do_rpc({:id=>1,
+              :procedure=>:info,
+              :arguments=>[model_rid, {}]
+      })
+    end
+
+    ## Return a list of the product resources as items
+    def list()
+      data = info()
+      ret = []
+      data[:aliases].each do |rid, aliases|
+        aliases.each do |al|
+          ret << {
+            :alias => al,
+            :rid => rid
+          }
+        end
+      end
+
+      ret
+    end
+
+    ## Fetch data from one resource
+    def fetch(rid)
+      do_rpc({:id=>1,
+              :procedure=>:info,
+              :arguments=>[rid, {}],
+      })
+    end
+
+    ## Remove a resource by RID
+    def remove(rid)
+      do_rpc({:id=>1,
+              :procedure=>:drop,
+              :arguments=>[rid]
+      })
+    end
+
+    ## Create a new resource in the prodcut
+    def create(alias_id, format=:string)
+      raise "Alias cannot be nil" if alias_id.nil?
+      # create then map.
+      rid = do_rpc({:id=>1,
+                  :procedure=>:create,
+                  :arguments=>[:dataport,
+                               {:format=>format,
+                                :name=>alias_id,
+                                :retention=>{:count=>1,:duration=>:infinity}
+                               }
+                              ]
+      })
+      return rid unless not rid.kind_of?(String) or rid.match(/\p{XDigit}{40}/)
+
+      do_rpc({:id=>1,
+              :procedure=>:map,
+              :arguments=>[:alias, rid, alias_id]
+      })
+    end
+
+    ## Upload a resource.
+    # this is for SyncUpDown
+    # @param modify Bool: True if item exists already and this is changing it
+    def upload(src, item, modify)
+      if modify then
+        # this is usually a format change, which can only be set on create.
+        # So delete then create.
+        remove(item[:rid])
+      end
+      r = create(item[:alias], item[:format])
+      raise "Create Failed: #{r}" unless r.nil?
+    end
+
+    ## Use alias for doing sync compares
+    # (The RID will change if destroyed and recreated.)
+    def synckey(item)
+      item[:alias]
+    end
+
+    ##
+    #
+    def tolocalpath(into, item)
+      into
+    end
+
+    ## Get a local list of items from the single file
+    def localitems(from)
+      from = Pathname.new(from) unless from.kind_of? Pathname
+      if not from.exist? then
+        say_warning "Skipping missing #{from.to_s}"
+        return []
+      end
+      unless from.file? then
+        say_warning "Cannot read from #{from.to_s}"
+        return []
+      end
+
+      here = []
+      from.open {|io| here = YAML.load(io) }
+      return [] if here == false
+
+      if here.kind_of?(Hash) and here.has_key?('resources') then
+        here['resources'].map{|i| Hash.transform_keys_to_symbols(i)}
+      else
+        []
+      end
+    end
+
+    def download(local, item)
+      # needs to append/merge with file
+      # for now, we'll read, modify, write
+      data = fetch(item[:rid])
+      item[:format] = data[:description][:format]
+
+      here = []
+      if local.exist? then
+        local.open('rb') {|io| here = YAML.load(io)}
+        here = [] if here == false
+        if here.kind_of?(Hash) and here.has_key?('resources') then
+          here = here['resources'].map{|i| Hash.transform_keys_to_symbols(i)}
+        else
+          here = []
+        end
+      end
+      here.delete_if do |i|
+        i[:alias] == item[:alias]
+      end
+      here << item.reject{|k,v| k==:synckey or k==:rid}
+      here.map!{|i| Hash.transform_keys_to_strings(i)}
+      local.open('wb') do |io|
+        io << {'resources'=>here}.to_yaml
+      end
+    end
+
+    def removelocal(dest, item)
+      # needs to append/merge with file
+      # for now, we'll read, modify, write
+      here = []
+      if dest.exist? then
+        dest.open('rb') {|io| here = YAML.load(io)}
+        here = [] if here == false
+        if here.kind_of?(Hash) and here.has_key?('resources') then
+          here = here['resources'].map{|i| Hash.transform_keys_to_symbols(i)}
+        else
+          here = []
+        end
+      end
+      here.delete_if do |it|
+        it[:alias] == item[:alias]
+      end
+      here.map!{|i| Hash.transform_keys_to_strings(i)}
+      dest.open('wb') do|io|
+        io << {'resources'=>here}.to_yaml
+      end
+    end
+
+    ##
+    # True if itemA and itemB are different
+    def docmp(itemA, itemB)
+      itemA[:alias] == itemB[:alias] and itemA[:format] == itemB[:format]
+    end
+
+  end
+  SyncRoot.add('specs', ProductResources, 'P', %{Product Specification})
+
+end
+#  vim: set ai et sw=2 ts=2 :

data/lib/MrMurano/Product.rb

@@ -11,11 +11,17 @@ module MrMurano
       @pid = $cfg['product.id']
       raise "No Product ID!" if @pid.nil?
       @uriparts = [:product, @pid]
+      @locationbase = $cfg['location.base']
+      @location = nil
     end
 
     include Http
     include Verbose
 
+    ## Generate an endpoint in Murano
+    # Uses the uriparts and path
+    # @param path String: any additional parts for the URI
+    # @return URI: The full URI for this enpoint.
     def endPoint(path='')
       parts = ['https:/', $cfg['net.host'], 'api:1'] + @uriparts
       s = parts.map{|v| v.to_s}.join('/')
@@ -24,18 +30,25 @@ module MrMurano
   end
 
   class Product < ProductBase
+    ## Get info about the product
     def info
       get('/info')
     end
 
+    ## List enabled devices
     def list(offset=0, limit=50)
       get("/device/?offset=#{offset}&limit=#{limit}")
     end
 
+    ## Enable a serial number
+    # This creates the device and opens the activation window.
     def enable(sn)
       post("/device/#{sn.to_s}")
     end
 
+    ## Upload a spec file.
+    #
+    # Note that this will fail if any of the resources already exist.
     def update(specFile)
       specFile = Pathname.new(specFile) unless specFile.kind_of? Pathname
 
@@ -53,10 +66,45 @@ module MrMurano
       ret
     end
 
+    ## Write a value to an alias on a device
     def write(sn, values)
       post("/write/#{sn}", values)
     end
 
+    ## Converts an exoline style spec file into a Murano style one
+    # @param fin IO: IO Stream to read from
+    # @return String: Converted yaml data
+    def convertit(fin)
+      specOut = {'resources'=>[]}
+      spec = YAML.load(fin)
+      if spec.has_key?('dataports') and spec['dataports'].kind_of?(Array) then
+        dps = spec['dataports'].map do |dp|
+          dp.delete_if{|k,v| k != 'alias' and k != 'format' and k != 'initial'}
+          dp['format'] = 'string' if (dp['format']||'')[0..5] == 'string'
+          dp
+        end
+        specOut['resources'] = dps
+      else
+        raise "No dataports section found, or not an array"
+      end
+      specOut
+    end
+
+    ## Converts an exoline style spec file into a Murano style one
+    # @param specFile String: Path to file or '-' for stdin
+    # @return String: Converted yaml data
+    def convert(specFile)
+      if specFile == '-' then
+        convertit($stdin).to_yaml
+      else
+        specFile = Pathname.new(specFile) unless specFile.kind_of? Pathname
+        out = ''
+        specFile.open() do |fin|
+          out = convertit(fin).to_yaml
+        end
+        out
+      end
+    end
   end
 
   ##
@@ -119,7 +167,7 @@ module MrMurano
           case resp
           when Net::HTTPSuccess
             if block_given? then
-              resp.read_body &block
+              resp.read_body(&block)
             else
               resp.read_body do |chunk|
                 $stdout.write chunk
@@ -136,7 +184,8 @@ module MrMurano
 
     ## Upload data for content item
     # TODO: add support for passing in IOStream
-    def upload(id, path)
+    # @param modify Bool: True if item exists already and this is changing it
+    def upload(id, path, modify=false)
       path = Pathname.new(path) unless path.kind_of? Pathname
 
       mime = MIME::Types.type_for(path.to_s)[0] || MIME::Types["application/octet-stream"][0]

data/lib/MrMurano/Solution-Cors.rb

@@ -0,0 +1,81 @@
+require 'yaml'
+require 'json'
+require 'MrMurano/Solution'
+
+module MrMurano
+  class Cors < SolutionBase
+    def initialize
+      super
+      @uriparts << 'cors'
+      @location = $cfg['location.cors']
+    end
+
+    def list()
+      data = fetch()
+      data[:id] = 'cors'
+      [data]
+    end
+
+    def fetch(id=nil, &block)
+      ret = get()
+      data = JSON.parse(ret[:cors], @json_opts)
+      # XXX cors is a JSON encoded string. That seems weird. keep an eye on this.
+      if block_given? then
+        yield Hash.transform_keys_to_strings(data).to_yaml
+      else
+        data
+      end
+    end
+
+    def remove(id)
+      # Not really anything to do here. Return to defaults? maybe?
+    end
+
+    ##
+    # Upload CORS
+    # :local path to file to push
+    # :remote hash of method and endpoint path (ignored for now)
+    # @param modify Bool: True if item exists already and this is changing it
+    def upload(local, remote, modify=false)
+      remote.reject!{|k,v| k==:synckey or k==:bundled or k==:id}
+      put('', remote)
+    end
+
+    def tolocalpath(into, item)
+      into
+    end
+
+    def removelocal(dest, item)
+      # this is a nop.
+    end
+#
+    def localitems(from)
+      from = Pathname.new(from) unless from.kind_of? Pathname
+      if not from.exist? then
+        warning "Skipping missing #{from.to_s}"
+        return []
+      end
+      unless from.file? then
+        warning "Cannot read from #{from.to_s}"
+        return []
+      end
+
+      here = {}
+      from.open {|io| here = YAML.load(io) }
+      return [] if here == false
+
+      here[:id] = 'cors'
+      [ Hash.transform_keys_to_symbols(here) ]
+    end
+
+    ##
+    # True if itemA and itemB are different
+    def docmp(itemA, itemB)
+      itemA != itemB
+    end
+
+  end
+  SyncRoot.add('cors', Cors, 'Z', %{CORS settings})
+end
+
+#  vim: set ai et sw=2 ts=2 :

data/lib/MrMurano/Solution-Endpoint.rb

@@ -39,7 +39,8 @@ module MrMurano
     # Upload endpoint
     # :local path to file to push
     # :remote hash of method and endpoint path
-    def upload(local, remote)
+    # @param modify Bool: True if item exists already and this is changing it
+    def upload(local, remote, modify)
       local = Pathname.new(local) unless local.kind_of? Pathname
       raise "no file" unless local.exist?
 
@@ -75,9 +76,10 @@ module MrMurano
     end
 
     def tolocalname(item, key)
-      name = item[:method].downcase
-      name << '_'
-      name << item[:path].gsub(/\//, '-')
+      name = ''
+      name << item[:path].split('/').reject{|i|i.empty?}.join('-')
+      name << '.'
+      name << item[:method].downcase
       name << '.lua'
     end
 
@@ -109,5 +111,7 @@ module MrMurano
     end
 
   end
+
+  SyncRoot.add('endpoints', Endpoint, 'A', %{Endpoints}, true)
 end
 #  vim: set ai et sw=2 ts=2 :

data/lib/MrMurano/Solution-File.rb

@@ -30,7 +30,7 @@ module MrMurano
           case resp
           when Net::HTTPSuccess
             if block_given? then
-              resp.read_body &block
+              resp.read_body(&block)
             else
               resp.read_body do |chunk|
                 $stdout.write chunk
@@ -62,7 +62,8 @@ module MrMurano
 
     ##
     # Upload a file
-    def upload(local, remote)
+    # @param modify Bool: True if item exists already and this is changing it
+    def upload(local, remote, modify)
       local = Pathname.new(local) unless local.kind_of? Pathname
 
       uri = endPoint('upload' + remote[:path])
@@ -161,5 +162,6 @@ module MrMurano
     end
 
   end
+  SyncRoot.add('files', File, 'S', %{Static Files}, true)
 end
 #  vim: set ai et sw=2 ts=2 :