vagrant-exec 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2776dc85cb5d8a7df0e61045fa2f1956247d0129
-  data.tar.gz: f42c5e89c60a7e99f1118cea5b217477dd66e8d1
+  metadata.gz: 5bd02c0d6a36ea13959a4d3b4b421cab17987605
+  data.tar.gz: c0dd85f24425414ecc9c2b89b9a0c274cfc1361d
 SHA512:
-  metadata.gz: 40f6d1b255f9f4f9e8a6791edb1425f97f03f9ae5b7021c8df6722556270365c0dd07565bca0dbb406bf4eb4e003bc4abb19d76690cc4cf9a63df81375991356
-  data.tar.gz: e4b0a564806da2874e4eceb3b241385e3cffe85812156d303e8987a5a794f5e2b4b8129b73d4d0fd6dff3625df5b2246d7d54bf22ff9bb442a79159bbef463c3
+  metadata.gz: 98b33e5c4f625631abb58d8a4295f16a60da65aa886947040862fc3d7801cc822e48f33485bfa8285108b0a8dc85d718dc75b93c421d941a986ec97ef84147bf
+  data.tar.gz: 6ac4df97bc193fdcefb118c93f7b3fd28d74d6441382306e58c07ce81aa9ab6b7d62a2ac8324980dd7f354c771348c4825f27fa31acaaf203ca8a2a965c04042

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.5.2
+
+* Allow to configure binstubs directory (#11)
+
 ## 0.5.1
 
 * Fixed binstubs for defined primary VM (#10 thanks @mikechau)

data/README.md

@@ -143,6 +143,15 @@ To make plain SSH work, it saves current SSH configuration of Vagrant to tempora
 
 Moving forward, you can use projects like [direnv](https://github.com/zimbatm/direnv) to add `bin/` to `PATH` and completely forget that you have VM running.
 
+It is also possible to configure binstubs directory (e.g. default `bin/` collides with Rails binstubs):
+
+```ruby
+Vagrant.configure('2') do |config|
+  config.vm.box = 'precise32'
+  config.exec.binstubs_path = 'vbin'
+end
+```
+
 Testing
 ----------------
 

data/Rakefile

@@ -14,7 +14,17 @@ namespace :features do
 
   desc 'Removes testing vagrant box.'
   task(:cleanup) do
-    system('bundle exec vagrant destroy -f')
-    system('bundle exec vagrant box remove vagrant_exec virtualbox')
+    system('bundle exec vagrant box remove --force vagrant_exec')
+
+    # For some reason, vagrant destroy ID fails for us
+    # so let's just stick to pure VirtualBox
+
+    `VBoxManage list vms`
+      .split("\n")
+      .select { |line| line =~ /aruba_(default|vagrant)/ }
+      .map { |line| line.match(/\{([\w-]+)\}/)[1] }
+      .each { |uuid| system("VBoxManage unregistervm #{uuid} -delete") }
+
+    system('bundle exec vagrant global-status --prune')
   end
 end

data/features/vagrant-exec/binstubs.feature

@@ -88,6 +88,21 @@ Feature: vagrant-exec binstubs
 
       """
 
+  Scenario: respects configured binstubs directory
+    Given I write to "Vagrantfile" with:
+    """
+    Vagrant.configure('2') do |config|
+      config.vm.box = 'vagrant_exec'
+      config.exec.binstubs_path = 'vbin'
+      config.exec.commands 'test'
+    end
+    """
+    And I run `bundle exec vagrant up`
+    When I run `bundle exec vagrant exec --binstubs`
+    Then the output should contain "Generated binstub for test in vbin/test."
+    And a file named "vbin/test" should exist
+    But a file named "bin/test" should not exist
+
   Scenario: escapes double-quotes in command
     Given I write to "Vagrantfile" with:
       """
@@ -130,7 +145,7 @@ Feature: vagrant-exec binstubs
     Then the exit status should be 0
     And the output should contain "No commands to generate binstubs for."
 
-  Scenario: raises if vagrant is not upped
+  Scenario: raises if vagrant is not up
     Given I write to "Vagrantfile" with:
       """
       Vagrant.configure('2') do |config|

data/lib/vagrant-exec/command.rb

@@ -86,23 +86,23 @@ module VagrantPlugins
             }
           end
 
-          shell = vm.config.ssh.shell
+          binstubs_path = vm.config.exec.binstubs_path
+          Dir.mkdir(binstubs_path) unless Dir.exist?(binstubs_path)
 
-          Dir.mkdir('bin') unless Dir.exist?('bin')
           explicit.each do |command|
             command[:constructed].gsub!('"', '\"') # escape double-quotes
 
             variables = {
               ssh_host: vm.name || 'default',
               ssh_config: SSH_CONFIG,
-              shell: shell,
+              shell: vm.config.ssh.shell,
               command: command[:constructed],
             }
             variables.merge!(template_root: "#{File.dirname(__FILE__)}/templates")
 
             binstub = Vagrant::Util::TemplateRenderer.render('binstub', variables)
 
-            filename = "bin/#{command[:command]}"
+            filename = [binstubs_path, command[:command]].join('/')
             File.open(filename, 'w') { |file| file.write binstub }
             File.chmod(0755, filename)
 

data/lib/vagrant-exec/config.rb

@@ -9,7 +9,10 @@ module VagrantPlugins
         }
       }.freeze
 
+      attr_accessor :binstubs_path
+
       def initialize
+        @binstubs_path = UNSET_VALUE
         @commands = UNSET_VALUE
       end
 
@@ -65,6 +68,8 @@ module VagrantPlugins
       end
 
       def finalize!
+        @binstubs_path = 'bin' if @binstubs_path == UNSET_VALUE
+
         if @commands == UNSET_VALUE
           @commands = [DEFAULT_SETTINGS.dup]
         else

data/lib/vagrant-exec/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-exec
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Alex Rodionov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-22 00:00:00.000000000 Z
+date: 2015-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba