phoseum-cli 0.0.10 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9472d2d52deb75c37183130fce537c43f87e25d2c5366f73d34e2e39f4b2f67
-  data.tar.gz: 6e37a6d2768e87133c97e5a7d5257595e39b9a97483be4eddc109f38f15e81e6
+  metadata.gz: af257807e723ba9bd048a4aa3b443b60e94614c32d944b3ea63b35f5e1c7cbff
+  data.tar.gz: de51ee8815a3b7f41356756ab6d58e4f7e1da472a195a2481a06119fa25ed368
 SHA512:
-  metadata.gz: a249f7bebf5c8621067a8f52a560ad6c24867d09956acd7e1323c79aa60628d8261ae06f73e45e54e1355ba07b673c883176c13273616c7c66683f90536f2f74
-  data.tar.gz: ea4973b4317ee70af953b628fefda619bbc35bc355434bf9c61f2d037ba058194a57959ffa6ef5c976728ae6298bc966af114e269407bf34dd82eca680de569c
+  metadata.gz: be9c074abcd17b62d9ad734b7ba3f768c0bec3d7bfc762ea08a4e15ef7f0a731b27c1a5674dabd2361baa5ebbc3b207fa62b16a85cc443af63274086b1b45afa
+  data.tar.gz: 214ab50c971d4799c27edf7c08ca16a1202f01c03873980f4e506c2f34e0fc53b950ce73f0df25da70ef9b080b0cfa4e9c6576e89b379c118854063fffc38e4e

data/bin/phoseum-cli

@@ -23,7 +23,7 @@ $MULTI = options[:multiple] ? true : false
 
 client_checks
 
-def upload(album)
+def upload(album,syn_name='',description='')
   headers = {}
   if !validate_token($config['TOKEN'])
     if token = user_login()
@@ -65,7 +65,8 @@ def upload(album)
       # last resort solution for accents and unrecognizable characters
       # but then will need to remove extension, pass the filter, then add extension again.
       # human_name = check_string_sanity(filename)
-      human_name = filename
+      human_name = filename.dup
+      human_name = human_name.gsub!(/(.*)\.JPG|JPEG|PNG|GIF$/i,'\1')
 
       somefound = search_image(image.signature)
       if somefound
@@ -84,6 +85,12 @@ def upload(album)
       post_body << "\r\n--#{BOUNDARY}--\r\n"
       http = Net::HTTP.new(uri.host, uri.port)
       headers = headers.merge({ "filename" => "#{image.signature}.#{image.type}", "album" => "#{album}", "name" => human_name })
+      if ! syn_name.nil?
+        headers = headers.merge({ "album_name" => syn_name })
+      end
+      if ! description.nil?
+        headers = headers.merge({ "description" => description })
+      end
       request = Net::HTTP::Post.new(uri, headers)
       request.body = post_body.join
       request["Content-Type"] = "multipart/form-data, boundary=#{BOUNDARY}"
@@ -154,7 +161,8 @@ end
 
 def health(what='',name='')
   headers = {}
-  if !validate_token($config['TOKEN'])
+
+  if !validate_token($config['TOKEN']) || !$config['TOKEN']
     if token = user_login()
       headers = { "bearer" => token }
     else
@@ -233,6 +241,10 @@ def user_mgmt(action,user,pass='',role='')
   post_body={}
   if action == "add_user"
     post_body=JSON.generate({"action" => "create-user", "user" => "#{user}", "password" => "#{pass}", "role" => "#{role}"})
+    if !$config['DEFAULT_SECRET']
+      puts "You must have a DEFAULT_SECRET setting to be able to create a user".red
+      exit 1
+    end
   end
   base = URI.parse("#{$config['SERVERURL']}")
   puts "\nConnecting to: #{$config['SERVERURL']}".yellow if !$QUIET
@@ -463,16 +475,50 @@ case options
       exit 1
     else
       album_clean=check_string_sanity(options[:album])
-      puts "Using Album destination: #{album_clean}".light_blue if !$QUIET
-      upload(album_clean)
+      usable_name= options[:name] ? options[:name].dup : ''
+      usable_desc= options[:description] ? options[:description].dup : ''
+      if usable_name.length > 255 || usable_desc.length > 255
+        if usable_name.length > 255
+          puts "Synthetic name has #{usable_name.length} characters!!".red
+        end
+        if usable_desc.length > 255
+          puts "SHORT Description has #{usable_desc.length} characters!!".red
+        end
+        puts "This is a huge-ass string mate, what are you doing?".red
+        puts "We should limit this to 255 chars. Keep it short. Aborting.".red
+        exit 1
+      end
+      if options[:name]
+        usable_name = clean_name(options[:name])
+        usable_desc = clean_name(options[:description])
+        puts "Using Album destination: #{album_clean} --> Named as '#{usable_name}'".light_blue if !$QUIET
+      else
+        puts "Using Album destination: #{album_clean}".light_blue if !$QUIET
+      end
+      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

@@ -20,6 +20,10 @@ def option_parser(opts)
       options[:delete] = d
     end
 
+    opts.on("-D", "--description 'SHORTDESC'", "Add album description (up to 255 chars). Use with: [album-path]") do |ds|
+      options[:description] = ds
+    end
+
     opts.on("-f", "--file-cfg FILENAME", "Use alternative configuration file") do |f|
       options[:filecfg] = f
     end
@@ -36,10 +40,22 @@ def option_parser(opts)
       options[:multiple] = m
     end
 
+    opts.on("-N", "--name 'REALNAME'", "Set Album's synthetic name. Use with: [album-path]") do |n|
+      options[:name] = n
+    end
+
     opts.on("-v", "--verbose", "Run verbosely (DEBUG mode)") do |v|
       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
@@ -149,6 +165,17 @@ def clean_html(msg)
   return msg
 end
 
+def clean_name(nameval)
+  name_words = nameval.split(' ')
+  name = ''
+  name_words.each do |word|
+    cword = check_string_sanity(word)
+    name = name.nil? ? cword : [name,cword].join(' ')
+  end
+  name.gsub!(/^\ /,'')
+  return name
+end
+
 def check_image_exists(fpath)
   flocal = fpath.split('/')
   filename = flocal.last
@@ -234,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']
@@ -266,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.10
+  version: 0.0.15
 platform: ruby
 authors:
 - Julio C Hegedus
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-16 00:00:00.000000000 Z
+date: 2020-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yaml