MuranoCLI 2.0.0 → 2.1.0

data/lib/MrMurano/commands/gb.rb

@@ -2,8 +2,8 @@ require 'pp'
 
 # You don't need this.
 # To use this:
-# - mkdir -p ~/.mrmurano/plugins
-# - ln gb.rb ~/.mrmurano/plugins
+# - mkdir -p ~/.murano/plugins
+# - ln gb.rb ~/.murano/plugins
 
 command :_gb do |c|
   c.syntax = %{murano _gb <class> <method> (<args>)}
@@ -18,7 +18,8 @@ command :_gb do |c|
     begin
       gb = Object::const_get("MrMurano::#{cls}").new
       if gb.respond_to? meth then
-        pp gb.__send__(meth, *args)
+        ret = gb.__send__(meth, *args)
+        gb.outf(ret) {|o,i| pp o}
       else
         say_error "'#{cls}' doesn't '#{meth}'"
       end

data/lib/MrMurano/commands/init.rb

@@ -42,6 +42,9 @@ command :init do |c|
         say "You are only part of one business; using #{bizid[:name]}"
         $cfg.set('businesses.id', bizid[:bizid], :project)
 
+      elsif bizz.count == 0 then
+        acc.warning "You don't have any businesses; Log into the webUI and create one."
+        exit 3
       else
         choose do |menu|
           menu.prompt = "Select which Business to use:"
@@ -65,6 +68,29 @@ command :init do |c|
         sol = solz.first
         say "You only have one solution; using #{sol[:domain]}"
         $cfg.set('solution.id', sol[:apiId], :project)
+
+      elsif solz.count == 0 then
+        say "You don't have any solutions; lets create one"
+        solname = ask("Solution Name? ")
+        ret = acc.new_solution(solname)
+        if ret.nil? then
+          acc.error "Create Solution failed"
+          exit 5
+        end
+        if not ret.kind_of?(Hash) and not ret.empty? then
+          acc.error "Create Solution failed: #{ret.to_s}"
+          exit 2
+        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]
+        if sid.nil? or sid.empty? then
+          acc.error "Solution didn't find an apiId!!!!  #{ret}"
+          exit 3
+        end
+        $cfg.set('solution.id', sid, :project)
+
       else
         choose do |menu|
           menu.prompt = "Select which Solution to use:"
@@ -88,6 +114,29 @@ command :init do |c|
         prd = podz.first
         say "You only have one product; using #{prd[:label]}"
         $cfg.set('product.id', prd[:modelId], :project)
+
+      elsif podz.count == 0 then
+        say "You don't have any products; lets create one"
+        podname = ask("Product Name? ")
+        ret = acc.new_product(podname)
+        if ret.nil? then
+          acc.error "Create Product failed"
+          exit 5
+        end
+        if not ret.kind_of?(Hash) and not ret.empty? then
+          acc.error "Create Product failed: #{ret.to_s}"
+          exit 2
+        end
+
+        # create doesn't return anything, so we need to go look for it.
+        ret = acc.products.select{|i| i[:label] == podname}
+        pid = ret.first[:modelId]
+        if pid.nil? or pid.empty? then
+          acc.error "Product didn't find an apiId!!!!  #{ret}"
+          exit 3
+        end
+        $cfg.set('product.id', pid, :project)
+
       else
         choose do |menu|
           menu.prompt = "Select which Product to use:"
@@ -104,8 +153,8 @@ command :init do |c|
     puts ''
     say "Ok, In business ID: #{$cfg['business.id']} using Solution ID: #{$cfg['solution.id']} with Product ID: #{$cfg['product.id']}"
 
-    # If no ProjectFile or Solutionfile, then write a ProjectFile
-    if $project.project_file.nil? then
+    # If no ProjectFile, then write a ProjectFile
+    if not $project.usingProjectfile then
       tmpl = File.read(File.join(File.dirname(__FILE__),'..','template','projectFile.murano.erb'))
       tmpl = ERB.new(tmpl)
       res = tmpl.result($project.data_binding)
@@ -127,7 +176,10 @@ command :init do |c|
         path = $cfg[cfgi]
         path = Pathname.new(path) unless path.kind_of? Pathname
         path = base + path
-        path.mkpath unless path.exist?
+        unless path.exist? then
+          path = path.dirname unless path.extname.empty?
+          path.mkpath
+        end
       end
       say "Default directories created"
     end

data/lib/MrMurano/commands/login.rb

@@ -0,0 +1,20 @@
+require 'MrMurano/Account'
+
+command 'login' do |c|
+  c.syntax = %{murano login}
+  c.summary = %{Log into Murano}
+  c.description = %{Log into Murano
+
+If you are having trouble logging in, try deleting the saved password first.
+`murano password delete <username>`
+  }
+  c.option '--show-token', %{Shows the API token}
+
+  c.action do |args, options|
+    acc = MrMurano::Account.new
+    ret = acc.token
+    say ret if options.show_token
+  end
+end
+
+#  vim: set ai et sw=2 ts=2 :

data/lib/MrMurano/commands/password.rb

@@ -11,10 +11,6 @@ end
 
 alias_command 'password current', :config, 'user.name'
 
-class Outter
-  include MrMurano::Verbose
-end
-
 command 'password list' do |c|
   c.syntax = %{murano password list}
   c.summary = %{List the usernames with saved passwords}
@@ -24,19 +20,16 @@ command 'password list' do |c|
     psd.load
 
     ret = psd.list
-    outter = Outter.new
-    outter.outf(ret) do |dd, ios|
+    psd.outf(ret) do |dd, ios|
       rows=[]
       dd.each_pair do |key, value|
         value.each{|v| rows << [key, v] }
       end
-      outter.tabularize({
+      psd.tabularize({
         :rows=>rows, :headers => [:Host, :Username]
       }, ios)
     end
-
   end
-
 end
 
 command 'password set' do |c|
@@ -50,6 +43,11 @@ command 'password set' do |c|
     psd = MrMurano::Passwords.new
     psd.load
 
+    if args.count < 1 then
+      psd.error "Missing username"
+      exit 1
+    end
+
     username = args.shift
     host = args.shift
     host = $cfg['net.host'] if host.nil?
@@ -76,6 +74,11 @@ command 'password delete' do |c|
     psd = MrMurano::Passwords.new
     psd.load
 
+    if args.count < 1 then
+      psd.error "Missing username"
+      exit 1
+    end
+
     username = args.shift
     host = args.shift
     host = $cfg['net.host'] if host.nil?

data/lib/MrMurano/commands/status.rb

@@ -70,7 +70,11 @@ command :status do |c|
     def gmerge(ret, type, options)
       if options.grouped then
         [:toadd, :todel, :tomod, :unchg].each do |kind|
-          ret[kind].each{|item| item[:pp_type] = type; @grouped[kind] << item}
+          ret[kind].each do |item|
+            item = item.to_h
+            item[:pp_type] = type
+            @grouped[kind] << item
+          end
         end
       else
         pretty(ret, options)

data/lib/MrMurano/commands.rb

@@ -6,6 +6,7 @@ require 'MrMurano/commands/cors'
 require 'MrMurano/commands/domain'
 require 'MrMurano/commands/init'
 require 'MrMurano/commands/keystore'
+require 'MrMurano/commands/login'
 require 'MrMurano/commands/logs'
 require 'MrMurano/commands/mock'
 require 'MrMurano/commands/postgresql'
@@ -24,7 +25,6 @@ require 'MrMurano/commands/solutionDelete'
 require 'MrMurano/commands/solutionList'
 require 'MrMurano/commands/status'
 require 'MrMurano/commands/sync'
-require 'MrMurano/commands/timeseries'
 require 'MrMurano/commands/tsdb'
 require 'MrMurano/commands/usage'
 

data/lib/MrMurano/version.rb

@@ -1,4 +1,4 @@
 module MrMurano
-  VERSION = '2.0.0'.freeze
+  VERSION = '2.1.0'.freeze
 end
 

data/spec/Account_spec.rb

@@ -7,6 +7,8 @@ require '_workspace'
 RSpec.describe MrMurano::Account, "token" do
   include_context "WORKSPACE"
   before(:example) do
+    @saved_cfg = ENV['MURANO_CONFIGFILE']
+    ENV['MURANO_CONFIGFILE'] = nil
     $cfg = MrMurano::Config.new
     $cfg.load
     $cfg['net.host'] = 'bizapi.hosted.exosite.io'
@@ -18,6 +20,7 @@ RSpec.describe MrMurano::Account, "token" do
 
   after(:example) do
     @acc.token_reset
+    ENV['MURANO_CONFIGFILE'] = @saved_cfg
   end
 
   context "Get login info" do
@@ -107,6 +110,8 @@ end
 RSpec.describe MrMurano::Account do
   include_context "WORKSPACE"
   before(:example) do
+    @saved_cfg = ENV['MURANO_CONFIGFILE']
+    ENV['MURANO_CONFIGFILE'] = nil
     $cfg = MrMurano::Config.new
     $cfg.load
     $cfg['net.host'] = 'bizapi.hosted.exosite.io'
@@ -116,6 +121,9 @@ RSpec.describe MrMurano::Account do
     @acc = MrMurano::Account.new
     allow(@acc).to receive(:token).and_return("TTTTTTTTTT")
   end
+  after(:example) do
+    ENV['MURANO_CONFIGFILE'] = @saved_cfg
+  end
 
   it "initializes" do
     uri = @acc.endPoint('')

data/spec/ConfigMigrate_spec.rb

@@ -10,6 +10,8 @@ RSpec.describe MrMurano::ConfigMigrate do
   before(:example) do
     @saved_pwd = ENV['MURANO_PASSWORD']
     ENV['MURANO_PASSWORD'] = nil
+    @saved_cfg = ENV['MURANO_CONFIGFILE']
+    ENV['MURANO_CONFIGFILE'] = nil
 
     $cfg = MrMurano::Config.new
     $cfg.load
@@ -27,6 +29,7 @@ RSpec.describe MrMurano::ConfigMigrate do
   after(:example) do
     $stdout, $stderr = @stdsaved
     ENV['MURANO_PASSWORD'] = @saved_pwd
+    ENV['MURANO_CONFIGFILE'] = @saved_cfg
   end
 
   it "imports all" do

data/spec/Config_spec.rb

@@ -131,8 +131,11 @@ RSpec.describe MrMurano::Config do
     end
 
     context "ENV['MURANO_CONFIGFILE']" do
+      before(:example) do
+        @saved_cfg = ENV['MURANO_CONFIGFILE']
+      end
       after(:example) do
-        ENV['MURANO_CONFIGFILE'] = nil
+        ENV['MURANO_CONFIGFILE'] = @saved_cfg
         ENV['MR_CONFIGFILE'] = nil
       end
 
@@ -165,13 +168,24 @@ RSpec.describe MrMurano::Config do
       end
 
       it "warns about migrating old ENV name" do
+        ENV['MURANO_CONFIGFILE'] = nil
+        ENV['MR_CONFIGFILE'] = @tmpdir + '/home/testcreate.config'
+        expect_any_instance_of(MrMurano::Config).to receive(:warning).once
+        MrMurano::Config.new
+      end
+
+      it "errors if both are defined" do
+        ENV['MURANO_CONFIGFILE'] = @tmpdir + '/home/testcreate.config'
         ENV['MR_CONFIGFILE'] = @tmpdir + '/home/testcreate.config'
         expect_any_instance_of(MrMurano::Config).to receive(:warning).once
+        expect_any_instance_of(MrMurano::Config).to receive(:error).once
         MrMurano::Config.new
       end
     end
 
     it "dumps" do
+      @saved_cfg = ENV['MURANO_CONFIGFILE']
+      ENV['MURANO_CONFIGFILE'] = nil
       cfg = MrMurano::Config.new
       cfg.load
       cfg['sync.bydefault'] = 'files'
@@ -182,6 +196,7 @@ RSpec.describe MrMurano::Config do
       want = template.result(binding)
 
       expect(ret).to eq(want)
+      ENV['MURANO_CONFIGFILE'] = @saved_cfg
     end
 
     context "fixing permissions" do

data/spec/Solution-Endpoint_spec.rb

@@ -290,12 +290,14 @@ RSpec.describe MrMurano::Endpoint do
                         'Content-Type'=>'application/json'}).
                         to_return(body: "")
 
-        ret = @srv.upload(@tio_.path, {:id=>"9K0",
-                                     :method=>"websocket",
-                                     :path=>"/api/v1/bar",
-                                     :content_type=>"application/json",
-        }, true)
-        expect(ret)
+      ret = @srv.upload(@tio_.path,
+        MrMurano::Endpoint::RouteItem.new(
+          :id=>"9K0",
+          :method=>"websocket",
+          :path=>"/api/v1/bar",
+          :content_type=>"application/json",
+      ), true)
+      expect(ret)
     end
 
     it "when nothing is there" do
@@ -308,11 +310,13 @@ RSpec.describe MrMurano::Endpoint do
                         'Content-Type'=>'application/json'}).
                         to_return(body: "")
 
-      ret = @srv.upload(@tio_.path, {:id=>"9K0",
-                                   :method=>"websocket",
-                                   :path=>"/api/v1/bar",
-                                   :content_type=>"application/json",
-      }, false)
+      ret = @srv.upload(@tio_.path,
+        MrMurano::Endpoint::RouteItem.new(
+          :id=>"9K0",
+          :method=>"websocket",
+          :path=>"/api/v1/bar",
+          :content_type=>"application/json",
+      ), false)
       expect(ret)
     end
 
@@ -322,10 +326,12 @@ RSpec.describe MrMurano::Endpoint do
                         'Content-Type'=>'application/json'}).
                         to_return(body: "")
 
-      ret = @srv.upload(@tio_.path, {:method=>"websocket",
-                                   :path=>"/api/v1/bar",
-                                   :content_type=>"application/json",
-      }, false)
+      ret = @srv.upload(@tio_.path,
+        MrMurano::Endpoint::RouteItem.new(
+          :method=>"websocket",
+          :path=>"/api/v1/bar",
+          :content_type=>"application/json",
+      ), false)
       expect(ret)
     end
 
@@ -336,11 +342,13 @@ RSpec.describe MrMurano::Endpoint do
                         to_return(status: 502, body: "{}")
 
       expect(@srv).to receive(:error).and_return(nil)
-      ret = @srv.upload(@tio_.path, {:id=>"9K0",
-                                   :method=>"websocket",
-                                   :path=>"/api/v1/bar",
-                                   :content_type=>"application/json",
-      }, true)
+      ret = @srv.upload(@tio_.path,
+        MrMurano::Endpoint::RouteItem.new(
+          :id=>"9K0",
+          :method=>"websocket",
+          :path=>"/api/v1/bar",
+          :content_type=>"application/json",
+      ), true)
       expect(ret)
     end
   end

data/spec/Solution-ServiceEventHandler_spec.rb

@@ -145,11 +145,13 @@ end
       }
       tio.close
 
-      ret = @srv.upload(tio.path, {:id=>"9K0",
-                                   :service=>'data',
-                                   :event=>'datapoint',
-                                   :solution_id=>"XYZ",
-      })
+      ret = @srv.upload(tio.path,
+        MrMurano::EventHandler::EventHandlerItem.new(
+          :id=>"9K0",
+          :service=>'data',
+          :event=>'datapoint',
+          :solution_id=>"XYZ",
+      ))
       expect(ret)
     end
   end
@@ -172,11 +174,13 @@ end
       }
       tio.close
 
-      ret = @srv.upload(tio.path, {:id=>"9K0",
-                                   :solution_id=>"XYZ",
-                                   :service=>"device",
-                                   :event=>"datapoint",
-      })
+      ret = @srv.upload(tio.path,
+        MrMurano::EventHandler::EventHandlerItem.new(
+          :id=>"9K0",
+          :service=>'device',
+          :event=>'datapoint',
+          :solution_id=>"XYZ",
+      ))
       expect(ret)
     end
 
@@ -264,25 +268,25 @@ end
 
     it "raises on alias without service" do
       expect {
-        @srv.mkname( {:event=>'bob'} )
+        @srv.mkname( MrMurano::EventHandler::EventHandlerItem.new(:event=>'bob') )
       }.to raise_error %{Missing parts! {"event":"bob"}}
     end
 
     it "raises on alias without event" do
       expect {
-        @srv.mkalias( {:service=>'bob'} )
+        @srv.mkalias( MrMurano::EventHandler::EventHandlerItem.new(:service=>'bob') )
       }.to raise_error %{Missing parts! {"service":"bob"}}
     end
 
     it "raises on name without service" do
       expect {
-        @srv.mkalias( {:event=>'bob'} )
+        @srv.mkalias( MrMurano::EventHandler::EventHandlerItem.new(:event=>'bob') )
       }.to raise_error %{Missing parts! {"event":"bob"}}
     end
 
     it "raises on name without event" do
       expect {
-        @srv.mkname( {:service=>'bob'} )
+        @srv.mkname( MrMurano::EventHandler::EventHandlerItem.new(:service=>'bob') )
       }.to raise_error %{Missing parts! {"service":"bob"}}
     end
   end
@@ -334,13 +338,15 @@ end
         tio.close
 
         ret = @srv.toRemoteItem(nil, tio.path)
-        expect(ret).to eq({:service=>'device',
-                           :event=>'datapoint',
-                           :line=>1,
-                           :line_end=>3,
-                           :local_path=>Pathname.new(tio.path),
-                           :script=>%{--#EVENT device datapoint\nTsdb.write{tags={sn='1'},metrics={[data.alias]=data.value[2]}}\n},
-        })
+        expect(ret).to eq(
+          MrMurano::EventHandler::EventHandlerItem.new(
+            :service=>'device',
+            :event=>'datapoint',
+            :line=>1,
+            :line_end=>3,
+            :local_path=>Pathname.new(tio.path),
+            :script=>%{--#EVENT device datapoint\nTsdb.write{tags={sn='1'},metrics={[data.alias]=data.value[2]}}\n},
+          ))
       end
     end