MrMurano 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20574af6b6ff5b2c2260cba7d436aa46599cc691
-  data.tar.gz: daca7cfcc9d0814d7423a1a15773aa6a02f65810
+  metadata.gz: 0271003380ad3597a7b8522db408a955f9e0678f
+  data.tar.gz: e36306d65362a9c67bca0b504713aecfa9f16a1d
 SHA512:
-  metadata.gz: 0689228efca83f14f7289376ba2e36f5e5034202fcfda983bb02c3a89382a8fa329c74c614600cb59adccfca8db94d762fd30c5406b221d2d2e3f045ed8fc841
-  data.tar.gz: 0bbf24196e0912384045f251c14b28a79e4dea2b864c62b7d5f3e284c22485260d8affbb54c19a9c60d09b1e251c5eae2eff4942768590d88d5d8e1f9549e927
+  metadata.gz: b032e0e3f04e2c9f2b6be2cc01584bd8b93484027a6509b0bd2657b25dda5d6e13fe3bbd8f0e6ffbc6860765c4b0386201c8625f986775196cbc4141f707b24f
+  data.tar.gz: c666e9604c69f2385d5ddea60232027a05714605b5ffa0900783c9f53b7a601fc617e2b4f788ed8af91b3f8fac06c92dae1a85b083c21b9f7f6aad434ed3e92b

data/lib/MrMurano.rb

@@ -1,26 +1,24 @@
 require 'MrMurano/version'
 require 'MrMurano/verbosing'
-require 'MrMurano/hash'
+require 'MrMurano/hash.rb'
 require 'MrMurano/http'
-require 'MrMurano/Config'
+require 'MrMurano/configFile'
 require 'MrMurano/Account'
 require 'MrMurano/Solution'
-require 'MrMurano/Solution-Endpoint'
-require 'MrMurano/Solution-File'
-require 'MrMurano/Solution-Services'
-require 'MrMurano/Solution-Users'
-require 'MrMurano/Solution-ServiceConfig'
+require 'MrMurano/Solution-Endpoint.rb'
+require 'MrMurano/Solution-File.rb'
+require 'MrMurano/Solution-Services.rb'
+require 'MrMurano/Solution-Users.rb'
+require 'MrMurano/Solution-ServiceConfig.rb'
 require 'MrMurano/Product'
 
-require 'MrMurano/accountCommand'
-require 'MrMurano/assignCommand'
 require 'MrMurano/configCommand'
 require 'MrMurano/contentCommand'
 require 'MrMurano/cors'
 require 'MrMurano/exportImport'
-require 'MrMurano/keystore'
-require 'MrMurano/logs'
-require 'MrMurano/status'
-require 'MrMurano/sync'
-require 'MrMurano/timeseries'
+require 'MrMurano/keystore.rb'
+require 'MrMurano/logs.rb'
+require 'MrMurano/sync.rb'
+require 'MrMurano/status.rb'
+require 'MrMurano/timeseries.rb'
 #require 'MrMurano/shelledCommand'

data/lib/MrMurano/Account.rb

@@ -2,10 +2,10 @@ require 'uri'
 require 'net/http'
 require 'json'
 require 'date'
+require 'pp'
+require 'terminal-table'
 require 'pathname'
 require 'yaml'
-require 'MrMurano/Config'
-require 'MrMurano/http'
 
 module MrMurano
   class Passwords
@@ -125,4 +125,55 @@ module MrMurano
   end
 end
 
+command :account do |c|
+  c.syntax = %{mr account [options]}
+  c.description = %{Show things about your account.}
+  c.option '--businesses', 'Get businesses for user'
+  c.option '--products', 'Get products for user (needs a business)'
+  c.option '--solutions', 'Get solutions for user (needs a business)'
+  c.option '--idonly', 'Only return the ids'
+
+  c.example %{List all businesses}, 'mr account --businesses'
+  c.example %{List solutions}, 'mr account --solutions -c business.id=XXXXXXXX'
+
+  c.action do |args, options|
+
+    acc = MrMurano::Account.new
+
+    if options.businesses then
+      data = acc.businesses
+      if options.idonly then
+        say data.map{|row| row[:bizid]}.join(' ')
+      else
+        busy = data.map{|row| [row[:bizid], row[:role], row[:name]]}
+        table = Terminal::Table.new :rows => busy, :headings => ['Biz ID', 'Role', 'Name']
+        say table
+      end
+
+    elsif options.products then
+      data = acc.products
+      if options.idonly then
+        say data.map{|row| row[:pid]}.join(' ')
+      else
+        busy = data.map{|r| [r[:label], r[:type], r[:pid], r[:modelId]]}
+        table = Terminal::Table.new :rows => busy, :headings => ['Label', 'Type', 'PID', 'ModelID']
+        say table
+      end
+
+    elsif options.solutions then
+      data = acc.solutions
+      if options.idonly then
+        say data.map{|row| row[:apiId]}.join(' ')
+      else
+        busy = data.map{|r| [r[:apiId], r[:domain], r[:type], r[:sid]]}
+        table = Terminal::Table.new :rows => busy, :headings => ['API ID', 'Domain', 'Type', 'SID']
+        say table
+      end
+
+    else
+      say acc.token
+    end
+
+  end
+end
 #  vim: set ai et sw=2 ts=2 :

data/lib/MrMurano/Product.rb

@@ -2,8 +2,6 @@ require 'uri'
 require 'mime/types'
 require 'csv'
 require 'pp'
-require 'MrMurano/http'
-require 'MrMurano/verbosing'
 
 module MrMurano
   class ProductBase

data/lib/MrMurano/Solution-Endpoint.rb

@@ -2,7 +2,6 @@ require 'uri'
 require 'net/http'
 require 'json'
 require 'pp'
-require 'MrMurano/Solution'
 
 module MrMurano
   # …/endpoint

data/lib/MrMurano/Solution-File.rb

@@ -4,7 +4,6 @@ require "http/form_data"
 require 'digest/sha1'
 require 'mime/types'
 require 'pp'
-require 'MrMurano/Solution'
 
 module MrMurano
   # …/file

data/lib/MrMurano/Solution-ServiceConfig.rb

@@ -1,4 +1,4 @@
-require 'MrMurano/Solution'
+require 'terminal-table'
 
 module MrMurano
   # …/serviceconfig
@@ -51,4 +51,55 @@ module MrMurano
   end
 end
 
+command 'assign list' do |c|
+  c.syntax = 'mr assign list [options]'
+  c.description = 'List the products that are assigned'
+  c.option '--idonly', 'Only return the ids'
+  c.action do |args, options|
+    sol = MrMurano::SC_Device.new
+
+    trigs = sol.showTriggers()
+    if options.idonly or $cfg['business.id'].nil? then
+      say trigs.join(' ')
+    else
+      acc = MrMurano::Account.new
+      products = acc.products
+      products.select!{|p| trigs.include? p[:modelId] }
+      if products.empty? then
+        say trigs.join(' ')
+      else
+        busy = products.map{|r| [r[:label], r[:type], r[:pid], r[:modelId]]}
+        table = Terminal::Table.new :rows => busy, :headings => ['Label', 'Type', 'PID', 'ModelID']
+        say table
+      end
+    end
+  end
+end
+alias_command :assign, 'assign list'
+
+command 'assign set' do |c|
+  c.syntax = 'mr assign set [product]'
+  c.description = 'Assign a product to a eventhandler'
+
+  c.action do |args, options|
+    sol = MrMurano::SC_Device.new
+
+    prname = args.shift
+    if prname.nil? then
+      prid = $cfg['product.id']
+    else
+      acc = MrMurano::Account.new
+      products = acc.products
+      products.select!{|p|
+        p[:label] == prname or p[:modelId] == prname or p[:pid] == prname
+      }
+      prid = products.map{|p| p[:modelId]}
+    end
+    raise "No product ID!" if prid.nil?
+    say "Assigning #{prid} to solution" if $cfg['tool.verbose']
+    sol.assignTriggers(prid) unless $cfg['tool.dry']
+  end
+
+end
+
 #  vim: set ai et sw=2 ts=2 :

data/lib/MrMurano/Solution-Services.rb

@@ -2,7 +2,6 @@ require 'uri'
 require 'net/http'
 require 'json'
 require 'pp'
-require 'MrMurano/Solution'
 
 module MrMurano
   ##

data/lib/MrMurano/Solution-Users.rb

@@ -3,7 +3,6 @@ require 'net/http'
 require 'json'
 require 'yaml'
 require 'pp'
-require 'MrMurano/Solution'
 
 module MrMurano
   ##

data/lib/MrMurano/Solution.rb

@@ -4,9 +4,6 @@ require 'json'
 require 'tempfile'
 require 'shellwords'
 require 'pp'
-require 'MrMurano/Config'
-require 'MrMurano/http'
-require 'MrMurano/verbosing'
 
 module MrMurano
   class SolutionBase

data/lib/MrMurano/exportImport.rb

@@ -4,21 +4,11 @@ require 'fileutils'
 
 command 'config export' do |c|
   c.syntax = %{mr config export}
-  c.summary = %{Export data to Solutionfiles}
-  c.description = %{Export data to Solutionfiles
-
-  This will write to the Solutionfile.json and .Solutionfile.secret used by the
-  exosite-cil tool.
-
-  This also will merge all of the endpoints into a single 'routes.lua' file.
-  }
+  c.summary = %{Export data to a Solutionfile.json and .Solutionfile.secret}
 
   c.option '--force', "Overwrite existing files."
-  c.option '--[no-]merge', "Merge endpoints into a single routes.lua file"
 
   c.action do |args, options|
-    options.defaults :merge => true
-
     solfile = Pathname.new($cfg['location.base'] + 'Solutionfile.json')
     solsecret = Pathname.new($cfg['location.base'] + '.Solutionfile.secret')
 
@@ -27,26 +17,24 @@ command 'config export' do |c|
       say "Use --force to overwrite"
     end
 
+    epf = 'routes.lua'
+      File.open(epf, 'w') do |dst|
+      MrMurano::Endpoint.new.locallist.each do |ed|
+        ed[:local_path].open do |fin|
+          FileUtils.copy_stream(fin, dst)
+        end
+        dst << "\n\n"
+      end
+    end
+
     solf = {
+      :routes => 'epf',
       :assets => $cfg['location.files'],
       :default_page => $cfg['files.default_page'],
       :services => {},
       :modules => {}
     }
 
-    if options.merge then
-      epf = 'routes.lua'
-      File.open(epf, 'w') do |dst|
-        MrMurano::Endpoint.new.locallist.each do |ed|
-          ed[:local_path].open do |fin|
-            FileUtils.copy_stream(fin, dst)
-          end
-          dst << "\n\n"
-        end
-      end
-      solf[:routes] = epf
-    end
-
     dpwd = Pathname.new(Dir.pwd)
     MrMurano::EventHandler.new.locallist.each do |ev|
       rp = ev[:local_path].relative_path_from(dpwd).to_s
@@ -83,12 +71,7 @@ end
 
 command 'config import' do |c|
   c.syntax = %{mr config import}
-  c.summary = %{Import data from Solutionfiles}
-  c.description = %{Import data from Solutionfiles
-
-  This imports from the Solutionfile.json and .Solutionfile.secret that are created
-  by the exosite-cli tool.
-  }
+  c.summary = %{Import data from a Solutionfile.json and .Solutionfile.secret}
 
   c.action do |args, options|
     solfile = ($cfg['location.base'] + 'Solutionfile.json')

data/lib/MrMurano/timeseries.rb

@@ -12,7 +12,7 @@ module MrMurano
     end
 
     def write(writestr)
-      post("/#{scid}/call/write", { :q=>writestr })
+      post("/#{scid}/call/write", { :query=>writestr })
     end
 
     def command(cmd)

data/lib/MrMurano/version.rb

@@ -1,4 +1,4 @@
 module MrMurano
-	VERSION = '1.4.1'.freeze
+  VERSION = '1.4.2'.freeze
 end
 

data/spec/Account-Passwords_spec.rb

@@ -1,7 +1,16 @@
-require 'MrMurano/version'
-require 'MrMurano/Account'
+require 'rubygems'
+require 'commander/import'
+require 'MrMurano'
 require 'tempfile'
 
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+# Some kludgery to work around commander.  Likely a better way to do this.
+program :version, MrMurano::VERSION
+program :description, %{Manage a Solution in Exosite's Murano}
+command(:nop){ |c| c.action {|a,o|} }
+default_command :nop
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+
 RSpec.describe MrMurano::Passwords, "#pwd" do
   it "Creates a file " do
     tmpfile = Dir.tmpdir + '/pwtest' # This way because Tempfile.new creates.

data/spec/ProductBase_spec.rb

@@ -1,5 +1,8 @@
 require 'MrMurano/version'
+require 'MrMurano/verbosing'
+require 'MrMurano/http'
 require 'MrMurano/Product'
+require 'MrMurano/configFile'
 
 RSpec.describe MrMurano::ProductBase, "#product_base" do
   before(:example) do

data/spec/ProductContent_spec.rb

@@ -1,5 +1,8 @@
 require 'MrMurano/version'
+require 'MrMurano/verbosing'
+require 'MrMurano/http'
 require 'MrMurano/Product'
+require 'MrMurano/configFile'
 
 RSpec.describe MrMurano::ProductContent, "#product_content" do
   before(:example) do

data/spec/Product_spec.rb

@@ -1,5 +1,8 @@
 require 'MrMurano/version'
+require 'MrMurano/verbosing'
+require 'MrMurano/http'
 require 'MrMurano/Product'
+require 'MrMurano/configFile'
 
 RSpec.describe MrMurano::Product, "#product" do
   before(:example) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: MrMurano
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Michael Conrad Tadpol Tilstra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-16 00:00:00.000000000 Z
+date: 2016-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -185,7 +185,6 @@ files:
 - bin/mr
 - lib/MrMurano.rb
 - lib/MrMurano/Account.rb
-- lib/MrMurano/Config.rb
 - lib/MrMurano/Product.rb
 - lib/MrMurano/Solution-Endpoint.rb
 - lib/MrMurano/Solution-File.rb
@@ -193,9 +192,8 @@ files:
 - lib/MrMurano/Solution-Services.rb
 - lib/MrMurano/Solution-Users.rb
 - lib/MrMurano/Solution.rb
-- lib/MrMurano/accountCommand.rb
-- lib/MrMurano/assignCommand.rb
 - lib/MrMurano/configCommand.rb
+- lib/MrMurano/configFile.rb
 - lib/MrMurano/contentCommand.rb
 - lib/MrMurano/cors.rb
 - lib/MrMurano/exportImport.rb

data/lib/MrMurano/accountCommand.rb

@@ -1,54 +0,0 @@
-require 'terminal-table'
-
-command :account do |c|
-  c.syntax = %{mr account [options]}
-  c.description = %{Show things about your account.}
-  c.option '--businesses', 'Get businesses for user'
-  c.option '--products', 'Get products for user (needs a business)'
-  c.option '--solutions', 'Get solutions for user (needs a business)'
-  c.option '--idonly', 'Only return the ids'
-
-  c.example %{List all businesses}, 'mr account --businesses'
-  c.example %{List solutions}, 'mr account --solutions -c business.id=XXXXXXXX'
-
-  c.action do |args, options|
-
-    acc = MrMurano::Account.new
-
-    if options.businesses then
-      data = acc.businesses
-      if options.idonly then
-        say data.map{|row| row[:bizid]}.join(' ')
-      else
-        busy = data.map{|row| [row[:bizid], row[:role], row[:name]]}
-        table = Terminal::Table.new :rows => busy, :headings => ['Biz ID', 'Role', 'Name']
-        say table
-      end
-
-    elsif options.products then
-      data = acc.products
-      if options.idonly then
-        say data.map{|row| row[:pid]}.join(' ')
-      else
-        busy = data.map{|r| [r[:label], r[:type], r[:pid], r[:modelId]]}
-        table = Terminal::Table.new :rows => busy, :headings => ['Label', 'Type', 'PID', 'ModelID']
-        say table
-      end
-
-    elsif options.solutions then
-      data = acc.solutions
-      if options.idonly then
-        say data.map{|row| row[:apiId]}.join(' ')
-      else
-        busy = data.map{|r| [r[:apiId], r[:domain], r[:type], r[:sid]]}
-        table = Terminal::Table.new :rows => busy, :headings => ['API ID', 'Domain', 'Type', 'SID']
-        say table
-      end
-
-    else
-      say acc.token
-    end
-
-  end
-end
-#  vim: set ai et sw=2 ts=2 :

data/lib/MrMurano/assignCommand.rb

@@ -1,54 +0,0 @@
-require 'terminal-table'
-
-command 'assign list' do |c|
-  c.syntax = 'mr assign list [options]'
-  c.description = 'List the products that are assigned'
-  c.option '--idonly', 'Only return the ids'
-  c.action do |args, options|
-    sol = MrMurano::SC_Device.new
-
-    trigs = sol.showTriggers()
-    if options.idonly or $cfg['business.id'].nil? then
-      say trigs.join(' ')
-    else
-      acc = MrMurano::Account.new
-      products = acc.products
-      products.select!{|p| trigs.include? p[:modelId] }
-      if products.empty? then
-        say trigs.join(' ')
-      else
-        busy = products.map{|r| [r[:label], r[:type], r[:pid], r[:modelId]]}
-        table = Terminal::Table.new :rows => busy, :headings => ['Label', 'Type', 'PID', 'ModelID']
-        say table
-      end
-    end
-  end
-end
-alias_command :assign, 'assign list'
-
-command 'assign set' do |c|
-  c.syntax = 'mr assign set [product]'
-  c.description = 'Assign a product to a eventhandler'
-
-  c.action do |args, options|
-    sol = MrMurano::SC_Device.new
-
-    prname = args.shift
-    if prname.nil? then
-      prid = $cfg['product.id']
-    else
-      acc = MrMurano::Account.new
-      products = acc.products
-      products.select!{|p|
-        p[:label] == prname or p[:modelId] == prname or p[:pid] == prname
-      }
-      prid = products.map{|p| p[:modelId]}
-    end
-    raise "No product ID!" if prid.nil?
-    say "Assigning #{prid} to solution" if $cfg['tool.verbose']
-    sol.assignTriggers(prid) unless $cfg['tool.dry']
-  end
-
-end
-
-#  vim: set ai et sw=2 ts=2 :