vagrant-exec 0.2.0 → 0.2.1

data/LICENSE.md

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

@@ -17,7 +17,7 @@ Example
 ```
 
 Installation
--------
+------------
 
 ```shell
 ➜ vagrant plugin install vagrant-exec
@@ -26,6 +26,8 @@ Installation
 Configuration
 -------------
 
+### Custom folder
+
 The root directory can be configured using Vagrantfile.
 
 ```ruby
@@ -38,10 +40,12 @@ end
 ```shell
 ➜ vagrant exec pwd
 # is the same as
-➜ vagrant ssh -c "cd /custom && bundle exec pwd'
+➜ vagrant ssh -c "cd /custom && bundle exec pwd"
 ```
 
-You can also enable bundler to prepend each command with `bundle exec` (note, that it won't be done for commands like `bundle install`).
+### Bundler
+
+You can enable bundler to prepend each command with `bundle exec`. Note that it won't be done for commands starting with `bundle` (e.g. `bundle install`).
 
 ```ruby
 Vagrant.configure('2') do |config|
@@ -53,14 +57,16 @@ end
 ```shell
 ➜ vagrant exec pwd
 # is the same as
-➜ vagrant ssh -c "cd /vagrant && bundle exec pwd'
+➜ vagrant ssh -c "cd /vagrant && bundle exec pwd"
 
 ➜ vagrant exec bundle install
 # is the same as
-➜ vagrant ssh -c "cd /vagrant && bundle install'
+➜ vagrant ssh -c "cd /vagrant && bundle install"
 ```
 
-You can also add environment variables to be exported before.
+### Environment variables
+
+You can add environment variables to be exported before.
 
 ```ruby
 Vagrant.configure('2') do |config|
@@ -73,7 +79,7 @@ end
 ```shell
 ➜ vagrant exec pwd
 # is the same as
-➜ vagrant ssh -c "cd /vagrant && export RAILS_ENV=test && export RAILS_ROOT=/vagrant && pwd'
+➜ vagrant ssh -c "cd /vagrant && export RAILS_ENV=test && export RAILS_ROOT=/vagrant && pwd"
 ```
 
 Acceptance tests
@@ -83,6 +89,11 @@ Before running features, you'll need to bootstrap box.
 
 ```shell
 ➜ bundle exec rake features:bootstrap
+```
+
+To run features, execute the following rake task.
+
+```shell
 ➜ bundle exec rake features:run
 ```
 

data/Rakefile

@@ -5,14 +5,14 @@ Bundler::GemHelper.install_tasks
 namespace :features do
   desc 'Downloads and adds vagrant box for testing.'
   task(:bootstrap) do
-    system('bundle exec vagrant box add vagrant_exec http://files.vagrantup.com/precise32.box')
+    system('bundle exec vagrant box add vagrant_exec http://cloud-images.ubuntu.com/vagrant/precise/current/precise-server-cloudimg-amd64-vagrant-disk1.box')
   end
 
   Cucumber::Rake::Task.new(:run) do |t|
     t.cucumber_opts = %w(--format pretty)
   end
 
-  desc 'Removes testing vagrant box .'
+  desc 'Removes testing vagrant box.'
   task(:cleanup) do
     system('bundle exec vagrant destroy -f')
     system('bundle exec vagrant box remove vagrant_exec virtualbox')

data/features/vagrant-exec.feature

@@ -16,14 +16,14 @@ Feature: vagrant-exec
     Given I run `bundle exec vagrant up`
     When I run `bundle exec vagrant exec pwd`
     Then the exit status should be 0
-    And the output should contain "Executing single command on remote machine: cd /vagrant && pwd"
+    And the output should contain "Executing single command on remote machine: source ~/.profile && cd /vagrant && pwd"
 
   Scenario: can use custom folder
     Given I set vagrant-exec folder to "/tmp"
     And I run `bundle exec vagrant up`
     When I run `bundle exec vagrant exec pwd`
     Then the exit status should be 0
-    And the output should contain "Executing single command on remote machine: cd /tmp && pwd"
+    And the output should contain "Executing single command on remote machine: source ~/.profile && cd /tmp && pwd"
 
   Scenario: raises error if folder is improperly set
     Given I set vagrant-exec folder to true
@@ -42,13 +42,13 @@ Feature: vagrant-exec
     And I run `bundle exec vagrant up`
     When I run `bundle exec vagrant exec pwd`
     Then the exit status should not be 0
-    And the output should contain "Executing single command on remote machine: cd /vagrant && bundle exec pwd"
+    And the output should contain "Executing single command on remote machine: source ~/.profile && cd /vagrant && bundle exec pwd"
 
   Scenario: does not use bundler for bundle commands
     Given I set vagrant-exec bundler to true
     And I run `bundle exec vagrant up`
     When I run `bundle exec vagrant exec bundle install`
-    Then the output should contain "Executing single command on remote machine: cd /vagrant && bundle install"
+    Then the output should contain "Executing single command on remote machine: source ~/.profile && cd /vagrant && bundle install"
 
   Scenario: raises error if bundler is improperly set
     Given I set vagrant-exec bundler to "true"
@@ -64,7 +64,7 @@ Feature: vagrant-exec
     And I run `bundle exec vagrant up`
     When I run `bundle exec vagrant exec pwd`
     Then the exit status should be 0
-    And the output should contain "Executing single command on remote machine: cd /vagrant && export TEST1=true && export TEST2=false && pwd"
+    And the output should contain "Executing single command on remote machine: source ~/.profile && cd /vagrant && export TEST1=true && export TEST2=false && pwd"
 
   Scenario Outline: shows help correctly
     Given I run `bundle exec vagrant up`
@@ -81,7 +81,7 @@ Feature: vagrant-exec
   Scenario Outline: passes command arguments correctly
     Given I run `bundle exec vagrant up`
     When I run `bundle exec vagrant exec <cmd>`
-    Then the output should contain "Executing single command on remote machine: cd /vagrant && <cmd>"
+    Then the output should contain "Executing single command on remote machine: source ~/.profile && cd /vagrant && <cmd>"
     Examples:
       | cmd                 |
       | cwd .               |

data/lib/vagrant-exec/command.rb

@@ -3,6 +3,32 @@ module VagrantPlugins
     class Command < Vagrant.plugin(2, :command)
 
       def execute
+        cmd, cmd_args = parse_args
+        cmd && cmd_args or return nil
+
+        # 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?
+
+          plain = "#{cmd} " << cmd_args.join(' ')
+
+          command = "source ~/.profile && "
+          command << "cd #{vm.config.exec.folder} && "
+          command << add_env(vm.config.exec.env)
+          command << add_bundler(vm.config.exec.bundler, plain)
+          command << plain
+
+          @logger.info("Executing single command on remote machine: #{command}")
+          env = vm.action(:ssh_run, ssh_run_command: command)
+
+          status = env[:ssh_run_exit_status] || 0
+          return status
+        end
+      end
+
+      private
+
+      def parse_args
         opts = OptionParser.new do |o|
           o.banner = 'Usage: vagrant exec [options] <command>'
           o.separator ''
@@ -21,31 +47,24 @@ module VagrantPlugins
           return nil
         end
 
-        # 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?
-
-          plain   = "#{cmd} " << cmd_args.join(' ')
-          command = "cd #{vm.config.exec.folder} && "
+        return cmd, cmd_args
+      end
 
-          env = vm.config.exec.env
+      def add_env(env)
+        ''.tap do |command|
           if env.any?
             env.each do |key, value|
               command << "export #{key}=#{value} && "
             end
           end
+        end
+      end
 
-          if vm.config.exec.bundler && !(plain =~ /^bundle /)
+      def add_bundler(bundler, plain_command)
+        ''.tap do |command|
+          if bundler && plain_command !~ /^bundle /
             command << 'bundle exec '
           end
-
-          command << plain
-
-          @logger.info("Executing single command on remote machine: #{command}")
-          env = vm.action(:ssh_run, ssh_run_command: command)
-
-          status = env[:ssh_run_exit_status] || 0
-          return status
         end
       end
 

data/lib/vagrant-exec/plugin.rb

@@ -2,7 +2,7 @@ module VagrantPlugins
   module Exec
     class Plugin < Vagrant.plugin(2)
 
-      name 'Vagrant Exec'
+      name 'vagrant-exec'
       description 'Plugin allows to execute commands within the context of synced folder.'
 
       config :exec do

data/lib/vagrant-exec/version.rb

@@ -1,7 +1,7 @@
 module VagrantPlugins
   module Exec
 
-    VERSION = '0.2.0'
+    VERSION = '0.2.1'
 
   end # Exec
 end # VagrantPlugins

data/vagrant-exec.gemspec

@@ -10,6 +10,7 @@ Gem::Specification.new do |s|
   s.homepage    = 'http://github.com/p0deje/vagrant-exec'
   s.summary     = 'Execute commands in Vagrant synced folder'
   s.description = 'Vagrant plugin to execute commands within the context of VM synced folder'
+  s.license     = 'MIT'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-exec
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-16 00:00:00.000000000 Z
+date: 2013-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
@@ -63,7 +63,8 @@ files:
 - lib/vagrant-exec/version.rb
 - vagrant-exec.gemspec
 homepage: http://github.com/p0deje/vagrant-exec
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -76,7 +77,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1395843341620425617
+      hash: 657150828523853671
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -85,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1395843341620425617
+      hash: 657150828523853671
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23