vagrant-exec 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdf97359b08da7aecc1cec47589bf02aaa36d376
-  data.tar.gz: af4fed40dc6b5ca851aec0a382a58c4fc8457943
+  metadata.gz: a3a198b905f07055f13866e6362600566d379f33
+  data.tar.gz: 804b8f85d3c87f30ca0e82e53e3c2d60d91e023d
 SHA512:
-  metadata.gz: 834d0241290326ca7fa9a458956ff1e2a748ea1b48919c8a0f1ae6197e554c299d3de2c58cd0e0745048d7ca125e74d2a2b57847ab5d280e8a633744eaac290f
-  data.tar.gz: 990ed319f29140ec6e523552dd770e5f3a2514ea4938889918e13f76126b0e2d94879fcce5d247f810fdfc656862bab1406aa5f1b894d4b16ee680d9afcdf870
+  metadata.gz: 0e6fe2bc7f19ecd536ab49942acbb7436ccebb674767e8e45aa02ec4f5fd9e2d1f37e35d12bd9075c4c4ef0cbe184109e34a7ccfde28ab04c9383acea8004ea4
+  data.tar.gz: e2dc1c0bd0f76c223fcb1b8af329b647d2db88d7828210d720c1225b6971ee500fe43fb45208cbc9b48aff7124553303c4ee6071f403653766c4a36eddcc5e45

data/.gitignore

@@ -0,0 +1,6 @@
+/pkg/
+/tmp/
+/.bundle/
+/vendor/bundle/
+Gemfile.lock
+results.html

data/LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Alex Rodionov
+Copyright (c) 2013-2104 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

@@ -8,99 +8,100 @@ Description
 
 You will probably use the plugin if you don't want to SSH into the box to execute commands simply because your machine environment is already configured (e.g. I use ZSH and TextMate bundles to run specs/features).
 
-Example
--------
+Installation
+------------
 
 ```bash
-➜ vagrant exec pwd
-/vagrant
+➜ vagrant plugin install vagrant-exec
 ```
 
-Installation
-------------
+Example
+-------
 
 ```bash
-➜ vagrant plugin install vagrant-exec
+➜ vagrant exec pwd
+/vagrant
 ```
 
 Configuration
 -------------
 
-### Custom root
-
-The root directory can be configured using Vagrantfile.
+vagrant-exec has only one configuration option for Vagrantfile, which allows you to alter the behavior of all or specific commands.
 
 ```ruby
 Vagrant.configure('2') do |config|
   config.vm.box = 'precise32'
-  config.exec.root = '/custom'
+  config.exec.commands '*', directory: '/tmp'
 end
 ```
 
-```bash
-➜ vagrant exec pwd
-# is the same as
-➜ vagrant ssh -c "cd /custom && bundle exec pwd"
-```
+Commands can either be:
+
+  * `"*"` (wildcard) - apply options to all the commands
+  * `"command"` (string) - apply options for specific commands
+  * `%w(command1 command2)` (array) - apply options to all commands in array
 
-### Prepend with
+Configuration options are merged, so if you specify single command in several places, all the option will be applied. The only exception is `:directory`, which is applied only once and in reverse order (i.e. the last set is used).
 
-You can tell `vagrant-exec` to prepend all the commands with custom string.
+### Directory
 
 ```ruby
 Vagrant.configure('2') do |config|
   config.vm.box = 'precise32'
-  config.exec.prepend_with 'bundle exec'
-end
-```
 
-```bash
-➜ vagrant exec pwd
-# is the same as
-➜ vagrant ssh -c "cd /vagrant && bundle exec pwd"
+  # Make /tmp working directory for all the commands:
+  #   ➜ vagrant exec pwd
+  #   # is the same as
+  #   ➜ vagrant ssh -c "cd /tmp && pwd"
+  config.exec.commands '*', directory: '/tmp'
+
+  # Make /etc working directory for env command:
+  #   ➜ vagrant exec env
+  #   # is the same as
+  #   ➜ vagrant ssh -c "cd /etc && env"
+  config.exec.commands '*', directory: '/etc'
+end
 ```
 
-You can also limit prepend to specific commands and combine them.
+### Prepend
 
 ```ruby
 Vagrant.configure('2') do |config|
   config.vm.box = 'precise32'
-  config.exec.prepend_with 'bundle exec', :only => %w(rails rspec cucumber)
-  config.exec.prepend_with 'rvmsudo', :only => %w(gem)
-end
-```
-
-```bash
-➜ vagrant exec rails c
-# is the same as
-➜ vagrant ssh -c "cd /vagrant && bundle exec rails c"
-```
 
-```bash
-➜ vagrant exec gem install bundler
-# is the same as
-➜ vagrant ssh -c "cd /vagrant && rvmsudo gem install bundler"
+  # Automatically prepend apt-get command with sudo:
+  #   ➜ vagrant exec apt-get install htop
+  #   # is the same as
+  #   ➜ vagrant ssh -c "cd /vagrant && sudo apt-get install htop"
+  config.exec.commands 'apt-get', prepend: 'sudo'
+
+  # Automatically prepend rails and rspec commands with bundle exec:
+  #   ➜ vagrant exec rails c
+  #   # is the same as
+  #   ➜ vagrant ssh -c "cd /vagrant && bundle exec rails c"
+  #
+  #   ➜ 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'
+end
 ```
 
 ### Environment variables
 
-You can add environment variables to be exported before.
-
 ```ruby
 Vagrant.configure('2') do |config|
   config.vm.box = 'precise32'
-  config.exec.env['RAILS_ENV'] = 'test'
-  config.exec.env['RAILS_ROOT'] = '/vagrant'
-end
-```
 
-```bash
-➜ vagrant exec pwd
-# is the same as
-➜ vagrant ssh -c "cd /vagrant && export RAILS_ENV=test && export RAILS_ROOT=/vagrant && pwd"
+  # Automatically export environment variables for ruby command:
+  #   ➜ 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 }
+end
 ```
 
-Acceptance tests
+Testing
 ----------------
 
 Before running features, you'll need to bootstrap box.
@@ -138,4 +139,4 @@ Note on Patches/Pull Requests
 Copyright
 ---------
 
-Copyright (c) 2013-2013 Alex Rodionov. See LICENSE.md for details.
+Copyright (c) 2013-2014 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(--require feature --format pretty --format html --out results.html)
   end
 
   desc 'Removes testing vagrant box.'

data/features/vagrant-exec.feature

@@ -1,13 +1,9 @@
 @no-clobber
 Feature: vagrant-exec
   In order to execute commands in Vagrant box
-  Within context of root synced folder
+  Within context of synced folder
   As a developer using vagrant-exec plugin
   I want to use "vagrant exec" command
-  And be able to customize folder
-  And prepend commands with "bundle exec"
-  And set exported environmental variables
-  Using Vagrantfile configuration
 
   Background:
     Given I write to "Vagrantfile" with:
@@ -43,140 +39,3 @@ Feature: vagrant-exec
       | cwd -h                |
       | cwd --blah            |
       | "cwd -h blah -v blah" |
-
-  Scenario: uses /vagrant as default root
-    Given I run `bundle exec vagrant up`
-    When I run `bundle exec vagrant exec pwd`
-    Then the exit status should be 0
-    And SHH subprocess should execute command "cd /vagrant && pwd"
-
-  Scenario: can use custom root
-    Given I overwrite "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.root = '/tmp'
-      end
-      """
-    And I run `bundle exec vagrant up`
-    When I run `bundle exec vagrant exec pwd`
-    Then the exit status should be 0
-    And SHH subprocess should execute command "cd /tmp && pwd"
-
-  Scenario: raises error if root is improperly set
-    Given I overwrite "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.root = true
-      end
-      """
-    And I run `bundle exec vagrant up`
-    Then the exit status should not be 0
-    And the output should contain "root should be a string"
-
-  Scenario: can prepend all commands
-    Given I overwrite "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.prepend_with 'echo vagrant-exec &&'
-      end
-      """
-    And I run `bundle exec vagrant up`
-    When I run `bundle exec vagrant exec pwd`
-    Then the exit status should be 0
-    And SHH subprocess should execute command "cd /vagrant && echo vagrant-exec && pwd"
-
-  Scenario: can prepend only specific commands
-    Given I overwrite "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.prepend_with 'echo vagrant-exec &&', :only => %w(pwd echo)
-      end
-      """
-    And I run `bundle exec vagrant up`
-    When I run `bundle exec vagrant exec pwd`
-    Then SHH subprocess should execute command "cd /vagrant && echo vagrant-exec && pwd"
-    When I run `bundle exec vagrant exec echo 1`
-    Then SHH subprocess should execute command "cd /vagrant && echo vagrant-exec && echo 1"
-    When I run `bundle exec vagrant exec env`
-    Then SHH subprocess should execute command "cd /vagrant && env"
-
-  Scenario: can use prepend multiple times
-    Given I overwrite "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.prepend_with 'echo vagrant-exec1 &&', :only => %w(pwd)
-        config.exec.prepend_with 'echo vagrant-exec2 &&', :only => %w(echo)
-      end
-      """
-    And I run `bundle exec vagrant up`
-    When I run `bundle exec vagrant exec pwd`
-    Then SHH subprocess should execute command "cd /vagrant && echo vagrant-exec1 && pwd"
-    When I run `bundle exec vagrant exec echo 1`
-    Then SHH subprocess should execute command "cd /vagrant && echo vagrant-exec2 && echo 1"
-
-  Scenario: raises error if prepend command is improperly set
-    Given I overwrite "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.prepend_with :test
-      end
-      """
-    When I run `bundle exec vagrant up`
-    Then the exit status should not be 0
-    And the output should contain "prepend_with command should be a string"
-
-  Scenario: raises error if prepend only is improperly set
-    Given I overwrite "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.prepend_with 'echo vagrant-exec1 &&', :only => 'test'
-      end
-      """
-    And I run `bundle exec vagrant up`
-    Then the exit status should not be 0
-    And the output should contain "prepend_with :only should be an array"
-
-  Scenario: can export environment variables
-    Given I overwrite "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.env['TEST1'] = true
-        config.exec.env['TEST2'] = false
-      end
-      """
-    And I run `bundle exec vagrant up`
-    When I run `bundle exec vagrant exec pwd`
-    Then the exit status should be 0
-    And SHH subprocess should execute command "cd /vagrant && export TEST1=true && export TEST2=false && pwd"

data/features/vagrant-exec/directory.feature

@@ -0,0 +1,55 @@
+@no-clobber
+Feature: vagrant-exec directory
+  In order to change the working directory
+  For commands I execute using vagrant-exec
+  As a user
+  I should be able to specify it in Vagrantfile
+
+  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
+      """
+    Given I run `bundle exec vagrant up`
+    When I run `bundle exec vagrant exec pwd`
+    Then the exit status should be 0
+    And SHH subprocess should execute command "cd /vagrant && pwd"
+
+  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'
+      end
+      """
+    And I run `bundle exec vagrant up`
+    When I run `bundle exec vagrant exec pwd`
+    Then the exit status should be 0
+    And SHH subprocess should execute command "cd /tmp && pwd"
+
+  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'
+      end
+      """
+    And I run `bundle exec vagrant up`
+    When I run `bundle exec vagrant exec echo 1`
+    Then SHH subprocess should execute command "cd /tmp && echo 1"
+    When I run `bundle exec vagrant exec env`
+    Then SHH subprocess should execute command "cd /vagrant && env"
+

data/features/vagrant-exec/environment_variables.feature

@@ -0,0 +1,65 @@
+@no-clobber
+Feature: vagrant-exec environment variables
+  In order to automatically set environment variables
+  For commands I execute using vagrant-exec
+  As a user
+  I should be able to specify them in Vagrantfile
+
+  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 }
+      end
+      """
+    And I run `bundle exec vagrant up`
+    When I run `bundle exec vagrant exec pwd`
+    Then the exit status should be 0
+    And SHH subprocess should execute command "cd /vagrant && export TEST1=true && export TEST2=false && pwd"
+
+  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' }
+        config.exec.commands %w(pwd echo), env: { 'TEST2' => true, 'TEST3' => false }
+      end
+      """
+    And I run `bundle exec vagrant up`
+    When I run `bundle exec vagrant exec cmd`
+    Then SHH subprocess should execute command "cd /vagrant && export TEST1=yo && cmd"
+    When I run `bundle exec vagrant exec pwd`
+    Then SHH subprocess should execute command "cd /vagrant && export TEST2=true && export TEST3=false && pwd"
+    When I run `bundle exec vagrant exec echo 1`
+    Then SHH subprocess should execute command "cd /vagrant && export TEST2=true && export TEST3=false && echo 1"
+    When I run `bundle exec vagrant exec env`
+    Then SHH subprocess should execute command "cd /vagrant && env"
+
+  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 }
+        config.exec.commands 'pwd', env: { 'TEST2' => false }
+        config.exec.commands %w(pwd echo), env: { 'TEST3' => false }
+      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 TEST1=true && export TEST2=false && export TEST3=false && pwd"
+    When I run `bundle exec vagrant exec echo 1`
+    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"

data/features/vagrant-exec/prepend.feature

@@ -0,0 +1,66 @@
+@no-clobber
+Feature: vagrant-exec prepend
+  In order to automatically prepend with custom command
+  Commands I execute using vagrant-exec
+  As a user
+  I should be able to specify it in Vagrantfile
+
+  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 &&'
+      end
+      """
+    And I run `bundle exec vagrant up`
+    When I run `bundle exec vagrant exec pwd`
+    Then the exit status should be 0
+    And SHH subprocess should execute command "cd /vagrant && echo vagrant-exec && pwd"
+
+  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 &&'
+        config.exec.commands %w(pwd echo), prepend: 'echo vagrant-exec2 &&'
+      end
+      """
+    And I run `bundle exec vagrant up`
+    When I run `bundle exec vagrant exec cmd`
+    Then SHH subprocess should execute command "cd /vagrant && echo vagrant-exec1 && cmd"
+    When I run `bundle exec vagrant exec pwd`
+    Then SHH subprocess should execute command "cd /vagrant && echo vagrant-exec2 && pwd"
+    When I run `bundle exec vagrant exec echo 1`
+    Then SHH subprocess should execute command "cd /vagrant && echo vagrant-exec2 && echo 1"
+    When I run `bundle exec vagrant exec env`
+    Then SHH subprocess should execute command "cd /vagrant && env"
+
+  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 &&'
+        config.exec.commands 'pwd', prepend: 'echo vagrant-exec2 &&'
+        config.exec.commands %w(pwd echo), prepend: 'echo vagrant-exec3 &&'
+      end
+      """
+    And I run `bundle exec vagrant up`
+    When I run `bundle exec vagrant exec pwd`
+    Then SHH subprocess should execute command "cd /vagrant && echo vagrant-exec1 && echo vagrant-exec2 && echo vagrant-exec3 && pwd"
+    When I run `bundle exec vagrant exec echo 1`
+    Then SHH subprocess should execute command "cd /vagrant && echo vagrant-exec1 && echo vagrant-exec3 && echo 1"
+    When I run `bundle exec vagrant exec env`
+    Then SHH subprocess should execute command "cd /vagrant && echo vagrant-exec1 && env"
+

data/features/vagrant-exec/validations.feature

@@ -0,0 +1,37 @@
+@no-clobber
+Feature: vagrant-exec validations
+  In order to avoid configuration mistakes for vagrant-exec commands
+  As a user
+  I should see proper validation errors
+
+  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
+      end
+      """
+
+  Scenario: raises error if command is not string or array of strings
+    When I run `bundle exec vagrant up`
+    Then the exit status should not be 0
+    And the output should contain "Commands should be String or Array<String>, received: true"
+
+  Scenario: raises error if directory is improperly set
+    When I run `bundle exec vagrant up`
+    Then the exit status should not be 0
+    And the output should contain ":directory should be String, received: nil"
+
+  Scenario: raises error if prepend is improperly set
+    When I run `bundle exec vagrant up`
+    Then the exit status should not be 0
+    And the output should contain ":prepend should be String, received: true"
+
+  Scenario: raises error if environment variables are improperly set
+    When I run `bundle exec vagrant up`
+    Then the exit status should not be 0
+    And the output should contain ":env should be Hash, received: 0"

data/lib/vagrant-exec/command.rb

@@ -3,7 +3,7 @@ module VagrantPlugins
     class Command < Vagrant.plugin(2, :command)
 
       def self.synopsis
-        'proxies command to VM synced folder root'
+        'executes commands in virtual machine'
       end
 
       def execute
@@ -12,19 +12,34 @@ module VagrantPlugins
 
         # Execute the actual SSH
         with_target_vms(nil, single_target: true) do |vm|
-          vm.config.exec.finalize! # TODO: do we have to call it explicitly?
+          settings = vm.config.exec._parsed_commands
+          passed_command, constructed_command = cmd.dup, ''
 
-          plain = cmd.dup
-          plain << ' ' << cmd_args.join(' ') unless cmd_args.empty?
+          # directory is applied only once
+          settings.reverse.each do |command|
+            cmd, opts = command[:cmd], command[:opts]
 
-          command  = "cd #{vm.config.exec.root} && "
-          command << add_env(vm.config.exec.env)
-          command << prepend_command(vm.config.exec.prepends, plain)
-          command << plain
+            if command_matches?(cmd, passed_command) && !directory_added?
+              constructed_command << add_directory(opts[:directory])
+            end
+          end
+
+          # apply options
+          settings.each do |command|
+            cmd, opts = command[:cmd], command[:opts]
+
+            if command_matches?(cmd, passed_command)
+              constructed_command << add_env(opts[:env])
+              constructed_command << add_prepend(opts[:prepend])
+            end
+          end
 
-          @logger.info("Executing single command on remote machine: #{command}")
+          constructed_command << passed_command
+          constructed_command << ' ' << cmd_args.join(' ') if cmd_args.any?
+
+          @logger.info("Executing single command on remote machine: #{constructed_command}")
           ssh_opts = { extra_args: ['-q'] } # make it quiet
-          env = vm.action(:ssh_run, ssh_run_command: command, ssh_opts: ssh_opts)
+          env = vm.action(:ssh_run, ssh_run_command: constructed_command, ssh_opts: ssh_opts)
 
           status = env[:ssh_run_exit_status] || 0
           return status
@@ -59,26 +74,37 @@ module VagrantPlugins
         return cmd, cmd_args
       end
 
+      def add_directory(directory)
+        ''.tap do |str|
+          if directory
+            str << "cd #{directory} && "
+            @directory_added = true
+          end
+        end
+      end
+
       def add_env(env)
-        ''.tap do |cmd|
+        ''.tap do |str|
           env.each do |key, value|
-            cmd << "export #{key}=#{value} && "
-          end if env.any?
+            str << "export #{key}=#{value} && "
+          end if env
         end
       end
 
-      def prepend_command(prepends, command)
-        bin = command.split(' ').first
-        ''.tap do |cmd|
-          prepends.each do |prep|
-            if !prep[:only] || prep[:only].include?(bin)
-              prep = prep[:command].strip # remove trailing space
-              cmd << "#{prep} "
-            end
-          end if prepends.any?
+      def add_prepend(prep)
+        ''.tap do |str|
+          str << "#{prep.strip} " if prep
         end
       end
 
+      def command_matches?(expected, actual)
+        expected =='*' || expected == actual || expected.include?(actual)
+      end
+
+      def directory_added?
+        !!@directory_added
+      end
+
     end # Command
   end # Exec
 end # VagrantPlugins

data/lib/vagrant-exec/config.rb

@@ -2,41 +2,79 @@ module VagrantPlugins
   module Exec
     class Config < Vagrant.plugin(2, :config)
 
-      attr_reader :env
-      attr_accessor :root
+      DEFAULT_SETTINGS = {
+        cmd: '*',
+        opts: {
+          directory: '/vagrant'
+        }
+      }.freeze
 
       def initialize
-        @env          = {}
-        @prepend_with = UNSET_VALUE
-        @root         = UNSET_VALUE
+        @commands = UNSET_VALUE
       end
 
-      def prepend_with(command, opts = {})
-        @prepend_with = [] if @prepend_with == UNSET_VALUE
-        @prepend_with << { :command => command }.merge(opts)
-      end
-
-      def prepends
-        @prepend_with
+      #
+      # Configures commands.
+      #
+      # @param cmd [String, Array<String>]
+      # @param opts [Hash]
+      # @option opts [String] :directory Directory to execute commands in
+      # @option opts [String] :prepend Command to prepend with
+      # @option opts [Hash] :env Environmental variables to export
+      #
+      def commands(cmd, opts = {})
+        @commands = [] if @commands == UNSET_VALUE
+        @commands << { cmd: cmd, opts: opts }
       end
 
       def validate(_)
-        return { 'exec' => ['root should be a string'] } unless @root.is_a?(String)
-        if @prepend_with.any?
-          if !@prepend_with.all? { |p| p[:command].is_a?(String) }
-            return { 'exec' => ['prepend_with command should be a string'] }
+        finalize!
+        errors = _detected_errors
+
+        @commands.each do |command|
+          cmd, opts = command[:cmd], command[:opts]
+
+          if !cmd.is_a?(String) && !array_of_strings?(cmd)
+            errors << "Commands should be String or Array<String>, received: #{cmd.inspect}"
           end
-          if !@prepend_with.all? { |p| !p[:only] || p[:only].is_a?(Array) }
-            return { 'exec' => ['prepend_with :only should be an array'] }
+
+          if opts.has_key?(:directory) && !opts[:directory].is_a?(String)
+            errors << ":directory should be String, received: #{opts[:directory].inspect}"
+          end
+
+          if opts.has_key?(:prepend) && !opts[:prepend].is_a?(String)
+            errors << ":prepend should be String, received: #{opts[:prepend].inspect}"
+          end
+
+          if opts.has_key?(:env) && !opts[:env].is_a?(Hash)
+            errors << ":env should be Hash, received: #{opts[:env].inspect}"
           end
         end
 
-        {}
+        { 'exec' => errors }
       end
 
       def finalize!
-        @root = '/vagrant' if @root == UNSET_VALUE
-        @prepend_with = [] if @prepend_with == UNSET_VALUE
+        if @commands == UNSET_VALUE
+          @commands = [DEFAULT_SETTINGS.dup]
+        else
+          # add default settings and merge options for splat
+          splats, commands = @commands.partition { |command| command[:cmd] == '*' }
+          commands.unshift(DEFAULT_SETTINGS.dup)
+          splats.each { |splat| commands.first[:opts].merge!(splat[:opts]) }
+          @commands = commands
+        end
+      end
+
+      # @api private
+      def _parsed_commands
+        @commands
+      end
+
+      private
+
+      def array_of_strings?(array)
+        array.is_a?(Array) && array.all? { |i| i.is_a?(String) }
       end
 
     end # Config

data/lib/vagrant-exec/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-exec
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Alex Rodionov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-13 00:00:00.000000000 Z
+date: 2014-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
@@ -44,6 +44,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
 - Gemfile
 - LICENSE.md
 - README.md
@@ -51,6 +52,10 @@ files:
 - features/step_definitions/steps.rb
 - features/support/env.rb
 - features/vagrant-exec.feature
+- features/vagrant-exec/directory.feature
+- features/vagrant-exec/environment_variables.feature
+- features/vagrant-exec/prepend.feature
+- features/vagrant-exec/validations.feature
 - lib/vagrant-exec.rb
 - lib/vagrant-exec/command.rb
 - lib/vagrant-exec/config.rb
@@ -85,3 +90,7 @@ test_files:
 - features/step_definitions/steps.rb
 - features/support/env.rb
 - features/vagrant-exec.feature
+- features/vagrant-exec/directory.feature
+- features/vagrant-exec/environment_variables.feature
+- features/vagrant-exec/prepend.feature
+- features/vagrant-exec/validations.feature