sct 0.1.28 → 0.1.34

data/sct/lib/sct/commands/hostfile.rb

@@ -2,13 +2,7 @@ module Sct
   class HostfileCommand
 
     def execute(args, options)
-      return UI.error("SCT has not been initialized. Run 'sct init' first.") unless SctCore::Config.exists
-
-      return UI.error("This command needs to be run with sudo.") unless SctCore::Helper.isSudo
-
-      return unless SctCore::Helper.ingressAddress
-      
-      ingressAddress = SctCore::Helper.ingressAddress
+      SctCore::Helper.ensure_permissions
 
       entries = [
         {
@@ -37,32 +31,42 @@ module Sct
         }
       ]
 
+      is_windows = SctCore::Helper::is_windows?
+
+      if is_windows
+        ingress_address = "127.0.0.1"
+      else
+        ingress_address = `sudo -u $SUDO_USER minikube ip`.chomp
+      end
+
+      windows_hosts_path = "/mnt/c/Windows/System32/drivers/etc/hosts"
+
       if options.path
         hosts_paths = [options.path]
       else
         hosts_paths = ["/etc/hosts"]
 
-        if SctCore::Helper.operatingSystem == SctCore::Helper::WINDOWS
-          hosts_paths << "/mnt/c/Windows/System32/drivers/etc/hosts"
+        if is_windows
+          hosts_paths << windows_hosts_path
         end
       end
 
       hosts_paths.each do |hosts_path|
-        line_ending = hosts_path == "/mnt/c/Windows/System32/drivers/etc/hosts" ? "\r\n" : "\n"
+        line_ending = hosts_path == windows_hosts_path ? "\r\n" : "\n"
 
         lines = File.readlines hosts_path
 
         # select the lines that do not include any entry
-        lines = lines.select { |line| ! entries.any? { |entry| line.include? entry[:host] } }
+        lines = lines.select { |line| ! entries.any? { |entry| line.include? " #{entry[:host]}" } }
 
         # add entries
         entries.each do |entry|
-          lines << "#{ingressAddress} #{entry[:host]} # #{entry[:comment]}#{line_ending}"
+          lines << "#{ingress_address} #{entry[:host]} # #{entry[:comment]}#{line_ending}"
         end
 
         File.write hosts_path, lines.join
 
-        UI.success("Patched #{hosts_path} with #{ingressAddress}")
+        UI.success("Patched #{hosts_path} with #{ingress_address}")
       end
 
     end

data/sct/lib/sct/commands_generator.rb

@@ -9,7 +9,7 @@ module Sct
             self.new.run
         end
 
-        def run 
+        def run
             program :name, 'sct'
             program :version, Sct::VERSION
             program :summary, 'CLI helper tool for local SCT development'
@@ -17,11 +17,11 @@ module Sct
 
             global_option('--verbose') { $verbose = true }
 
-            command :init do |c| 
+            command :init do |c|
                 c.syntax = 'sct init'
                 c.description = 'setup sct'
 
-                c.action do |args, options| 
+                c.action do |args, options|
                     UI.important("setting up sct")
                     Sct::InitCommand.new.execute(args, options)
                 end
@@ -33,17 +33,17 @@ module Sct
                 c.description = 'patch hostfile with kubernetes ip'
 
                 c.action do |args, options|
-                    UI.important("Trying to patch hostfile")
+                    UI.important("Trying to patch hosts file...")
                     Sct::HostfileCommand.new.execute(args, options)
                 end
             end
 
-            command :'mysql proxy' do |c|
+            command :'mysql-proxy' do |c|
 
-                c.syntax = 'sct mysql proxy'
+                c.syntax = 'sct mysql-proxy'
                 c.description = 'setup google mysql proxy'
 
-                c.action do |args, options| 
+                c.action do |args, options|
                     UI.important("Trying to setup mysql proxy")
                     Sct::MysqlproxyCommand.new.execute(args, options)
                 end
@@ -67,4 +67,4 @@ module Sct
             run!
         end
     end
-end
+end

data/sct/lib/sct/version.rb

@@ -1,3 +1,3 @@
 module Sct
-  VERSION = "0.1.28"
+  VERSION = "0.1.34"
 end

data/sct_core/lib/sct_core/helper.rb

@@ -5,27 +5,6 @@ module SctCore
     MAC_OS = "MacOS"
     UBUNTU = "Ubuntu"
 
-    def self.ingressAddress
-      if self.operatingSystem == WINDOWS
-        kubeconfig_file = "minikube-config"
-      else
-        kubeconfig_file = "config"
-      end
-
-      kubeconfig_path= "#{self.homePath}/.kube/#{kubeconfig_file}"
-
-      ip = `KUBECONFIG="#{kubeconfig_path}" kubectl get ingress`
-
-      if ip.nil? || ip.empty?
-        puts "Can't fetch IP from kubectl".yellow
-        return nil
-      end
-
-      match = ip.scan(/((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3})/)
-
-      return match.first.first
-    end
-
     def self.to_hash(str)
       Hash[
         str.split("\n").map{|i|i.split('=')}
@@ -60,7 +39,7 @@ module SctCore
     end
 
     def self.windowsHomePath
-      if self.operatingSystem == WINDOWS
+      if self.is_windows?
         return self.convertWindowsToWSLPath(`cmd.exe /c echo %userprofile%`)
       end
 
@@ -68,7 +47,7 @@ module SctCore
     end
 
     def self.convertWindowsToWSLPath(path)
-      if self.operatingSystem == WINDOWS
+      if self.is_windows?
         return path.gsub(/C:\\/, '/mnt/c/').gsub(/\\\\/, "/").gsub(/\\/, '/').gsub(/\r\n?/, '')
       end
 
@@ -76,23 +55,43 @@ module SctCore
     end
 
     def self.convertWSLToWindowsPath(path)
-      if self.operatingSystem == WINDOWS
+      if self.is_windows?
         return path.gsub(/\/mnt\/c/, 'C:/').gsub(/\/\//, '/').gsub(/\\\\/, "/").gsub(/\r\n?/, '')
       end
 
       return path
     end
 
-    def self.isSudo
+    def self.is_sudo?
       return !ENV["SUDO_USER"].nil? && !ENV["SUDO_USER"].empty?
     end
 
-    def self.minikube
-      if self.operatingSystem == WINDOWS
-          return "minikube.exe"
-      else
-          return "minikube"
+    def self.is_windows?
+      return self.operatingSystem == WINDOWS
+    end
+
+    def self.is_windows_administrator?
+      # https://serverfault.com/a/95464
+      return `/mnt/c/Windows/System32/WindowsPowerShell/v1.0/powershell.exe -c "(New-Object Security.Principal.WindowsPrincipal([Security.Principal.WindowsIdentity]::GetCurrent())).IsInRole([Security.Principal.WindowsBuiltInRole]::Administrator)"` == "True\r\n"
+    end
+
+    def self.ensure_sudo
+      if !self.is_sudo?
+        UI.error "This command needs to be run with sudo."
+        exit 1
       end
     end
+
+    def self.ensure_windows_administrator
+      if self.is_windows? && !self.is_windows_administrator?
+        UI.error "This command needs to be run in an admin shell."
+        exit 1
+      end
+    end
+
+    def self.ensure_permissions
+      self.ensure_sudo
+      self.ensure_windows_administrator
+    end
   end
 end

data/sct_core/lib/sct_core/update_checker/update_checker.rb

@@ -38,11 +38,7 @@ module SctCore
                 UI.important("# An update for #{gem_name} is available. You are on #{current_version}.")
             end
             UI.important("# You should use the latest version.")
-            UI.important("# Please update using `#{self.update_command(gem_name: gem_name)}`.")
-
-            UI.important('#######################################################################')
-            UI.important("# Run `sudo gem cleanup` from time to time to speed up sct.")
-
+            UI.important("# Please update by running `#{self.update_command(gem_name: gem_name)}`.")
             UI.important('#######################################################################')
 
             ensure_rubygems_source
@@ -62,7 +58,7 @@ module SctCore
         end
 
         def self.update_command(gem_name: "sct")
-            "sudo gem install #{gem_name.downcase}"
+            "sudo gem update #{gem_name.downcase}"
         end
 
         def self.fetch_latest(gem_name)

data/shell/lib/shell.rb

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

data/shell/lib/shell/commands_generator.rb

@@ -7,8 +7,8 @@ module Shell
             self.new.run
         end
 
-        def run 
+        def run
             Shell::Runner.new.launch
         end
     end
-end
+end

data/shell/lib/shell/module.rb

@@ -4,6 +4,6 @@ module Shell
 
     # import the helper functionality from SCT
     Helpers = Sct::Helper
-    UI = Sct::UI 
+    UI = Sct::UI
 
-end
+end

data/shell/lib/shell/runner.rb

@@ -1,34 +1,83 @@
+require 'yaml'
+
 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
-                
+
+        def launch
+            command = ARGV.join(" ")
+
+            if ! File.exist? "./okteto.yml"
+                error "Could not find file 'okteto.yml'."
+            end
+
+            manifest = YAML.load File.read "./okteto.yml"
+
+            deployment = manifest["name"]
+
+            pod = find_pod deployment
+
+            if command.empty?
+                system "kubectl exec #{pod} -it -- sh", { in: :in, out: :out, err: :err }
             else
-                show_error
+                system "kubectl exec #{pod} -it -- #{command}", { in: :in, out: :out, err: :err }
+            end
+        end
+
+        def find_pod deployment
+            output = `kubectl get pods --show-labels`
+
+            # split output lines
+            lines = output.split "\n"
+
+            #  exclude first line (table header)
+            lines = lines[1..-1]
+
+            # get the name and labels of each pod
+            pods = lines.map do |line|
+                columns = line.split " "
+
+                name = columns[0]
+
+                labels = columns[5].split(",").reduce({}) do |labels, label|
+                    key, value = label.split "="
+                    labels[key] = value
+                    labels
+                end
+
+                {
+                    name: name,
+                    labels: labels
+                }
             end
+
+            # filter by deployment
+            pods = pods.filter { |pod| pod[:labels]["app"] == deployment }
+
+            if pods.length == 0
+                error "Could not find pod for deployment #{deployment}."
+            elsif pods.length > 1
+                error "Found more than one pod for deployment #{deployment}. Multiple pods are not supported."
+            end
+
+            pod = pods.first
+
+            if pod[:labels]["dev.okteto.com"] != "true"
+                print "The current pod is running a production image and was not started by Okteto. Are you sure you want to continue? [y/N] ".red
+
+                answer = $stdin.readline.chomp.downcase
+
+                if answer != "y"
+                    exit
+                end
+            end
+
+            pod[:name]
         end
 
-        def show_error 
-            tools = Shell::TOOLS.map { |tool| tool.to_s }.join(", ")
-            UI.error("Tool not found. Try one of these: #{tools}")
+        def error message
+            UI.error message
+            exit 1
         end
+
     end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sct
 version: !ruby/object:Gem::Version
-  version: 0.1.28
+  version: 0.1.34
 platform: ruby
 authors:
 - Reshad Farid
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-15 00:00:00.000000000 Z
+date: 2020-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -227,17 +227,10 @@ 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/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
@@ -263,7 +256,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Spend Cloud Tool.

data/shell/lib/shell/ClassLevelInheritableAttributes.rb

@@ -1,25 +0,0 @@
-module ClassLevelInheritableAttributes
-  def self.included(base)
-    base.extend(ClassMethods)
-  end
-
-  module ClassMethods
-    def inheritable_attributes(*args)
-      @inheritable_attributes ||= [:inheritable_attributes]
-      @inheritable_attributes += args
-      args.each do |arg|
-        class_eval %(
-          class << self; attr_accessor :#{arg} end
-        )
-      end
-      @inheritable_attributes
-    end
-
-    def inherited(subclass)
-      @inheritable_attributes.each do |inheritable_attribute|
-        instance_var = "@#{inheritable_attribute}"
-        subclass.instance_variable_set(instance_var, instance_variable_get(instance_var))
-      end
-    end
-  end
-end

data/shell/lib/shell/docker/composer.rb

@@ -1,16 +0,0 @@
-require "sct_core"
-require_relative "docker"
-
-module Shell
-    class Composer < Docker
-
-        # Configure the Yarn command
-       def self.config
-            self.set_image("eu.gcr.io/dev-pasc-vcdm/helpers-composer:latest", true)
-            self.set_pwd_as_volume("/app")
-            self.add_volume(SctCore::Helper.convertWSLToWindowsPath("#{SctCore::Helper.windowsHomePath || SctCore::Helper.homePath}/.composer") , "/tmp")
-            self.set_current_user_and_group()
-            self.set_entrypoint("composer")
-        end
-    end
-end