vagrant-shell 0.2.14 → 0.2.15

checksums.yaml

@@ -1,15 +1,7 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YWJjNjBkNTU5OTZmNTA1OGI2MzNmNTU0YmVhMzc0Y2ZhZWEwZGJkMA==
-  data.tar.gz: !binary |-
-    ZmI4MDk2MmY0MjcyZmUyNjU4Mjk4ZGFhZmQ4NDE4YmExZGE4NjYyZg==
-SHA512:
-  metadata.gz: !binary |-
-    YzM5NmI5MjU0YzI0ODk5ZGQ4N2ViNzA3NTNjYTI0NjEzN2Q3ZmRjMjNmNThh
-    ZTc5YTgyZjUzMDA3NmYxZGJhYzU2YzYyZjVjODYzOGQzZTE5YjIxOTU5Zjdh
-    MDZlMGZhY2ExZDJmZGNjN2MxNzQ4OWE5MjI3YjdkMmNjOGExZDE=
-  data.tar.gz: !binary |-
-    NjE1MzRjYzRhNzFkMDNiYzI1NTM2MzQ0OTk4Mzc5M2EwMDI1ZDFmZTk5ZGE5
-    NmNjZTFhOWY1MzVhMTgzOTc3NTMxMWVkNDAxNjAxZDliMGFhMGE5MmFjOTVi
-    YTdiZGY3NDk1YTAyMGE1Y2QxNzExMTliY2ZmMWMzOGVmMTY0ZDM=
+--- 
+SHA512: 
+  metadata.gz: d14ca3df494cac0f48a470ecf757312df2f1c390b1ef8f7c0715a15c573c5055fff8efbe67158d8cb17a737f3650d0476665953c225cb8d887d8f3bd7cdf20db
+  data.tar.gz: 4648f73c86070fa6ef929f8c497ff0096bfb5e8d82351163ff8fe5a3cab7949dcbd931d56136ee847af1808e7c00a14837ead347f881f3cf4b736dd0833a34f7
+SHA1: 
+  metadata.gz: fb216248e27fb0c22ed1325e808d8236506cfeaf
+  data.tar.gz: 30e6ee1cd824649024136c1971a609b75112a184

data/.gitignore

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

data/.gitsetup.yml

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

data/Gemfile

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

data/Gemfile.lock

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

data/Makefile

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

data/README.md

@@ -11,7 +11,8 @@ terminate-instance, ssh-info, and read-state.
 
 See `libexec/shell-docker` for an example.
 
-**NOTE:** This plugin requires  ruby 1.9 and bundler
+**NOTE:** This plugin requires Vagrant 1.2+, ruby 1.9, and bundler.  This
+README was tested using Ubuntu Raring.
 
 ## Demo
 
@@ -20,24 +21,37 @@ bundler and cached gems.
 
 Go to the demo directory:
 
-    cd demo/docker
-
-Download the ubuntu docker image:
-
-    docker pull ubuntu
+    cd demo
 
 Run make to bundle gems, install the demo vagrant box:
 
     make
 
+Download the ubuntu docker image:
+
+    docker pull ubuntu
+
 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 ubuntu:precise
+    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?

data/lib/vagrant-shell/action/read_ssh_info.rb

@@ -12,27 +12,24 @@ module VagrantPlugins
         end
 
         def call(env)
-          env[:machine_ssh_info] = read_ssh_info(env[:script], env[:machine])
+          env[:machine_ssh_info] = read_ssh_info(env[:machine])
 
           @app.call(env)
         end
 
-        def read_ssh_info(script, machine)
+        def read_ssh_info(machine)
           return nil if machine.id.nil?
 
-          # Find the machine
-          server = script.servers.get(machine.id)
-          if server.nil?
-            # The machine can't be found
-            @logger.info("Machine couldn't be found, assuming it got destroyed.")
-            machine.id = nil
-            return nil
+          # Read the DNS info
+          output = %x{ #{machine.provider_config.script} ssh-info #{machine.id} }
+          if $?.to_i > 0
+            raise Errors::ShellError, :message => "Failure: #{env[:machine].provider_config.script} ssh-info #{machine.id}"
           end
 
-          # Read the DNS info
+          host,port = output.split(/\s+/)[0,2] # TODO check formatting
           return {
-            :host => server.public_ip_address || server.dns_name || server.private_ip_address,
-            :port => server.public_port || server.private_port
+            :host => host,
+            :port => port
           }
         end
       end

data/lib/vagrant-shell/action/read_state.rb

@@ -12,25 +12,20 @@ module VagrantPlugins
         end
 
         def call(env)
-          env[:machine_state_id] = read_state(env[:script], env[:machine])
+          env[:machine_state_id] = read_state(env[:machine])
 
           @app.call(env)
         end
 
-        def read_state(script, machine)
+        def read_state(machine)
           return :not_created if machine.id.nil?
 
-          # Find the machine
-          server = aws.servers.get(machine.id)
-          if server.nil? || [:"shutting-down", :terminated].include?(server.state.to_sym)
-            # The machine can't be found
-            @logger.info("Machine not found or terminated, assuming it got destroyed.")
-            machine.id = nil
-            return :not_created
-          end
-
           # Return the state
-          return server.state.to_sym
+          output = %x{ #{machine.provider_config.script} read-state #{machine.id} }
+          if $?.to_i > 0
+            raise Errors::ShellError, :message => "Failure: #{env[:machine].provider_config.script} read-state #{machine.id}"
+          end
+          output.strip
         end
       end
     end

data/lib/vagrant-shell/action/run_instance.rb

@@ -1,5 +1,5 @@
 require "log4r"
-require 'json'
+require "pp"
 
 require 'vagrant/util/retryable'
 
@@ -21,35 +21,27 @@ module VagrantPlugins
           # Initialize metrics if they haven't been
           env[:metrics] ||= {}
 
-          # Get the region we're going to booting up in
-          region = env[:machine].provider_config.region
-
           # Get the configs
-          region_config         = env[:machine].provider_config.get_region_config(region)
-          image                 = region_config.image
-          user_data             = region_config.user_data
-          run_args              = region_config.run_args
+          provider_config = env[:machine].provider_config
+          image              = provider_config.image
+          user_data          = provider_config.user_data
+          run_args           = provider_config.run_args
 
           # Launch!
           env[:ui].info(I18n.t("vagrant_shell.launching_instance"))
           env[:ui].info(" -- Image: #{image}")
 
-          begin
-            options = {
-              :image              => image,
-              :user_data          => user_data,
-              :run_args           => run_args
-            }
-
-            server = env[:script].servers.create(options)
+          # Immediately save the ID since it is created at this point.
+          output = %x{ #{env[:machine].provider_config.script} run-instance #{image} #{run_args.join(" ")} }
+          if $?.to_i > 0
+            raise Errors::ShellError, :message => "Failure: #{env[:machine].provider_config.script} run-instance #{image} ..."
           end
           
-          # Immediately save the ID since it is created at this point.
-          env[:machine].id = server.id
+          env[:machine].id = output.split(/\s+/)[0]
 
           # Wait for the instance to be ready first
           env[:metrics]["instance_ready_time"] = Util::Timer.time do
-            tries = region_config.instance_ready_timeout / 2
+            tries = provider_config.instance_ready_timeout / 2
 
             env[:ui].info(I18n.t("vagrant_shell.waiting_for_ready"))
             begin
@@ -58,7 +50,7 @@ module VagrantPlugins
                 next if env[:interrupted]
 
                 # Wait for the server to be ready
-                server.wait_for(2) { ready? }
+                true
               end
             rescue Shell::Errors::TimeoutError
               # Delete the instance
@@ -66,7 +58,7 @@ module VagrantPlugins
 
               # Notify the user
               raise Errors::InstanceReadyTimeout,
-                timeout: region_config.instance_ready_timeout
+                timeout: provider_config.instance_ready_timeout
             end
           end
 

data/lib/vagrant-shell/action/terminate_instance.rb

@@ -11,11 +11,15 @@ module VagrantPlugins
         end
 
         def call(env)
-          server = env[:script].servers.get(env[:machine].id)
-
           # Destroy the server and remove the tracking ID
           env[:ui].info(I18n.t("vagrant_shell.terminating"))
-          server.destroy
+          output = %x{ #{env[:machine].provider_config.script} terminate-instance #{env[:machine].id}}
+          if $?.to_i > 0
+            raise Errors::ShellError, :message => "Failure: #{env[:machine].provider_config.script} terminate-instance #{env[:machine].id}"
+          end
+
+          puts output
+
           env[:machine].id = nil
 
           @app.call(env)

data/lib/vagrant-shell/action.rb

@@ -11,15 +11,8 @@ module VagrantPlugins
       # This action is called to terminate the remote machine.
       def self.action_destroy
         Vagrant::Action::Builder.new.tap do |b|
-          b.use Call, DestroyConfirm do |env, b2|
-            if env[:result]
-              b2.use ConfigValidate
-              b2.use ConnectShell
-              b2.use TerminateInstance
-            else
-              b2.use MessageWillNotDestroy
-            end
-          end
+          b.use ConfigValidate
+          b.use TerminateInstance
         end
       end
 
@@ -44,7 +37,6 @@ module VagrantPlugins
       def self.action_read_ssh_info
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
-          b.use ConnectShell
           b.use ReadSSHInfo
         end
       end
@@ -55,7 +47,6 @@ module VagrantPlugins
       def self.action_read_state
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
-          b.use ConnectShell
           b.use ReadState
         end
       end
@@ -92,9 +83,7 @@ module VagrantPlugins
       # This action is called to bring the box up from nothing.
       def self.action_up
         Vagrant::Action::Builder.new.tap do |b|
-          b.use HandleBoxUrl
           b.use ConfigValidate
-          b.use ConnectShell
           b.use Call, IsCreated do |env, b2|
             if env[:result]
               b2.use MessageAlreadyCreated
@@ -109,11 +98,9 @@ module VagrantPlugins
 
       # The autoload farm
       action_root = Pathname.new(File.expand_path("../action", __FILE__))
-      autoload :ConnectShell, action_root.join("connect_shell")
       autoload :IsCreated, action_root.join("is_created")
       autoload :MessageAlreadyCreated, action_root.join("message_already_created")
       autoload :MessageNotCreated, action_root.join("message_not_created")
-      autoload :MessageWillNotDestroy, action_root.join("message_will_not_destroy")
       autoload :ReadSSHInfo, action_root.join("read_ssh_info")
       autoload :ReadState, action_root.join("read_state")
       autoload :RunInstance, action_root.join("run_instance")

data/lib/vagrant-shell/config.rb

@@ -3,71 +3,41 @@ require "vagrant"
 module VagrantPlugins
   module Shell
     class Config < Vagrant.plugin("2", :config)
+      # The ID of the Image to use.
+      #
+      # @return [String]
+      attr_accessor :image
 
       # The timeout to wait for an instance to become ready.
       #
       # @return [Fixnum]
       attr_accessor :instance_ready_timeout
 
-
       # The user data string
       #
       # @return [String]
       attr_accessor :user_data
 
-      # The ID of the Image to use.
-      attr_accessor :image
-
       # The shell script implementing some tech
+      # 
+      # @return [String]
       attr_accessor :script
 
       # The shell script run-instance args
+      # 
+      # @return [String]
       attr_accessor :run_args
 
-      def initialize(region_specific=false)
+      def initialize
+        @image                  = UNSET_VALUE
         @instance_ready_timeout = UNSET_VALUE
         @user_data              = UNSET_VALUE
-        @image                  = UNSET_VALUE
         @script                 = UNSET_VALUE
         @run_args               = UNSET_VALUE
 
         # Internal state (prefix with __ so they aren't automatically
         # merged)
-        @__compiled_region_configs = {}
         @__finalized = false
-        @__region_config = {}
-        @__region_specific = region_specific
-      end
-
-      # Allows region-specific overrides of any of the settings on this
-      # configuration object. This allows the user to override things like
-      # AMI and keypair name for regions. Example:
-      #
-      #     aws.region_config "us-east-1" do |region|
-      #       region.ami = "ami-12345678"
-      #       region.keypair_name = "company-east"
-      #     end
-      #
-      # @param [String] region The region name to configure.
-      # @param [Hash] attributes Direct attributes to set on the configuration
-      #   as a shortcut instead of specifying a full block.
-      # @yield [config] Yields a new Shell configuration.
-      def region_config(region, attributes=nil, &block)
-        # Append the block to the list of region configs for that region.
-        # We'll evaluate these upon finalization.
-        @__region_config[region] ||= []
-
-        # Append a block that sets attributes if we got one
-        if attributes
-          attr_block = lambda do |config|
-            config.set_options(attributes)
-          end
-
-          @__region_config[region] << attr_block
-        end
-
-        # Append a block if we got one
-        @__region_config[region] << block if block_given?
       end
 
       #-------------------------------------------------------------------
@@ -76,102 +46,31 @@ module VagrantPlugins
 
       def merge(other)
         super.tap do |result|
-          # Copy over the region specific flag. "True" is retained if either
-          # has it.
-          new_region_specific = other.instance_variable_get(:@__region_specific)
-          result.instance_variable_set(
-            :@__region_specific, new_region_specific || @__region_specific)
-
-          # Go through all the region configs and prepend ours onto
-          # theirs.
-          new_region_config = other.instance_variable_get(:@__region_config)
-          @__region_config.each do |key, value|
-            new_region_config[key] ||= []
-            new_region_config[key] = value + new_region_config[key]
-          end
-
-          # Set it
-          result.instance_variable_set(:@__region_config, new_region_config)
-
-          # Merge in the tags
-          result.tags.merge!(self.tags)
-          result.tags.merge!(other.tags)
         end
       end
 
       def finalize!
+        # Image must be nil, since we can't default that
+        @image = nil if @image == UNSET_VALUE
+
         # Set the default timeout for waiting for an instance to be ready
         @instance_ready_timeout = 120 if @instance_ready_timeout == UNSET_VALUE
 
         # User Data is nil by default
         @user_data = nil if @user_data == UNSET_VALUE
 
-        # Image must be nil, since we can't default that
-        @image = nil if @image == UNSET_VALUE
-
         # No default shell script
         @script = nil if @script == UNSET_VALUE
 
-        # No run args by default
+        # No rub args by default
         @run_args = [] if @run_args == UNSET_VALUE
 
-        # Compile our region specific configurations only within
-        # NON-REGION-SPECIFIC configurations.
-        if !@__region_specific
-          @__region_config.each do |region, blocks|
-            config = self.class.new(true).merge(self)
-
-            # Execute the configuration for each block
-            blocks.each { |b| b.call(config) }
-
-            # The region name of the configuration always equals the
-            # region config name:
-            config.region = region
-
-            # Finalize the configuration
-            config.finalize!
-
-            # Store it for retrieval
-            @__compiled_region_configs[region] = config
-          end
-        end
-
         # Mark that we finalized
         @__finalized = true
       end
 
       def validate(machine)
-        errors = _detected_errors
-
-        errors << I18n.t("vagrant_shell.config.region_required") if @region.nil?
-
-        if @region
-          # Get the configuration for the region we're using and validate only
-          # that region.
-          config = get_region_config(@region)
-
-          if !config.use_iam_profile
-            errors << I18n.t("vagrant_shell.config.access_key_id_required") if \
-              config.access_key_id.nil?
-            errors << I18n.t("vagrant_shell.config.secret_access_key_required") if \
-              config.secret_access_key.nil?
-          end
-
-          errors << I18n.t("vagrant_shell.config.ami_required") if config.ami.nil?
-      end
-
-        { "Shell Provider" => errors }
-      end
-
-      # This gets the configuration for a specific region. It shouldn't
-      # be called by the general public and is only used internally.
-      def get_region_config(name)
-        if !@__finalized
-          raise "Configuration must be finalized before calling this method."
-        end
-
-        # Return the compiled region config
-        @__compiled_region_configs[name] || self
+        { "Shell Provider" => [ ] } 
       end
 
       # utilities
@@ -180,16 +79,9 @@ module VagrantPlugins
       end
 
       def find_script name
-        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
+        File.expand_path("../../../libexec/shell-#{name}", __FILE__)
       end
+
     end
   end
 end

data/lib/vagrant-shell/errors.rb

@@ -11,20 +11,16 @@ module VagrantPlugins
         error_key(:shell_error)
       end
 
-      class InternalShellError < VagrantShellError
-        error_key(:internal_shell_error)
-      end
-
-      class InstanceReadyTimeout < VagrantShellError
+      class TimeoutError < VagrantShellError
         error_key(:instance_ready_timeout)
       end
 
-      class RsyncError < VagrantShellError
-        error_key(:rsync_error)
+      class ComputeError < VagrantShellError
+        error_key(:instance_ready_timeout)
       end
 
-      class MkdirError < VagrantShellError
-        error_key(:mkdir_error)
+      class InstanceReadyTimeout < VagrantShellError
+        error_key(:instance_ready_timeout)
       end
     end
   end

data/lib/vagrant-shell/plugin.rb

@@ -18,13 +18,14 @@ module VagrantPlugins
       This plugin installs a provider that allows Vagrant to manage
       machines with shell scripts.
       DESC
+
       def self.make_provider nm_provider
         config(nm_provider, :provider) do
           require_relative "config"
           Config
         end
 
-        provider(nm_provider, parallel: true) do
+        provider(nm_provider) do
           # Setup logging and i18n
           setup_logging
           setup_i18n
@@ -35,6 +36,8 @@ module VagrantPlugins
         end
       end
 
+      make_provider(:shell)
+
       # This initializes the internationalization strings.
       def self.setup_i18n
         I18n.load_path << File.expand_path("locales/en.yml", Shell.source_root)

data/lib/vagrant-shell/version.rb

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

data/libexec/shell-docker

@@ -8,10 +8,6 @@ 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-static → shell-self}

@@ -16,7 +16,7 @@ case "$cmd" in
     image="$1"; shift
     debug "run-instance $image"
     debug "run-instance args: $* 1>&2"
-    echo "$image"
+    echo $RANDOM
     ;;
   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 "${instance} 22"
+    echo "127.0.0.1 22"
     ;;
   read-state)
     instance="$1"; shift

data/vagrant-shell.gemspec

@@ -0,0 +1,51 @@
+$:.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

metadata

@@ -1,29 +1,35 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: vagrant-shell
-version: !ruby/object:Gem::Version
-  version: 0.2.14
+version: !ruby/object:Gem::Version 
+  version: 0.2.15
 platform: ruby
-authors:
+authors: 
 - Tom Bombadil
 - Mitchell Hashimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-17 00:00:00.000000000 Z
+
+date: 2014-01-17 00:00:00 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:
-- lib/vagrant-shell/action/connect_shell.rb
+
+files: 
+- CHANGELOG.md
+- Gemfile
+- Gemfile.lock
 - lib/vagrant-shell/action/is_created.rb
 - lib/vagrant-shell/action/message_already_created.rb
 - lib/vagrant-shell/action/message_not_created.rb
-- lib/vagrant-shell/action/message_will_not_destroy.rb
 - lib/vagrant-shell/action/read_ssh_info.rb
 - lib/vagrant-shell/action/read_state.rb
 - lib/vagrant-shell/action/run_instance.rb
@@ -34,39 +40,46 @@ 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
-- locales/en.yml
+- libexec/shell-aws
 - libexec/shell-docker
-- libexec/shell-ec2
-- libexec/shell-static
-- CHANGELOG.md
+- libexec/shell-self
 - LICENSE
+- locales/en.yml
+- Makefile
 - README.md
-- VERSION
+- vagrant-shell-0.2.7.gem
+- vagrant-shell.gemspec
+- .gitignore
+- .gitsetup.yml
 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/VERSION

@@ -1 +0,0 @@
-0.2.14

data/lib/vagrant-shell/action/connect_shell.rb

@@ -1,30 +0,0 @@
-require "log4r"
-
-module VagrantPlugins
-  module Shell
-    module Action
-      # This action connects to Shell, verifies credentials work, and
-      # puts the Shell script object into the `:script` key
-      # in the environment.
-      class ConnectShell
-        def initialize(app, env)
-          @app    = app
-          @logger = Log4r::Logger.new("vagrant_shell::action::connect_shell")
-        end
-
-        def call(env)
-          # Get the region we're going to booting up in
-          region = env[:machine].provider_config.region
-
-          # Get the configs
-          region_config     = env[:machine].provider_config.get_region_config(region)
-
-          @logger.info("Connecting to Shell...")
-          env[:script] = nil
-
-          @app.call(env)
-        end
-      end
-    end
-  end
-end

data/lib/vagrant-shell/action/message_will_not_destroy.rb

@@ -1,16 +0,0 @@
-module VagrantPlugins
-  module Shell
-    module Action
-      class MessageWillNotDestroy
-        def initialize(app, env)
-          @app = app
-        end
-
-        def call(env)
-          env[:ui].info(I18n.t("vagrant_shell.will_not_destroy", name: env[:machine].name))
-          @app.call(env)
-        end
-      end
-    end
-  end
-end

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

@@ -1,23 +0,0 @@
-# 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