hem 1.0.1.beta4 → 1.0.1.beta5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8a0d2321381353eb8669c12174ae9cb85452e8f
-  data.tar.gz: eb2a214c9b48bf643e44cada533ca050b1c2b679
+  metadata.gz: 50ba9467abdcbc5240b09e934016f1195be6c165
+  data.tar.gz: ec8fcd39f9172bb05e5a0174647de1574dc1d5e8
 SHA512:
-  metadata.gz: e0c8293b22d916be773aee652d1e65c0d2efbe55b821ba72bfa24c5e3170319527bfe78989bf8dd03b95b9bdcf743341fc6f9b7509e26069e02b8a6606c2be49
-  data.tar.gz: 2a144ebfad25614d238f115853448c5f0c0c229420a8c6e900152dea8aab76dfb3669ac9c7b927e482c3545b1916319cbb88c8bc459b4a2a1828f00ad0306b53
+  metadata.gz: cc2a7ffdd94f60db5ec456c85caffeea69ea85d1a589fc0ebf5335f0bc31d039122a8236d567e83ed8f3fdf5548862e8fff801b84aa3866cf36ddea4e3b7b19d
+  data.tar.gz: 0de71d01152dbc13e9ca27b9b5deb3bb4c0d1aa783c95bd73e6af72572353fd904dd9826193ad9086ba852317c400acab9bb5ac535ccec6b4d087db3ccd3dc05

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hem (1.0.1.beta4)
+    hem (1.0.1.beta5)
       aws-sdk (~> 2.0.24)
       deepstruct (~> 0.0.5)
       highline (~> 1.6.20)

data/lib/hem/lib/vm/command.rb

@@ -25,7 +25,7 @@ module Hem
 
           case pipe_opts[:on]
             when :vm
-              @pipe_in_vm = cmd.gsub(/(\\+)/, '\\\\\1')
+              @pipe_in_vm = cmd
             when :host
               @pipe = cmd
             else
@@ -43,44 +43,9 @@ module Hem
           pipe cmd, :on => :vm
         end
 
-        # TODO Refactor in to ssh helper with similar opts to shell helper
-        # TODO Migrate all vm_shell functionality this direction
         def run
           return if @command.nil?
-          require 'net/ssh/simple'
-          opts = @@vm_inspector.ssh_config.merge(@opts)
-
-          Net::SSH::Simple.sync do
-            ssh_opts = {
-                :user => opts[:ssh_user],
-                :port => opts[:ssh_port],
-                :forward_agent => true,
-                :global_known_hosts_file => "/dev/null",
-                :paranoid => false,
-                :user_known_hosts_file => "/dev/null"
-            }
-
-            ssh_opts[:keys] = [opts[:ssh_identity]] if opts[:ssh_identity]
-
-            tmp = Tempfile.new "vm_command_exec"
-
-            begin
-              filename = File.basename(tmp.path)
-              remote_file = "/tmp/#{filename}"
-              tmp.write "#{@command}#{opts[:append]}"
-              tmp.close
-
-              scp_put opts[:ssh_host], tmp.path, remote_file, ssh_opts
-              result = ssh opts[:ssh_host], "cd #{opts[:pwd]}; exec /bin/bash #{remote_file}", ssh_opts
-              ssh opts[:ssh_host], "rm #{remote_file}", ssh_opts
-
-              # Throw exception if exit code not 0
-
-              return opts[:capture] ? result.stdout : result.success
-            ensure
-              tmp.unlink
-            end
-          end
+          shell to_s, @opts
         end
 
         # TODO Speed up Vagrant SSH connections
@@ -107,7 +72,7 @@ module Hem
           pwd_set_command = " -- \"cd #{@opts[:pwd].shellescape}; exec /bin/bash"
 
           vm_command = [
-              @pipe_in_vm,
+              @pipe_in_vm.nil? ? nil : @pipe_in_vm.gsub(/(\\+)/, '\\\\\1'),
               @command
           ].compact.join(" | ")
 

data/lib/hem/tasks/vm.rb

@@ -105,7 +105,7 @@ namespace :vm do
     opts = { :psuedo_tty => STDIN.tty? }
 
     Hem.ui.success "Determining VM connection details..." if STDOUT.tty?
-    command = execute.empty? ? vm_command(nil, opts) : vm_command(execute, opts)
+    command = execute.empty? ? create_command(nil, opts) : create_command(execute, opts)
     Hem.logger.debug "vm:ssh: #{command}"
 
     Hem.ui.success "Connecting..." if STDOUT.tty?

data/lib/hem/version.rb

@@ -1,3 +1,3 @@
 module Hem
-  VERSION = '1.0.1-beta4'
+  VERSION = '1.0.1-beta5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hem
 version: !ruby/object:Gem::Version
-  version: 1.0.1.beta4
+  version: 1.0.1.beta5
 platform: ruby
 authors:
 - Mike Simons
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-06 00:00:00.000000000 Z
+date: 2015-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop
@@ -301,7 +301,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Inviqan toolbelt