MrMurano 1.6.3 → 1.7.0

data/lib/MrMurano/commands/cors.rb

@@ -1,54 +1,27 @@
-
-module MrMurano
-  class Cors < SolutionBase
-    def initialize
-      super
-      @uriparts << 'cors'
-      @location = $cfg['location.cors']
-    end
-
-    def fetch()
-      ret = get()
-      ret[:cors]
-    end
-
-    # TODO: fill out other metheds so this could be part of sync up/down.
-
-    ##
-    # Upload CORS
-    # :local path to file to push
-    # :remote hash of method and endpoint path (ignored for now)
-    def upload(local, remote)
-      local = Pathname.new(local) unless local.kind_of? Pathname
-      raise "no file" unless local.exist?
-
-      local.open do |io|
-        data = YAML.load(io)
-        put('', data)
-      end
-    end
-
-    def tolocalpath(into, item)
-      into
-    end
-  end
-end
+require 'yaml'
+require 'MrMurano/Solution-Cors'
 
 command :cors do |c|
   c.syntax = %{mr cors [options]}
-  c.description = %{Get or set the CORS for the solution.}
+  c.summary = %{Get or set the CORS for the solution. [Deprecated]}
+  c.description = %{Get or set the CORS for the solution.
+
+This is deprecated.  Use `mr syncup --cors` or `mr syncdown --cors` instead.
+  }
   c.option '-f','--file FILE', String, %{File to set CORS from}
 
   c.action do |args,options|
+    say_warning "This is deprecated.  Use `mr syncup --cors` or `mr syncdown --cors` instead."
     sol = MrMurano::Cors.new
 
     if options.file then
       #set
-      pp sol.upload(options.file, {})
+      data = sol.localitems(options.file)
+      sol.outf sol.upload(options.file, data.first)
     else
       # get
       ret = sol.fetch()
-      puts ret
+      sol.outf ret
     end
   end
 

data/lib/MrMurano/commands/exportImport.rb

@@ -8,7 +8,7 @@ command 'config export' do |c|
   c.description = %{Export data to Solutionfiles
 
   This will write to the Solutionfile.json and .Solutionfile.secret used by the
-  exosite-cil tool.
+  exosite-cli tool.
 
   This also will merge all of the endpoints into a single 'routes.lua' file.
   }
@@ -23,8 +23,9 @@ command 'config export' do |c|
     solsecret = Pathname.new($cfg['location.base'] + '.Solutionfile.secret')
 
     if not options.force and (solfile.exist? or solsecret.exist?) then
-      say_error "Solutionfile.json or .Solutionfile.secret already exist."
-      say "Use --force to overwrite"
+      sol = MrMurano::Solution.new
+      sol.error "Solutionfile.json or .Solutionfile.secret already exist."
+      sol.error "Use --force to overwrite"
     end
 
     solf = {

data/lib/MrMurano/commands/keystore.rb

@@ -1,3 +1,4 @@
+require 'MrMurano/Solution-ServiceConfig'
 
 module MrMurano
   class Keystore < ServiceConfig
@@ -7,29 +8,29 @@ module MrMurano
     end
 
     def keyinfo
-      ret = get("/#{scid}/call/info")
+      call(:info)
     end
 
     def listkeys
-      ret = get("/#{scid}/call/list")
+      ret = call(:list)
       ret[:keys]
     end
 
     def getkey(key)
-      ret = post("/#{scid}/call/get", {:key=>key})
+      ret = call(:get, :post, {:key=>key})
       ret[:value]
     end
 
     def setkey(key, value)
-      post("/#{scid}/call/set", { :key=>key, :value=>value })
+      call(:set, :post, { :key=>key, :value=>value })
     end
 
     def delkey(key)
-      post("/#{scid}/call/delete", { :key=>key})
+      call(:delete, { :key=>key})
     end
 
     def command(key, cmd, args)
-      post("/#{scid}/call/command", {:key=>key, :command=>cmd, :args=>args})
+      call(:command, {:key=>key, :command=>cmd, :args=>args})
     end
 
   end
@@ -40,7 +41,7 @@ command 'keystore info' do |c|
   c.description = %{Show info about the Keystore}
   c.action do |args,options|
     sol = MrMurano::Keystore.new
-    pp sol.keyinfo
+    sol.outf sol.keyinfo
   end
 end
 
@@ -49,9 +50,7 @@ command 'keystore list' do |c|
   c.description = %{List all of the keys in the Keystore}
   c.action do |args,options|
     sol = MrMurano::Keystore.new
-    sol.listkeys.each do |key|
-      puts key
-    end
+    sol.outf sol.listkeys
   end
 end
 alias_command :keystore, 'keystore list'
@@ -62,7 +61,7 @@ command 'keystore get' do |c|
   c.action do |args,options|
     sol = MrMurano::Keystore.new
     ret = sol.getkey(args[0])
-    puts ret
+    sol.outf ret
   end
 end
 
@@ -98,16 +97,16 @@ See http://docs.exosite.com/murano/services/keystore/#command for current list.
   c.example %{mr keystore command lpush mykey A B C}, %{Push three values onto list}
   c.example %{mr keystore command lrem mykey 0 B}, %{Remove all B values from list}
   c.action do |args,options|
+    sol = MrMurano::Keystore.new
     if args.count < 2 then
-      say_error "Not enough params"
+      sol.error "Not enough params"
     else
-      sol = MrMurano::Keystore.new
       ret = sol.command(args[1], args[0], args[2..-1])
       if ret.has_key?(:value) then
-        puts ret[:value]
+        sol.outf ret[:value]
       else
-        say_error "#{ret[:code]}: #{ret.message}"
-        pp ret[:error] if ($cfg['tool.debug'] and ret.has_key?(:error))
+        sol.error "#{ret[:code]}: #{ret.message}"
+        sol.outf ret[:error] if ($cfg['tool.debug'] and ret.has_key?(:error))
       end
     end
   end

data/lib/MrMurano/commands/logs.rb

@@ -38,7 +38,7 @@ command :logs do |c|
                                         :create_additions=>false})
                     puts MrMurano::Pretties::makePretty(js, options)
                   rescue
-                    say_error '=== JSON parse error, showing raw instead ==='
+                    sol.error '=== JSON parse error, showing raw instead ==='
                     puts m
                   end
                 end
@@ -68,7 +68,7 @@ command :logs do |c|
           end
         end
       else
-        say_error "Couldn't get logs: #{ret}"
+        sol.error "Couldn't get logs: #{ret}"
         break
       end
 

data/lib/MrMurano/commands/productCreate.rb

@@ -4,22 +4,22 @@ command 'product create' do |c|
   c.description = %{Create a new product}
 
   c.action do |args, options|
+    acc = MrMurano::Account.new
     if args.count < 1 then
-      say_error "Name of product missing"
+      acc.error "Name of product missing"
       return
     end
     name = args[0]
 
-    acc = MrMurano::Account.new
     ret = acc.new_product(name)
     if not ret.kind_of?(Hash) and not ret.empty? then
-      say_error "Create failed: #{ret.to_s}"
+      acc.error "Create failed: #{ret.to_s}"
       return
     end
 
     # create doesn't return anything, so we need to go look for it.
     ret = acc.products.select{|i| i[:label] == name}
-    say ret.first[:modelId]
+    acc.outf ret.first[:modelId]
 
   end
 end

data/lib/MrMurano/commands/productDelete.rb

@@ -6,28 +6,26 @@ command 'product delete' do |c|
   c.description = %{Delete a product}
 
   c.action do |args, options|
+    acc = MrMurano::Account.new
     if args.count < 1 then
-      say_error "Product id or name missing"
+      acc.error "Product id or name missing"
       return
     end
     name = args[0]
 
-    acc = MrMurano::Account.new
 
     # Need to convert what we got into the internal PID.
     ret = acc.products.select{|i| i.has_value? name }
 
-    if $cfg['tool.debug'] then
-      say "Matches found:"
-      pp ret
-    end
+    acc.debug "Matches found:"
+    acc.outf(ret) if $cfg['tool.debug']
 
     if ret.empty? then
-      say_error "No product matching '#{name}' found. Nothing to delete."
+      acc.error "No product matching '#{name}' found. Nothing to delete."
     else
       ret = acc.delete_product(ret.first[:pid])
       if not ret.kind_of?(Hash) and not ret.empty? then
-        say_error "Delete failed: #{ret.to_s}"
+        acc.error "Delete failed: #{ret.to_s}"
       end
     end
   end

data/lib/MrMurano/commands/productSpec.rb

@@ -1,6 +1,8 @@
+require 'MrMurano/Account'
 require 'MrMurano/Product'
 require 'MrMurano/hash'
 require 'yaml'
+require 'terminal-table'
 
 command 'product spec convert' do |c|
   c.syntax = %{mr product spec convert FILE}
@@ -8,38 +10,22 @@ command 'product spec convert' do |c|
   c.option '-o', '--output FILE', %{Download to file instead of STDOUT}
 
   c.action do |args, options|
+    prd = MrMurano::Product.new
     if args.count == 0 then
-      say_error "Missing file"
+      prd.error "Missing file"
     else
-
-      File.open(args[0]) do |fin|
-        spec = YAML.load(fin)
-        unless spec.has_key?('dataports') then
-          say_error "Not an exoline spec file"
-        else
-          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
-
-          spec = {'resource'=>dps}
-          if options.output then
-            File.open(options.output, 'w') do |io|
-              io << spec.to_yaml
-            end
-          else
-            puts spec.to_yaml
-          end
-        end
-      end
+      prd.outf prd.convert(args[0])
     end
   end
 end
 
 command 'product spec push' do |c|
   c.syntax = %{mr product spec push [--file FILE]}
-  c.summary = %{Upload a new specification for a product}
+  c.summary = %{Upload a new specification for a product [Deprecated]}
+  c.description = %{Convert exoline spec file into Murano format
+
+This is deprecated.  Use `mr syncup --specs` instead.
+  }
 
   c.option '--file FILE', "The spec file to upload"
 
@@ -49,6 +35,8 @@ command 'product spec push' do |c|
   # - $cfg['product.spec']
 
   c.action do |args, options|
+    prd = MrMurano::Product.new
+    prd.warning "This is deprecated.  Use `mr syncup --specs` instead."
 
     file = $cfg['product.spec']
     prid = $cfg['product.id']
@@ -56,10 +44,9 @@ command 'product spec push' do |c|
     file = options.file unless options.file.nil?
 
     if not file.nil? and FileTest.exist?(file) then
-      prd = MrMurano::Product.new
-      pp prd.update(file)
+      prd.outf prd.update(file)
     else
-      say_error "No spec file to push: #{file}"
+      prd.error "No spec file to push: #{file}"
     end
   end
 end
@@ -69,27 +56,35 @@ command 'product spec pull' do |c|
   c.summary = %{Pull down the specification for a product}
 
   c.option '-o', '--output FILE', %{Download to file instead of STDOUT}
+  c.option '--aliasonly', 'Only return the aliases'
 
   c.action do |args, options|
     prd = MrMurano::Product.new
     ret = prd.info
 
-    resources = ret[:resources].map do |r|
-      r.delete(:rid)
-      Hash.transform_keys_to_strings(r)
+    io=nil
+    if options.output then
+      io = File.open(options.output, 'w')
     end
 
-    spec = { 'resources'=> resources }
+    if options.aliasonly then
+      ret = ret[:resources].map{|row| row[:alias]}
+    end
 
-    if options.output then
-      File.open(options.output, 'w') do |io|
-        io << spec.to_yaml
+    prd.outf(ret, io) do |dd, ios|
+      if ret.kind_of? Array then
+        ios.puts ret.join(' ')
+      else
+        prd.tabularize({
+          :rows => ret[:resources].map{|r| [r[:alias], r[:format], r[:rid]]},
+          :headers => ['Alias', 'Format', 'RID']
+        }, ios)
       end
-    else
-      puts spec.to_yaml
     end
+    io.close unless io.nil?
   end
 end
 alias_command 'product spec', 'product spec pull'
+alias_command 'product spec list', 'product spec pull', '--astable'
 
 #  vim: set ai et sw=2 ts=2 :

data/lib/MrMurano/commands/productWrite.rb

@@ -6,17 +6,19 @@ command 'product write' do |c|
 
   c.action do |args,options|
     sn = args.shift
+    prd = MrMurano::Product.new
     if (args.count % 2) != 0 then
-      say_error "Last alias is missing a value to write."
+      prd.error "Last alias is missing a value to write."
     else
       data = Hash[*args]
-      prd = MrMurano::Product.new
       ret = prd.write(sn, data)
-      ret.each_pair do |k,v|
-        if v == 'ok' then
-          say "#{k.to_s}: #{v}"
-        else
-          say_error "#{k.to_s}: #{v}"
+      prd.outf(ret) do |dd|
+        ret.each_pair do |k,v|
+          if v == 'ok' then
+            say "#{k.to_s}: #{v}"
+          else
+            prd.error "#{k.to_s}: #{v}"
+          end
         end
       end
     end

data/lib/MrMurano/commands/serialNumberCmds.rb

@@ -42,7 +42,7 @@ the activation call within this time, it will need to be enabled again.
     elsif args.count > 0 then
       prd.enable(args[0])
     else
-      say_error "Missing a serial number to enable"
+      prd.error "Missing a serial number to enable"
     end
   end
 end
@@ -61,14 +61,14 @@ CIK again.
 }
 
   c.action do |args,options|
+    prd = MrMurano::ProductSerialNumber.new
     if args.count < 1 then
-      say_error "Serial number missing"
+      prd.error "Serial number missing"
       return
     end
     sn = args.first
 
-    prd = MrMurano::ProductSerialNumber.new
-    pp prd.activate(sn)
+    prd.outf prd.activate(sn)
 
   end
 end

data/lib/MrMurano/commands/solutionCreate.rb

@@ -4,22 +4,22 @@ command 'solution create' do |c|
   c.description = %{Create a new solution}
 
   c.action do |args, options|
+    acc = MrMurano::Account.new
     if args.count < 1 then
-      say_error "Name of solution missing"
+      acc.error "Name of solution missing"
       return
     end
     name = args[0]
 
-    acc = MrMurano::Account.new
     ret = acc.new_solution(name)
     if not ret.kind_of?(Hash) and not ret.empty? then
-      say_error "Create failed: #{ret.to_s}"
+      acc.error "Create failed: #{ret.to_s}"
       return
     end
 
     # create doesn't return anything, so we need to go look for it.
     ret = acc.solutions.select{|i| i[:domain] =~ /#{name}\./}
-    say ret.first[:apiId]
+    acc.outf ret.first[:apiId]
 
   end
 end

data/lib/MrMurano/commands/solutionDelete.rb

@@ -5,28 +5,28 @@ command 'solution delete' do |c|
   c.description = %{Delete a solution}
 
   c.action do |args, options|
+    acc = MrMurano::Account.new
     if args.count < 1 then
-      say_error "Solution id or name missing"
+      acc.error "Solution id or name missing"
       return
     end
     name = args[0]
 
-    acc = MrMurano::Account.new
 
     # Need to convert what we got into the internal PID.
     ret = acc.solutions.select{|i| i.has_value?(name) or i[:domain] =~ /#{name}\./ }
 
     if $cfg['tool.debug'] then
       say "Matches found:"
-      pp ret
+      acc.outf ret
     end
 
     if ret.empty? then
-      say_error "No solution matching '#{name}' found. Nothing to delete."
+      acc.error "No solution matching '#{name}' found. Nothing to delete."
     else
       ret = acc.delete_solution(ret.first[:sid])
       if not ret.kind_of?(Hash) and not ret.empty? then
-        say_error "Delete failed: #{ret.to_s}"
+        acc.error "Delete failed: #{ret.to_s}"
       end
     end
   end

data/lib/MrMurano/commands/status.rb

@@ -3,24 +3,21 @@ command :status do |c|
   c.syntax = %{mr status [options]}
   c.description = %{Get the status of files}
   c.option '--all', 'Check everything'
-  c.option '-s','--[no-]files', %{Static Files}
-  c.option '-a','--[no-]endpoints', %{Endpoints}
-  c.option '-m','--[no-]modules', %{Modules}
-  c.option '-e','--[no-]eventhandlers', %{Event Handlers}
-  c.option '--[no-]roles', %{Roles}
-  c.option '--[no-]users', %{Users}
+
+  # Load options to control which things to status
+  MrMurano::SyncRoot.each_option do |s,l,d|
+    c.option s, l, d
+  end
 
   c.option '--[no-]asdown', %{Report as if syncdown instead of syncup}
   c.option '--[no-]diff', %{For modified items, show a diff}
   c.option '--[no-]grouped', %{Group all adds, deletes, and mods together}
   c.option '--[no-]showall', %{List unchanged as well}
-  
+
   c.action do |args,options|
     options.default :delete=>true, :create=>true, :update=>true, :diff=>false,
       :grouped => true
 
-    MrMurano.checkSAME(options)
-
     def fmtr(item)
       if item.has_key? :local_path then
         item[:local_path].relative_path_from(Pathname.pwd()).to_s
@@ -54,41 +51,11 @@ command :status do |c|
         pretty(ret, options)
       end
     end
-    
-    if options.endpoints then
-      sol = MrMurano::Endpoint.new
-      ret = sol.status(options)
-      gmerge(ret, 'A', options)
-    end
-
-    if options.modules then
-      sol = MrMurano::Library.new
-      ret = sol.status(options)
-      gmerge(ret, 'M', options)
-    end
-
-    if options.eventhandlers then
-      sol = MrMurano::EventHandler.new
-      ret = sol.status(options)
-      gmerge(ret, 'E', options)
-    end
-
-    if options.roles then
-      sol = MrMurano::Role.new
-      ret = sol.status(options)
-      gmerge(ret, 'R', options)
-    end
-
-    if options.users then
-      sol = MrMurano::User.new
-      ret = sol.status(options)
-      gmerge(ret, 'U', options)
-    end
 
-    if options.files then
-      sol = MrMurano::File.new
+    MrMurano::SyncRoot.each_filtered(options.__hash__) do |name, type, klass|
+      sol = klass.new
       ret = sol.status(options)
-      gmerge(ret, 'S', options)
+      gmerge(ret, type, options)
     end
 
     pretty(@grouped, options) if options.grouped