MrMurano 1.10.4 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf5ccffebdadc594e4bbee2043d852e75ccf2880
-  data.tar.gz: c4a286c251447baad93cdc7eaa25867968dcd66b
+  metadata.gz: df22b4d754cd7953bdc3a0eb585237340b1a1bc1
+  data.tar.gz: a1beeba561cee4af0d3269f6b91aa9f97f4233fa
 SHA512:
-  metadata.gz: f6b88a0b7797d4382613e566482a2de65772c592d76d1937c1032ad2beee144b8becfca6444f17a6aaf1f65a41665c9a1c6e7952736479cd8e32eddb2d969072
-  data.tar.gz: eeabfe027720df8f0c3d02deae524382a755e83ac0e8875057ef643efaf1e99acba143e920f260c22185e7030c643fd85fe2db8ea313d2731854ba5e34915465
+  metadata.gz: 93e43f224d125b59114a30ee086b8ce378e02bb40be13813317d9e8d19ba9d74af697af14bef8cc0562c6e9bc234b62f09fdc8d9ef20027d91b0d282baeae467
+  data.tar.gz: aed4c799fe5037211194dd5d16cf3f1ba5bcc935bd3cfc64b5509e913a99062884f4c497d39b87a24c65b590a9bf16889f170d5821af7268636044dbcc161c40

data/.gitignore

@@ -6,6 +6,7 @@ Icon
 cookies
 .jiramulerc
 tags
+mr.exe
 
 xcuserdata
 Pods/

data/LICENSE.txt

@@ -0,0 +1,19 @@
+Copyright (c) 2016 Exosite
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this
+software and associated documentation files (the "Software"), to deal in the
+Software without restriction, including without limitation the rights to use, copy,
+modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
+and to permit persons to whom the Software is furnished to do so, subject to the
+following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
+OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+

data/MrMurano.iss

@@ -0,0 +1,50 @@
+[Setup]
+AppName=MrMurano
+AppVersion={%MRVERSION}
+DefaultDirName={pf}\MrMurano
+DefaultGroupName=MrMurano
+ChangesEnvironment=yes
+OutputBaseFileName=MrMuranoSetup
+AppPublisher=Exosite
+AppPublisherURL=http://exosite.com/
+AppCopyright=Copyright (C) 2016 Exosite
+LicenseFile=LICENSE.txt
+
+[Files]
+Source: "mr.exe"; DestDir: "{app}\bin"
+Source: "LICENSE.txt"; DestDir: "{app}"
+Source: "ReadMe.txt"; DestDir: "{app}"; Flags: isreadme
+
+; http://www.jrsoftware.org/ishelp/
+
+;;;;;;;;;;;;;;;;;;;;;;;;;
+; http://stackoverflow.com/questions/3304463/how-do-i-modify-the-path-environment-variable-when-running-an-inno-setup-install/3431379
+[Registry]
+Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"; \
+    ValueType: expandsz; ValueName: "Path"; ValueData: "{olddata};{app}\bin"; \
+    Check: NeedsAddPath('{app}\bin')
+
+;;; Not working.
+[Code]
+
+function NeedsAddPath(Param: string): boolean;
+var
+  OrigPath: string;
+  ParamExpanded: string;
+begin
+  //expand the setup constants like {app} from Param
+  ParamExpanded := ExpandConstant(Param);
+  if not RegQueryStringValue(HKEY_LOCAL_MACHINE,
+    'SYSTEM\CurrentControlSet\Control\Session Manager\Environment',
+    'Path', OrigPath)
+  then begin
+    Result := True;
+    exit;
+  end;
+  // look for the path with leading and trailing semicolon and with or without \ ending
+  // Pos() returns 0 if not found
+  Result := Pos(';' + UpperCase(ParamExpanded) + ';', ';' + UpperCase(OrigPath) + ';') = 0;
+  if Result = True then
+     Result := Pos(';' + UpperCase(ParamExpanded) + '\;', ';' + UpperCase(OrigPath) + ';') = 0;
+end;
+

data/README.markdown

@@ -213,6 +213,8 @@ MrMurano uses [git flow](https://github.com/nvie/gitflow#getting-started) for
 
 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.

data/Rakefile

@@ -16,13 +16,20 @@ task :echo do
     puts "= #{Bundler::GemHelper.gemspec.version} ="
 end
 
-desc "Push only develop, master, and tags to origin"
-task :gitpush do
-    sh %{git checkout develop}
-    sh %{git push}
-    sh %{git checkout master}
-    sh %{git push}
-    sh %{git push --tags}
+namespace :git do
+    desc "Push only develop, master, and tags to origin"
+    task :origin do
+        sh %{git push origin develop}
+        sh %{git push origin master}
+        sh %{git push origin --tags}
+    end
+
+    desc "Push only develop, master, and tags to upstream"
+    task :upstream do
+        sh %{git push upstream develop}
+        sh %{git push upstream master}
+        sh %{git push upstream --tags}
+    end
 end
 
 task :gempush do
@@ -38,13 +45,6 @@ task :gemit do
     sh %{git checkout develop}
 end
 
-task :wexe do
-    # Need to find all dlls, because ocra isn't finding them for some reason.
-    gemdir = `gem env gemdir`.chomp  # XXX can we get that without running commands?
-    gemdlls = Dir[File.join(gemdir, 'extensions', '*')]
-    sh %{ocra bin/mr #{gemdlls.join(' ')}}
-end
-
 desc "Prints a cmd to test this in another directory"
 task :testwith do
     pwd=Dir.pwd.sub(Dir.home, '~')
@@ -52,10 +52,52 @@ task :testwith do
 end
 
 desc 'Run RSpec'
-task :test do
+task :rspec do
     Dir.mkdir("report") unless File.directory?("report")
     sh %{rspec --format html --out report/index.html --format progress}
 end
+task :test => [:rspec]
+
+file "ReadMe.txt" => ['README.markdown'] do |t|
+    File.open(t.prerequisites.first) do |rio|
+        File.open(t.name, 'w') do |wio|
+            wio << rio.read.gsub(/\n/,"\r\n")
+        end
+    end
+end
+
+if Gem.win_platform? then
+    file 'mr.exe' => Dir['lib/MrMurano/**/*.rb'] do
+        # Need to find all dlls, because ocra isn't finding them for some reason.
+        gemdir = `gem env gemdir`.chomp
+        gemdlls = Dir[File.join(gemdir, 'extensions', '*')]
+        ENV['RUBYLIB'] = 'lib'
+        sh %{ocra bin/mr #{gemdlls.join(' ')}}
+    end
+    task :wexe => ['mr.exe']
+
+    desc 'Run rspec on cmd tests using mr.exe'
+    task :mr_exe_test => ['mr.exe'] do
+        Dir.mkdir("report") unless File.directory?("report")
+        ENV['CI_MR_EXE'] = '1'
+        files = Dir[File.join('spec', 'cmd_*_spec.rb')]
+        sh %{rspec --format html --out report/mr_exe.html --format progress #{files.join(' ')}}
+    end
+    task :test => [:mr_exe_test]
+
+    installerName = "Output/MrMurano-#{Bundler::GemHelper.gemspec.version.to_s}-Setup.exe"
+
+    desc "Build a Windows installer for MrMurano"
+    task :inno => [installerName]
+
+    file "Output/MrMuranoSetup.exe" => ['mr.exe', 'ReadMe.txt'] do
+        ENV['MRVERSION'] = Bundler::GemHelper.gemspec.version.to_s
+        sh %{"C:\\Program Files (x86)\\Inno Setup 5\\iscc.exe" MrMurano.iss}
+    end
+    file installerName => ['Output/MrMuranoSetup.exe'] do |t|
+        FileUtils.move t.prerequisites.first, t.name, :verbose=>true
+    end
+end
 
 #  vim: set sw=4 ts=4 :
 

data/TODO.taskpaper

@@ -23,7 +23,7 @@ Account:
 	- Netrc library (or the netrc format) doesn't allow '#' in passwords. @done(2016-08-10)
 
 Endpoints:
-	- In fetch(); add content_type to script header if not application/json
+	- In fetch(); add content_type to script header if not application/json @done(2016-12-06)
 	- Add support for multiple endpoints in one file @pri(high) @done(2016-11-18)
 	- Add directory support like in modules @done(2016-07-26)
 

data/lib/MrMurano/Config.rb

@@ -90,9 +90,19 @@ module MrMurano
       set('location.specs', 'specs', :defaults)
 
       set('files.default_page', 'index.html', :defaults)
+      set('files.searchFor', '**/*', :defaults)
+      set('files.ignoring', '', :defaults)
 
+      set('endpoints.searchFor', '*.lua */*.lua', :defaults)
+      set('endpoints.ignoring', '*_test.lua *_spec.lua .*', :defaults)
+
+      set('eventhandler.searchFor', '*.lua */*.lua', :defaults)
+      set('eventhandler.ignoring', '*_test.lua *_spec.lua .*', :defaults)
       set('eventhandler.skiplist', 'websocket webservice device.service_call', :defaults)
 
+      set('modules.searchFor', '*.lua */*.lua', :defaults)
+      set('modules.ignoring', '*_test.lua *_spec.lua .*', :defaults)
+
       set('diff.cmd', 'diff -u', :defaults)
     end
 

data/lib/MrMurano/Mock.rb

@@ -0,0 +1,63 @@
+require 'erb'
+require 'securerandom'
+
+module MrMurano
+  class Mock
+    attr_accessor :uuid, :testpoint_file
+
+    def initialize
+    end
+
+    def show
+      file = Pathname.new(get_testpoint_path)
+      if file.exist? then
+        authorization = %{if request.headers["authorization"] == "}
+        file.open('rb') do |io|
+          io.each_line do |line|
+            auth_line = line.include?(authorization)
+            if auth_line then
+              capture = /\=\= "(.*)"/.match(line)
+              return capture.captures[0]
+            end
+          end
+        end
+      end
+      return false
+    end
+
+    def get_mock_template
+      path = get_mock_template_path()
+      return ::File.read(path)
+    end
+
+    def get_testpoint_path
+      file_name = 'testpoint.post.lua'
+      path = %{#{$cfg['location.endpoints']}/#{file_name}}
+      return path
+    end
+
+    def get_mock_template_path
+      return ::File.join(::File.dirname(__FILE__), 'template', 'mock.erb')
+    end
+
+    def create_testpoint
+      uuid = SecureRandom.uuid
+      template = ERB.new(get_mock_template)
+      endpoint = template.result(binding)
+
+      Pathname.new(get_testpoint_path).open('wb') do |io|
+        io << endpoint
+      end
+      return uuid
+    end
+
+    def remove_testpoint
+      file = Pathname.new(get_testpoint_path)
+      if file.exist? then
+        file.unlink
+        return true
+      end
+      return false
+    end
+  end
+end

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

@@ -90,23 +90,6 @@ module MrMurano
       psn.remove_sn(sn)
     end
 
-    ## Rename a device
-    # +sn+:: Identifier for a device
-    # +newname+:: The new name of the device
-    def rename(sn, newname, rid=nil)
-      newname = sn if newname.nil?
-      rid = sn_rid(sn) if rid.nil?
-      verbose "Setting name of #{sn} to #{newname}"
-      debug "  Via RID: #{rid}"
-      do_rpc({
-        :procedure=>:update,
-        :arguments=>[
-          rid,
-          {:name=>newname}
-        ]
-      })
-    end
-
     ## Get a tree of info for a device and its resources.
     # +sn+:: Identifier for a device
     def twee(sn)

data/lib/MrMurano/Product-Resources.rb

@@ -34,7 +34,7 @@ module MrMurano
       name = $cfg['product.spec']
       prid = $cfg['product.id']
       name = $cfg["p-#{prid}.spec"] unless prid.nil? or $cfg["p-#{prid}.spec"].nil?
-      raise "No spec file named; run `mr config prodcut.spec <specfile>`" if name.nil?
+      raise "No spec file named; run `mr config product.spec <specfile>`" if name.nil?
 
       unless $cfg['location.specs'].nil? then
         name = ::File.join($cfg['location.specs'], name)

data/lib/MrMurano/Product.rb

@@ -111,7 +111,7 @@ module MrMurano
 
     ## Write a value to an alias on a device
     def write(sn, values)
-      post("/write/#{sn}", values)
+      post("/write/#{sn}", values) unless $cfg['tool.dry']
     end
 
     ## Converts an exoline style spec file into a Murano style one

data/lib/MrMurano/Solution-Endpoint.rb

@@ -11,13 +11,18 @@ module MrMurano
       super
       @uriparts << 'endpoint'
       @location = $cfg['location.endpoints']
+
+      @match_header = /--#ENDPOINT (?<method>\S+) (?<path>\S+)( (?<ctype>.*))?/
     end
 
     ##
     # This gets all data about all endpoints
     def list
       get().map do |item|
-        item[:content_type] = 'application/json' if item[:content_type].empty?
+        if item[:content_type].nil? or item[:content_type].empty? then
+          item[:content_type] = 'application/json'
+        end
+        # XXX should this update the script header?
         item
       end
     end
@@ -25,18 +30,35 @@ module MrMurano
     def fetch(id)
       ret = get('/' + id.to_s)
       ret[:content_type] = 'application/json' if ret[:content_type].empty?
-      # TODO: add content_type to header if not application/json
-      aheader = (ret[:script].lines.first or "").chomp
-      dheader = /^--#ENDPOINT (?i:#{ret[:method]}) #{ret[:path]}$/
-      rheader = %{--#ENDPOINT #{ret[:method].upcase} #{ret[:path]}\n}
+
+      script = ret[:script].lines.map{|l|l.chomp}
+
+      aheader = (script.first or "")
+
+      rh = ['--#ENDPOINT', ret[:method].upcase, ret[:path]]
+      rh << ret[:content_type] if ret[:content_type] != 'application/json'
+      rheader = rh.join(' ')
+
+      # if header is missing add it.
+      # If header is wrong, replace it.
+
+      md = @match_header.match(aheader)
+      if md.nil? then
+        # header missing.
+        script.unshift rheader
+      elsif md[:method] != ret[:method] or
+            md[:path] != ret[:path] or
+            md[:content_type] != ret[:content_type] then
+        # header is wrong.
+        script[0] = rheader
+      end
+      # otherwise current header is good.
+
+      script = script.join("\n") + "\n"
       if block_given? then
-        yield rheader unless dheader =~ aheader
-        yield ret[:script]
+        yield script
       else
-        res = ''
-        res << rheader unless dheader =~ aheader
-        res << ret[:script]
-        res
+        script
       end
     end
 
@@ -82,6 +104,14 @@ module MrMurano
       delete('/' + id.to_s)
     end
 
+    def searchFor
+      $cfg['endpoints.searchFor'].split
+    end
+
+    def ignoring
+      $cfg['endpoints.ignore'].split
+    end
+
     def tolocalname(item, key)
       name = ''
       name << item[:path].split('/').reject{|i|i.empty?}.join('-')
@@ -97,7 +127,7 @@ module MrMurano
       cur = nil
       lineno=0
       path.readlines().each do |line|
-        md = /--#ENDPOINT (?<method>\S+) (?<path>\S+)( (?<ctype>.*))?/.match(line)
+        md = @match_header.match(line)
         if not md.nil? then
           # header line.
           cur[:line_end] = lineno unless cur.nil?

data/lib/MrMurano/Solution-File.rb

@@ -145,21 +145,28 @@ module MrMurano
         itemA[:checksum] != itemB[:checksum])
     end
 
-    def localitems(from)
-      from = Pathname.new(from) unless from.kind_of? Pathname
-      unless from.exist? then
-        return []
-      end
-      raise "Not a directory: #{from.to_s}" unless from.directory?
-
-      Pathname.glob(from.to_s + '/**/*').reject do |path|
-        path.directory?
-      end.map do |path|
-        name = toRemoteItem(from, path)
-        name[:local_path] = path
-        name
-      end
+    def searchFor
+      $cfg['files.searchFor'].split
     end
+    def ignoring
+      $cfg['files.ignoring'].split
+    end
+
+#    def localitems(from)
+#      from = Pathname.new(from) unless from.kind_of? Pathname
+#      unless from.exist? then
+#        return []
+#      end
+#      raise "Not a directory: #{from.to_s}" unless from.directory?
+#
+#      Pathname.glob(from.to_s + '/**/*').reject do |path|
+#        path.directory? or ignoring.any?{|i| ::File.fnmatch(i,path)}
+#      end.map do |path|
+#        name = toRemoteItem(from, path)
+#        name[:local_path] = path
+#        name
+#      end
+#    end
 
   end
   SyncRoot.add('files', File, 'S', %{Static Files}, true)

data/lib/MrMurano/Solution-ServiceConfig.rb

@@ -111,7 +111,8 @@ module MrMurano
     def assignTriggers(products)
       details = fetch(scid)
       products = [products] unless products.kind_of? Array
-      details[:triggers] = {:pid=>products, :vendor=>products}
+      details[:triggers] = {:pid=>products}
+      details[:parameters] = {:pid=>products}
 
       put('/'+scid, details)
     end

data/lib/MrMurano/Solution-Services.rb

@@ -25,6 +25,8 @@ module MrMurano
     end
 
     def fetch(name)
+      raise "Missing name!" if name.nil?
+      raise "Empty name!" if name.empty?
       ret = get('/'+name)
       if block_given? then
         yield ret[:script]
@@ -171,6 +173,14 @@ module MrMurano
       end
     end
 
+    def searchFor
+      $cfg['modules.searchFor'].split
+    end
+
+    def ignoring
+      $cfg['modules.ignoring'].split
+    end
+
     def toRemoteItem(from, path)
       name = path.basename.to_s.sub(/\..*/, '')
       {:name => name}
@@ -207,6 +217,14 @@ module MrMurano
       end
     end
 
+    def searchFor
+      $cfg['eventhandler.searchFor'].split
+    end
+
+    def ignoring
+      $cfg['eventhandler.ignoring'].split
+    end
+
     def list
       ret = get()
       # eventhandler.skiplist is a list of whitespace seperated dot-paired values.

data/lib/MrMurano/SyncUpDown.rb

@@ -245,6 +245,17 @@ module MrMurano
       items.values
     end
 
+    ##
+    # Returns array of globs to search for files
+    def searchFor
+      %w{*.lua */*.lua}
+    end
+
+    ## Returns array of globs of files to ignore
+    def ignoring
+      %w{*_test.lua *_spec.lua .*}
+    end
+
     ##
     # Get a list of local items rooted at #from
     #
@@ -254,22 +265,14 @@ module MrMurano
     # @param from Pathname: Directory of items to scan
     # @return Array: of Hashes of item details
     def localitems(from)
-      from.children.map do |path|
-        if path.directory? then
-          # TODO: look for definition. ( ?.rockspec? ?mr.modules? ?mr.manifest? )
-          # Lacking definition, find all *.lua but not *_test.lua
-          # This specifically and intentionally only goes one level deep.
-          path.children
-        else
-          path
+      searchIn = from.to_s
+      sf = searchFor.map{|i| ::File.join(searchIn, i)}
+      Dir[*sf].flatten.compact.reject do |p|
+        ::File.directory?(p) or ignoring.any? do |i|
+          ::File.fnmatch(i,p)
         end
-      end.flatten.compact.reject do |path|
-        # TODO: These globs should be in $cfg.
-        path.fnmatch('*_test.lua') or path.basename.fnmatch('.*')
-      end.select do |path|
-        # TODO: These globs should be in $cfg.
-        path.extname == '.lua'
       end.map do |path|
+        path = Pathname.new(path)
         item = toRemoteItem(from, path)
         if item.kind_of?(Array) then
           item.compact.map{|i| i[:local_path] = path; i}

data/lib/MrMurano/commands/gb.rb

@@ -0,0 +1,33 @@
+require 'pp'
+
+# You don't need this.
+# To use this:
+# - mkdir -p ~/.mrmurano/plugins
+# - ln gb.rb ~/.mrmurano/plugins
+
+command :_gb do |c|
+  c.syntax = %{mr _gb <class> <method> (<args>)}
+  c.summary = %{Call internal class methods directly.}
+  c.description = %{Call internal class methods directly.}
+
+  c.action do |args, options|
+    cls = args[0]
+    meth = args[1].to_sym
+    args.shift(2)
+
+    begin
+      gb = Object::const_get("MrMurano::#{cls}").new
+      if gb.respond_to? meth then
+        pp gb.__send__(meth, *args)
+      else
+        say_error "'#{cls}' doesn't '#{meth}'"
+      end
+    rescue Exception => e
+      say_error e.message
+      pp e
+    end
+  end
+end
+
+
+#  vim: set ai et sw=2 ts=2 :

data/lib/MrMurano/commands/mock.rb

@@ -0,0 +1,63 @@
+require 'MrMurano/Mock'
+
+command 'mock' do |c|
+  c.syntax = %{mr mock}
+  c.summary = %{Enable or disable testpoint. Show current UUID.}
+  c.description = %{mock lets you enable testpoints to do local lua development}
+
+  c.action do |args, options|
+    ::Commander::UI.enable_paging
+    say MrMurano::SubCmdGroupHelp.new(c).get_help
+  end
+end
+
+command 'mock enable' do |c|
+  c.syntax = %{mr mock enable}
+  c.summary = %{Create a testpoint file.}
+  c.description = %{Run syncup after running this to carry the change through to Murano.
+   Returns the UUID to be used for authenticating.
+  }
+  c.option '--raw', %{print raw uuid}
+  c.action do |args, options|
+    mock = MrMurano::Mock.new
+    uuid = mock.create_testpoint()
+    if options.raw then
+      say uuid
+    else
+      say %{Created testpoint file. Run `mr syncup` to activate. The following is the authorization token:}
+      say %{$ export AUTHORIZATION="#{uuid}"}
+    end
+  end
+end
+
+command 'mock disable' do |c|
+  c.syntax = %{mr mock disable}
+  c.summary = %{Remove the testpoint file.}
+  c.description = %{Run syncup after running this to carry the change through to Murano.}
+
+  c.action do |args, options|
+    mock = MrMurano::Mock.new
+    removed = mock.remove_testpoint()
+    if removed then
+      say %{Deleted testpoint file. Run `mr syncup` to remove the testpoint.}
+    else
+      say %{No testpoint file to remove.}
+    end
+  end
+end
+
+command 'mock show' do |c|
+  c.syntax = %{mr mock disable}
+  c.summary = %{Remove the testpoint file.}
+  c.description = %{Run syncup after running this to carry the change through to Murano.}
+
+  c.action do |args, options|
+    mock = MrMurano::Mock.new
+    uuid = mock.show()
+    if uuid then
+      say uuid
+    else
+      say %{Could not find testpoint file or UUID in testpoint file.}
+    end
+  end
+end