gleis 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b6a2a9fc4d3430d52a2d06173bb90376a9ac36610cea8c4b575e5842304e6e6
-  data.tar.gz: 0ed2b9286e7e55e15657724273fb7f03ef3c49e1b1c939aa7314967f7e225e06
+  metadata.gz: e259aa0549f7f0a6e982128032b6229870ec360d1f8ff5df5cde09d0b56ac46b
+  data.tar.gz: 79c8e30feb451306648f510cc03fabdfc7d1d38f5c80c722c18e70b0baa5781d
 SHA512:
-  metadata.gz: 62ed6e20c3eae5fb1295676d3bef32c63622c4116193ed5a75b57810e3e46612565ef81f11f8c53ac70581fb241ccb73296ab97618d9af6704ddc8f5aa348b07
-  data.tar.gz: e0ad98a6a3933c3edf2d31fadb7172ae509252b7678b80bdbfd49c5e71effb8e0f39881eb39b418c44dcb561375a36faa5ce443a52d152c5802e68439c661c3f
+  metadata.gz: c9c407ddec056aa78d8b05675bdc7563444aa5978eb0cdf073fda9bffa62ad7ed348d1cfde96a51e4fe1ff6ff1405e31985e305d6bba6b8cf01c2b7f0eece7a5
+  data.tar.gz: ad2c83adeab38fe45a52024f2e9df85ca2f6fc2f370b4aa9220079ed00ab0b20048e26793b9c4e3c06f2eb0345cb36c313a5d60b90b70795598be63b1cc731af

data/CHANGELOG.md

@@ -5,6 +5,26 @@ 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.4.0 - 2019-02-10
+
+### Added
+
+- Application rollback for deploying a previous deployment referred by its commit hash
+- Application maintenance mode for temporary taking app offline
+- Description to the --app/-a option for specifying the name of the app
+- Reverse storage synchronisation (from Gleis storage to local computer) using -x option
+
+### Changed
+
+- Application status to use generic data key instead of status key
+- Addon listing format to be clearer and add more spacing
+- Listing of deployments to show with an asterisk which deployment is currently in use
+- Status of app to show current deployment commit short hash and version
+
+### Fixed
+
+- Missing credential information for syncing storage
+
 ## 0.3.2 - 2018-12-15
 
 ### Added

data/exe/gleis

@@ -2,7 +2,7 @@
 
 require 'gleis/main'
 
-puts "\n###  Gleis CLI Copyright (c) 2018 towards GmbH - v#{Gleis::VERSION} - https://gleis.cloud  ###\n\n" \
+puts "\n###  Gleis CLI Copyright (c) 2018-2019 towards GmbH - v#{Gleis::VERSION} - https://gleis.cloud  ###\n\n" \
   unless ARGF.argv.include?('-q')
 
 trap 'SIGINT' do

data/lib/gleis/addon.rb

@@ -17,11 +17,12 @@ module Gleis
       addons = body ['data']
       if addons.any?
         puts "List of available add-ons:\n\n"
-        printf("\t%-30s %-15s %s\n", 'ADD-ON NAME', 'VERSION', 'CATEGORY')
-        printf("\t%s\n\n", 'DESCRIPTION')
+        printf("\t%s\n", 'ADD-ON NAME')
+        printf("\t%-30s %-15s %s\n", 'DESCRIPTION', 'VERSION', 'CATEGORY')
+        printf("\t%-30s %-15s %s\n\n", '-----------', '-------', '--------')
         addons.each do |addon|
           printf("\t%-30s %-15s %s\n", addon['name'], addon['version'], addon['category'])
-          puts "\t#{addon['description']}\n"
+          puts "\t#{addon['description']}\n\n"
         end
       else
         puts 'No add-ons avaialble.'

data/lib/gleis/application.rb

@@ -47,9 +47,11 @@ module Gleis
       body = API.request('get', action, token)
       if body['deployments'].any?
         body['deployments'].reverse_each do |d|
-          puts "v#{d['version']} | #{d['commit'][0, 7]} | #{d['email']} | #{d['subject']}\n" \
+          deployed = d['deployed'] ? '(*)' : ''
+          puts "v#{d['version']}#{deployed} | #{d['commit'][0, 7]} | #{d['email']} | #{d['subject']}\n" \
             "deployed by #{d['name']} on #{Time.parse(d['created_at']).strftime('%c')}\n\n"
         end
+        puts "\t(*) current version in use\n\n"
       else
         puts 'No deployments found, please deploy your app first.'
       end
@@ -119,6 +121,24 @@ module Gleis
       end
     end
 
+    def self.maintenance(app_name, mode = nil)
+      token = Token.check
+      body = API.request('get', "maintenance/#{app_name}", token)
+      current_mode_text = body['data'] == true ? 'on' : 'off'
+      if mode.nil?
+        puts "Maintenance mode is currently #{current_mode_text}"
+      else
+        abort("Maintenance mode is already #{current_mode_text}") if body['data'] == mode
+        body = API.request('put', 'maintenance', token, 'name': app_name, 'mode': mode)
+        new_mode_text = mode == true ? 'on' : 'off'
+        if body['success'] == 1
+          puts "Successfully turned #{new_mode_text} maintenance mode"
+        else
+          puts "Failed to turn #{new_mode_text} maintenance mode"
+        end
+      end
+    end
+
     def self.restart(app_name)
       token = Token.check
       body = API.request('post', 'restart', token, 'name': app_name)
@@ -129,17 +149,14 @@ module Gleis
       end
     end
 
-    def self.scale(app_name, replica)
+    def self.rollback(app_name, commit)
       token = Token.check
-      count = Utils.validate_scale_count(replica)
-      body = API.request('post', 'scale', token, 'name': app_name, 'count': count)
+      Utils.validate_commit_hash(commit)
+      body = API.request('post', 'rollback', token, 'name': app_name, 'commit': commit)
       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
+        puts "Successfully rolled back app to deployment with commit hash #{commit}"
       else
-        puts "Failed to scale app: #{body['message']}"
+        puts "Failed to rollback app: #{body['message']}"
       end
     end
 
@@ -178,10 +195,14 @@ module Gleis
       body = API.request('get', action, token)
       puts "Status of app #{app_name}:\n\n"
       if body['success'] == 1
-        status = body['status']
+        status = body['data']
+        if status['deployment_commit'] && status['deployment_version']
+          deployment = "\tDeployment:\t#{status['deployment_commit']} (v#{status['deployment_version']})\n"
+        end
         puts "\tStatus:\t\trunning\n" \
              "\tStarted at:\t#{Time.parse(status['createdat']).localtime.strftime('%c')}\n" \
              "\tUpdated at:\t#{Time.parse(status['updatedat']).localtime.strftime('%c')}\n" \
+             "#{deployment}" \
              "\tUpdate count:\t#{status['forceupdate']}\n" \
              "\tReplicas:\t#{status['replicas']}"
       else

data/lib/gleis/cli/addon.rb

@@ -2,7 +2,7 @@ module Gleis
   module CLI
     # Add-ons-related CLI commands
     class Addon < Thor
-      class_option :app, aliases: :a, type: :string, default: Utils.app_name
+      class_option :app, aliases: :a, type: :string, default: Utils.app_name, desc: 'Name of application'
 
       desc 'add ADDON', 'Add add-on to app'
       def add(name)

data/lib/gleis/cli/app.rb

@@ -2,7 +2,7 @@ module Gleis
   module CLI
     # Application-related CLI commands
     class App < Thor
-      class_option :app, aliases: :a, type: :string, default: Utils.app_name
+      class_option :app, aliases: :a, type: :string, default: Utils.app_name, desc: 'Name of application'
 
       desc 'config [VAR=value]', 'Show, set or delete environment variables'
       def config(env_var = '')
@@ -40,6 +40,19 @@ module Gleis
         Application.logs(options[:app])
       end
 
+      desc 'maintenance', 'Enable or disable maintenance mode'
+      option :on, type: :boolean, default: false, desc: 'Turn on maintenance mode'
+      option :off, type: :boolean, default: false, desc: 'Turn off maintenance mode'
+      def maintenance
+        abort('On and off are mutually exclusive options.') if options[:on] && options[:off]
+        if options[:on]
+          mode = true
+        elsif options[:off]
+          mode = false
+        end
+        Application.maintenance(options[:app], mode)
+      end
+
       desc 'ps', 'Show running processes'
       def ps
         Application.ps(options[:app])
@@ -50,6 +63,11 @@ module Gleis
         Application.restart(options[:app])
       end
 
+      desc 'rollback COMMIT', 'Rollback to a previous deployment specified by its commit hash'
+      def rollback(commit)
+        Application.rollback(options[:app], commit)
+      end
+
       desc 'scale #REPLICA', 'Scale up or down (horizontal scaling)'
       def scale(replica)
         Application.scale(options[:app], replica)

data/lib/gleis/cli/db.rb

@@ -2,7 +2,7 @@ module Gleis
   module CLI
     # Database-related CLI subcommands
     class Db < Thor
-      class_option :app, aliases: :a, type: :string, default: Utils.app_name
+      class_option :app, aliases: :a, type: :string, default: Utils.app_name, desc: 'Name of application'
 
       desc 'backup', 'Backup locally database DATABASE_URL'
       def backup

data/lib/gleis/cli/domain.rb

@@ -2,7 +2,7 @@ module Gleis
   module CLI
     # Domain-related CLI commands
     class Domain < Thor
-      class_option :app, aliases: :a, type: :string, default: Utils.app_name
+      class_option :app, aliases: :a, type: :string, default: Utils.app_name, desc: 'Name of application'
 
       desc 'add DOMAIN', 'Add domain name to app'
       def add(name)

data/lib/gleis/cli/sharing.rb

@@ -2,7 +2,7 @@ module Gleis
   module CLI
     # Sharing-related CLI commands
     class Sharing < Thor
-      class_option :app, aliases: :a, type: :string, default: Utils.app_name
+      class_option :app, aliases: :a, type: :string, default: Utils.app_name, desc: 'Name of application'
 
       desc 'add EMAIL ROLE', 'Allow user to access app (roles: collaborator, owner)'
       def add(email, role)

data/lib/gleis/cli/storage.rb

@@ -2,7 +2,7 @@ module Gleis
   module CLI
     # Storage-related CLI commands
     class Storage < Thor
-      class_option :app, aliases: :a, type: :string, default: Utils.app_name
+      class_option :app, aliases: :a, type: :string, default: Utils.app_name, desc: 'Name of application'
 
       desc 'add TYPE', 'Add storage to app'
       def add(type)
@@ -19,9 +19,11 @@ module Gleis
         Gleis::Storage.list(options[:app])
       end
 
-      desc 'sync DIRECTORY', 'Synchronise local directory with remote storage'
+      desc 'sync DIRECTORY', 'Synchronise local directory to Gleis storage (from local to remote)'
+      option :reverse, aliases: :x, type: :boolean, default: false,
+                       desc: 'Reverse synchronisation (from remote to local)'
       def sync(dir)
-        Gleis::Storage.sync(options[:app], dir)
+        Gleis::Storage.sync(options[:app], dir, options[:reverse])
       end
     end
   end

data/lib/gleis/management.rb

@@ -21,7 +21,7 @@ module Gleis
     def self.license
       puts <<LICENSE
       Gleis Command Line Interface for the Gleis Platform as a Service
-      Copyright (C) 2018 towards GmbH
+      Copyright (C) 2018-2019 towards GmbH
 
       This program is free software: you can redistribute it and/or modify
       it under the terms of the GNU General Public License as published by

data/lib/gleis/storage.rb

@@ -46,7 +46,7 @@ module Gleis
       end
     end
 
-    def self.sync(app_name, dir)
+    def self.sync(app_name, dir, reverse = false)
       token = Token.check
       abort("Directory #{dir} does not exist or is not a directory.") unless Dir.exist?(dir)
       # Get CLI parameters from API server
@@ -54,10 +54,15 @@ module Gleis
       abort('The rsync tool is not installed on this system.') unless system('which rsync >/dev/null')
       body = API.request('get', "storage/#{app_name}", token)
       if body['success'] == 1
-        if body['storage']
-          ns_app_name = "#{body['namespace']}_#{app_name}"
-          ENV['RSYNC_PASSWORD'] = body['storage']['password']
-          exec("rsync -rth --progress #{dir}/ rsync://#{ns_app_name}@#{params['sync_server']}/#{ns_app_name}")
+        if (storage = body['data']['storage'].first)
+          ns_app_name = "#{body['data']['namespace']}_#{app_name}"
+          ENV['RSYNC_PASSWORD'] = storage['password']
+          directories = if reverse
+                          "rsync://#{ns_app_name}@#{params['sync_server']}/#{ns_app_name} #{dir}/"
+                        else
+                          "#{dir}/ rsync://#{ns_app_name}@#{params['sync_server']}/#{ns_app_name}"
+                        end
+          exec("rsync -rth --progress #{directories}")
         else
           puts 'No storage configured yet.'
         end

data/lib/gleis/utils.rb

@@ -42,6 +42,11 @@ module Gleis
       count_i
     end
 
+    def self.validate_commit_hash(commit)
+      abort('Please specifiy a valid commit hash (e.g. 3efb741) pointing to another deployment of your app.') unless
+        commit =~ /^\h{7,40}$/
+    end
+
     def self.add_remote_to_git_config(remote_url)
       config_file = Dir.pwd + '/.git/config'
       return false unless File.exist?(config_file)

data/lib/gleis/version.rb

@@ -1,3 +1,3 @@
 module Gleis
-  VERSION = '0.3.2'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gleis
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Marc Bigler
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-15 00:00:00.000000000 Z
+date: 2019-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler