phoseum-cli 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 102e4fe0316e79e37507ece6aa7119cdf23f8f2029d27e97d7211dae8aedcc08
-  data.tar.gz: bfe78eca818f6e7d9ef1b015c76aecd03d52db5521424cc3d835739322232b4b
+  metadata.gz: af257807e723ba9bd048a4aa3b443b60e94614c32d944b3ea63b35f5e1c7cbff
+  data.tar.gz: de51ee8815a3b7f41356756ab6d58e4f7e1da472a195a2481a06119fa25ed368
 SHA512:
-  metadata.gz: 6f3bbe28c768e6924090fa64cd3ff35d9125fe10a4fed80f495bb52d5d8576176d6cb9fc48cd577ac3f2a17a9f698b1eecd0e14e3f2070300e8da11815f7c0ed
-  data.tar.gz: 7710d08185a06695a4f461aca529a68219710051c48fcc43b356ab155970a7618fa72320a6f519393caf46cf2c0adb04aabb9a2561f9cf580876ab8df03fc4e6
+  metadata.gz: be9c074abcd17b62d9ad734b7ba3f768c0bec3d7bfc762ea08a4e15ef7f0a731b27c1a5674dabd2361baa5ebbc3b207fa62b16a85cc443af63274086b1b45afa
+  data.tar.gz: 214ab50c971d4799c27edf7c08ca16a1202f01c03873980f4e506c2f34e0fc53b950ce73f0df25da70ef9b080b0cfa4e9c6576e89b379c118854063fffc38e4e

data/bin/phoseum-cli

@@ -498,12 +498,27 @@ case options
       upload(album_clean,usable_name,usable_desc)
     end
   when -> (l) { l[:login] }
+    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
     puts "Start login process".green if !$QUIET
     if user_login
       puts "Login successful".green
     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.14"

metadata

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