vagrant-exec 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3a198b905f07055f13866e6362600566d379f33
-  data.tar.gz: 804b8f85d3c87f30ca0e82e53e3c2d60d91e023d
+  metadata.gz: c2473ab163ba85fb8cc4d9e802771390a95d977f
+  data.tar.gz: 4af5e4619102413eaf5ef543f6f848cc991be591
 SHA512:
-  metadata.gz: 0e6fe2bc7f19ecd536ab49942acbb7436ccebb674767e8e45aa02ec4f5fd9e2d1f37e35d12bd9075c4c4ef0cbe184109e34a7ccfde28ab04c9383acea8004ea4
-  data.tar.gz: e2dc1c0bd0f76c223fcb1b8af329b647d2db88d7828210d720c1225b6971ee500fe43fb45208cbc9b48aff7124553303c4ee6071f403653766c4a36eddcc5e45
+  metadata.gz: 886d5a874793ed7a27eadf7830095e12e21ac6f241c63c7ce77d51f476ddbc266e1dbcc0748ae6d680bc8477557ac40b62e286b52965bc831bda5c7710bfcafc
+  data.tar.gz: 40e06e6cdc5ed0c7a09d6ab93e35b8da76dc23ad6d6cfd6098ffaa64ef2c6108872f708d325c7c348dc25a87a07880587786bf0005b2245dda5faca37b2ed00b

data/Gemfile

@@ -1,10 +1,12 @@
 source 'http://rubygems.org'
 
-gemspec
-
 group :development do
   # We depend on Vagrant for development, but we don't add it as a
   # gem dependency because we expect to be installed within the
   # Vagrant environment itself using `vagrant plugin`.
   gem 'vagrant', git: 'git://github.com/mitchellh/vagrant.git'
 end
+
+group :plugins do
+  gemspec
+end

data/README.md

@@ -59,7 +59,7 @@ Vagrant.configure('2') do |config|
   #   ➜ vagrant exec env
   #   # is the same as
   #   ➜ vagrant ssh -c "cd /etc && env"
-  config.exec.commands '*', directory: '/etc'
+  config.exec.commands 'env', directory: '/etc'
 end
 ```
 
@@ -122,6 +122,8 @@ After you're done, remove Vagrant box.
 ➜ bundle exec rake features:cleanup
 ```
 
+To show stduot, add `@announce-stdout` tag to scenario/feature.
+
 Known issues
 -----------------------------
 

data/Rakefile

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

data/cucumber.yml

@@ -0,0 +1 @@
+default: --require features --format html --out results.html --format pretty

data/features/step_definitions/steps.rb

@@ -3,6 +3,6 @@ Then(/^SHH subprocess should execute command "(.+)"$/) do |command|
   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('"')}'"]
+  ssh += ['-q', '-t', "bash -l -c '#{command.delete("''")}'"]
   assert_partial_output("Executing SSH in subprocess: #{ssh}", all_output)
 end

data/features/vagrant-exec.feature

@@ -8,16 +8,13 @@ Feature: vagrant-exec
   Background:
     Given I write to "Vagrantfile" with:
       """
-      $LOAD_PATH.unshift File.expand_path('../../../lib', __FILE__)
-      require 'vagrant-exec'
-
       Vagrant.configure('2') do |config|
         config.vm.box = 'vagrant_exec'
       end
       """
+    And I run `bundle exec vagrant up`
 
   Scenario Outline: shows help correctly
-    Given I run `bundle exec vagrant up`
     When I run `bundle exec vagrant exec <args>`
     Then the output should contain "Usage: vagrant exec [options] <command>"
     Examples:
@@ -29,13 +26,12 @@ Feature: vagrant-exec
       | --help pwd -h |
 
   Scenario Outline: passes command arguments correctly
-    Given I run `bundle exec vagrant up`
-    When I run `bundle exec vagrant exec <cmd>`
-    Then SHH subprocess should execute command "cd /vagrant && <cmd>"
+    When I run `bundle exec vagrant exec <command>`
+    Then SHH subprocess should execute command "cd /vagrant && <command>"
     Examples:
-      | cmd                   |
-      | cwd .                 |
-      | cwd ~                 |
-      | cwd -h                |
-      | cwd --blah            |
-      | "cwd -h blah -v blah" |
+      | command               |
+      | pwd .                 |
+      | pwd ~                 |
+      | pwd -h                |
+      | pwd --blah            |
+      | 'pwd -h blah -v blah' |

data/features/vagrant-exec/directory.feature

@@ -8,9 +8,6 @@ Feature: vagrant-exec directory
   Scenario: uses /vagrant as default directory
     Given I write to "Vagrantfile" with:
       """
-      $LOAD_PATH.unshift File.expand_path('../../../lib', __FILE__)
-      require 'vagrant-exec'
-
       Vagrant.configure('2') do |config|
         config.vm.box = 'vagrant_exec'
       end
@@ -23,9 +20,6 @@ Feature: vagrant-exec directory
   Scenario: can use custom directory for all commands
     Given I write to "Vagrantfile" with:
       """
-      $LOAD_PATH.unshift File.expand_path('../../../lib', __FILE__)
-      require 'vagrant-exec'
-
       Vagrant.configure('2') do |config|
         config.vm.box = 'vagrant_exec'
         config.exec.commands '*', directory: '/tmp'
@@ -39,9 +33,6 @@ Feature: vagrant-exec directory
   Scenario: can use custom directory for specific commands
     Given I write to "Vagrantfile" with:
       """
-      $LOAD_PATH.unshift File.expand_path('../../../lib', __FILE__)
-      require 'vagrant-exec'
-
       Vagrant.configure('2') do |config|
         config.vm.box = 'vagrant_exec'
         config.exec.commands %w(pwd echo), directory: '/tmp'

data/features/vagrant-exec/environment_variables.feature

@@ -8,9 +8,6 @@ Feature: vagrant-exec environment variables
   Scenario: can export environment variables for all commands
     Given I write to "Vagrantfile" with:
       """
-      $LOAD_PATH.unshift File.expand_path('../../../lib', __FILE__)
-      require 'vagrant-exec'
-
       Vagrant.configure('2') do |config|
         config.vm.box = 'vagrant_exec'
         config.exec.commands '*', env: { 'TEST1' => true, 'TEST2' => false }
@@ -24,9 +21,6 @@ Feature: vagrant-exec environment variables
   Scenario: can export environment variables for specific commands
     Given I write to "Vagrantfile" with:
       """
-      $LOAD_PATH.unshift File.expand_path('../../../lib', __FILE__)
-      require 'vagrant-exec'
-
       Vagrant.configure('2') do |config|
         config.vm.box = 'vagrant_exec'
         config.exec.commands 'cmd', env: { 'TEST1' => 'yo' }
@@ -46,9 +40,6 @@ Feature: vagrant-exec environment variables
   Scenario: can combine environment variables
     Given I write to "Vagrantfile" with:
       """
-      $LOAD_PATH.unshift File.expand_path('../../../lib', __FILE__)
-      require 'vagrant-exec'
-
       Vagrant.configure('2') do |config|
         config.vm.box = 'vagrant_exec'
         config.exec.commands '*', env: { 'TEST1' => true }
@@ -63,3 +54,15 @@ Feature: vagrant-exec environment variables
     Then SHH subprocess should execute command "cd /vagrant && export TEST1=true && export TEST3=false && echo 1"
     When I run `bundle exec vagrant exec env`
     Then SHH subprocess should execute command "cd /vagrant && export TEST1=true && env"
+
+  Scenario: wraps values with spaces to quotes
+    Given I write to "Vagrantfile" with:
+      """
+      Vagrant.configure('2') do |config|
+        config.vm.box = 'vagrant_exec'
+        config.exec.commands 'pwd', env: { 'TEST' => 'one two' }
+      end
+      """
+    And I run `bundle exec vagrant up`
+    When I run `bundle exec vagrant exec pwd`
+    Then SHH subprocess should execute command "cd /vagrant && export TEST="one two" && pwd"

data/features/vagrant-exec/prepend.feature

@@ -8,9 +8,6 @@ Feature: vagrant-exec prepend
   Scenario: can prepend all commands
     Given I write to "Vagrantfile" with:
       """
-      $LOAD_PATH.unshift File.expand_path('../../../lib', __FILE__)
-      require 'vagrant-exec'
-
       Vagrant.configure('2') do |config|
         config.vm.box = 'vagrant_exec'
         config.exec.commands '*', prepend: 'echo vagrant-exec &&'
@@ -24,9 +21,6 @@ Feature: vagrant-exec prepend
   Scenario: can prepend specific commands
     Given I write to "Vagrantfile" with:
       """
-      $LOAD_PATH.unshift File.expand_path('../../../lib', __FILE__)
-      require 'vagrant-exec'
-
       Vagrant.configure('2') do |config|
         config.vm.box = 'vagrant_exec'
         config.exec.commands 'cmd', prepend: 'echo vagrant-exec1 &&'
@@ -46,9 +40,6 @@ Feature: vagrant-exec prepend
   Scenario: can combine prepended
     Given I write to "Vagrantfile" with:
       """
-      $LOAD_PATH.unshift File.expand_path('../../../lib', __FILE__)
-      require 'vagrant-exec'
-
       Vagrant.configure('2') do |config|
         config.vm.box = 'vagrant_exec'
         config.exec.commands '*', prepend: 'echo vagrant-exec1 &&'
@@ -64,3 +55,15 @@ Feature: vagrant-exec prepend
     When I run `bundle exec vagrant exec env`
     Then SHH subprocess should execute command "cd /vagrant && echo vagrant-exec1 && env"
 
+  Scenario: adds prepend only in the end
+    Given I write to "Vagrantfile" with:
+      """
+      Vagrant.configure('2') do |config|
+        config.vm.box = 'vagrant_exec'
+        config.exec.commands 'pwd', prepend: 'bundle exec'
+        config.exec.commands 'pwd', env: { 'TEST' => true }
+      end
+      """
+    And I run `bundle exec vagrant up`
+    When I run `bundle exec vagrant exec pwd`
+    Then SHH subprocess should execute command "cd /vagrant && export TEST=true && bundle exec pwd"

data/features/vagrant-exec/validations.feature

@@ -7,9 +7,6 @@ Feature: vagrant-exec validations
   Background:
     Given I write to "Vagrantfile" with:
       """
-      $LOAD_PATH.unshift File.expand_path('../../../lib', __FILE__)
-      require 'vagrant-exec'
-
       Vagrant.configure('2') do |config|
         config.vm.box = 'vagrant_exec'
         config.exec.commands true, directory: nil, prepend: true, env: 0

data/lib/vagrant-exec/command.rb

@@ -15,22 +15,24 @@ module VagrantPlugins
           settings = vm.config.exec._parsed_commands
           passed_command, constructed_command = cmd.dup, ''
 
-          # directory is applied only once
+          # directory is applied only once in the beginning
           settings.reverse.each do |command|
-            cmd, opts = command[:cmd], command[:opts]
-
-            if command_matches?(cmd, passed_command) && !directory_added?
-              constructed_command << add_directory(opts[:directory])
+            if command_matches?(command[:cmd], passed_command) && !directory_added?
+              constructed_command << add_directory(command[:opts][:directory])
             end
           end
 
-          # apply options
+          # apply environment variables
           settings.each do |command|
-            cmd, opts = command[:cmd], command[:opts]
+            if command_matches?(command[:cmd], passed_command)
+              constructed_command << add_env(command[:opts][:env])
+            end
+          end
 
-            if command_matches?(cmd, passed_command)
-              constructed_command << add_env(opts[:env])
-              constructed_command << add_prepend(opts[:prepend])
+          # apply prepend in the end
+          settings.each do |command|
+            if command_matches?(command[:cmd], passed_command)
+              constructed_command << add_prepend(command[:opts][:prepend])
             end
           end
 
@@ -86,6 +88,7 @@ module VagrantPlugins
       def add_env(env)
         ''.tap do |str|
           env.each do |key, value|
+            value = %("#{value}") if value.is_a?(String) && value.include?(' ')
             str << "export #{key}=#{value} && "
           end if env
         end

data/lib/vagrant-exec/version.rb

@@ -1,7 +1,7 @@
 module VagrantPlugins
   module Exec
 
-    VERSION = '0.4.0'
+    VERSION = '0.4.1'
 
   end # Exec
 end # VagrantPlugins

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-exec
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Alex Rodionov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-02 00:00:00.000000000 Z
+date: 2014-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
@@ -49,6 +49,7 @@ files:
 - LICENSE.md
 - README.md
 - Rakefile
+- cucumber.yml
 - features/step_definitions/steps.rb
 - features/support/env.rb
 - features/vagrant-exec.feature