vagrant-exec 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b89068882edbaa84b37d2ba85e1e590560304f3
-  data.tar.gz: 2b75d7b7fddae121d5497ff896883fa02adda639
+  metadata.gz: 2776dc85cb5d8a7df0e61045fa2f1956247d0129
+  data.tar.gz: f42c5e89c60a7e99f1118cea5b217477dd66e8d1
 SHA512:
-  metadata.gz: a2d2a14a6cdb183e07c4bfec1549a606348e61590b5489ce8914f33cc9d681317eaa301e8abe2fd3b191ae4e102ad55f1f3c329ff9e0a7e2bda6061ca94321fb
-  data.tar.gz: 84098dcd483f3ae1c58ec57d7c5830432e146c0bbe89750cea35b19154edee28c8b5ecb5c128a545bb593bda4a2c7e1a728964c7dac1925233d63653de21fcc5
+  metadata.gz: 40f6d1b255f9f4f9e8a6791edb1425f97f03f9ae5b7021c8df6722556270365c0dd07565bca0dbb406bf4eb4e003bc4abb19d76690cc4cf9a63df81375991356
+  data.tar.gz: e4b0a564806da2874e4eceb3b241385e3cffe85812156d303e8987a5a794f5e2b4b8129b73d4d0fd6dff3625df5b2246d7d54bf22ff9bb442a79159bbef463c3

data/CHANGELOG.md

@@ -1,4 +1,8 @@
-## 0.5.0 (unreleased)
+## 0.5.1
+
+* Fixed binstubs for defined primary VM (#10 thanks @mikechau)
+
+## 0.5.0
 
 * Added binstubs support
 

data/LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) 2013-2104 Alex Rodionov
+Copyright (c) 2013-2015 Alex Rodionov
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -83,7 +83,7 @@ Vagrant.configure('2') do |config|
   #   ➜ vagrant exec rspec spec/
   #   # is the same as
   #   ➜ vagrant ssh -c "cd /vagrant && bundle exec rspec spec/"
-  config.exec.commands %w(rails rspec), prepend: 'bundle exec'
+  config.exec.commands %w[rails rspec], prepend: 'bundle exec'
 end
 ```
 
@@ -97,14 +97,14 @@ Vagrant.configure('2') do |config|
   #   ➜ vagrant exec ruby -e 'puts 1'
   #   # is the same as
   #   ➜ vagrant ssh -c "cd /vagrant && export RUBY_GC_MALLOC_LIMIT=100000000 && ruby -e 'puts 1'"
-  config.exec.commands 'ruby', env: { 'RUBY_GC_MALLOC_LIMIT' => 100000000 }
+  config.exec.commands 'ruby', env: {'RUBY_GC_MALLOC_LIMIT' => 100000000}
 end
 ```
 
 Binstubs
 ----------------
 
-It is possible can generate binstubs for all your configured commands. You might want to do this to avoid typing `vagrant exec` every time before command, or if you want integrate your flow in editor (e.g. running tests from editor).
+It is possible to generate binstubs for all your configured commands. You might want to do this to avoid typing `vagrant exec` every time before command, or if you want integrate your flow in editor (e.g. running tests from editor).
 
 Assuming you have the following configuration:
 
@@ -112,8 +112,8 @@ Assuming you have the following configuration:
 Vagrant.configure('2') do |config|
   config.vm.box = 'precise32'
   config.exec.commands 'bundle'
-  config.exec.commands %w(rails rake), prepend: 'bundle exec'
-  config.exec.commands %w(rspec cucumber), prepend: 'spring'
+  config.exec.commands %w[rails rake], prepend: 'bundle exec'
+  config.exec.commands %w[rspec cucumber], prepend: 'spring'
 end
 ```
 
@@ -177,10 +177,10 @@ Note on Patches/Pull Requests
 * Fork the project.
 * Make your feature addition or bug fix.
 * Add tests for it. This is important so I don't break it in a future version unintentionally.
-* Commit, do not mess with rakefile, version, or history. (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
+* Commit, do not mess with Rakefile, version, or history. (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
 * Send me a pull request. Bonus points for topic branches.
 
 Copyright
 ---------
 
-Copyright (c) 2013-2014 Alex Rodionov. See LICENSE.md for details.
+Copyright (c) 2013-2015 Alex Rodionov. See LICENSE.md for details.

data/Rakefile

@@ -9,7 +9,7 @@ namespace :features do
   end
 
   Cucumber::Rake::Task.new(:run) do |t|
-    t.cucumber_opts = %w(--format pretty)
+    t.cucumber_opts = %w[--format pretty]
   end
 
   desc 'Removes testing vagrant box.'

data/features/step_definitions/steps.rb

@@ -1,8 +1,8 @@
 Then(/^SHH subprocess should execute command "(.+)"$/) do |command|
-  ssh  = %w(vagrant@127.0.0.1 -p 2200 -o Compression=yes)
-  ssh += %w(-o DSAAuthentication=yes -o LogLevel=FATAL)
-  ssh += %w(-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null)
-  ssh += %W(-o IdentitiesOnly=yes -i #{Dir.home}/.vagrant.d/insecure_private_key)
+  ssh  = %w[vagrant@127.0.0.1 -p 2200 -o Compression=yes]
+  ssh += %w[-o DSAAuthentication=yes -o LogLevel=FATAL]
+  ssh += %w[-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null]
+  ssh += %W[-o IdentitiesOnly=yes -i #{Dir.home}/.vagrant.d/insecure_private_key]
   ssh += ['-q', '-t', "bash -l -c '#{command.delete("''")}'"]
   assert_partial_output("Executing SSH in subprocess: #{ssh}", all_output)
 end

data/features/vagrant-exec/binstubs.feature

@@ -12,7 +12,7 @@ Feature: vagrant-exec binstubs
       Vagrant.configure('2') do |config|
         config.vm.box = 'vagrant_exec'
         config.exec.commands 'echo', directory: '/tmp'
-        config.exec.commands %w(pwd echo), prepend: 'test -d . &&', env: { 'TEST' => 1 }
+        config.exec.commands %w[pwd echo], prepend: 'test -d . &&', env: {'TEST' => 1}
       end
       """
     And I run `bundle exec vagrant up`
@@ -43,7 +43,7 @@ Feature: vagrant-exec binstubs
     Then the exit status should be 0
     And the output should contain "/vagrant"
 
-  Scenario: dumps vagrant ssh-config to file
+  Scenario: dumps vagrant ssh-config to file for default box
     Given I write to "Vagrantfile" with:
       """
       Vagrant.configure('2') do |config|
@@ -56,6 +56,20 @@ Feature: vagrant-exec binstubs
     Then a file named ".vagrant/ssh_config" should exist
     And the file ".vagrant/ssh_config" should contain result of vagrant ssh-config
 
+  Scenario: dumps vagrant ssh-config to file for defined box
+    Given I write to "Vagrantfile" with:
+      """
+      Vagrant.configure('2') do |config|
+        config.vm.box = 'vagrant_exec'
+        config.vm.define 'vagrant'
+        config.exec.commands 'echo'
+      end
+      """
+    And I run `bundle exec vagrant up`
+    When I run `bundle exec vagrant exec --binstubs`
+    Then a file named ".vagrant/ssh_config" should exist
+    And the file ".vagrant/ssh_config" should contain result of vagrant ssh-config
+
   Scenario: respects configured shell
     Given I write to "Vagrantfile" with:
       """
@@ -79,7 +93,7 @@ Feature: vagrant-exec binstubs
       """
       Vagrant.configure('2') do |config|
         config.vm.box = 'vagrant_exec'
-        config.exec.commands 'echo', env: { 'TEST' => 'one two' }
+        config.exec.commands 'echo', env: {'TEST' => 'one two'}
       end
       """
     And I run `bundle exec vagrant up`
@@ -108,7 +122,7 @@ Feature: vagrant-exec binstubs
       """
       Vagrant.configure('2') do |config|
         config.vm.box = 'vagrant_exec'
-        config.exec.commands '*', env: { 'TEST' => 'one two' }
+        config.exec.commands '*', env: {'TEST' => 'one two'}
       end
       """
     And I run `bundle exec vagrant up`

data/features/vagrant-exec/directory.feature

@@ -35,7 +35,7 @@ Feature: vagrant-exec directory
       """
       Vagrant.configure('2') do |config|
         config.vm.box = 'vagrant_exec'
-        config.exec.commands %w(pwd echo), directory: '/tmp'
+        config.exec.commands %w[pwd echo], directory: '/tmp'
       end
       """
     And I run `bundle exec vagrant up`

data/features/vagrant-exec/environment_variables.feature

@@ -10,7 +10,7 @@ Feature: vagrant-exec environment variables
       """
       Vagrant.configure('2') do |config|
         config.vm.box = 'vagrant_exec'
-        config.exec.commands '*', env: { 'TEST1' => true, 'TEST2' => false }
+        config.exec.commands '*', env: {'TEST1' => true, 'TEST2' => false}
       end
       """
     And I run `bundle exec vagrant up`
@@ -24,7 +24,7 @@ Feature: vagrant-exec environment variables
       Vagrant.configure('2') do |config|
         config.vm.box = 'vagrant_exec'
         config.exec.commands 'cmd', env: { 'TEST1' => 'yo' }
-        config.exec.commands %w(pwd echo), env: { 'TEST2' => true, 'TEST3' => false }
+        config.exec.commands %w[pwd echo], env: {'TEST2' => true, 'TEST3' => false}
       end
       """
     And I run `bundle exec vagrant up`
@@ -42,9 +42,9 @@ Feature: vagrant-exec environment variables
       """
       Vagrant.configure('2') do |config|
         config.vm.box = 'vagrant_exec'
-        config.exec.commands '*', env: { 'TEST1' => true }
-        config.exec.commands 'pwd', env: { 'TEST2' => false }
-        config.exec.commands %w(pwd echo), env: { 'TEST3' => false }
+        config.exec.commands '*', env: {'TEST1' => true}
+        config.exec.commands 'pwd', env: {'TEST2' => false}
+        config.exec.commands %w[pwd echo], env: {'TEST3' => false}
       end
       """
     And I run `bundle exec vagrant up`
@@ -60,7 +60,7 @@ Feature: vagrant-exec environment variables
       """
       Vagrant.configure('2') do |config|
         config.vm.box = 'vagrant_exec'
-        config.exec.commands 'pwd', env: { 'TEST' => 'one two' }
+        config.exec.commands 'pwd', env: {'TEST' => 'one two'}
       end
       """
     And I run `bundle exec vagrant up`

data/features/vagrant-exec/prepend.feature

@@ -24,7 +24,7 @@ Feature: vagrant-exec prepend
       Vagrant.configure('2') do |config|
         config.vm.box = 'vagrant_exec'
         config.exec.commands 'cmd', prepend: 'echo vagrant-exec1 &&'
-        config.exec.commands %w(pwd echo), prepend: 'echo vagrant-exec2 &&'
+        config.exec.commands %w[pwd echo], prepend: 'echo vagrant-exec2 &&'
       end
       """
     And I run `bundle exec vagrant up`
@@ -44,7 +44,7 @@ Feature: vagrant-exec prepend
         config.vm.box = 'vagrant_exec'
         config.exec.commands '*', prepend: 'echo vagrant-exec1 &&'
         config.exec.commands 'pwd', prepend: 'echo vagrant-exec2 &&'
-        config.exec.commands %w(pwd echo), prepend: 'echo vagrant-exec3 &&'
+        config.exec.commands %w[pwd echo], prepend: 'echo vagrant-exec3 &&'
       end
       """
     And I run `bundle exec vagrant up`
@@ -61,7 +61,7 @@ Feature: vagrant-exec prepend
       Vagrant.configure('2') do |config|
         config.vm.box = 'vagrant_exec'
         config.exec.commands 'pwd', prepend: 'bundle exec'
-        config.exec.commands 'pwd', env: { 'TEST' => true }
+        config.exec.commands 'pwd', env: {'TEST' => true}
       end
       """
     And I run `bundle exec vagrant up`

data/lib/vagrant-exec/command.rb

@@ -19,7 +19,7 @@ module VagrantPlugins
           command << ' ' << cmd_args.join(' ') if cmd_args.any?
 
           @logger.info("Executing single command on remote machine: #{command}")
-          ssh_opts = { extra_args: ['-q'] } # make it quiet
+          ssh_opts = {extra_args: ['-q']} # make it quiet
           env = vm.action(:ssh_run, ssh_run_command: command, ssh_opts: ssh_opts)
 
           status = env[:ssh_run_exit_status] || 0
@@ -93,6 +93,7 @@ module VagrantPlugins
             command[:constructed].gsub!('"', '\"') # escape double-quotes
 
             variables = {
+              ssh_host: vm.name || 'default',
               ssh_config: SSH_CONFIG,
               shell: shell,
               command: command[:constructed],

data/lib/vagrant-exec/config.rb

@@ -33,7 +33,7 @@ module VagrantPlugins
         if args.empty?
           @commands
         else
-          @commands << { cmd: args[0], opts: args[1] || {} }
+          @commands << {cmd: args[0], opts: args[1] || {}}
         end
       end
 
@@ -61,7 +61,7 @@ module VagrantPlugins
           end
         end
 
-        { 'exec' => errors }
+        {'exec' => errors}
       end
 
       def finalize!

data/lib/vagrant-exec/support/ssh_helper.rb

@@ -11,7 +11,7 @@ module VagrantPlugins
         raise Vagrant::Errors::SSHNotReady if ssh_info.nil?
 
         variables = {
-          host_key: host || "vagrant",
+          host_key: host || 'vagrant',
           ssh_host: ssh_info[:host],
           ssh_port: ssh_info[:port],
           ssh_user: ssh_info[:username],

data/lib/vagrant-exec/templates/binstub.erb

@@ -1,2 +1,2 @@
 #!/bin/bash
-ssh -F <%= ssh_config %> -q -t default "<%= shell %> -c '<%= command %> $@'"
+ssh -F <%= ssh_config %> -q -t <%= ssh_host %> "<%= shell %> -c '<%= command %> $@'"

data/lib/vagrant-exec/version.rb

@@ -1,7 +1,7 @@
 module VagrantPlugins
   module Exec
 
-    VERSION = '0.5.0'
+    VERSION = '0.5.1'
 
   end # Exec
 end # VagrantPlugins

data/vagrant-exec.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
-  s.require_paths = %w(lib)
+  s.require_paths = %w[lib]
 
   s.add_development_dependency 'aruba'
   s.add_development_dependency 'rake'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-exec
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Alex Rodionov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-30 00:00:00.000000000 Z
+date: 2015-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
@@ -102,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Execute commands in Vagrant synced folder