vagrant-shell 0.2.3 → 0.2.4

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

@@ -23,16 +23,17 @@ module VagrantPlugins
 
           # Get the configs
           provider_config = env[:machine].provider_config
-          ami                = provider_config.ami
+          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(" -- AMI: #{ami}")
+          env[:ui].info(" -- Image: #{image}")
 
           begin
             # Immediately save the ID since it is created at this point.
-            env[:machine].id = `#{env[:machine].provider_config.script} run-instance #{ami}`.split(/\s+/)[0]
+            env[:machine].id = `#{env[:machine].provider_config.script} run-instance #{image} #{run_args.join(" ")}`.split(/\s+/)[0]
           rescue Errors::ComputeError => e
             raise Errors::ShellError, :message => e.message
           end

data/lib/vagrant-shell/config.rb

@@ -3,10 +3,10 @@ require "vagrant"
 module VagrantPlugins
   module Shell
     class Config < Vagrant.plugin("2", :config)
-      # The ID of the AMI to use.
+      # The ID of the Image to use.
       #
       # @return [String]
-      attr_accessor :ami
+      attr_accessor :image
 
       # The timeout to wait for an instance to become ready.
       #
@@ -23,11 +23,17 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :script
 
+      # The shell script run-instance args
+      # 
+      # @return [String]
+      attr_accessor :run_args
+
       def initialize
-        @ami                    = UNSET_VALUE
+        @image                  = UNSET_VALUE
         @instance_ready_timeout = UNSET_VALUE
         @user_data              = UNSET_VALUE
         @script                 = UNSET_VALUE
+        @run_args               = UNSET_VALUE
 
         # Internal state (prefix with __ so they aren't automatically
         # merged)
@@ -44,8 +50,8 @@ module VagrantPlugins
       end
 
       def finalize!
-        # AMI must be nil, since we can't default that
-        @ami = nil if @ami == UNSET_VALUE
+        # 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
@@ -56,6 +62,9 @@ module VagrantPlugins
         # No default shell script
         @script = nil if @script == UNSET_VALUE
 
+        # No rub args by default
+        @run_args = [] if @run_args == UNSET_VALUE
+
         # Mark that we finalized
         @__finalized = true
       end

data/lib/vagrant-shell/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Shell
-    VERSION = "0.2.3"
+    VERSION = "0.2.4"
   end
 end

data/locales/en.yml

@@ -22,8 +22,8 @@ en:
       will be silently ignored.
 
     config:
-      ami_required: |-
-        An AMI must be configured via "ami"
+      image_required: |-
+        An Image must be configured via "image"
       private_key_missing: |-
         The specified private key for Shell could not be found
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-shell
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-01 00:00:00.000000000 Z
+date: 2013-05-02 00:00:00.000000000 Z
 dependencies: []
 description: Enables Vagrant to manage machines using shell scripts
 email: