sct 0.1.35 → 1.0.5

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/sct/lib/sct/commands/dev.rb

@@ -0,0 +1,63 @@
+require 'yaml'
+
+module Sct
+  class DevCommand
+
+    @@file = "docker-compose.dev.yml"
+
+    def error message
+      UI.error message
+      exit 1
+    end
+
+    def dc command, env = {}
+      system env, "docker-compose -f ~/development/spend-cloud/docker-compose.yml #{command}"
+    end
+
+    def dc_dev command, env = {}
+      system env, "docker-compose -f #{@@file} #{command}"
+    end
+
+    def manifest
+      if !File.exist? @@file
+        error "Could not find file '#{@@file}'."
+      end
+
+      YAML.load File.read @@file
+    end
+
+    def execute args, options
+      services = manifest["services"].to_a
+
+      if services.length != 1
+        error "Currently sct only supports a single service declaration in '#{@@file}'. Contact the infra guild if you consider this a limitation."
+      end
+
+      service, service_spec = services.first
+
+      container = service_spec["container_name"]
+      command = service_spec["command"] || ""
+
+      env = { "PUID" => `id -u`.chomp, "PGID" => `id -g`.chomp }
+
+      if options.pull
+        return unless dc_dev "pull"
+      end
+
+      if options.build
+        return unless dc_dev "build #{options.pull ? "--pull" : ""}", env
+      end
+
+      if options.pull or options.build
+        system "docker image prune -f"
+      end
+
+      return unless dc "rm --stop --force #{service}"
+
+      dc_dev "run --rm --service-ports --name #{container} #{service} #{command}", env
+
+      dc "up --detach #{service}"
+    end
+
+  end
+end

data/sct/lib/sct/commands/mysqlproxy.rb

@@ -1,20 +1,14 @@
 module Sct
   class MysqlproxyCommand
-    
+
     DEFAULT_SECRET_NAME = "gcloud-credentials"
 
     def execute(args, options)
-
-      return UI.error("SCT has not been initialized. Run 'sct init' first.") unless SctCore::Config.exists
-      
-      path = SctCore::Config.get('cloud-proxy-path')
-
       system("kubectl delete secret gcloud-credentials")
-      system("kubectl create secret generic gcloud-credentials --from-file=#{path}")
-      
+      system("kubectl create secret generic gcloud-credentials --from-file=~/.config/gcloud/application_default_credentials.json")
+
       UI.success("Authenticated with secret-name: '#{DEFAULT_SECRET_NAME}'")
     end
-  
-  end
 
-end
+  end
+end

data/sct/lib/sct/commands/shell.rb

@@ -0,0 +1,50 @@
+require 'yaml'
+
+module Sct
+  class ShellCommand
+
+    def error message
+      UI.error message
+      exit 1
+    end
+
+    def execute args, options
+      command = args.empty? ? "sh" : args.join(" ")
+
+      file = "docker-compose.dev.yml"
+
+      if !File.exist? file
+        error "Could not find file '#{file}'."
+      end
+
+      manifest = YAML.load File.read file
+
+      services = manifest["services"].to_a
+
+      if services.length != 1
+        error "Currently sct only supports a single service declaration in '#{file}'. Contact the infra guild if you consider this a limitation."
+      end
+
+      service, service_spec = services.first
+
+      container = service_spec["container_name"]
+
+      project = `docker container inspect --format '{{index .Config.Labels "com.docker.compose.project"}}' #{container}`.chomp
+
+      if project == "spend-cloud"
+        print "This container was not started with 'sct dev'. Are you sure you want to continue? [y/N] ".red
+
+        answer = $stdin.readline.chomp.downcase
+
+        if answer != "y"
+          exit
+        end
+      end
+
+      user = options.root ? "root:root" : "$(id -u):$(id -g)"
+
+      system "docker exec -it --user #{user} #{container} #{command}"
+    end
+
+  end
+end

data/sct/lib/sct/commands_generator.rb

@@ -17,51 +17,40 @@ module Sct
 
             global_option('--verbose') { $verbose = true }
 
-            command :init do |c|
-                c.syntax = 'sct init'
-                c.description = 'setup sct'
-
-                c.action do |args, options|
-                    UI.important("setting up sct")
-                    Sct::InitCommand.new.execute(args, options)
-                end
-            end
-
-            command :hostfile do |c|
-
-                c.syntax = 'sct hostfile'
-                c.description = 'patch hostfile with kubernetes ip'
-
-                c.action do |args, options|
-                    UI.important("Trying to patch hosts file...")
-                    Sct::HostfileCommand.new.execute(args, options)
-                end
-            end
-
             command :'mysql-proxy' do |c|
-
                 c.syntax = 'sct mysql-proxy'
                 c.description = 'setup google mysql proxy'
 
                 c.action do |args, options|
                     UI.important("Trying to setup mysql proxy")
-                    Sct::MysqlproxyCommand.new.execute(args, options)
+                    Sct::MysqlproxyCommand.new.execute args, options
                 end
-
             end
 
             command :'cluster' do |c|
-
                 c.syntax = 'sct cluster'
                 c.description = 'make changes to the cluster'
-
             end
 
             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|
+                c.syntax = 'sct dev'
+                c.description = 'start development container in the current directory'
+                c.option '--build', '(re)build images before starting'
+                c.option '--pull', 'pull latest images before starting'
+
+                c.action do |args, options|
+                    Sct::DevCommand.new.execute args, options
+                end
             end
 
             run!

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 = "0.1.35"
+  VERSION = "1.0.5"
 end

data/sct_core/lib/sct_core.rb

@@ -1,5 +1,4 @@
 require_relative 'sct_core/core_ext/string'
-require_relative 'sct_core/config'
 require_relative 'sct_core/helper'
 require_relative 'sct_core/update_checker/update_checker'
 require_relative 'sct_core/command_executor'
@@ -11,4 +10,4 @@ require 'colored'
 require 'commander'
 
 # these need to be imported after commander
-require_relative 'sct_core/module'
+require_relative 'sct_core/module'

data/sct_core/lib/sct_core/helper.rb

@@ -5,13 +5,13 @@ module SctCore
     MAC_OS = "MacOS"
     UBUNTU = "Ubuntu"
 
-    def self.to_hash(str)
+    def self.to_hash str
       Hash[
         str.split("\n").map{|i|i.split('=')}
       ]
     end
 
-    def self.operatingSystem
+    def self.operating_system
       proc = `uname -a`
 
       case proc.downcase
@@ -29,7 +29,7 @@ module SctCore
     def self.homePath
       user = ENV["SUDO_USER"] || ENV["USER"]
 
-      if self.operatingSystem == MAC_OS
+      if self.operating_system == MAC_OS
           home = "/Users"
       else
           home = "/home"
@@ -46,7 +46,7 @@ module SctCore
       return nil
     end
 
-    def self.convertWindowsToWSLPath(path)
+    def self.convertWindowsToWSLPath path
       if self.is_windows?
         return path.gsub(/C:\\/, '/mnt/c/').gsub(/\\\\/, "/").gsub(/\\/, '/').gsub(/\r\n?/, '')
       end
@@ -54,7 +54,7 @@ module SctCore
       return path
     end
 
-    def self.convertWSLToWindowsPath(path)
+    def self.convertWSLToWindowsPath path
       if self.is_windows?
         return path.gsub(/\/mnt\/c/, 'C:/').gsub(/\/\//, '/').gsub(/\\\\/, "/").gsub(/\r\n?/, '')
       end
@@ -67,7 +67,7 @@ module SctCore
     end
 
     def self.is_windows?
-      return self.operatingSystem == WINDOWS
+      return self.operating_system == WINDOWS
     end
 
     def self.is_windows_administrator?
@@ -93,5 +93,6 @@ module SctCore
       self.ensure_sudo
       self.ensure_windows_administrator
     end
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sct
 version: !ruby/object:Gem::Version
-  version: 0.1.35
+  version: 1.0.5
 platform: ruby
 authors:
 - Reshad Farid
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-24 00:00:00.000000000 Z
+date: 2021-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -200,17 +200,15 @@ files:
 - cluster/lib/cluster.rb
 - cluster/lib/cluster/commands_generator.rb
 - cluster/lib/cluster/module.rb
-- cluster/lib/cluster/resources/.DS_Store
-- cluster/lib/cluster/resources/corefile.yml
 - 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/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
@@ -218,7 +216,6 @@ files:
 - 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
@@ -227,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
@@ -244,7 +237,6 @@ require_paths:
 - cluster/lib
 - sct/lib
 - sct_core/lib
-- shell/lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -256,7 +248,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Spend Cloud Tool.

data/cluster/lib/cluster/resources/corefile.yml

@@ -1,45 +0,0 @@
-apiVersion: v1
-data:
-  Corefile: |
-    .:53 {
-        errors
-        health {
-           lameduck 5s
-        }
-        ready
-        kubernetes cluster.local in-addr.arpa ip6.arpa {
-           pods insecure
-           fallthrough in-addr.arpa ip6.arpa
-           ttl 30
-        }
-        prometheus :9153
-        forward . 8.8.8.8
-        cache 30
-        loop
-        reload
-        loadbalance
-    }
-  Corefile-backup: |
-    .:53 {
-        errors
-        health {
-           lameduck 5s
-        }
-        ready
-        kubernetes cluster.local in-addr.arpa ip6.arpa {
-           pods insecure
-           fallthrough in-addr.arpa ip6.arpa
-           ttl 30
-        }
-        prometheus :9153
-        forward . /etc/resolv.conf
-        cache 30
-        loop
-        reload
-        loadbalance
-    }
-kind: ConfigMap
-metadata:
-  creationTimestamp: null
-  name: coredns
-  selfLink: /api/v1/namespaces/kube-system/configmaps/coredns