MrMurano 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5af905319869d15b61caf042c9ef16ce355013c7
-  data.tar.gz: 5859d5041f72f72143e1bde1412857b66ad817a0
+  metadata.gz: 20574af6b6ff5b2c2260cba7d436aa46599cc691
+  data.tar.gz: daca7cfcc9d0814d7423a1a15773aa6a02f65810
 SHA512:
-  metadata.gz: 92b19376b2470b30da3196aa702958f837002bac6873f093be78dcf3c60d105c3472bdd9e9b27def0a5f1e539cced568120719dc9338ef33e7d28007371e0aff
-  data.tar.gz: a5d950dc9e1089851a0bdd6b3c20a27c308f8b7d7a0a9ef85d47de0037e3109fceaa97b68bfe722c04f010115085532f98c9db5d5492a0afff05614ff71ef346
+  metadata.gz: 0689228efca83f14f7289376ba2e36f5e5034202fcfda983bb02c3a89382a8fa329c74c614600cb59adccfca8db94d762fd30c5406b221d2d2e3f045ed8fc841
+  data.tar.gz: 0bbf24196e0912384045f251c14b28a79e4dea2b864c62b7d5f3e284c22485260d8affbb54c19a9c60d09b1e251c5eae2eff4942768590d88d5d8e1f9549e927

data/lib/MrMurano.rb

@@ -1,24 +1,26 @@
 require 'MrMurano/version'
 require 'MrMurano/verbosing'
-require 'MrMurano/hash.rb'
+require 'MrMurano/hash'
 require 'MrMurano/http'
-require 'MrMurano/configFile'
+require 'MrMurano/Config'
 require 'MrMurano/Account'
 require 'MrMurano/Solution'
-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/Solution-Endpoint'
+require 'MrMurano/Solution-File'
+require 'MrMurano/Solution-Services'
+require 'MrMurano/Solution-Users'
+require 'MrMurano/Solution-ServiceConfig'
 require 'MrMurano/Product'
 
+require 'MrMurano/accountCommand'
+require 'MrMurano/assignCommand'
 require 'MrMurano/configCommand'
 require 'MrMurano/contentCommand'
 require 'MrMurano/cors'
 require 'MrMurano/exportImport'
-require 'MrMurano/keystore.rb'
-require 'MrMurano/logs.rb'
-require 'MrMurano/sync.rb'
-require 'MrMurano/status.rb'
-require 'MrMurano/timeseries.rb'
+require 'MrMurano/keystore'
+require 'MrMurano/logs'
+require 'MrMurano/status'
+require 'MrMurano/sync'
+require 'MrMurano/timeseries'
 #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
@@ -23,6 +23,7 @@ module MrMurano
       end
     end
     def save()
+      @path.dirname.mkpath unless @path.dirname.exist?
       @path.open('wb') do |io|
         io << @data.to_yaml
       end
@@ -124,55 +125,4 @@ 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,6 +2,8 @@ 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,6 +2,7 @@ require 'uri'
 require 'net/http'
 require 'json'
 require 'pp'
+require 'MrMurano/Solution'
 
 module MrMurano
   # …/endpoint

data/lib/MrMurano/Solution-File.rb

@@ -4,6 +4,7 @@ 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 'terminal-table'
+require 'MrMurano/Solution'
 
 module MrMurano
   # …/serviceconfig
@@ -51,55 +51,4 @@ 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,6 +2,7 @@ require 'uri'
 require 'net/http'
 require 'json'
 require 'pp'
+require 'MrMurano/Solution'
 
 module MrMurano
   ##

data/lib/MrMurano/Solution-Users.rb

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

data/lib/MrMurano/Solution.rb

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

data/lib/MrMurano/accountCommand.rb

@@ -0,0 +1,54 @@
+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

@@ -0,0 +1,54 @@
+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 :

data/lib/MrMurano/exportImport.rb

@@ -4,11 +4,21 @@ require 'fileutils'
 
 command 'config export' do |c|
   c.syntax = %{mr config export}
-  c.summary = %{Export data to a Solutionfile.json and .Solutionfile.secret}
+  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.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')
 
@@ -17,24 +27,26 @@ 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
@@ -71,7 +83,12 @@ end
 
 command 'config import' do |c|
   c.syntax = %{mr config import}
-  c.summary = %{Import data from a Solutionfile.json and .Solutionfile.secret}
+  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.action do |args, options|
     solfile = ($cfg['location.base'] + 'Solutionfile.json')

data/lib/MrMurano/version.rb

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

data/spec/Account-Passwords_spec.rb

@@ -1,16 +1,7 @@
-require 'rubygems'
-require 'commander/import'
-require 'MrMurano'
+require 'MrMurano/version'
+require 'MrMurano/Account'
 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.
@@ -24,6 +15,18 @@ RSpec.describe MrMurano::Passwords, "#pwd" do
     end
   end
 
+  it "Creates a file in a directory that doesn't exist." do
+    tmpfile = Dir.tmpdir + '/deeper/pwtest' # This way because Tempfile.new creates.
+    begin
+      pwd = MrMurano::Passwords.new( tmpfile )
+      pwd.save
+
+      expect( FileTest.exists?(tmpfile) )
+    ensure
+      File.unlink(tmpfile) if File.exists? tmpfile
+    end
+  end
+
   it "Loads a file" do
     Tempfile.open('test') do |tf|
       tf << %{---

data/spec/ProductBase_spec.rb

@@ -1,8 +1,5 @@
 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,8 +1,5 @@
 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,8 +1,5 @@
 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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: MrMurano
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Michael Conrad Tadpol Tilstra
@@ -185,6 +185,7 @@ 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
@@ -192,8 +193,9 @@ 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