phoseum-cli 0.0.13 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 052beefab210d213c09986b11dfe93e499d328f6523f7f3cba71ecb2502ead53
-  data.tar.gz: 75fd5b65b74758d1517c61e65f69295ca445e70ba37e32ae57863da0ddb825d9
+  metadata.gz: 2ae7c5b87f964e094e8e1e6ef6f1a147e5870aead7c9e8d8fbc1f301f9801f4b
+  data.tar.gz: d495df08338bfb6a067fdc2643e0a12042a310ba4b83d4b5476bf900123c4949
 SHA512:
-  metadata.gz: 44173a8f4ed5893c0fdd6b5a9ef2b4ab463b091ed4c35f237be7f3ad369044a281d9067edbf7bd9d72670c45973827d9428fc015a6071f4eff5e1ff1ffd55c5f
-  data.tar.gz: 68c50ae1d3cc2c35e4d369bc02bbba99236a07a1a3f3e314f73ff411bab7e3ee27965507afbb22b44220df36a411ee10a84586ad5109be62e4e2bf974cba7f95
+  metadata.gz: 40c22cc7fff4bfec7b5479856b5ec2b6ea95089f538f4bce1dcc5f394bf0f90c61245ac5249f103183bf283d97772a856f99bddb669fef3ba9a00db1541a4b11
+  data.tar.gz: 220f37e7d4efaf40014a025a4cd4250726d5e0d9752994a35636dfab51be8ecca3acccc1758471ec43c7eb7774ff88b261b2a86dc0722c40cd239a61bc3c1cd0

data/bin/phoseum-cli

@@ -277,6 +277,15 @@ def user_mgmt(action,user,pass='',role='')
 end
 
 def user_login(puser='',ppass='')
+
+  server_value = cross_versions()
+  if server_value['version'] != VERSION_SIGN
+    puts "Server and Client version won't match, please make them match to continue.".red
+    puts "Remote version: #{server_value['version']}"
+    puts "Local version: #{VERSION_SIGN}"
+    exit 1
+  end
+
   post_body={}
   user= !puser ? '' : puser
   pass= !ppass ? '' : ppass
@@ -504,6 +513,14 @@ case options
     else
       puts "Login failed".red
     end
+  when -> (vs) { vs[:version] }
+    local_version
+    exit 0
+  when -> (x) { x[:crossv] }
+    server_value = cross_versions()
+    puts "Remote version: #{server_value['version']}"
+    puts "Local version: #{VERSION_SIGN}"
+    exit 0
   when -> (t) { t[:test] }
     puts "Making local analysis of files on directory".green if !$QUIET
     test

data/lib/phoseum/phoseum-cli-lib.rb

@@ -48,6 +48,14 @@ def option_parser(opts)
       options[:verbose] = v
     end
 
+    opts.on("-V", "--version", "What version we are") do |vs|
+      options[:version] = vs
+    end
+
+    opts.on("-x", "--cross-versions", "Check version match between Client and API") do |x|
+      options[:crossv] = x
+    end
+
     opts.on("-r", "--role ROLE", "Role for user: [User, Super]. Use with 'create-user'") do |r|
       options[:role] = r
     end
@@ -253,6 +261,37 @@ def validate_token(token)
   end
 end
 
+def cross_versions
+  headers = {}
+  base = URI.parse("#{$config['SERVERURL']}")
+  request = Net::HTTP::Post.new(base,headers)
+  request.basic_auth("cli", "loginNOauth")
+  request.body = JSON.generate({"action" => "version-check" })
+  response = Net::HTTP.start(base.hostname, $config['PORT'],
+                             :timeout => $config['CALL_TIMEOUT'],
+                             :use_ssl => base.scheme == "https",
+                             :verify_mode => OpenSSL::SSL::VERIFY_PEER,
+                             :ca_file => $config['CA_TRUST']
+                             ) do |http|
+    http.request(request)
+  end
+  begin
+    list = JSON.parse(response.body)
+    return list
+    # if list['error']
+    #   return false
+    # end
+    # if list['success']
+    #   return true
+    # end
+  rescue
+    puts "\nThe server sent out an Error:".red
+    puts clean_html(response.body)
+    exit 1
+  end
+end
+
+
 def delete_user(username)
   headers = {}
   if $config['TOKEN']
@@ -285,3 +324,10 @@ def delete_user(username)
     exit 1
   end
 end
+
+def local_version
+  puts "This CLI library is running version: #{VERSION_SIGN}"
+  return
+end
+
+VERSION_SIGN="0.0.18"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phoseum-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.18
 platform: ruby
 authors:
 - Julio C Hegedus
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-01 00:00:00.000000000 Z
+date: 2020-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yaml