kplay 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee454eb8cc66ab390cf4a69147164d3eb6467d34
-  data.tar.gz: 6e6feaf91aa9ede0800d6ca476a94ffac3017a3f
+  metadata.gz: cf0f80f50de689e33da4d0f9fb8b51295e3d50f4
+  data.tar.gz: b61eb551a31a32c24b9db57b3646b9d3ab27304f
 SHA512:
-  metadata.gz: ea6dffb4f2faab9de1c863becd39cd07f4f93b06835f225971b2665159eb6ee1d55a4c60546b8c3e93254fae9891afeff3a16889869aa9af89b30b39926fba2f
-  data.tar.gz: ec157892f3a2c18767506071e92ef0e6b556b763d439eff8daf729414573f6f953ee48f52aa6122b79a8ea4c9b7a467e854a8667ccadfc1adc1a3ddf681927af
+  metadata.gz: 1c1afd53acf9dd1982747dc28524e650234eb3652c4b33e5125ff65186da0dff6f6dd56ee999069430785c069e55d7d6c137932850cf989bf48d27aadf2724b5
+  data.tar.gz: 659e234dca21a60fac32b895d4ebc112d018302966a2932737ea951951f7407440dfcc34e79576e7e96f63beb9ef5cb7759e65aa6b15a03a02423e2308eac5bf

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

@@ -67,14 +67,17 @@ module Kplay
           ]
         }
       }
-      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.to_s }
-      c['spec']['containers'].first['volumeMounts'] <<
-        { 'name' => 'ssh-auth-sock', 'mountPath' => Kplay::Minikube.ssh_forwarding_socket_vm.to_s }
-      c['spec']['volumes'] <<
-        { 'name' => 'ssh-auth-sock', 'hostPath' => { 'path' => Kplay::Minikube.ssh_forwarding_socket_vm.to_s } }
+      # 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
 

data/lib/kplay/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kplay
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Alex Kukushkin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-05 00:00:00.000000000 Z
+date: 2018-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor