hem 1.0.1.beta5 → 1.0.1.beta6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50ba9467abdcbc5240b09e934016f1195be6c165
-  data.tar.gz: ec8fcd39f9172bb05e5a0174647de1574dc1d5e8
+  metadata.gz: 464afc8e551b0a00daad552544ab7d939d0fb0f0
+  data.tar.gz: c36788f90cb8a124df6fd45efb8f2872ef05093d
 SHA512:
-  metadata.gz: cc2a7ffdd94f60db5ec456c85caffeea69ea85d1a589fc0ebf5335f0bc31d039122a8236d567e83ed8f3fdf5548862e8fff801b84aa3866cf36ddea4e3b7b19d
-  data.tar.gz: 0de71d01152dbc13e9ca27b9b5deb3bb4c0d1aa783c95bd73e6af72572353fd904dd9826193ad9086ba852317c400acab9bb5ac535ccec6b4d087db3ccd3dc05
+  metadata.gz: 5126f005b480789a700e71c442aca4f9443ee45bec148abb7bacd2abdb81b3dd6396381384af602127c410cce5aebdc7231932e3dfd5a100db64b86034b12d91
+  data.tar.gz: ad45a6aba07525e19a4d2c5a6c3de35a0eb3932e826e8d8b8ec5f04d3a87fa04a0b42b3cfd8ba21589300ff96125b72bf84b6639d50e57ac4c1648a4ce29693f

data/Gemfile.lock

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

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

@@ -53,38 +53,36 @@ module Hem
         # https://gist.github.com/jedi4ever/5657094
 
         def to_s
-          opts = @@vm_inspector.ssh_config.merge(@opts)
+          require 'tempfile'
+          config = ::Tempfile.new 'hem_ssh_config'
+          config.write @@vm_inspector.ssh_config
+          config.close
 
-          psuedo_tty = opts[:psuedo_tty] ? "-t" : ""
+          psuedo_tty = opts[:psuedo_tty] ? '-t' : ''
 
           ssh_command = [
-              "ssh",
-              "-o 'UserKnownHostsFile /dev/null'",
-              "-o 'StrictHostKeyChecking no'",
-              "-o 'ForwardAgent yes'",
-              "-o 'LogLevel FATAL'",
-              "-p #{opts[:ssh_port]}",
-              "-i #{opts[:ssh_identity].shellescape}",
+              'ssh',
+              "-F #{config.path.shellescape}",
               psuedo_tty,
-              "#{opts[:ssh_user].shellescape}@#{opts[:ssh_host].shellescape}"
-          ].join(" ")
+              'default'
+          ].join(' ')
 
           pwd_set_command = " -- \"cd #{@opts[:pwd].shellescape}; exec /bin/bash"
 
           vm_command = [
               @pipe_in_vm.nil? ? nil : @pipe_in_vm.gsub(/(\\+)/, '\\\\\1'),
               @command
-          ].compact.join(" | ")
+          ].compact.join(' | ')
 
           command = [
               ssh_command + pwd_set_command,
               vm_command.empty? ? nil : vm_command.shellescape
-          ].compact.join(" -c ") + "#{opts[:append].shellescape}\""
+          ].compact.join(' -c ') + "#{@opts[:append].shellescape}\""
 
           [
               @pipe,
               command
-          ].compact.join(" | ")
+          ].compact.join(' | ')
         end
 
         def to_str

data/lib/hem/lib/vm/inspector.rb

@@ -51,21 +51,7 @@ module Hem
 
           raise Exception.new "Could not retrieve VM ssh configuration" unless config
 
-          patterns = {
-              :ssh_user => /^\s*User (.*)$/,
-              :ssh_identity => /^\s*IdentityFile (.*)$/,
-              :ssh_host => /^\s*HostName (.*)$/,
-              :ssh_port => /^\s*Port (\d+)/
-          }
-
-          output = {}
-
-          patterns.each do |k, pattern|
-            match = config.match(pattern)
-            output[k] = match[1] if match
-          end
-
-          return @ssh_config = output
+          return config
         end
       end
     end

data/lib/hem/version.rb

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

data/spec/hem/helpers/command_spec.rb

@@ -12,15 +12,24 @@ describe Hem::Helper do
       }
     })
 
+    Hem.user_config = DeepStruct.wrap({})
+
     Hem.ui = Hem::Ui.new
 
     vmi_double = double(Hem::Lib::Vm::Inspector).as_null_object
-    vmi_double.should_receive(:ssh_config).and_return({
-      :ssh_host => 'fakehost',
-      :ssh_user => 'fakeuser',
-      :ssh_port => '999',
-      :ssh_identity => 'fakeidentity'
-    })
+    vmi_double.should_receive(:ssh_config).and_return <<-eos
+Host default
+  HostName 127.0.0.1
+  User vagrant
+  Port 2222
+  UserKnownHostsFile /dev/null
+  StrictHostKeyChecking no
+  PasswordAuthentication no
+  IdentityFile "/path/to/project/tools/vagrant/.vagrant/machines/default/virtualbox/private_key"
+  IdentitiesOnly yes
+  LogLevel FATAL
+  ForwardAgent yes
+    eos
 
     Hem::Lib::Vm::Command.class_eval do
       class_variable_set '@@vm_inspector', vmi_double
@@ -36,12 +45,12 @@ describe Hem::Helper do
       create_command("my_command", :pwd => '/').to_s.should_not match /\s-t\s/
     end
 
-    it "should default to ssh_config user" do
-      create_command("my_command", :pwd => '/').to_s.should match /fakeuser@/
+    it "should use injected config" do
+      create_command("my_command", :pwd => '/').to_s.should match /-F [^-][^ ]*/
     end
 
-    it "should default to ssh_config host name" do
-      create_command("my_command", :pwd => '/').to_s.should match /@fakehost/
+    it "should use default host" do
+      create_command("my_command", :pwd => '/').to_s.should match /\ default/
     end
 
     it "should not wrap piped commands with echo by default" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hem
 version: !ruby/object:Gem::Version
-  version: 1.0.1.beta5
+  version: 1.0.1.beta6
 platform: ruby
 authors:
 - Mike Simons
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-09 00:00:00.000000000 Z
+date: 2016-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop