kplay 0.3.0 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e33ce504a8556db68e6a1d1527a6c0acae9d76b8
-  data.tar.gz: ed304d74a3784d09568fd8f171db18cc1be3cd25
+SHA256:
+  metadata.gz: dc35b067b4f0dbb20c4e1a6dee5836e55bdb8ebdad15f904d016612841c3500c
+  data.tar.gz: f836b8eee716c322689020b7d1082f265ce19e7a4b4615efbddb9beba7c6fb8d
 SHA512:
-  metadata.gz: 7025d7487f8cbe6fb77f5f573581c11383599538a531b23a26a9bfc24dd2b63a5386b3e85664c9bc628eab5f199635b24527c7bec7e7129d3ad91acf8ab1f7c7
-  data.tar.gz: acef8a5a62e71fb839bcb1d283b9dd13cbad99b6ef957dab9a0812b6fe9dbac82655a33de1040a609627782fd67beb911783217b113646542500229d4da83cf7
+  metadata.gz: 5cfcb34d4e73b017549ce8edcb3302b89be99aeeda981c30d315ace03fd269dbb93cad13de5d55ce5c6353c31100a57074e7b504cb0ec91438f556f06d2817f7
+  data.tar.gz: 5c231acbd206b8cad4984645389b05b12eae73afa196e6807713b382aea59b9094bb1e6d22d69be85ab79a84cde45bc51c2a98caa816115fd0beba2b1f168efa

data/kplay.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rainbow', '~> 3.0'
 
   spec.add_development_dependency 'bundler', '~> 1.14'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '~> 12.0', '>= 12.3.3'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'pry', '~> 0.11'
 end

data/lib/kplay/config.rb

@@ -13,7 +13,8 @@ module Kplay
       'shell' => '/bin/bash',
       'shell_args' => ['-c', 'cd /${name}; exec "${SHELL:-sh}"'],
       'stop_grace_period' => 5,
-      'etc_hosts' => [] # <ip> <alias1> [<alias2> ...]
+      'etc_hosts' => [], # <ip> <alias1> [<alias2> ...],
+      'volumes' => [] # ["<from>:<to>", ...]
     }.freeze
 
     attr_reader :path, :data

data/lib/kplay/minikube.rb

@@ -43,21 +43,5 @@ module Kplay
       end
       Pathname.new(path_host.to_s.sub(hostfolder_host.to_s, hostfolder_vm.to_s))
     end
-
-
-    # Returns true if SSH agent forwarding can be enabled
-    # (socket resides in VM mounted folders)
-    #
-    def self.ssh_forwarding_available?
-      !!ssh_forwarding_socket_vm
-    end
-
-    # Returns path to SSH agent forwarding socket in a VM
-    #
-    def self.ssh_forwarding_socket_vm
-      socket_path = ENV['SSH_AUTH_SOCK']
-      return nil unless socket_path
-      Minikube.host_path_in_vm(socket_path) rescue nil
-    end
   end # module Minikube
 end # module Kplay

data/lib/kplay/pod.rb

@@ -61,20 +61,23 @@ module Kplay
           'volumes' => [
             {
               'name' => volume_name,
-              'hostPath' => { 'path' => path_host }
+              'hostPath' => { 'path' => path_vm.to_s }
             }
             # <-- ssh forwarding socket in VM mounted here
           ]
         }
       }
-      return c unless Kplay::Minikube.ssh_forwarding_available?
-      # enable SSH forwarding
-      c['spec']['containers'].first['env'] <<
-        { 'name' => 'SSH_AUTH_SOCK', 'value' => Kplay::Minikube.ssh_forwarding_socket_vm }
-      c['spec']['containers'].first['volumeMounts'] <<
-        { 'name' => 'ssh_auth_sock', 'mountPath' => Kplay::Minikube.ssh_forwarding_socket_vm }
-      c['spec']['volumes'] <<
-        { 'name' => 'ssh_auth_sock', 'hostPath' => { 'path' => Kplay::Minikube.ssh_forwarding_socket_vm } }
+      # add custom volumes
+      config[:volumes].each_with_index do |volume_def, i|
+        v_from, v_to = volume_def.split(':')
+        v_from = Kplay::Minikube.host_path_in_vm(Pathname.new(v_from).expand_path)
+        v_to   = Pathname.new(v_to) # do not expand path locally
+        name = 'volume-' + i.to_s
+        c['spec']['containers'].first['volumeMounts'] <<
+          { 'name' => name, 'mountPath' => v_to.to_s }
+        c['spec']['volumes'] <<
+          { 'name' => name, 'hostPath' => { 'path' => v_from.to_s } }
+      end
       c
     end
 
@@ -97,7 +100,7 @@ module Kplay
     #
     def stop!
       Kplay.sh(
-        ['kubectl', 'delete', 'pod', name, "--grace-period=#{config[:stop_grace_period]}", '--force'],
+        ['kubectl', 'delete', 'pod', name, "--grace-period=#{config[:stop_grace_period]}"],
         echo: options[:verbose]
       )
     end
@@ -106,7 +109,7 @@ module Kplay
     #
     def shell
       Kplay.sh(
-        ['kubectl', 'exec', name, '-ti', config[:shell], '--', *config[:shell_args]],
+        ['kubectl', 'exec', '-ti', name, '--', config[:shell], *config[:shell_args]],
         tty: true,
         echo: options[:verbose]
       )

data/lib/kplay/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Kplay
-  VERSION = '0.3.0'
+  VERSION = '0.4.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kplay
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.3
 platform: ruby
 authors:
 - Alex Kukushkin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-05 00:00:00.000000000 Z
+date: 2020-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -58,14 +58,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -144,8 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Starts your project within a container in minikube