vagrant-shell 0.2.13 → 0.2.14

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!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=

data/VERSION

@@ -1 +1 @@
-0.2.13
+0.2.14

data/lib/vagrant-shell/action.rb

@@ -11,8 +11,15 @@ module VagrantPlugins
       # This action is called to terminate the remote machine.
       def self.action_destroy
         Vagrant::Action::Builder.new.tap do |b|
-          b.use ConfigValidate
-          b.use TerminateInstance
+          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
         end
       end
 
@@ -37,6 +44,7 @@ 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
@@ -47,6 +55,7 @@ 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
@@ -83,7 +92,9 @@ 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
@@ -98,9 +109,11 @@ 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/action/connect_shell.rb

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

@@ -0,0 +1,16 @@
+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/action/read_ssh_info.rb

@@ -12,24 +12,27 @@ module VagrantPlugins
         end
 
         def call(env)
-          env[:machine_ssh_info] = read_ssh_info(env[:machine])
+          env[:machine_ssh_info] = read_ssh_info(env[:script], env[:machine])
 
           @app.call(env)
         end
 
-        def read_ssh_info(machine)
+        def read_ssh_info(script, machine)
           return nil if machine.id.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}"
+          # 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
           end
 
-          host,port = output.split(/\s+/)[0,2] # TODO check formatting
+          # Read the DNS info
           return {
-            :host => host,
-            :port => port
+            :host => server.public_ip_address || server.dns_name || server.private_ip_address,
+            :port => server.public_port || server.private_port
           }
         end
       end

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

@@ -12,20 +12,25 @@ module VagrantPlugins
         end
 
         def call(env)
-          env[:machine_state_id] = read_state(env[:machine])
+          env[:machine_state_id] = read_state(env[:script], env[:machine])
 
           @app.call(env)
         end
 
-        def read_state(machine)
+        def read_state(script, machine)
           return :not_created if machine.id.nil?
 
-          # Return the state
-          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}"
+          # 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
-          output.strip
+
+          # Return the state
+          return server.state.to_sym
         end
       end
     end

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

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

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

@@ -11,15 +11,11 @@ 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"))
-          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
-
+          server.destroy
           env[:machine].id = nil
 
           @app.call(env)

data/lib/vagrant-shell/config.rb

@@ -3,41 +3,71 @@ 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
-        @image                  = UNSET_VALUE
+      def initialize(region_specific=false)
         @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
 
       #-------------------------------------------------------------------
@@ -46,31 +76,102 @@ 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 rub args by default
+        # No run 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)
-        { "Shell Provider" => [ ] } 
+        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
       end
 
       # utilities
@@ -89,7 +190,6 @@ module VagrantPlugins
           return try_load
         end
       end
-
     end
   end
 end

data/lib/vagrant-shell/errors.rb

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

data/lib/vagrant-shell/plugin.rb

@@ -18,14 +18,13 @@ 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) do
+        provider(nm_provider, parallel: true) do
           # Setup logging and i18n
           setup_logging
           setup_i18n
@@ -36,8 +35,6 @@ 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/libexec/shell-docker

@@ -20,11 +20,18 @@ case "$cmd" in
     ;;
   ssh-info)
     instance="$1"; shift
-    echo "$(docker inspect $instance | awk '$1 ~ /IPAddress/ { split($2,ip,"\""); print ip[2] }')" 22
+    echo "$(docker inspect -format '{{.NetworkSettings.IPAddress}}' $instance)" 22
     ;;
   read-state)
     instance="$1"; shift
-    echo "$(docker inspect $instance | awk '$1 ~ /Running/ { split($2,state,","); print(state[1] == "true" ? "running" : "not_created") }')"
+    case "$(docker inspect -tformat '{{.State.Running}}' $instance)" in
+      true)
+        echo running
+        ;;
+      *)
+        echo not_created
+        ;;
+    esac
     ;;
   *)
     exit 1

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-shell
 version: !ruby/object:Gem::Version
-  version: 0.2.13
-  prerelease: 
+  version: 0.2.14
 platform: ruby
 authors:
 - Tom Bombadil
@@ -10,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-22 00:00:00.000000000 Z
+date: 2014-01-17 00:00:00.000000000 Z
 dependencies: []
 description: Enables Vagrant to manage machines using shell scripts
 email:
@@ -20,9 +19,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/vagrant-shell/action/connect_shell.rb
 - 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
@@ -47,26 +48,25 @@ files:
 - VERSION
 homepage: http://destructuring.org/vagrant-shell
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: vagrant-shell
-rubygems_version: 1.8.25
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Enables Vagrant to manage machines using shell scripts
 test_files: []