sct 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06a1549735471b58e3b71a78c178d20f2b0286ab56aa033ec38939e72e753136
-  data.tar.gz: 03b53faf4b186f00b8ed7e90472987bf996f1bc0c7dfdfdaa99d2d312fdb1bcb
+  metadata.gz: 14d8446d9ad177cfe1423a229687670d9731830389539014fda62491d09ca054
+  data.tar.gz: fa3083af252bb67c0b776d270a69b29605e6ce33e06cfe8b6625998ab0cff29a
 SHA512:
-  metadata.gz: e3774e0a9a48e460aaa4beaec523337f91b3f2e8c14d25175cb7af2cb74e3779da9daae1546af322afa3871ad3d77445cb63186b30a0dcc444c2b3747e91919c
-  data.tar.gz: 85b8be2a234f769f590ba26ff80ddff7736603427b54a75abfee25a05e28a524ed3f955a3c64f7446a91d7a9a0ec3acce9dce2cb50d590f8e1de4c4c3bed94d1
+  metadata.gz: d62a9c18d78ce4a821d32cb0848c4bbc2dc88e1ca526f7600c1bb8b7945a36522f157e94a365036cc68e7549ae76f90368d2c54a1335b43d2cc2233c4c354d54
+  data.tar.gz: 98381741d7493183b420c176843062d005b8f6620d0a67ce0739d53da77ae2bf11c73c60817b2a0965dfd41a338a249446ec482ee27ba465f8b92708cb768db8

data/sct/lib/sct/cli_tools_distributor.rb

@@ -1,6 +1,6 @@
 module Sct
     class CLIToolsDistributor
-        class << self 
+        class << self
             def take_off
                 require 'sct'
 
@@ -8,18 +8,18 @@ module Sct
 
                 if tool_name && Sct::TOOLS.include?(tool_name.to_sym)
                     # Triggering a specific tool
-          
+
                     require tool_name
                     begin
                       # First, remove the tool's name from the arguments
                       # Since it will be parsed by the `commander` at a later point
                       # and it must not contain the binary name
                       ARGV.shift
-          
+
                       # Import the CommandsGenerator class, which is used to parse
                       # the user input
                       require File.join(tool_name, "commands_generator")
-          
+
                       # Call the tool's CommandsGenerator class and let it do its thing
                       commands_generator = Object.const_get(tool_name.sct_module)::CommandsGenerator
                     rescue LoadError
@@ -28,15 +28,15 @@ module Sct
                       # When we launch this feature, this should never be the case
                       abort("#{tool_name} can't be called via `sct #{tool_name}`, run '#{tool_name}' directly instead".red)
                     end
-          
+
                     # Some of the tools might use other actions so need to load all
                     # actions before we start the tool generator here in the future
                     Sct.load_actions
-                    
+
                     # trigger start on tool
                     commands_generator.start
 
-                else 
+                else
                     require "sct/commands_generator"
                     Sct::CommandsGenerator.start
                 end
@@ -47,4 +47,4 @@ module Sct
 
         end
     end
-end
+end

data/{shell/lib/shell/runner.rb → sct/lib/sct/commands/shell.rb}

@@ -1,15 +1,15 @@
 require 'yaml'
 
-module Shell
-  class Runner
+module Sct
+  class ShellCommand
 
     def error message
       UI.error message
       exit 1
     end
 
-    def launch
-      command = ARGV.empty? ? "sh" : ARGV.join(" ")
+    def execute args, options
+      command = args.empty? ? "sh" : args.join(" ")
 
       file = "docker-compose.dev.yml"
 
@@ -41,7 +41,9 @@ module Shell
         end
       end
 
-      system "docker exec -it --user $(id -u):$(id -g) #{container} #{command}"
+      user = options.root ? "root:root" : "$(id -u):$(id -g)"
+
+      system "docker exec -it --user #{user} #{container} #{command}"
     end
 
   end

data/sct/lib/sct/commands_generator.rb

@@ -35,6 +35,11 @@ module Sct
             command :'shell' do |c|
                 c.syntax = 'sct shell'
                 c.description = 'run commands from the shell using docker containers'
+                c.option '--root', 'run as root user in the container'
+
+                c.action do |args, options|
+                    Sct::ShellCommand.new.execute args, options
+                end
             end
 
             command :'dev' do |c|

data/sct/lib/sct/tools.rb

@@ -1,12 +1,9 @@
 module Sct
     TOOLS = [
       :sct,
-      :shell,
       :cluster
     ]
-  
+
     # a list of all the config files we currently expect
-    TOOL_CONFIG_FILES = [
-      
-    ]
-  end
+    TOOL_CONFIG_FILES = []
+  end

data/sct/lib/sct/version.rb

@@ -1,3 +1,3 @@
 module Sct
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sct
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Reshad Farid
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-01 00:00:00.000000000 Z
+date: 2021-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -208,6 +208,7 @@ files:
 - sct/lib/sct/command.rb
 - sct/lib/sct/commands/dev.rb
 - sct/lib/sct/commands/mysqlproxy.rb
+- sct/lib/sct/commands/shell.rb
 - sct/lib/sct/commands_generator.rb
 - sct/lib/sct/tools.rb
 - sct/lib/sct/version.rb
@@ -223,10 +224,6 @@ files:
 - sct_core/lib/sct_core/ui/interface.rb
 - sct_core/lib/sct_core/ui/ui.rb
 - sct_core/lib/sct_core/update_checker/update_checker.rb
-- shell/lib/shell.rb
-- shell/lib/shell/commands_generator.rb
-- shell/lib/shell/module.rb
-- shell/lib/shell/runner.rb
 homepage: https://gitlab.com/proactive-software/packages/sct
 licenses:
 - MIT
@@ -238,7 +235,6 @@ post_install_message:
 rdoc_options: []
 require_paths:
 - cluster/lib
-- shell/lib
 - sct/lib
 - sct_core/lib
 required_ruby_version: !ruby/object:Gem::Requirement

data/shell/lib/shell.rb

@@ -1,2 +0,0 @@
-require_relative 'shell/runner'
-require_relative 'shell/module'

data/shell/lib/shell/commands_generator.rb

@@ -1,14 +0,0 @@
-require_relative 'runner'
-
-module Shell
-    class CommandsGenerator
-
-        def self.start
-            self.new.run
-        end
-
-        def run
-            Shell::Runner.new.launch
-        end
-    end
-end

data/shell/lib/shell/module.rb

@@ -1,9 +0,0 @@
-require 'sct_core/helper'
-
-module Shell
-
-    # import the helper functionality from SCT
-    Helpers = Sct::Helper
-    UI = Sct::UI
-
-end