vagrant-aliyun 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7ef1d6f0d68cb8e266af16a511ac62895071ffd
-  data.tar.gz: 870da495bef5c60eea45d956c39baf10d0138280
+  metadata.gz: d8408453334ab660eef7fd808713d32d5955e05c
+  data.tar.gz: 81d541fefdb736a8a7a8f6e137e382bc65461d29
 SHA512:
-  metadata.gz: e6a6131f111f29270481677f1b8c3da0eb41bf84c9edc95b7413bb4a39f2917e95229c9ac906cb7d90a04136b1139f7da190d40e13d2c7d2df609237d790fd3c
-  data.tar.gz: 5e1c4fc9bee37a2a0f2f1016fccc4390505ff68b0dccd30b11a4a514af9a570dae188542e57fc5f614bce30a41c209c096b6b76c7427549dbe14805618ce6363
+  metadata.gz: 216536a1357ee9b9536a1b16efebd9a79413d4abd7a02955f23842aed531690e9d88ddb9c124307610d27ed397eba69b3f81c8d5d0dc1f48535207ce536b5ad2
+  data.tar.gz: f8850b2db69eecc4279ff8c88df489b6955a4d470ff8322cbbe1dbb15b5f48377059b012ac1a65dd45926deb6aeed0848175955641a8356f401cbd1b6d87738a

data/Gemfile.lock

@@ -23,7 +23,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-aliyun (0.0.4)
+    vagrant-aliyun (0.0.5)
       aliyun-api (~> 0.0.7)
       ruby-hmac (~> 0.4.0)
 

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

@@ -36,7 +36,11 @@ module VagrantPlugins
           env[:ui].info(" -- Instance Type: #{config.instance_type}")
           env[:ui].info(" -- Internet Max Bandwidth Out: #{config.internet_max_bandwidth_out}")
           env[:ui].info(" -- Security Group ID: #{config.security_group_id}")
-          instance = ecs.create_instance :region_id=>config.region_id,:image_id=>config.image_id,:instance_type=>config.instance_type,:internet_max_bandwidth_out=>config.internet_max_bandwidth_out,:security_group_id=>config.security_group_id,:password=>config.password
+          env[:ui].info(" -- Instance Charge Type: #{config.instance_charge_type}")
+          if config.instance_charge_type == 'PrePaid'
+            env[:ui].info(" -- Instance Period: #{config.instance_period}")
+          end
+          instance = ecs.create_instance :region_id=>config.region_id,:image_id=>config.image_id,:instance_type=>config.instance_type,:internet_max_bandwidth_out=>config.internet_max_bandwidth_out,:security_group_id=>config.security_group_id,:password=>config.password,:instance_charge_type=>config.instance_charge_type,:period=>config.instance_period
           ecs.allocate_public_ip_address :instance_id=>instance["InstanceId"]
           env[:ui].info(I18n.t("vagrant_aliyun.starting"))
           ecs.start_instance :instance_id=>instance["InstanceId"]

data/lib/vagrant-aliyun/config.rb

@@ -12,6 +12,8 @@ module VagrantPlugins
       attr_accessor :internet_max_bandwidth_out
       attr_accessor :security_group_id
       attr_accessor :password
+      attr_accessor :instance_charge_type
+      attr_accessor :instance_period
       attr_accessor :instance_ready_timeout
 
       def initialize()
@@ -23,7 +25,9 @@ module VagrantPlugins
         @internet_max_bandwidth_out = UNSET_VALUE
         @security_group_id = UNSET_VALUE
         @password = UNSET_VALUE
-        @instance_ready_timeout    = UNSET_VALUE
+        @instance_charge_type = UNSET_VALUE
+        @instance_period = UNSET_VALUE
+        @instance_ready_timeout = UNSET_VALUE
       end
 
       def finalize!
@@ -35,6 +39,8 @@ module VagrantPlugins
         @internet_max_bandwidth_out = nil if @internet_max_bandwidth_out == UNSET_VALUE
         @security_group_id = nil if @security_group_id == UNSET_VALUE
         @password = nil if @password == UNSET_VALUE
+        @instance_charge_type = nil if @instance_charge_type == UNSET_VALUE
+        @instance_period = nil if @instance_period == UNSET_VALUE
         @instance_ready_timeout = 120 if @instance_ready_timeout == UNSET_VALUE
       end
 
@@ -48,6 +54,10 @@ module VagrantPlugins
         errors << I18n.t("vagrant_aliyun.config.internet_max_bandwidth_out_required") if @internet_max_bandwidth_out.nil?
         errors << I18n.t("vagrant_aliyun.config.security_group_id_required") if @security_group_id.nil?
         errors << I18n.t("vagrant_aliyun.config.password_required") if @password.nil?
+        errors << I18n.t("vagrant_aliyun.config.instance_charge_type_required") if @instance_charge_type.nil?
+        if @instance_charge_type != nil && @instance_charge_type == 'PrePaid' && @instance_period == nil
+          errors << I18n.t("vagrant_aliyun.config.instance_period_required")
+        end
         { "Aliyun Provider" => errors }
       end
     end

data/lib/vagrant-aliyun/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module AliyunECS
-    VERSION = '0.0.4'
+    VERSION = '0.0.5'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-aliyun
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Taurus Cheung
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-24 00:00:00.000000000 Z
+date: 2015-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aliyun-api
@@ -71,10 +71,11 @@ files:
 - lib/vagrant-aliyun/version.rb
 - lib/vagrant-aliyun.rb
 - locales/en.yml
-- pkg/vagrant-aliyun-0.0.4.gem
+- pkg/vagrant-aliyun-0.0.5.gem
 - Rakefile
 - README.md
 - vagrant-aliyun.gemspec
+- .DS_Store
 - .gitignore
 homepage: https://github.com/lccheun2/vagrant-aliyun
 licenses: