MuranoCLI 2.2.3 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9accf3aa9ba6d1b05ce2f8e5ec5e25f5dd7112a
-  data.tar.gz: b5ad0c1ea60a8638ced916c1f5364b3b21802deb
+  metadata.gz: e73fc277539519b2b36d38f2d86a67bd106779e2
+  data.tar.gz: f715f1075a208806e9ff2f9e989f154f312bfde8
 SHA512:
-  metadata.gz: b9e0922ce8294ca87478ce84f764e4afce1b979dd2e7f79344a2260da50a03f19b366e17bde29f0507049b52ca4b0bd8d0fb1b9b04e667c06affd0b9a32f01fe
-  data.tar.gz: 3ae95b5db41330ee002fcc26102f80f2a39f547ee3e28a03ca45341a965b15d67f4d3a6f31529cc20b541105160b0dce77e3f55d362a29318bd07ebc70a16e74
+  metadata.gz: 552129eb3e4167a498cd8ad76910fa9efd1793cc1b96331542956009c5e18eacdede1a27bd3017b2d10b77e7aa6add683609459c40ff8bf107b864e23a8cb85d
+  data.tar.gz: 351343bca4f083fbb75ca4452a5878c43268943ea25c905d8d73f55b7de954442c12124eb1e1fe2a18fa2dc04d000fb7596e5cc7dfe6391d43338fb964f98f41

data/.agignore

@@ -0,0 +1,13 @@
+.git/
+coverage/
+pkg/
+report/
+
+.byebug_history
+.rspec_examples.txt
+Gemfile.lock
+.bundle/
+
+# 2017-05-12: Testing!
+*.out
+

data/Rakefile

@@ -31,7 +31,7 @@ gvim lib/MrMurano/version.rb
 git commit -a -m 'version bump'
 git flow release finish <newversion>
 # When editing message for tag, add release notes.
-rake git:all
+#rake git:all
 # Wait for all tests to complete.
 # if all passed: rake gemit
 EOR
@@ -71,24 +71,24 @@ end
 
 ###
 # When new tags are pushed to upstream, the CI will kick-in and build the release
-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
-
-    desc "Push to origin and upstream"
-    task :all => [:origin, :upstream]
-end
+#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
+#
+#    desc "Push to origin and upstream"
+#    task :all => [:origin, :upstream]
+#end
 
 desc "Build, install locally, and push gem"
 task :gemit do

data/lib/MrMurano.rb

@@ -17,5 +17,5 @@ require 'MrMurano/Product'
 require 'MrMurano/Product-1P-Device'
 require 'MrMurano/Product-Resources'
 
-require 'MrMurano/ReCommander'
+#require 'MrMurano/ReCommander'
 require 'MrMurano/commands'

data/lib/MrMurano/Config.rb

@@ -142,6 +142,8 @@ module MrMurano
       else
         set('diff.cmd', 'diff -u', :defaults)
       end
+
+      set('postgresql.migrations_dir', 'sql-migrations', :defaults)
     end
 
     ## Find the root of this project Directory.
@@ -281,6 +283,9 @@ module MrMurano
 
   end
 
+  class ConfigError < StandardError
+  end
+
 end
 
 #  vim: set ai et sw=2 ts=2 :

data/lib/MrMurano/ReCommander.rb

@@ -35,7 +35,14 @@ module Commander
       hooked = MrMurano::Hooked.new(section)
       hooked.check_run_pre_hook
 
-      old_run_active_command
+      begin
+        old_run_active_command
+      rescue MrMurano::ConfigError => err
+        puts err.message
+        exit 1
+      rescue StandardError => err
+        raise
+      end
 
       hooked.check_run_post_hook
     end

data/lib/MrMurano/Solution-Cors.rb

@@ -13,6 +13,7 @@ module MrMurano
 
     def fetch(id=nil, &block)
       ret = get()
+      return [] if ret.is_a? Hash and ret.has_key? :error
       if ret.kind_of?(Hash) and ret.has_key?(:cors) then
         # XXX cors is a JSON encoded string. That seems weird. keep an eye on this.
         data = JSON.parse(ret[:cors], @json_opts)

data/lib/MrMurano/Solution-Endpoint.rb

@@ -30,7 +30,9 @@ module MrMurano
     ##
     # This gets all data about all endpoints
     def list
-      get().map do |item|
+      ret = get()
+      return [] if ret.is_a? Hash and ret.has_key? :error
+      ret.map do |item|
         if item[:content_type].nil? or item[:content_type].empty? then
           item[:content_type] = 'application/json'
         end

data/lib/MrMurano/Solution-File.rb

@@ -28,7 +28,9 @@ module MrMurano
     ##
     # Get a list of all of the static content
     def list
-      get().map{|i| FileItem.new(i)}
+      ret = get()
+      return [] if ret.is_a? Hash and ret.has_key? :error
+      ret.map{|i| FileItem.new(i)}
     end
 
     ##

data/lib/MrMurano/Solution-ServiceConfig.rb

@@ -10,7 +10,9 @@ module MrMurano
     end
 
     def list
-      get()[:items]
+      ret = get()
+      return [] if ret.is_a? Hash and ret.has_key? :error
+      ret[:items]
     end
     def fetch(id)
       get('/' + id.to_s)
@@ -85,6 +87,7 @@ module MrMurano
 
     def list
       ret = get()
+      return [] if ret.is_a? Hash and ret.has_key? :error
       ret[:items]
     end
 

data/lib/MrMurano/Solution-Services.rb

@@ -191,7 +191,7 @@ module MrMurano
 
     def list
       ret = get()
-      return [] unless ret.has_key? :items
+      return [] if ret.is_a? Hash and ret.has_key? :error
       ret[:items].map{|i| LibraryItem.new(i)}
     end
 
@@ -250,6 +250,7 @@ module MrMurano
 
     def list
       ret = get()
+      return [] if ret.is_a? Hash and ret.has_key? :error
       # eventhandler.skiplist is a list of whitespace seperated dot-paired values.
       # fe: service.event service service service.event
       skiplist = ($cfg['eventhandler.skiplist'] or '').split

data/lib/MrMurano/Solution.rb

@@ -8,7 +8,7 @@ module MrMurano
   class SolutionBase
     def initialize
       @sid = $cfg['solution.id']
-      raise "No solution!" if @sid.nil?
+      raise MrMurano::ConfigError.new("No solution!") if @sid.nil?
       @uriparts = [:solution, @sid]
       @itemkey = :id
       @project_section = nil

data/lib/MrMurano/SyncUpDown.rb

@@ -658,7 +658,7 @@ module MrMurano
 
     ## Get status of things here verses there
     #
-    # @param options [Hash, Commander::Command::Options] Options on opertation
+    # @param options [Hash, Commander::Command::Options] Options on operation
     # @param selected [Array<String>] Filters for _matcher
     # @return [Hash{Symbol=>Array<Item>}] Items grouped by the action that should be taken
     def status(options={}, selected=[])
@@ -694,7 +694,7 @@ module MrMurano
         mrg = herebox[key].reject{|k,v| k==itemkey}
         mrg = therebox[key].merge(mrg)
         if docmp(herebox[key], therebox[key]) then
-          mrg[:diff] = dodiff(mrg) if options[:diff] and mrg[:selected]
+          mrg[:diff] = dodiff(mrg.to_h) if options[:diff] and mrg[:selected]
           tomod << mrg
         else
           unchg << mrg

data/lib/MrMurano/commands.rb

@@ -1,4 +1,5 @@
 require 'MrMurano/commands/assign'
+require 'MrMurano/commands/business'
 require 'MrMurano/commands/businessList'
 require 'MrMurano/commands/config'
 require 'MrMurano/commands/content'

data/lib/MrMurano/commands/business.rb

@@ -0,0 +1,15 @@
+require 'MrMurano/SubCmdGroupContext'
+
+command :business do |c|
+  c.syntax = %{murano business}
+  c.summary = %{About Business}
+  c.description = %{Sub-commands for working with Businesses}
+
+  c.action do |args, options|
+    ::Commander::UI.enable_paging
+    say MrMurano::SubCmdGroupHelp.new(c).get_help
+  end
+end
+
+#  vim: set ai et sw=2 ts=2 :
+

data/lib/MrMurano/commands/init.rb

@@ -63,7 +63,7 @@ command :init do |c|
     if not options.force and not $cfg['solution.id'].nil? then
       say "Using Solution ID already set to #{$cfg['solution.id']}"
     else
-      solz = acc.solutions
+      solz = acc.solutions.select{|s| s[:type] == 'dataApi'}
       if solz.count == 1 then
         sol = solz.first
         say "You only have one solution; using #{sol[:domain]}"
@@ -83,10 +83,12 @@ command :init do |c|
         end
 
         # create doesn't return anything, so we need to go look for it.
-        ret = acc.solutions.select{|i| i[:domain] =~ /#{solname}\./}
-        sid = ret.first[:apiId]
+        ret = acc.solutions.select do |i|
+          i[:type] == 'dataApi' and (i[:name] == solname or i[:domain] =~ /#{solname}\./i)
+        end
+        sid = (ret.first or {})[:apiId]
         if sid.nil? or sid.empty? then
-          acc.error "Solution didn't find an apiId!!!!  #{ret}"
+          acc.error "Solution didn't find an apiId!!!! #{name} -> #{ret}"
           exit 3
         end
         $cfg.set('solution.id', sid, :project)

data/lib/MrMurano/commands/postgresql.rb

@@ -7,12 +7,16 @@ module MrMurano
       @serviceName = 'postgresql'
     end
 
-    def query(query)
-      call(:query, :post, {:sql=>query})
+    def query(query, params=nil)
+      aqr = {:sql=>query}
+      aqr[:parameters] = params unless params.nil?
+      call(:query, :post, aqr)
     end
 
-    def queries(query)
-      call(:queries, :post, {:sql=>query})
+    def queries(query, params=nil)
+      aqr = {:sql=>query}
+      aqr[:parameters] = params unless params.nil?
+      call(:queries, :post, aqr)
     end
   end
 end
@@ -20,18 +24,28 @@ end
 command :postgresql do |c|
   c.syntax = %{murano postgresql <SQL Commands>}
   c.summary = %{Query the relational database}
+  c.description = %{Query the relational database
 
+  Queries can include $# escapes that are filled from the --param option.
+  }
+
+  c.option '--param LIST',Array,  %{Values to fill $# with}
   c.option '-f', '--file FILE', %{File of SQL commands}
   c.option '-o', '--output FILE', %{Download to file instead of STDOUT}
 
+  c.example %{murano postgresql 'select * from bob'}, %{Run a SQL command}
+  c.example %{murano postgresql 'select * from prices' -c outformat=csv -o prices.csv}, %{Download all values in prices to a CSV file.}
+  c.example %{murano postgresql 'INSERT INTO prices (price, item) VALUES ($1,$2)' --param 1.24,Food}, %{Insert using parameters.}
+  c.example %{murano postgresql -f cmds.sql}, %{Run multiple commands from a file}
+
   c.action do |args,options|
     pg = MrMurano::Postgresql.new
     if options.file then
       sqls = File.read(options.file)
 
-      ret = pg.queries sqls
+      ret = pg.queries(sqls, options.param)
     else
-      ret = pg.query args.join(' ')
+      ret = pg.query(args.join(' '), options.param)
     end
 
     unless ret[:error].nil? then
@@ -58,21 +72,26 @@ end
 
 command 'postgresql migrate' do |c|
   c.syntax = %{murano postgresql migrate (up|down) <level>}
-  c.summary = %{Run database migration scripts.
-
+  c.summary = %{Run database migration scripts.}
+  c.description = %{Run database migration scripts.
 
   The names of the script files must be in the "<level>-<name>-<up|down>.sql"
-  format.
+  format.  Each file is a series of Postgres SQL commands.
 
   The current version of the migrations (last <level> ran) will be stored in an
-  extra table in your database.  (__murano_cli_migrate__)
+  extra table in your database.  (__murano_cli__.migrate_version)
 
   }
 
   c.option '--dir DIR', %{Directory where migrations live}
 
+  c.example %{murano postgresql migrate up}, %{Run migrations up to largest version.}
+  c.example %{murano postgresql migrate up 2}, %{Run migrations up to version 2.}
+  c.example %{murano postgresql migrate down 1}, %{Run migrations down to version 1.}
+  c.example %{murano postgresql migrate down 0}, %{Run migrations down to version 0.}
+
   c.action do |args,options|
-    options.default :dir => File.join($cfg['location.base'], 'sql-migrations')
+    options.default :dir => File.join($cfg['location.base'], $cfg['postgresql.migrations_dir'])
 
     direction = args.shift
     if direction =~ /down/i then
@@ -87,8 +106,9 @@ command 'postgresql migrate' do |c|
 
     # get current version of DB.
     ret = pg.queries %{
-    CREATE TABLE IF NOT EXISTS __murano_cli_migrate__ (version integer);
-    SELECT version FROM __murano_cli_migrate__;
+    CREATE SCHEMA IF NOT EXISTS __murano_cli__;
+    CREATE TABLE IF NOT EXISTS __murano_cli__.migrate_version (version integer);
+    SELECT version FROM __murano_cli__.migrate_version ORDER BY version DESC;
     }.gsub(/^\s+/,'')
     unless ret[:error].nil? then
       pp ret
@@ -122,6 +142,7 @@ command 'postgresql migrate' do |c|
       end
     end
 
+    pg.debug "Migrations before: #{migrations}"
     # Select migrations between current and desired
     migrations.select! do |m|
       mvrs, _ = File.basename(m).split('-')
@@ -132,6 +153,7 @@ command 'postgresql migrate' do |c|
         mvrs > current_version and mvrs <= want_version
       end
     end
+    pg.debug "Migrations after: #{migrations}"
 
     # Run migrations.
     migrations.each do |m|
@@ -147,10 +169,10 @@ command 'postgresql migrate' do |c|
           exit 5
         else
           if direction == 'down' then
-            pg.queries %{DELETE FROM __murano_cli_migrate__ WHERE version = #{mvrs};
+            pg.queries %{DELETE FROM __murano_cli__.migrate_version WHERE version = #{mvrs};
               COMMIT;}.gsub(/^\s+/,'')
           else
-            pg.queries %{INSERT INTO __murano_cli_migrate__ values (#{mvrs});
+            pg.queries %{INSERT INTO __murano_cli__.migrate_version values (#{mvrs});
               COMMIT;}.gsub(/^\s+/,'')
           end
         end

data/lib/MrMurano/commands/solutionCreate.rb

@@ -23,10 +23,12 @@ command 'solution create' do |c|
     end
 
     # create doesn't return anything, so we need to go look for it.
-    ret = acc.solutions.select{|i| i[:domain] =~ /#{name}\./}
-    sid = ret.first[:apiId]
+    ret = acc.solutions.select do |i|
+      i[:type] == 'dataApi' and (i[:name] == name or i[:domain] =~ /#{name}\./i)
+    end
+    sid = (ret.first or {})[:apiId]
     if sid.nil? or sid.empty? then
-      acc.error "Didn't find an apiId!!!!  #{ret}"
+      acc.error "Didn't find an apiId!!!! #{name} -> #{ret} "
       exit 3
     end
     if options.save then

data/lib/MrMurano/commands/status.rb

@@ -69,15 +69,21 @@ command :status do |c|
     @grouped = {:toadd=>[],:todel=>[],:tomod=>[], :unchg=>[]}
     def gmerge(ret, type, options)
       if options.grouped then
-        [:toadd, :todel, :tomod, :unchg].each do |kind|
-          ret[kind].each do |item|
-            item = item.to_h
-            item[:pp_type] = type
-            @grouped[kind] << item
-          end
-        end
+        out = @grouped
       else
-        pretty(ret, options)
+        out = {:toadd=>[],:todel=>[],:tomod=>[], :unchg=>[]}
+      end
+
+      [:toadd, :todel, :tomod, :unchg].each do |kind|
+        ret[kind].each do |item|
+          item = item.to_h
+          item[:pp_type] = type
+          out[kind] << item
+        end
+      end
+
+      unless options.grouped then
+        pretty(out, options)
       end
     end
 

data/lib/MrMurano/version.rb

@@ -1,4 +1,4 @@
 module MrMurano
-  VERSION = '2.2.3'.freeze
+  VERSION = '2.2.4'.freeze
 end
 

data/spec/cmd_domain_spec.rb

@@ -22,7 +22,7 @@ RSpec.describe 'murano domain', :cmd, :needs_password do
 
   it "show domain" do
     out, err, status = Open3.capture3(capcmd('murano', 'domain'))
-    expect(out.chomp).to eq("#{@project_name}.apps.exosite.io")
+    expect(out.chomp).to eq("#{@project_name.downcase}.apps.exosite.io")
     expect(err).to eq('')
     expect(status.exitstatus).to eq(0)
   end

data/spec/fixtures/dumped_config

@@ -40,3 +40,6 @@ ignoring = *_test.lua *_spec.lua .*
 
 [diff]
 cmd = <%= Gem.win_platform? ? 'fc' : 'diff -u' %>
+
+[postgresql]
+migrations_dir = sql-migrations

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: MuranoCLI
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.2.4
 platform: ruby
 authors:
 - Michael Conrad Tadpol Tilstra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-12 00:00:00.000000000 Z
+date: 2017-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -246,6 +246,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- .agignore
 - .gitignore
 - .rspec
 - .travis.yml
@@ -280,6 +281,7 @@ files:
 - lib/MrMurano/SyncUpDown.rb
 - lib/MrMurano/commands.rb
 - lib/MrMurano/commands/assign.rb
+- lib/MrMurano/commands/business.rb
 - lib/MrMurano/commands/businessList.rb
 - lib/MrMurano/commands/completion.rb
 - lib/MrMurano/commands/config.rb