sct 0.1.14 → 0.1.19

data/sct_core/lib/sct_core/ui/interface.rb

@@ -0,0 +1,120 @@
+module SctCore
+    # Abstract super class
+    class Interface
+      #####################################################
+      # @!group Messaging: show text to the user
+      #####################################################
+  
+      # Level Error: Can be used to show additional error
+      #   information before actually raising an exception
+      #   or can be used to just show an error from which
+      #
+      #   By default those messages are shown in red
+      def error(_message)
+        not_implemented(__method__)
+      end
+  
+      # Level Important: Can be used to show warnings to the user
+      #   not necessarily negative, but something the user should
+      #   be aware of.
+      #
+      #   By default those messages are shown in yellow
+      def important(_message)
+        not_implemented(__method__)
+      end
+  
+      # Level Success: Show that something was successful
+      #
+      #   By default those messages are shown in green
+      def success(_message)
+        not_implemented(__method__)
+      end
+  
+      # Level Message: Show a neutral message to the user
+      #
+      #   By default those messages shown in white/black
+      def message(_message)
+        not_implemented(__method__)
+      end
+  
+      # Level Deprecated: Show that a particular function is deprecated
+      #
+      #   By default those messages shown in strong blue
+      def deprecated(_message)
+        not_implemented(__method__)
+      end
+  
+      # Level Command: Print out a terminal command that is being
+      #   executed.
+      #
+      #   By default those messages shown in cyan
+      def command(_message)
+        not_implemented(__method__)
+      end
+  
+      # Level Command Output: Print the output of a command with
+      #   this method
+      #
+      #   By default those messages shown in magenta
+      def command_output(_message)
+        not_implemented(__method__)
+      end
+  
+      # Level Verbose: Print out additional information for the
+      #   users that are interested. Will only be printed when
+      #
+      #   By default those messages are shown in white
+      def verbose(_message)
+        not_implemented(__method__)
+      end
+  
+      # Print a header = a text in a box
+      #   use this if this message is really important
+      def header(_message)
+        not_implemented(__method__)
+      end
+  
+      # Print lines of content around specific line where
+      #   failed to parse.
+      #
+      #   This message will be shown as error
+      def content_error(content, error_line)
+        not_implemented(__method__)
+      end
+  
+      #####################################################
+      # @!group Errors: Inputs
+      #####################################################
+  
+      # Is is possible to ask the user questions?
+      def interactive?
+        not_implemented(__method__)
+      end
+  
+      # get a standard text input (single line)
+      def input(_message)
+        not_implemented(__method__)
+      end
+  
+      # A simple yes or no question
+      def confirm(_message)
+        not_implemented(__method__)
+      end
+  
+      # Let the user select one out of x items
+      # return value is the value of the option the user chose
+      def select(_message, _options)
+        not_implemented(__method__)
+      end
+  
+      # Password input for the user, text field shouldn't show
+      # plain text
+      def password(_message)
+        not_implemented(__method__)
+      end
+
+      def user_error!(error_message, options = {})
+        not_implemented(__method__)
+      end
+    end
+  end

data/sct_core/lib/sct_core/ui/ui.rb

@@ -0,0 +1,26 @@
+module SctCore
+    class UI
+      class << self
+        attr_accessor(:ui_object)
+  
+        def ui_object
+          require_relative 'implementations/shell'
+          @ui_object ||= Shell.new
+        end
+  
+        def method_missing(method_sym, *args, &_block)
+          # not using `responds` because we don't care about methods like .to_s and so on
+          require_relative 'interface'
+          interface_methods = SctCore::Interface.instance_methods - Object.instance_methods
+          UI.user_error!("Unknown method '#{method_sym}', supported #{interface_methods}") unless interface_methods.include?(method_sym)
+  
+          self.ui_object.send(method_sym, *args)
+        end
+      end
+    end
+  end
+  
+  # Import all available implementations
+  Dir[File.dirname(__FILE__) + '/implementations/*.rb'].each do |file|
+    require_relative file
+  end

data/shell/lib/shell.rb

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

data/shell/lib/shell/commands_generator.rb

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

data/{lib/sct → shell/lib/shell}/docker/composer.rb

@@ -1,13 +1,14 @@
-require "sct/docker/docker"
+require "sct_core"
+require_relative "docker"
 
-module Sct
+module Shell
     class Composer < Docker
 
         # Configure the Yarn command
        def self.config
             self.setImage("eu.gcr.io/dev-pasc-vcdm/helpers-composer:latest", true)
             self.setPwdAsVolume("/app")
-            self.addVolume(Sct::Helpers.convertWSLToWindowsPath("#{Sct::Helpers.windowsHomePath || Sct::Helpers.homePath}/.composer") , "/tmp")
+            self.addVolume(SctCore::Helper.convertWSLToWindowsPath("#{SctCore::Helper.windowsHomePath || SctCore::Helper.homePath}/.composer") , "/tmp")
             self.setCurrentUserAndGroup()
             self.setEntrypoint("composer")
         end

data/{lib/sct → shell/lib/shell}/docker/docker.rb

@@ -1,6 +1,7 @@
-require "sct/ClassLevelInheritableAttributes"
+require "sct_core"
+require "shell/ClassLevelInheritableAttributes"
 
-module Sct
+module Shell
     class Docker
         include ClassLevelInheritableAttributes
         inheritable_attributes :image, :is_private_registry, :entrypoint, :volumes, :ports, :extra_arguments
@@ -26,9 +27,7 @@ module Sct
         ###
         def self.exec(cli_arguments)
 
-            cli_arguments.each do | argument |
-                self.addExtraArgument(argument)
-            end
+            self.addExtraArgument(cli_arguments)
 
             self.config()
 
@@ -60,8 +59,8 @@ module Sct
         def self.setPwdAsVolume(volume_path)
             pwd = `pwd -P`
 
-            if Sct::Helpers.operatingSystem == Sct::Helpers::WINDOWS
-                pwd=Sct::Helpers.convertWSLToWindowsPath(pwd)
+            if SctCore::Helper.operatingSystem == SctCore::Helper::WINDOWS
+                pwd=SctCore::Helper.convertWSLToWindowsPath(pwd)
             end
 
             addVolume(pwd, volume_path)
@@ -141,9 +140,7 @@ module Sct
         def self.runCommand()
             command = self.compileCommand()
 
-            system(command)
-
-            return $?.success?
+            SctCore::CommandExecutor.execute(command: command, print_all: true, suppress_output: false)
         end
 
         ###

data/{lib/sct → shell/lib/shell}/docker/php.rb

@@ -1,6 +1,7 @@
-require "sct/docker/docker"
+require "sct_core"
+require_relative "docker"
 
-module Sct
+module Shell
     class Php < Docker
 
         # Configure the Yarn command

data/{lib/sct → shell/lib/shell}/docker/yarn.rb

@@ -1,13 +1,14 @@
-require "sct/docker/docker"
+require "sct_core"
+require_relative "docker"
 
-module Sct
+module Shell
     class Yarn < Docker
 
         # Configure the Yarn command
        def self.config
             self.setImage("eu.gcr.io/dev-pasc-vcdm/helpers-yarn:latest", true)
             self.setPwdAsVolume("/app")
-            self.addVolume(Sct::Helpers.convertWSLToWindowsPath("#{Sct::Helpers.windowsHomePath || Sct::Helpers.homePath}/.cache") , "/.cache")
+            self.addVolume(SctCore::Helper.convertWSLToWindowsPath("#{SctCore::Helper.windowsHomePath || SctCore::Helper.homePath}/.cache") , "/.cache")
             self.mapPort(8081, 8080)
             self.mapPort(9001)
             self.setCurrentUserAndGroup()

data/shell/lib/shell/module.rb

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

data/shell/lib/shell/runner.rb

@@ -0,0 +1,34 @@
+module Shell
+    class Runner
+        # define launch work
+        def launch 
+
+            tool_name = ARGV.first ? ARGV.first.downcase : nil
+
+            if tool_name && Shell::TOOLS.include?(tool_name.to_sym)
+                
+                require_relative "docker/#{tool_name}"
+                command = "#{ARGV[1..(ARGV.length+1)].join(" ")}"
+
+                case ARGV.first
+                when 'php'
+                    Shell::Php.exec(command)
+                when 'composer'
+                    Shell::Composer.exec(command)
+                when 'yarn'
+                    Shell::Yarn.exec(command)
+                else
+                    show_error
+                end
+                
+            else
+                show_error
+            end
+        end
+
+        def show_error 
+            tools = Shell::TOOLS.map { |tool| tool.to_s }.join(", ")
+            UI.error("Tool not found. Try one of these: #{tools}")
+        end
+    end
+end

data/shell/lib/shell/tools.rb

@@ -0,0 +1,7 @@
+module Shell
+    TOOLS = [
+      :yarn,
+      :composer,
+      :php
+    ]
+end

metadata

@@ -1,85 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: sct
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.19
 platform: ruby
 authors:
 - Reshad Farid
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-26 00:00:00.000000000 Z
+date: 2020-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: class_interface
+  name: colored
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: colored
+  name: commander
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 4.4.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 4.4.7
 - !ruby/object:Gem::Dependency
-  name: hosts
+  name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 1.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 1.7.2
 - !ruby/object:Gem::Dependency
-  name: commander
+  name: terminal-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.4.7
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.4.7
+        version: '1.8'
 - !ruby/object:Gem::Dependency
-  name: highline
+  name: tty-screen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.2
+        version: 0.6.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.2
+        version: 0.6.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: tty-spinner
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -127,45 +153,54 @@ description: Spend Cloud Tool enables to setup a local development environment f
 email:
 - reshad.farid@visma.com
 executables:
+- console
 - sct
+- setup
 extensions: []
 extra_rdoc_files: []
 files:
-- ".DS_Store"
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
-- CODE_OF_CONDUCT.md
-- Gemfile
-- Gemfile.lock
-- LICENSE.txt
-- README.md
-- Rakefile
 - bin/console
 - bin/sct
 - bin/setup
-- lib/.DS_Store
-- lib/sct.rb
-- lib/sct/.DS_Store
-- lib/sct/ClassLevelInheritableAttributes.rb
-- lib/sct/command.rb
-- lib/sct/command_interface.rb
-- lib/sct/command_option.rb
-- lib/sct/commands/cluster.rb
-- lib/sct/commands/composer.rb
-- lib/sct/commands/hostfile.rb
-- lib/sct/commands/init.rb
-- lib/sct/commands/mysqlproxy.rb
-- lib/sct/commands/php.rb
-- lib/sct/commands/yarn.rb
-- lib/sct/config.rb
-- lib/sct/docker/composer.rb
-- lib/sct/docker/docker.rb
-- lib/sct/docker/php.rb
-- lib/sct/docker/yarn.rb
-- lib/sct/setup/helpers.rb
-- lib/sct/version.rb
-- sct.gemspec
+- cluster/lib/.DS_Store
+- cluster/lib/cluster.rb
+- cluster/lib/cluster/commands_generator.rb
+- cluster/lib/cluster/module.rb
+- cluster/lib/cluster/runner.rb
+- sct/lib/.DS_Store
+- sct/lib/sct.rb
+- sct/lib/sct/.DS_Store
+- sct/lib/sct/cli_tools_distributor.rb
+- sct/lib/sct/command.rb
+- sct/lib/sct/commands/hostfile.rb
+- sct/lib/sct/commands/init.rb
+- sct/lib/sct/commands/mysqlproxy.rb
+- sct/lib/sct/commands_generator.rb
+- sct/lib/sct/tools.rb
+- sct/lib/sct/version.rb
+- sct_core/lib/.DS_Store
+- sct_core/lib/sct_core.rb
+- sct_core/lib/sct_core/.DS_Store
+- sct_core/lib/sct_core/command_executor.rb
+- sct_core/lib/sct_core/config.rb
+- sct_core/lib/sct_core/core_ext/string.rb
+- sct_core/lib/sct_core/helper.rb
+- sct_core/lib/sct_core/module.rb
+- sct_core/lib/sct_core/sct_pty.rb
+- sct_core/lib/sct_core/ui/implementations/shell.rb
+- sct_core/lib/sct_core/ui/interface.rb
+- sct_core/lib/sct_core/ui/ui.rb
+- shell/README.md
+- shell/lib/shell.rb
+- shell/lib/shell/ClassLevelInheritableAttributes.rb
+- shell/lib/shell/commands_generator.rb
+- shell/lib/shell/docker/composer.rb
+- shell/lib/shell/docker/docker.rb
+- shell/lib/shell/docker/php.rb
+- shell/lib/shell/docker/yarn.rb
+- shell/lib/shell/module.rb
+- shell/lib/shell/runner.rb
+- shell/lib/shell/tools.rb
 homepage: https://gitlab.com/proactive-software/packages/sct
 licenses:
 - MIT
@@ -176,19 +211,22 @@ metadata:
 post_install_message: 
 rdoc_options: []
 require_paths:
-- lib
+- cluster/lib
+- shell/lib
+- sct/lib
+- sct_core/lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Spend Cloud Tool.