hobo-inviqa 0.0.7.pre.rc2 → 0.0.7.pre.rc3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTRkZWNjNDIxZGFkODc3MDM2ZmViYTk2OTFkOGM1NTVjMDE0YWU0MA==
+    MjQzZmFjY2Y1M2FjNGMyZTgzMWE4YmExMTI1YTliY2NkYzNiMWExYw==
   data.tar.gz: !binary |-
-    MWIyZWM0NWNlMDg1YzJiOTI3NzY2ODc5M2ViNDhlNDA3MGNiMmMwYg==
+    YWVkNDBkOGJkN2ViYjBmY2Y0ZTE5NjQxYWY2NWI5ZGNjMWQ2MWNmOA==
 SHA512:
   metadata.gz: !binary |-
-    NDhiM2M3ZmVmNmU2NDYzYTE0M2YxNTc4ZTQ3MjUzODRkMWE4MDJmM2M2ZGFm
-    YWJjYmU3M2Q4MWVjMThiNTA1ZjhjMTZlNzVmZDlkY2UyMzExYmE0ZWE4NDA1
-    NDA2MjAzNmJhYzYwZDU4MDM2Y2I5ZjllOTE2MWVkYWY2MWNkMTc=
+    NjU2ZWQ2ZWU3ODAwMWFlMmMwYmZkYjFlZjgwYzdiOGMzYmI3NzM3MWQ0Yzc4
+    YzNjMjk3NWYyNTQwY2JkYTZlNTI0NzNlODdhOTcwOTA2ODQ1ZDU4ZGI1YWZk
+    ZjZjYjgyMzBiYjE4YWM1ZWY4ZjgwNzQ3MzVjMTlmZDQxYmZmYzY=
   data.tar.gz: !binary |-
-    NDIzYzNhOTgwYzM2MjYyMGE2ZWQyZmJjYzA2NjFiYzNlMWQ5NGMxZWU4Mjdm
-    NDUyOTRkNjY2ZWEzOGJhNzU0YjI3NmM1ZmM2NzkzZTU0OWFmNDEzMjJhN2Fm
-    Y2NjOTRhMjhjYjQyN2M0N2Q3YmY2MjJhOGEyOGUyZWM2NDUwNmM=
+    MGE4MTNlMDI0NTQ1MzdlNTU3M2QxMjk1MzgzZThiNGYyMDQ4MGJlZjc3YmZl
+    ODJjMDhlNjUyMGNlZmY1NjE2YjgwNTM1NmY5NWJiZTY1ZWE0MWFmZjYzYWMw
+    MTE3MTBiNGRiMDk3MjA5ODBhMTNlOTBlNDU2YmY4YzkxOWY2ODY=

data/Gemfile.lock

@@ -1,11 +1,12 @@
 PATH
   remote: .
   specs:
-    hobo-inviqa (0.0.7.pre.rc2)
+    hobo-inviqa (0.0.7.pre.rc3)
       aws-sdk (~> 1.34.0)
       bundler (~> 1.5.2)
       deepstruct (~> 0.0.5)
       highline (~> 1.6.20)
+      net-ssh-simple (~> 1.6.3)
       os (~> 0.9.6)
       rake (~> 10.1.1)
       rake-hooks (~> 1.2.3)
@@ -25,6 +26,7 @@ GEM
       json (~> 1.4)
       nokogiri (>= 1.4.4)
       uuidtools (~> 2.1)
+    blockenspiel (0.4.5)
     builder (3.2.2)
     celluloid (0.15.2)
       timers (~> 1.1.0)
@@ -59,6 +61,7 @@ GEM
     guard-rspec (4.2.6)
       guard (~> 2.1)
       rspec (>= 2.14, < 4.0)
+    hashie (2.0.5)
     highline (1.6.21)
     json (1.8.1)
     listen (2.5.0)
@@ -71,6 +74,14 @@ GEM
     mini_portile (0.5.2)
     multi_json (1.8.4)
     multi_test (0.0.3)
+    net-scp (1.1.2)
+      net-ssh (>= 2.6.5)
+    net-ssh (2.7.0)
+    net-ssh-simple (1.6.3)
+      blockenspiel (~> 0.4.3)
+      hashie (>= 1.1.0)
+      net-scp (~> 1.1.0)
+      net-ssh (~> 2.7.0)
     nio4r (1.0.0)
     nokogiri (1.6.1)
       mini_portile (~> 0.5.0)
@@ -94,7 +105,7 @@ GEM
     rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.5)
-    ruby-progressbar (1.4.1)
+    ruby-progressbar (1.4.2)
     semantic (1.3.0)
     slop (3.4.7)
     teerb (0.0.1)

data/hobo.gemspec

@@ -29,6 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "ruby-progressbar", "~> 1.4.1"
   spec.add_dependency "teerb", "~> 0.0.1"
   spec.add_dependency "os", "~> 0.9.6"
+  spec.add_dependency "net-ssh-simple", "~> 1.6.3"
 
   spec.add_development_dependency "aruba", "~> 0.5.4"
   spec.add_development_dependency "rspec", "~> 2.14.1"

data/lib/hobo/helper/vm_command.rb

@@ -1,4 +1,5 @@
 require 'tempfile'
+require 'net/ssh/simple'
 
 module Hobo
   module Helper
@@ -37,29 +38,29 @@ module Hobo
         return @project_mount_path if @project_mount_path
 
         tmp = Tempfile.new('vm_command_locator', Hobo.project_path)
-        tmp.write(Hobo.project_path)
 
-        locator_file = File.basename(tmp.path)
+        begin
+          tmp.write(Hobo.project_path)
 
-        pattern = OS.windows? ? 'vboxsf' : Hobo.project_path.shellescape
+          locator_file = File.basename(tmp.path)
 
-        # TODO genericise the command escaping from lib/hobo/patches/slop.rb to avoid nested shell escaping hell
-        sed = 's/.* on \(.*\) type.*/\\\1\\\/%%/g'.gsub('%%', locator_file)
-        locator_results = vm_shell(
-          "mount | grep #{pattern} | sed -e\"#{sed}\" | xargs md5sum",
-          :capture => true,
-          :pwd => '/',
-          :psuedo_tty => false,
-          :ignore_errors => true
-        )
+          pattern = OS.windows? ? 'vboxsf' : Hobo.project_path.shellescape
 
-        tmp.close
+          sed = 's/.* on \(.*\) type.*/\1\/%%/g'.gsub('%%', locator_file)
+          locator_results = VmCommand.new(
+            "mount | grep #{pattern} | sed -e\"#{sed}\" | xargs md5sum",
+            :capture => true,
+            :pwd => '/'
+          ).run
+        ensure
+          tmp.unlink
+        end
 
         match = locator_results.match(/^([a-z0-9]{32})\s+(.*)$/)
 
         raise Exception.new("Unable to locate project mount point in VM") if !match
 
-        @project_mount_path = File.dirname(match[2])
+        @vm_project_mount_path = File.dirname(match[2])
 
         # Stash it in config
         Hobo.project_config[:vm] ||= {}
@@ -128,6 +129,45 @@ module Hobo
         return self
       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?
+        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
+      end
+
       # TODO Speed up Vagrant SSH connections
       # May need to be disabled for windows (mm_send_fd: UsePrivilegeSeparation=yes not supported)
       # https://gist.github.com/jedi4ever/5657094

data/lib/hobo/tasks/deps.rb

@@ -70,13 +70,22 @@ namespace :deps do
   desc "Install chef dependencies"
   task :chef => [ "deps:gems" ] do
     locate "*Cheffile" do
-      Hobo.ui.title "Installing chef dependencies"
+      Hobo.ui.title "Installing chef dependencies via librarian"
       Bundler.with_clean_env do
-        bundle_shell "librarian-chef", "install", "--verbose", realtime: true, indent: 2 do |line|
+        bundle_shell "librarian-chef", "install", "--verbose", :realtime => true, :indent => 2 do |line|
           line =~ /Installing.*</ ? line.strip + "\n" : nil
         end
       end
       Hobo.ui.separator
     end
+
+    locate "*Berksfile" do
+      Hobo.ui.title "Installing chef dependencies via berkshelf"
+      Bundler.with_clean_env do
+        bundle_shell "berks", "install", :realtime => true, :indent => 2
+        bundle_shell "berks", "install", "--path", "cookbooks"
+      end
+      Hobo.ui.separator
+    end
   end
 end

data/lib/hobo/version.rb

@@ -1,3 +1,3 @@
 module Hobo
-  VERSION = '0.0.7-rc2'
+  VERSION = '0.0.7-rc3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hobo-inviqa
 version: !ruby/object:Gem::Version
-  version: 0.0.7.pre.rc2
+  version: 0.0.7.pre.rc3
 platform: ruby
 authors:
 - Mike Simons
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-03 00:00:00.000000000 Z
+date: 2014-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop
@@ -164,6 +164,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.6
+- !ruby/object:Gem::Dependency
+  name: net-ssh-simple
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.3
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement