gleis 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3280f3d9b314f1cec830590c37979bf254307805c88f1f411bf2c65b483c39c
-  data.tar.gz: 53c27f8be4e7b691bd3c1892cb806cdd3b3c65a9b92cda48826b60513bd6952f
+  metadata.gz: 5279f32d3b80eb5907b580db6a0377e308901890709e6a7db19e2118210decfd
+  data.tar.gz: f613f56d5dce97e59304b0e223cb94df1fab942e1e678ac24d5548bc7bee061e
 SHA512:
-  metadata.gz: c8eb3cfbd61e91cb7488875ebe179cf09954fee641bbb510b1b33c1f0bd0495d53ed3a101b34b49deb8d408e707ec6002e8abc477e4259a108be021206ba6e7c
-  data.tar.gz: 4f543eb031d9c696be13dfce9f9638e429776ca65974041a06419d5ab9e159eb679cbc75fe22fb59e45a0ae550fc9a3294b761bdd29a306568af9e5b388b56be
+  metadata.gz: 36336262ed60d02bac812b5617415b2d1dca4ba40b1c2d1ee1563e38a6c3e37ac7ac5f5229a718dc39203b82e736880a206eed3a71cb6b85c6c35501d907c464
+  data.tar.gz: 6264718149ab07be6825e20141921a38d9880ad5f2545d0dfb79684ef240997208e0c3352e58748d5055c3c103ab2696ed79703218f74befbf10b18c7597f206

data/CHANGELOG.md

@@ -5,6 +5,20 @@ All notable changes to the Gleis CLI will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 0.8.0 - 2020-04-19
+
+### Changed
+
+- Calls to system commands to check first if external system command exists
+- External system call to which command with own which method
+- Path separator to be dynamic for cross-platform compatibility
+- Password prompt to use IO.noecho instead of depending on stty system command
+- Save path of database dump file to be stored into user home directory instead of tmp
+
+### Fixed
+
+- Adding SSH Host configuration in non-existing SSH config file
+
 ## 0.7.1 - 2020-03-20
 
 ### Changed

data/lib/gleis/application.rb

@@ -74,6 +74,7 @@ module Gleis
 
     def self.exec(app_name, command)
       token = Token.check
+      abort('The SSH client command ssh is not installed on this system.') unless Utils.which('ssh')
       config_body = Config.get_env_vars(app_name, token)
       # Get storage and generate mount parameter
       mount_param = Utils.generate_exec_mount_param(API.request('get', "storage/#{app_name}", token), app_name)
@@ -86,8 +87,8 @@ module Gleis
           -p #{p['run_port']} \
           #{p['run_username']}@#{p['run_server']} \
           '#{Utils.generate_exec_env_param(config_body['env_vars'])} #{mount_param} \
-            #{p['registry_server']}/#{dp_body['namespace']}/#{app_name}:#{dp_body['deployments'].last['commit'][0..6]} \
-            #{command}'")
+          #{p['registry_server']}/#{dp_body['namespace']}/#{app_name}:#{dp_body['deployments'].last['commit'][0..6]} \
+          #{command}'")
       else
         puts 'No deployments found, please deploy your app first.'
       end

data/lib/gleis/config.rb

@@ -4,8 +4,8 @@ module Gleis
     # Override default API URL if GLEIS_API_URL env variable is set
     API_URL = ENV['GLEIS_API_URL'].nil? ? 'https://api.basel.gleis.app/' : ENV['GLEIS_API_URL']
     API_VERSION = 'v0'.freeze
-    SSH_KEY_FILE_BASE = Dir.home + '/.ssh/gleis'
-    TOKEN_FILE = Dir.home + '/.gleis-token'
+    SSH_KEY_FILE_BASE = File.join(Dir.home, '.ssh', 'gleis')
+    TOKEN_FILE = File.join(Dir.home, '.gleis-token')
 
     def self.get_env_vars(app_name, token)
       body = API.request('get', "config/#{app_name}", token)

data/lib/gleis/database.rb

@@ -8,7 +8,7 @@ module Gleis
       abort('There is no database configured under the DATABASE_URL variable.') unless url
       db_name = url.split('/').last
       timestamp = Time.now.strftime('%Y%m%d%H%M%S')
-      backup_file = "/tmp/#{app_name}_#{db_name}_#{timestamp}.pgdump"
+      backup_file = File.join(Dir.home, "#{app_name}_#{db_name}_#{timestamp}.pgdump")
       if system("pg_dump -f #{backup_file} #{url}")
         puts "Database configured at DATABASE_URL succesfully backed up locally in #{backup_file}"
       else
@@ -102,7 +102,7 @@ module Gleis
 
     def self.psql(app_name)
       token = Token.check
-      abort('The PostgreSQL client psql is not installed on this system.') unless system('which psql >/dev/null')
+      abort('The PostgreSQL client psql is not installed on this system.') unless Utils.which('psql')
       url = Config.get_env_var(app_name, token, 'DATABASE_URL')
       abort('There is no database configured under the DATABASE_URL variable.') unless url
       ENV['PGCONNECT_TIMEOUT'] = '5'

data/lib/gleis/ssh.rb

@@ -11,9 +11,13 @@ module Gleis
 
       hostname = Socket.gethostname
       datetime = Time.now.strftime('%Y-%m-%d %H:%M')
-      # returns true on success
-      system('ssh-keygen', '-f', key_file, '-b 4096',
-             "-C generated by Gleis CLI for #{username} by #{ENV['USER']}@#{hostname} on #{datetime}")
+      # returns true on success and nil if command is not found or failed
+      if Utils.which('ssh-keygen')
+        system('ssh-keygen', '-f', key_file, '-b 4096',
+               "-C generated by Gleis CLI for #{username} by #{ENV['USER']}@#{hostname} on #{datetime}")
+      else
+        puts 'The SSH key genator command ssh-keygen is not installed on this system.'
+      end
     end
 
     def self.load_public_key(public_key_file)
@@ -21,10 +25,10 @@ module Gleis
     end
 
     def self.add_host_to_config(host_name, private_key_file)
-      config_file = Dir.home + '/.ssh/config'
+      config_file = File.join(Dir.home, '.ssh', 'config')
       ssh_host_line = "Host #{host_name}"
-      # Check if SSH config for hosts already exists
-      return if Utils.line_exists_in_file(config_file, ssh_host_line)
+      # Do not continue if host already exists in current SSH config file
+      return if File.exist?(config_file) && Utils.line_exists_in_file(config_file, ssh_host_line)
 
       f = File.open(config_file, 'a')
       f.puts "\n# Added by Gleis CLI on #{Time.now.strftime('%Y-%m-%d %H:%M')}"

data/lib/gleis/storage.rb

@@ -51,7 +51,7 @@ module Gleis
       abort("Directory #{dir} does not exist or is not a directory.") unless Dir.exist?(dir)
       # Get CLI parameters from API server
       params = Params.get_cli_parameters(token)
-      abort('The rsync tool is not installed on this system.') unless system('which rsync >/dev/null')
+      abort('The rsync tool is not installed on this system.') unless Utils.which('rsync')
       body = API.request('get', "storage/#{app_name}", token)
       if body['success'] == 1
         if (storage = body['data']['storage'].first)

data/lib/gleis/utils.rb

@@ -1,3 +1,5 @@
+require 'io/console'
+
 module Gleis
   # This class gathers various utilities as small methods
   class Utils
@@ -7,9 +9,7 @@ module Gleis
 
     def self.prompt_password
       print 'Password: '
-      system 'stty -echo'
-      password = $stdin.gets.chomp
-      system 'stty echo'
+      password = STDIN.noecho(&:gets).chomp
       puts
       password
     end
@@ -32,7 +32,7 @@ module Gleis
 
     def self.check_for_local_pg_command(command)
       abort("The PostgreSQL client required to run the command #{command}) is not installed on this system.") unless
-        system("which #{command} >/dev/null")
+        which(command)
     end
 
     def self.validate_scale_count(count)
@@ -48,7 +48,7 @@ module Gleis
     end
 
     def self.add_remote_to_git_config(remote_url)
-      config_file = Dir.pwd + '/.git/config'
+      config_file = File.join(Dir.pwd, '.git', 'config')
       return false unless File.exist?(config_file)
 
       # Check if gleis remote already exists
@@ -119,5 +119,16 @@ module Gleis
     def self.update_available?(actual_version)
       Gem::Version.new(Gleis::VERSION) < Gem::Version.new(actual_version)
     end
+
+    def self.which(command)
+      file_extensions = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
+      ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+        file_extensions.each do |extension|
+          executable = File.join(path, "#{command}#{extension}")
+          return executable if File.executable?(executable) && !File.directory?(executable)
+        end
+      end
+      nil
+    end
   end
 end

data/lib/gleis/version.rb

@@ -1,3 +1,3 @@
 module Gleis
-  VERSION = '0.7.1'
+  VERSION = '0.8.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gleis
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Marc Bigler
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-20 00:00:00.000000000 Z
+date: 2020-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -122,8 +122,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.20.0
-description: Command-line interface to deploy and manage your Rails apps on the Swiss
-  PaaS https://gleis.cloud
+description: "    Command-line interface to deploy and manage your Rails apps on the
+  https://gleis.cloud Swiss Platform as a Service.\n"
 email:
 - gleis@towards.ch
 executables: