vagrant-docker-exec 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8957378f186f209b14ab5fac4d3eafc58124c362
-  data.tar.gz: 551437aec60c3fb4afdf7cc1da07559b3f1a107e
+  metadata.gz: e8e9d37811dfd1f8eba7e1f4154eb7075de8708c
+  data.tar.gz: cc16af1013738a246c7a4d3e984e446c8ed645f0
 SHA512:
-  metadata.gz: 1af27c6e07338d16825977cc879877d9a3933257d68106b56cd1b5ae899a7fe26c96fdeaf77db8b815463fa7df7673f617e208a07234a9b1c7272a512e89b364
-  data.tar.gz: 455c2ce6255fed03dcad309e6c0edd05d024927a6919ed125ec04fe83fc50dcefa87adfbf8b0b4e076474cf99a24d8b319584265284d063d42fe1bd2bd3c2bf1
+  metadata.gz: b82a4e0863011b47cb9225f85113e42666f98f107e4c4d36dc47a24bfa978664f9e12de2476774ddecf9b265a0925808b62ffec03550e0124f94d375fbf40428
+  data.tar.gz: c1d6cbb87ad7ed36d89ab83897c7227868579393d6824bdd68d14c9961dd86f1f1d2ece9ae7197923f5e5123cdf068b5c2c0f5abd27b03b2d4d6055dcd694b04

data/.gitignore

@@ -3,3 +3,5 @@ Gemfile.lock
 Vagrantfile*
 www
 pkg
+*.sublime-project
+*.sublime-workspace

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.1.4 (June 21, 2015)
+
+* Added \-\-no-prefix option
+
 ## 0.1.3 (March 7, 2015)
 
 * Exec commands now use machine id and no longer expects a container name

data/README.md

@@ -2,9 +2,13 @@
 This plugin allows you to run `docker exec` commands from your host. When running docker in a proxy, this will save you the effort of sshing into the proxy to run `docker exec`. If you have multiple running containers, you can exec a command that runs on each container sequentially. Visit [Docker's command reference](https://docs.docker.com/reference/commandline/cli/#exec) for details on the exec command.
 
 ## Known Issues
-Docker exec requires Docker 1.3.0 or higher. On non-Linux system, the docker in boot2docker provided by Vagrant is version 1.2 and does not support the exec command, so a custom docker host is required.
+When running vagrant on Linux, interactive shells fail to return output with Vagrant 1.7.2 running on Ubuntu 14 Trusty Tahr. It appears to be a problem inherent to Vagrant 1.7.2 because built in commands like `vagrant docker run` also fail to return output from a shell. There is no known workaround at this time.
 
-You can find more information on setting up a custom docker host on the [Vagrant blog](http://www.vagrantup.com/blog/feature-preview-vagrant-1-6-docker-dev-environments.html) but basically, create Vagrantfile.proxy:
+A container must be running before running `docker exec`, it will not be started automatically.
+
+`docker-exec` requires Docker 1.3.0 or higher. On non-Linux system, the docker in boot2docker provided by Vagrant is version 1.2 and does not support the exec command, so a custom docker host is required.
+
+You can find more information on setting up a custom docker host on the [Vagrant blog](http://www.vagrantup.com/blog/feature-preview-vagrant-1-6-docker-dev-environments.html) but basically, create Vagrantfile.proxy and forward all your ports:
 
 ```ruby
 Vagrant.configure("2") do |config|
@@ -37,6 +41,11 @@ To install the plugin, run the following command:
 vagrant plugin install vagrant-docker-exec
 ```
 
+Periodically check for updates:
+```bash
+vagrant plugin update
+```
+
 ## Usage
 A common use case for the exec command is to open a new shell in a running conatiner. To make it easy, run the `docker-shell` shortcut:
 ```bash
@@ -52,14 +61,15 @@ vagrant docker-exec -t nginx -- bash
 
 The syntax for `docker-exec` is:
 ```bash
-vagrant docker-exec [options] [container] -- [command] [args]
+vagrant docker-exec [options] [container] -- <command> [args]
 ```
 
 Options are:
---[no-]detach Run in the background
--t, --[no-]tty Open an interactive shell
+-t, \-\-[no-]tty Open an interactive shell
+\-\-[no-]prefix Prefix output with machine names
+\-\-[no-]detach Run in the background
 
-In a multimachine environment `docker-exec` (and `docker-shell`) must be followed by at least 1 container name defined by `config.vm.define`. For example, for this Vagrantfile
+When opening a shell in a multimachine environment, `docker-exec -t` (and `docker-shell`) must be followed by at least 1 container name defined by `config.vm.define`. For example, for this Vagrantfile
 ```ruby
 Vagrant.configure("2") do |config|
   config.vm.define "web" do |v|
@@ -73,10 +83,10 @@ Vagrant.configure("2") do |config|
 end
 ```
 
-The container name passed to `docker-exec` is `web` even though a docker assigned the container the name "nginx".
+The vagrant identifier is `web` so the command to open a shell will be `vagrant docker-exec -t web -- bash` even though the command `docker ps` will list the container name as "nginx". To avoid confusion it's best to use the same name for `config.vm.define` and `d.name`.
 
 ## Examples
-Everything after the double hyphen is sent to docker's exec command. For example, to create a new file in a container named nginx:
+Arguments after the double hyphen are sent to docker's exec command. For example, to create a new file in a container named nginx:
 ```bash
 vagrant docker-exec web -- touch /var/www/html/test.html
 ```
@@ -94,6 +104,11 @@ vagrant docker-exec nginx nginx2 -- ifconfig | grep inet
 ==> nginx2:           inet6 addr: ::1/128 Scope:Host
 ```
 
+To omit the container name prefix, pass the option \-\-no-prefix:
+```bash
+bundle exec vagrant docker-exec --no-prefix -- head -n 1 /etc/hosts
+```
+
 The name of the container is only required for interactive shells. To run a command on multiple running containers, omit the container name:
 ```bash
 vagrant docker-exec -- hostname

data/lib/vagrant-docker-exec/command/exec.rb

@@ -9,9 +9,10 @@ module VagrantPlugins
         options = {}
         options[:detach] = false
         options[:pty] = false
+        options[:prefix] = true
 
         opts = OptionParser.new do |o|
-          o.banner = "Usage: vagrant docker-exec [command...]"
+          o.banner = "Usage: vagrant docker-exec [options] [container] -- <command> [args]"
           o.separator ""
           o.separator "Options:"
           o.separator ""
@@ -23,6 +24,10 @@ module VagrantPlugins
           o.on("-t", "--[no-]tty", "Allocate a pty") do |t|
             options[:pty] = t
           end
+
+          o.on("--[no-]prefix", "Prefix output with machine names") do |p|
+            options[:prefix] = p
+          end
         end
 
         # Parse out the extra args to send to SSH, which is everything
@@ -63,7 +68,7 @@ module VagrantPlugins
 
       def exec_command(machine, options, command)
 
-        exec_cmd = %W(docker exec)
+        exec_cmd = %w(docker exec)
         exec_cmd << "-i" << "-t" if options[:pty]
         exec_cmd << machine.id.to_s
         exec_cmd += options[:extra_args] if options[:extra_args]
@@ -81,6 +86,8 @@ module VagrantPlugins
         end
 
         output_options = {}
+        output_options[:prefix] = false if !options[:prefix]
+
         machine.ui.output(output.chomp!, **output_options) if !output.empty?
 
       end

data/lib/vagrant-docker-exec/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module DockerExec
-  	VERSION = "0.1.3"
+  	VERSION = "0.1.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-docker-exec
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - William Kolean
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-07 00:00:00.000000000 Z
+date: 2015-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler