vagrant-exec 0.3.0 → 0.3.1

checksums.yaml

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

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/support/env.rb

@@ -1,3 +1,7 @@
+unless `bundle exec vagrant box list`.include?('vagrant_exec')
+  raise 'Box is not added! Run "rake features:bootstrap".'
+end
+
 require 'aruba/cucumber'
 ENV['VAGRANT_LOG'] = 'info'
 

data/features/vagrant-exec.feature

@@ -12,7 +12,8 @@ Feature: vagrant-exec
   Background:
     Given I write to "Vagrantfile" with:
       """
-      Vagrant.require_plugin 'vagrant-exec'
+      $LOAD_PATH.unshift File.expand_path('../../../lib', __FILE__)
+      require 'vagrant-exec'
 
       Vagrant.configure('2') do |config|
         config.vm.box = 'vagrant_exec'
@@ -52,7 +53,8 @@ Feature: vagrant-exec
   Scenario: can use custom root
     Given I overwrite "Vagrantfile" with:
       """
-      Vagrant.require_plugin 'vagrant-exec'
+      $LOAD_PATH.unshift File.expand_path('../../../lib', __FILE__)
+      require 'vagrant-exec'
 
       Vagrant.configure('2') do |config|
         config.vm.box = 'vagrant_exec'
@@ -67,7 +69,8 @@ Feature: vagrant-exec
   Scenario: raises error if root is improperly set
     Given I overwrite "Vagrantfile" with:
       """
-      Vagrant.require_plugin 'vagrant-exec'
+      $LOAD_PATH.unshift File.expand_path('../../../lib', __FILE__)
+      require 'vagrant-exec'
 
       Vagrant.configure('2') do |config|
         config.vm.box = 'vagrant_exec'
@@ -81,7 +84,8 @@ Feature: vagrant-exec
   Scenario: can prepend all commands
     Given I overwrite "Vagrantfile" with:
       """
-      Vagrant.require_plugin 'vagrant-exec'
+      $LOAD_PATH.unshift File.expand_path('../../../lib', __FILE__)
+      require 'vagrant-exec'
 
       Vagrant.configure('2') do |config|
         config.vm.box = 'vagrant_exec'
@@ -96,7 +100,8 @@ Feature: vagrant-exec
   Scenario: can prepend only specific commands
     Given I overwrite "Vagrantfile" with:
       """
-      Vagrant.require_plugin 'vagrant-exec'
+      $LOAD_PATH.unshift File.expand_path('../../../lib', __FILE__)
+      require 'vagrant-exec'
 
       Vagrant.configure('2') do |config|
         config.vm.box = 'vagrant_exec'
@@ -114,7 +119,8 @@ Feature: vagrant-exec
   Scenario: can use prepend multiple times
     Given I overwrite "Vagrantfile" with:
       """
-      Vagrant.require_plugin 'vagrant-exec'
+      $LOAD_PATH.unshift File.expand_path('../../../lib', __FILE__)
+      require 'vagrant-exec'
 
       Vagrant.configure('2') do |config|
         config.vm.box = 'vagrant_exec'
@@ -131,22 +137,23 @@ Feature: vagrant-exec
   Scenario: raises error if prepend command is improperly set
     Given I overwrite "Vagrantfile" with:
       """
-      Vagrant.require_plugin 'vagrant-exec'
+      $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
       """
-    Given I set vagrant-exec prepend with :test for all commands
-    And I run `bundle exec vagrant up`
+    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:
       """
-      Vagrant.require_plugin 'vagrant-exec'
+      $LOAD_PATH.unshift File.expand_path('../../../lib', __FILE__)
+      require 'vagrant-exec'
 
       Vagrant.configure('2') do |config|
         config.vm.box = 'vagrant_exec'
@@ -160,7 +167,8 @@ Feature: vagrant-exec
   Scenario: can export environment variables
     Given I overwrite "Vagrantfile" with:
       """
-      Vagrant.require_plugin 'vagrant-exec'
+      $LOAD_PATH.unshift File.expand_path('../../../lib', __FILE__)
+      require 'vagrant-exec'
 
       Vagrant.configure('2') do |config|
         config.vm.box = 'vagrant_exec'

data/lib/vagrant-exec/command.rb

@@ -14,7 +14,8 @@ module VagrantPlugins
         with_target_vms(nil, single_target: true) do |vm|
           vm.config.exec.finalize! # TODO: do we have to call it explicitly?
 
-          plain = "#{cmd} " << cmd_args.join(' ')
+          plain = cmd.dup
+          plain << ' ' << cmd_args.join(' ') unless cmd_args.empty?
 
           command  = "cd #{vm.config.exec.root} && "
           command << add_env(vm.config.exec.env)
@@ -51,6 +52,10 @@ module VagrantPlugins
           return nil
         end
 
+        # remove "--" arg which is added by Vagrant
+        # https://github.com/p0deje/vagrant-exec/issues/2
+        cmd_args.delete_if { |a| a == '--' }
+
         return cmd, cmd_args
       end
 

data/lib/vagrant-exec/version.rb

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

metadata

@@ -1,46 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-exec
 version: !ruby/object:Gem::Version
-  version: 0.3.0
-  prerelease: 
+  version: 0.3.1
 platform: ruby
 authors:
 - Alex Rodionov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-19 00:00:00.000000000 Z
+date: 2014-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Vagrant plugin to execute commands within the context of VM synced folder
@@ -65,33 +60,26 @@ files:
 homepage: http://github.com/p0deje/vagrant-exec
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1851522929754547545
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1851522929754547545
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Execute commands in Vagrant synced folder
 test_files:
 - features/step_definitions/steps.rb