vagrant-shell 0.2.5 → 0.2.6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vagrant-shell (0.2.4)
+    vagrant-shell (0.2.5)
 
 GEM
   remote: https://rubygems.org/

data/Makefile

@@ -6,5 +6,10 @@ bundler:
 	bundle --local --path vendor/bundle
 
 vagrant:
-	bundle exec vagrant box remove vagrant-shell-demo shell || true
-	bundle exec vagrant box add vagrant-shell-demo vagrant-shell-demo.box
+	bundle exec vagrant box remove vagrant-shell shell || true
+	bundle exec vagrant box add vagrant-shell vagrant-shell.box
+
+shell:
+	docker pull ubuntu
+	bundle exec vagrant up --provider shell || true
+	bundle exec vagrant ssh

data/README.md

@@ -1,5 +1,3 @@
-# Work in progress, still QA'ing the demo
-
 # Vagrant Shell Provider
 
 This is a [Vagrant](http://www.vagrantup.com) 1.2+ plugin that adds a
@@ -7,15 +5,11 @@ shell provider to Vagrant, allowing Vagrant to control and provision
 machines using shell scripts.  It's meant to be customized with scripts
 for Xen, Docker, etc.
 
-**NOTE:** This plugin requires Vagrant 1.2+,
+**NOTE:** This plugin requires Vagrant 1.2+, ruby 1.9, and bundler.
 
 vagrant-shell is forked from vagrant-aws with the fog/aws parts replaced
-with a shell script that takes four command arguments:
-
-    script run-instance $image_id command args... -> $instance_id
-    script terminate-instance $instance_id
-    script ssh-info $instance_id -> ssh-host ssh-port
-    script read-state $instance_id -> *
+with a shell script that takes four sub-commands: run-instance,
+terminate-instance, ssh-info, and read-state.
 
 See `libexec/shell-docker` for an example.
 
@@ -24,14 +18,22 @@ See `libexec/shell-docker` for an example.
 I don't know how to instal vagrant-shell as a plugin, so this repo uses
 bundler and cached gems.  Requires ruby 1.9.3 (vagrant).
 
-Run make to bundle gems and install the demo vagrant box:
+Run make to bundle gems, pull the ubuntu image, and install the demo vagrant
+box:
 
     make
 
+Download the ubuntu docker image:
+
+    docker pull ubuntu
+
 Bring up the docker container:
 
     bundle exec vagrant up --provider shell
 
+The commands passed to the container are sourced from `libexec/init-docker`.
+It sets up the root user with an ssh key suitable for vagrant.
+
 SSH into the container:
 
     bundle exec vagrant ssh

data/Vagrantfile

@@ -1,11 +1,24 @@
 require "vagrant-shell"
 
+def read_script pth_script
+  File.read(pth_script).split(/[ \t]*[\r\n]+/).join("; ")
+end
+
 Vagrant.configure("2") do |config|
+  config.vm.box = "vagrant-shell"
+
   config.vm.provider :shell do |shell, override|
-    override.vm.box = "vagrant-shell-demo"
-    shell.script = File.expand_path("../libexec/shell-docker", __FILE__)
-    shell.run_args = [ 'bash -c "mkdir -p /root/.ssh/authorized_keys; curl -s https://raw.github.com/mitchellh/vagrant/master/keys/vagrant.pub > /root/.ssh/authorized_keys; aptitude install -y openssh-server; mkdir -p /var/run/sshd; exec /usr/sbin/sshd -D"' ]
+    # use public docker ubuntu
+    shell.image = "ubuntu"
     override.ssh.username = "root"
+
+    # vagrant-shell comes with shell-docker to support docker containers
+    shell.script = File.expand_path("../libexec/shell-docker", __FILE__)
+
+    # set up vagrant keys, install/configure/run Ubuntu sshd
+    shell.run_args = [ "bash -c '#{read_script File.expand_path("../libexec/init-docker", __FILE__)}'" ]
+
+    # don't copy anything to /vagrant
     override.vm.synced_folder ".", "/vagrant", :id => "vagrant-root", :disabled => true
   end
 end

data/lib/vagrant-shell/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Shell
-    VERSION = "0.2.5"
+    VERSION = "0.2.6"
   end
 end

data/libexec/init-docker

@@ -0,0 +1,7 @@
+DEBIAN_FRONTEND=noninteractive apt-get install -y wget openssh-server
+install -d -m 0700 -o root -g root /root/.ssh
+wget -O - https://raw.github.com/mitchellh/vagrant/master/keys/vagrant.pub > /root/.ssh/authorized_keys.tmp
+install -m 0600 -o root -g root /root/.ssh/authorized_keys.tmp /root/.ssh/authorized_keys
+rm -f /root/.ssh/authorized_keys.tmp
+install -d -m 0755 -o root -g root /var/run/sshd
+exec /usr/sbin/sshd -D

data/libexec/shell-docker

@@ -1,4 +1,8 @@
-#!/bin/bash
+#!/bin/bash -efu
+
+if [[ -n "${VAGRANT_LOG:-}" ]]; then
+  set -x
+fi
 
 cmd="$1"; shift
 case "$cmd" in

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-shell
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-06 00:00:00.000000000 Z
+date: 2013-05-15 00:00:00.000000000 Z
 dependencies: []
 description: Enables Vagrant to manage machines using shell scripts
 email:
@@ -41,6 +41,7 @@ files:
 - lib/vagrant-shell/util/timer.rb
 - lib/vagrant-shell/version.rb
 - lib/vagrant-shell.rb
+- libexec/init-docker
 - libexec/shell-docker
 - LICENSE
 - locales/en.yml
@@ -48,7 +49,8 @@ files:
 - Rakefile
 - README.md
 - vagrant-shell-0.2.3.gem
-- vagrant-shell-demo.box
+- vagrant-shell-0.2.5.gem
+- vagrant-shell.box
 - vagrant-shell.gemspec
 - Vagrantfile
 - vendor/bundle/bin/erubis