vagrant-shell 0.2.15 → 0.2.16

checksums.yaml

@@ -1,7 +1,15 @@
---- 
-SHA512: 
-  metadata.gz: d14ca3df494cac0f48a470ecf757312df2f1c390b1ef8f7c0715a15c573c5055fff8efbe67158d8cb17a737f3650d0476665953c225cb8d887d8f3bd7cdf20db
-  data.tar.gz: 4648f73c86070fa6ef929f8c497ff0096bfb5e8d82351163ff8fe5a3cab7949dcbd931d56136ee847af1808e7c00a14837ead347f881f3cf4b736dd0833a34f7
-SHA1: 
-  metadata.gz: fb216248e27fb0c22ed1325e808d8236506cfeaf
-  data.tar.gz: 30e6ee1cd824649024136c1971a609b75112a184
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    Y2I5ZjBlNjJlNjI1Y2MwZGY2ZWNkY2JlNjkzN2YxN2Q3YTlmZDFjNQ==
+  data.tar.gz: !binary |-
+    YWNjZjBmNDA5YWZjYzdkYmQ2OTBmNDgwMGYzMGExOWE1ZDcwNjRhZA==
+SHA512:
+  metadata.gz: !binary |-
+    ZDhiYjNkNGFiNjM5NWVkOTAzMDBlZWQ0YmJhMjcwMTlhNzczY2ZmYzc1MTdh
+    OWVkNGMzNjg4Yzc4YmRmMTg1NGNiNjQ3Yjg2NzRkYWE3N2YwZWMzYjRiYTRl
+    ZTg4MjI5NGVkZmU4ZWU5NTFhYWJjN2NjZDVjMTlhZDY5ODM1MzE=
+  data.tar.gz: !binary |-
+    ODBlOTUxNzQ2MGNjYjZlNDY3YzM1NzAyZTU2ZTFhYjYzMzgyYjcxMTI0YzZi
+    N2Y3ODlhMmZiNzAyNWEzYzRlNmFiNGM2NWY3YmIzMjEwYmE5NjNkYTJhYWZh
+    NTEyNjE3M2Q1Y2Q2MmI2NGYyNGUzNzQxNTNhZTY1ZGJkMzQ0YjQ=

data/README.md

@@ -11,8 +11,7 @@ terminate-instance, ssh-info, and read-state.
 
 See `libexec/shell-docker` for an example.
 
-**NOTE:** This plugin requires Vagrant 1.2+, ruby 1.9, and bundler.  This
-README was tested using Ubuntu Raring.
+**NOTE:** This plugin requires  ruby 1.9 and bundler
 
 ## Demo
 
@@ -21,37 +20,24 @@ bundler and cached gems.
 
 Go to the demo directory:
 
-    cd demo
-
-Run make to bundle gems, install the demo vagrant box:
-
-    make
+    cd demo/docker
 
 Download the ubuntu docker image:
 
     docker pull ubuntu
 
+Run make to bundle gems, install the demo vagrant box:
+
+    make
+
 Bring up the docker containers:
 
     bundle exec vagrant up
+    bundle exec vagrant status
 
 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 one of the the containers:
 
-    bundle exec vagrant ssh default
-
-## Testing without docker
-
-If docker is not available, use script `shell-self` to pretend the
-localhost is the vagrant instance.  Be careful since `vagrant ssh` will
-connect to the localhost.
-
-Prepend `env SHELL_SCRIPT=self` to `bundle exec vagrant` so the
-`Vagrantfile` will adjust its docker behavior to suit localhost.
-
-## TODO
-
-vagrant package
-vagrant reload?
+    bundle exec vagrant ssh ubuntu:precise

data/VERSION

@@ -0,0 +1 @@
+0.2.16

data/lib/vagrant-shell/config.rb

@@ -79,7 +79,15 @@ module VagrantPlugins
       end
 
       def find_script name
-        File.expand_path("../../../libexec/shell-#{name}", __FILE__)
+        try_path = ENV['PATH'].split(/:/).flatten.inject([]) { |acc, p| x = File.join(p,"shell-#{name.to_s}"); File.exists?(x) && acc << x; acc }.first
+        if try_path
+          return try_path
+        end
+
+        try_load = $:.inject([]) { |acc, p| x = File.expand_path("../libexec/shell-#{name.to_s}", p); File.exists?(x) && acc << x; acc }.first
+        if try_load
+          return try_load
+        end
       end
 
     end

data/lib/vagrant-shell/ssh-agent.rb

@@ -0,0 +1,23 @@
+# fool vagrant into using ssh-agent keys instead of a fixed key on file
+module Vagrant
+  module Util
+    class Platform
+      def self.solaris?
+        true
+      end
+    end
+  end
+end
+
+require "net/ssh"
+
+module Net::SSH
+  class << self
+    alias_method :old_start, :start
+    
+    def start(host, username, opts)
+      opts[:keys_only] = false
+      self.old_start(host, username, opts)
+    end
+  end
+end 

data/lib/vagrant-shell/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Shell
-    VERSION = "0.2.15"
+    VERSION = File.read(File.expand_path("../../../VERSION", __FILE__)).strip
   end
 end

data/libexec/shell-docker

@@ -8,6 +8,10 @@ cmd="$1"; shift
 case "$cmd" in
   run-instance)
     image="$1"; shift
+    cmd_bootstrap="$(which shell-docker-$image 2>&- || true)"
+    if [[ -x "$cmd_bootstrap" ]]; then
+      $cmd_bootstrap
+    fi
     docker run -d "$image" "$@"
     ;;
   terminate-instance)

data/libexec/{shell-self → shell-static}

@@ -16,7 +16,7 @@ case "$cmd" in
     image="$1"; shift
     debug "run-instance $image"
     debug "run-instance args: $* 1>&2"
-    echo $RANDOM
+    echo "$image"
     ;;
   terminate-instance)
     instance="$1"; shift
@@ -26,7 +26,7 @@ case "$cmd" in
     instance="$1"; shift
     debug "ssh-info $instance"
     debug "ssh-info: 127.0.0.1 22"
-    echo "127.0.0.1 22"
+    echo "${instance} 22"
     ;;
   read-state)
     instance="$1"; shift

metadata

@@ -1,32 +1,24 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: vagrant-shell
-version: !ruby/object:Gem::Version 
-  version: 0.2.15
+version: !ruby/object:Gem::Version
+  version: 0.2.16
 platform: ruby
-authors: 
+authors:
 - Tom Bombadil
 - Mitchell Hashimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-01-17 00:00:00 Z
+date: 2014-01-17 00:00:00.000000000 Z
 dependencies: []
-
 description: Enables Vagrant to manage machines using shell scripts
-email: 
+email:
 - amanibhavam@destructuring.org
 - mitchell@hashicorp.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- CHANGELOG.md
-- Gemfile
-- Gemfile.lock
+files:
 - lib/vagrant-shell/action/is_created.rb
 - lib/vagrant-shell/action/message_already_created.rb
 - lib/vagrant-shell/action/message_not_created.rb
@@ -40,46 +32,39 @@ files:
 - lib/vagrant-shell/errors.rb
 - lib/vagrant-shell/plugin.rb
 - lib/vagrant-shell/provider.rb
+- lib/vagrant-shell/ssh-agent.rb
 - lib/vagrant-shell/util/timer.rb
 - lib/vagrant-shell/version.rb
 - lib/vagrant-shell.rb
-- libexec/shell-aws
+- locales/en.yml
 - libexec/shell-docker
-- libexec/shell-self
+- libexec/shell-ec2
+- libexec/shell-static
+- CHANGELOG.md
 - LICENSE
-- locales/en.yml
-- Makefile
 - README.md
-- vagrant-shell-0.2.7.gem
-- vagrant-shell.gemspec
-- .gitignore
-- .gitsetup.yml
+- VERSION
 homepage: http://destructuring.org/vagrant-shell
 licenses: []
-
 metadata: {}
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: vagrant-shell
 rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Enables Vagrant to manage machines using shell scripts
 test_files: []
-

data/.gitignore

@@ -1,7 +0,0 @@
-# OS-specific
-.DS_Store
-
-# Bundler/Rubygems
-/*.gem
-pkg/*
-tags

data/.gitsetup.yml

@@ -1,4 +0,0 @@
----
-remotes:
-  primary: git@github.com:destructuring/vagrant-shell
-  secondary: git@bitbucket.org:destructuring/vagrant-shell

data/Gemfile

@@ -1,3 +0,0 @@
-source "https://rubygems.org"
-
-gemspec

data/Gemfile.lock

@@ -1,14 +0,0 @@
-PATH
-  remote: .
-  specs:
-    vagrant-shell (0.2.6)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  vagrant-shell!

data/Makefile

@@ -1,6 +0,0 @@
-GEM := $(shell pwd | xargs basename)
-gem:
-	gem build $(GEM).gemspec
-
-public:
-	gem push $(shell ls -thd $(GEM)*.gem  | head -1)

data/vagrant-shell.gemspec

@@ -1,51 +0,0 @@
-$:.unshift File.expand_path("../lib", __FILE__)
-require "vagrant-shell/version"
-
-Gem::Specification.new do |s|
-  s.name          = "vagrant-shell"
-  s.version       = VagrantPlugins::Shell::VERSION
-  s.platform      = Gem::Platform::RUBY
-  s.authors       = [ "Tom Bombadil", "Mitchell Hashimoto" ]
-  s.email         = [ "amanibhavam@destructuring.org", "mitchell@hashicorp.com" ]
-  s.homepage      = "http://destructuring.org/vagrant-shell"
-  s.summary       = "Enables Vagrant to manage machines using shell scripts"
-  s.description   = "Enables Vagrant to manage machines using shell scripts"
-
-  s.required_rubygems_version = ">= 1.3.6"
-  s.rubyforge_project         = "vagrant-shell"
-
-  # The following block of code determines the files that should be included
-  # in the gem. It does this by reading all the files in the directory where
-  # this gemspec is, and parsing out the ignored files from the gitignore.
-  # Note that the entire gitignore(5) syntax is not supported, specifically
-  # the "!" syntax, but it should mostly work correctly.
-  root_path      = File.dirname(__FILE__)
-  all_files      = Dir.chdir(root_path) { Dir.glob("**/{*,.*}") }
-  all_files.reject! { |file| [".", ".."].include?(File.basename(file)) }
-  gitignore_path = File.join(root_path, ".gitignore")
-  gitignore      = File.readlines(gitignore_path)
-  gitignore.map!    { |line| line.chomp.strip }
-  gitignore.reject! { |line| line.empty? || line =~ /^(#|!)/ }
-
-  unignored_files = all_files.reject do |file|
-    # Ignore any directories, the gemspec only cares about files
-    next true if File.directory?(file)
-
-    # Ignore any paths that match anything in the gitignore. We do
-    # two tests here:
-    #
-    #   - First, test to see if the entire path matches the gitignore.
-    #   - Second, match if the basename does, this makes it so that things
-    #     like '.DS_Store' will match sub-directories too (same behavior
-    #     as git).
-    #
-    gitignore.any? do |ignore|
-      File.fnmatch(ignore, file, File::FNM_PATHNAME) ||
-        File.fnmatch(ignore, File.basename(file), File::FNM_PATHNAME)
-    end
-  end
-
-  s.files         = unignored_files
-  s.executables   = unignored_files.map { |f| f[/^bin\/(.*)/, 1] }.compact
-  s.require_path  = 'lib'
-end