gleis 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 130f0b723f904109cb4cb38df148a8dc5a7748e40e3e4106ea646a004ccf1aa8
-  data.tar.gz: 2a9754ec31b238984825eb7d6a22f54e90528de1b3feb6c178f765bb18375057
+  metadata.gz: dd8f6576940149755d70e4ea02a3f5bcf7ab4e525464f028586a834f45611865
+  data.tar.gz: dc3be857698d158c6a52980a2689946484ca2091ada419b98c384eb3c82fefbe
 SHA512:
-  metadata.gz: b122513b42305f9764f184e65772db36fb7bcec1743e9404b3836c8c78d2efe0ed01f7a1c9445ddf83a4a2032b816c0b54fa245fa3af87b840d99234ed76c297
-  data.tar.gz: 5cb296c2bfcf9529328a7efaf73efa34963deffbf1bb7097d5fd831820089707f79cd077ab91e4fe3a2235bdbfa1ecc526da95051509d4f55b4ac36545d5fe04
+  metadata.gz: 442e5c846df04518a366ac19cbdb077f1fb439366526f3d6f1983832864089e2af0d98ef1044f83a04e60b868881d61635e305d1f5663a1ab1e5fa7da6b15c9f
+  data.tar.gz: 00dc1fb43a246242db2e70f1a35dce3af1c98ce3202d2ec7d954866263705e1b1b0b35f21c96232880027e70b108452a996e8d51a037c0774ebcb5a61469d3a1

data/CHANGELOG.md

@@ -5,6 +5,24 @@ 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.6.0 - 2019-08-20
+
+### Added
+
+- Parameter --follow/-f to app logs command to follow live the log file of an app
+
+### Changed
+
+- Requests to API to include CLI version in HTTP User-Agent header
+
+### Fixed
+
+- Missing application scale command
+
+### Removed
+
+- Occurrences of the safe navigation operator in order to support Ruby <2.3
+
 ## 0.5.0 - 2019-02-25
 
 ### Added

data/lib/gleis/api.rb

@@ -5,17 +5,29 @@ module Gleis
   class API
     def self.request(method, action, token = nil, body = {})
       url = Config::API_URL + Config::API_VERSION + '/cli/' + action
+      user_agent = RestClient::Platform.default_user_agent + ' Gleis/' + VERSION
       begin
         case method
         when 'get', 'delete'
-          resp = RestClient.send(method, url, 'X-Gleis-Token': token, content_type: :json, accept: :json)
+          resp = RestClient.send(method, url, 'X-Gleis-Token': token, content_type: :json, accept: :json,
+                                              user_agent: user_agent)
         when 'post', 'put'
           if token
             resp =
-              RestClient.send(method, url, body.to_json, 'X-Gleis-Token': token, content_type: :json, accept: :json)
+              RestClient.send(method, url, body.to_json, 'X-Gleis-Token': token, content_type: :json, accept: :json,
+                                                         user_agent: user_agent)
           else
-            resp = RestClient.send(method, url, body.to_json, content_type: :json, accept: :json)
+            resp = RestClient.send(method, url, body.to_json, content_type: :json, accept: :json,
+                                                              user_agent: user_agent)
           end
+        when 'stream'
+          stream_output = proc { |response|
+            response.read_body do |chunk|
+              puts chunk
+            end
+          }
+          RestClient::Request.execute(method: :get, url: url, block_response: stream_output,
+                                      headers: { 'X-Gleis-Token': token })
         end
       rescue RestClient::BadRequest
         abort('Authentication failed.')
@@ -35,12 +47,16 @@ module Gleis
       rescue StandardError # (e.g. SocketError, Errno::ECONNREFUSED, RestClient::BadGateway, ...)
         abort('There was an issue connecting to the Gleis API server.')
       else
-        if resp.body.empty?
-          # If there is no body return whole response object
-          resp
-        else
-          # Return Ruby data structure of the JSON parsed body
-          JSON.parse(resp.body)
+        # Streaming GET returns Net::HTTPInternalServerError in case of issue and no usable response body
+        # In that case the class of resp.body == Net::ReadAdapter
+        if defined? resp
+          if resp.body.empty?
+            # If there is no body return whole response object
+            resp
+          else
+            # Return Ruby data structure of the JSON parsed body
+            JSON.parse(resp.body)
+          end
         end
       end
     end

data/lib/gleis/application.rb

@@ -108,18 +108,22 @@ module Gleis
       end
     end
 
-    def self.logs(app_name, process)
+    def self.logs(app_name, follow, process)
       token = Token.check
-      action = "logs/#{app_name}/#{process}"
-      body = API.request('get', action, token)
-      if body['log'].nil?
-        puts 'Failed to get logs: ' + body['message']
-      elsif body['log'].empty?
-        puts 'No log entries found yet.'
+      action = "logs/#{app_name}/#{process}?follow=#{follow}"
+      if follow == true
+        puts "Following log for the #{app_name} #{process} process:\n\n"
+        API.request('stream', action, token)
       else
-        puts "Most recent entries of consolidated log for #{app_name} (#{process} process):"
-        puts
-        puts body['log']
+        body = API.request('get', action, token)
+        if body['log'].nil?
+          puts 'Failed to get logs: ' + body['message']
+        elsif body['log'].empty?
+          puts 'No log entries found yet.'
+        else
+          puts "Most recent entries of consolidated log for the #{app_name} #{process} process:\n\n"
+          puts body['log']
+        end
       end
     end
 
@@ -176,7 +180,7 @@ module Gleis
       token = Token.check
       body = API.request('get', "ps/#{app_name}", token)
       puts 'Failed to get processes.' unless body['success'] == 1
-      if body['data']&.size&.positive?
+      if body['data'] && body['data'].size && body['data'].size.positive?
         body['data'].each_with_index do |service, index|
           puts "=== #{service[0]}: `#{service[1]['command']}`"
           if service[1]['tasks'].empty?
@@ -191,6 +195,20 @@ module Gleis
       end
     end
 
+    def self.scale(app_name, replica)
+      token = Token.check
+      count = Utils.validate_scale_count(replica)
+      body = API.request('post', 'scale', token, 'name': app_name, 'count': count)
+      if body['success'] == 1
+        puts "Successfully scaled app to #{count} replica"
+        if body['message']
+          puts 'Note that your app is currently not running, hence scaling will take effect as soon as you start it'
+        end
+      else
+        puts "Failed to scale app: #{body['message']}"
+      end
+    end
+
     def self.status(app_name)
       token = Token.check
       action = 'status/' + app_name

data/lib/gleis/cli/app.rb

@@ -36,10 +36,12 @@ module Gleis
       end
 
       desc 'logs', 'View last log entries of a process'
+      option :follow, aliases: :'-f', type: :boolean, default: false,
+                      desc: 'Follow live log data'
       option :process, aliases: :'-p', type: :string, default: 'web',
                        desc: 'Process type (valid types are: scheduler, worker and web)'
       def logs
-        Application.logs(options[:app], options[:process])
+        Application.logs(options[:app], options[:follow], options[:process])
       end
 
       desc 'maintenance', 'Enable or disable maintenance mode'

data/lib/gleis/utils.rb

@@ -38,7 +38,7 @@ module Gleis
     def self.validate_scale_count(count)
       count_i = count.to_i
       abort('Please specifiy a number between 1 and 10 as parameter in order to scale your app.') unless
-        count_i&.between?(1, 10)
+        count_i && count_i.between?(1, 10)
       count_i
     end
 

data/lib/gleis/version.rb

@@ -1,3 +1,3 @@
 module Gleis
-  VERSION = '0.5.0'
+  VERSION = '0.6.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gleis
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Marc Bigler
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-25 00:00:00.000000000 Z
+date: 2019-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.57'
+        version: '0.66'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.57'
+        version: '0.66'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -185,8 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Gleis CLI to deploy and manage Rails apps on the Gleis PaaS