vagrant-niftycloud 0.1.5 → 0.1.6

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.1.6 (July 29, 2013)
+
+* vagrant up直後にCtrl+Cで中断した場合に、vagrant statusでステータスが取得できない問題を修正
+
 # 0.1.5 (July 27, 2013)
 
 * gemspecファイルのライセンス表示を追加

data/README.md

@@ -1,8 +1,9 @@
 # vagrant-niftycloud
 
 [![Gem Version](https://badge.fury.io/rb/vagrant-niftycloud.png)](http://badge.fury.io/rb/vagrant-niftycloud)
-[![Build Status](https://travis-ci.org/sakama/vagrant-niftycloud.png?branch=master)](https://travis-ci.org/sakama/vagrant-niftycloud)
 [![Dependency Status](https://gemnasium.com/sakama/vagrant-niftycloud.png)](https://gemnasium.com/sakama/vagrant-niftycloud)
+[![Build Status](https://travis-ci.org/sakama/vagrant-niftycloud.png)](https://travis-ci.org/sakama/vagrant-niftycloud)
+[![Code Climate](https://codeclimate.com/github/sakama/vagrant-niftycloud.png)](https://codeclimate.com/github/sakama/vagrant-niftycloud)
 
 `開発中！8月頭を目処に処理をブラッシュアップします`
 
@@ -29,7 +30,9 @@ Chef以外の動作確認は行なっていませんが、プラグインで行
 
 まずVagrant 1.2以降をインストールして下さい。
 
-vagrant upを実行する前に通常のVagrant使用時と同じようにboxファイルをVagrantに追加する必要があります。
+Vagrantは1.1からgem経由ではなく[パッケージでのインストール](http://downloads.vagrantup.com/)に変わっているので注意してください。
+
+vagrant upを実行する前に、VirtualBox等でVagrantを使用する時と同じようにboxファイルをVagrantに追加する必要があります。
 
 自分でboxファイルを作成するか、こちらで用意しているboxファイルを使用して、任意の名前でダミーのboxを追加して下さい。
 
@@ -158,7 +161,7 @@ boxフォーマットは`metadata.json`と`Vagrantfile`をtar.gzで圧縮した
 
 VirtualBoxやVMWare Fusion向けの数GBあるboxと比較すると遙かに軽量で、デフォルト設定を記述する場所という位置付けとなっています。
 
-`Vagrantfile` で指定された項目・値はproviderとしてniftycloudを指定した場合のデフォルト値として扱わるため、複数メンバーで作業する場合等はオリジナルのboxを作成しておくと便利です。
+`Vagrantfile` で指定された項目/値はproviderとしてniftycloudを指定した場合のデフォルト値として扱われるため、複数メンバーで作業する場合等はオリジナルのboxを作成しておくと便利です。
 
 
 ## 設定
@@ -269,4 +272,4 @@ $ bundle exec vagrant up --provider=niftycloud
 
 ## ライセンス
 
-[vagrant-aws](https://github.com/mitchellh/vagrant-aws) をベースに NIFTY Cloud 向けに修正を加えたものです。 オリジナルに準じて MITライセンス を適用します。
+[vagrant-aws](https://github.com/mitchellh/vagrant-aws) をベースにニフティクラウド向けに修正を加えたものです。 オリジナルに準じて MITライセンス を適用します。

data/lib/vagrant-niftycloud.rb

@@ -6,6 +6,7 @@ module VagrantPlugins
   module NiftyCloud
     lib_path = Pathname.new(File.expand_path("../vagrant-niftycloud", __FILE__))
     autoload :Action, lib_path.join("action")
+    autoload :Servers, lib_path.join("servers/servers")
     autoload :Errors, lib_path.join("errors")
 
     # This returns the path to the source of this plugin.

data/lib/vagrant-niftycloud/action/connect_niftycloud.rb

@@ -1,11 +1,6 @@
 # -*- coding: utf-8 -*-
-require "NIFTY"
 require "log4r"
 
-if !ENV["VAGRANT_LOG"].nil? && ENV["VAGRANT_LOG"].upcase=='DEBUG'
-  NIFTY::LOG.level = Logger::DEBUG
-end
-
 module VagrantPlugins
   module NiftyCloud
     module Action
@@ -35,18 +30,18 @@ module VagrantPlugins
           # http://cloud.nifty.com/api/sdk/rdoc/
           begin
             @logger.info("Connecting to NiftyCloud...")
-            env[:niftycloud_compute] = NIFTY::Cloud::Base.new(niftycloud_config)
+            env[:niftycloud_compute] = Servers::Servers.new(niftycloud_config)
           rescue NIFTY::ConfigurationError => e
-            raise VagrantPlugins::NiftyCloud::Errors::NiftyCloudConfigurationError,
+            raise Errors::NiftyCloudConfigurationError,
               :message => e.message
           rescue NIFTY::ArgumentError => e
-            raise VagrantPlugins::NiftyCloud::Errors::NiftyCloudArgumentError,
+            raise Errors::NiftyCloudArgumentError,
               :message => e.message
           rescue NIFTY::ResponseFormatError => e
-            raise VagrantPlugins::NiftyCloud::Errors::NiftyCloudResponseFormatError,
+            raise Errors::NiftyCloudResponseFormatError,
               :message => e.message
           rescue NIFTY::ResponseError => e
-            raise VagrantPlugins::NiftyCloud::Errors::NiftyCloudResponseError,
+            raise Errors::NiftyCloudResponseError,
               :code    => e.error_code,
               :message => e.error_message
           end

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

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require "log4r"
 
 module VagrantPlugins
@@ -24,20 +25,20 @@ module VagrantPlugins
           # 例外の定義は以下参照
           # http://cloud.nifty.com/api/sdk/rdoc/
           begin
-            server = niftycloud.describe_instances(:instance_id => machine.id).reservationSet.item.first.instancesSet.item.first
+            server = niftycloud.get(machine)
             # Read the DNS info
             return {
               :host => server.ipAddress,
               :port => 22
             }
           rescue NIFTY::ConfigurationError => e
-            raise VagrantPlugins::NiftyCloud::Errors::NiftyCloudConfigurationError,
+            raise Errors::NiftyCloudConfigurationError,
               :message => e.message
           rescue NIFTY::ArgumentError => e
-            raise VagrantPlugins::NiftyCloud::Errors::NiftyCloudArgumentError,
+            raise Errors::NiftyCloudArgumentError,
               :message => e.message
           rescue NIFTY::ResponseFormatError => e
-            raise VagrantPlugins::NiftyCloud::Errors::NiftyCloudResponseFormatError,
+            raise Errors::NiftyCloudResponseFormatError,
               :message => e.message
           rescue NIFTY::ResponseError => e
             # The machine can't be found

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

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require "log4r"
 
 module VagrantPlugins
@@ -24,7 +25,7 @@ module VagrantPlugins
           # 例外の定義は以下参照
           # http://cloud.nifty.com/api/sdk/rdoc/
           begin
-            server = niftycloud.describe_instances(:instance_id => machine.id).reservationSet.item.first.instancesSet.item.first
+            server = niftycloud.get(machine)
 
             state = server.instanceState.name
             case state
@@ -37,13 +38,13 @@ module VagrantPlugins
               return state.to_sym
             end
           rescue NIFTY::ConfigurationError => e
-            raise VagrantPlugins::NiftyCloud::Errors::NiftyCloudConfigurationError,
+            raise Errors::NiftyCloudConfigurationError,
               :message => e.message
           rescue NIFTY::ArgumentError => e
-            raise VagrantPlugins::NiftyCloud::Errors::NiftyCloudArgumentError,
+            raise Errors::NiftyCloudArgumentError,
               :message => e.message
           rescue NIFTY::ResponseFormatError => e
-            raise VagrantPlugins::NiftyCloud::Errors::NiftyCloudResponseFormatError,
+            raise Errors::NiftyCloudResponseFormatError,
               :message => e.message
           rescue NIFTY::ResponseError => e
             machine.id = nil

data/lib/vagrant-niftycloud/action/resume_instance.rb

@@ -16,38 +16,21 @@ module VagrantPlugins
           # 例外の定義は以下参照
           # http://cloud.nifty.com/api/sdk/rdoc/
           begin
-            env[:ui].info(I18n.t("vagrant_niftycloud.resuming"))
-
-            # 起動直後等、resume処理できないステータスの場合一旦待つ
-            server = env[:niftycloud_compute].describe_instances(:instance_id => env[:machine].id).reservationSet.item.first.instancesSet.item.first
-            while server.instanceState.name == 'pending'
-              sleep 5
-              server = env[:niftycloud_compute].describe_instances(:instance_id => env[:machine].id).reservationSet.item.first.instancesSet.item.first
-              env[:ui].info(I18n.t("vagrant_niftycloud.processing"))
-            end
-
-            if server.instanceState.name != 'running'
-              env[:niftycloud_compute].start_instances(:instance_id => env[:machine].id)
-              while server.instanceState.name != 'running'
-                sleep 5
-                server = env[:niftycloud_compute].describe_instances(:instance_id => env[:machine].id).reservationSet.item.first.instancesSet.item.first
-                env[:ui].info(I18n.t("vagrant_niftycloud.processing"))
-              end
-            end
+            env[:niftycloud_compute].start(env)
 
             @app.call(env)
           rescue NIFTY::ConfigurationError => e
-            raise VagrantPlugins::NiftyCloud::Errors::NiftyCloudConfigurationError,
+            raise Errors::NiftyCloudConfigurationError,
               :message => e.message
           rescue NIFTY::ArgumentError => e
-            raise VagrantPlugins::NiftyCloud::Errors::NiftyCloudArgumentError,
+            raise Errors::NiftyCloudArgumentError,
               :message => e.message
           rescue NIFTY::ResponseFormatError => e
-            raise VagrantPlugins::NiftyCloud::Errors::NiftyCloudResponseFormatError,
+            raise Errors::NiftyCloudResponseFormatError,
               :message => e.message
           rescue NIFTY::ResponseError => e
             ui.error("Could not locate server '#{env[:machine].id}'.  Please verify it was provisioned in the current zone.")
-            raise VagrantPlugins::NiftyCloud::Errors::NiftyCloudResponseError,
+            raise Errors::NiftyCloudResponseError,
               :code    => e.error_code,
               :message => e.error_message
           end

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

@@ -60,21 +60,24 @@ module VagrantPlugins
           # http://cloud.nifty.com/api/sdk/rdoc/
           begin
             # インスタンス立ち上げ開始
-            server = env[:niftycloud_compute].run_instances(options).instancesSet.item.first
+            server = env[:niftycloud_compute].create(options)
           rescue NIFTY::ConfigurationError => e
-            raise VagrantPlugins::NiftyCloud::Errors::NiftyCloudConfigurationError,
+            raise Errors::NiftyCloudConfigurationError,
               :message => e.message
           rescue NIFTY::ArgumentError => e
-            raise VagrantPlugins::NiftyCloud::Errors::NiftyCloudArgumentError,
+            raise Errors::NiftyCloudArgumentError,
               :message => e.message
           rescue NIFTY::ResponseFormatError => e
-            raise VagrantPlugins::NiftyCloud::Errors::NiftyCloudResponseFormatError,
+            raise Errors::NiftyCloudResponseFormatError,
               :message => e.message
           rescue NIFTY::ResponseError => e
-            raise VagrantPlugins::NiftyCloud::Errors::NiftyCloudResponseError,
+            raise Errors::NiftyCloudResponseError,
               :code    => e.error_code,
               :message => e.error_message
           end
+
+          # Immediately save the ID since it is created at this point.
+          env[:machine].id = instance_id
             
           # リトライ回数。サーバステータスがrunningになるまで5秒のintervalでdescribe_instancesを実行するので
           # タイムアウト秒数/5を上限回数とする
@@ -87,7 +90,7 @@ module VagrantPlugins
 
               count += 1 
               sleep 5
-              server = env[:niftycloud_compute].describe_instances(:instance_id => instance_id).reservationSet.item.first.instancesSet.item.first
+              server = env[:niftycloud_compute].get(env)
               env[:ui].info(I18n.t("vagrant_niftycloud.processing"))
               if count > tries
                 # Delete the instance
@@ -97,9 +100,6 @@ module VagrantPlugins
               end
             end
           end
-          
-          # Immediately save the ID since it is created at this point.
-          env[:machine].id = instance_id
 
           # Terminate the instance if we were interrupted
           terminate(env) if env[:interrupted]

data/lib/vagrant-niftycloud/action/suspend_instance.rb

@@ -16,37 +16,20 @@ module VagrantPlugins
           # 例外の定義は以下参照
           # http://cloud.nifty.com/api/sdk/rdoc/
           begin
-            env[:ui].info(I18n.t("vagrant_niftycloud.suspending"))
-
-            # 起動直後等、stop処理できないステータスの場合一旦待つ
-            server = env[:niftycloud_compute].describe_instances(:instance_id => env[:machine].id).reservationSet.item.first.instancesSet.item.first
-            while server.instanceState.name == 'pending'
-              sleep 5
-              server = env[:niftycloud_compute].describe_instances(:instance_id => env[:machine].id).reservationSet.item.first.instancesSet.item.first
-              env[:ui].info(I18n.t("vagrant_niftycloud.processing"))
-            end
-
-            if server.instanceState.name != 'stopped'
-              env[:niftycloud_compute].stop_instances(:instance_id => env[:machine].id, :force => false)
-              while server.instanceState.name != 'stopped'
-                sleep 5
-                server = env[:niftycloud_compute].describe_instances(:instance_id => env[:machine].id).reservationSet.item.first.instancesSet.item.first
-                env[:ui].info(I18n.t("vagrant_niftycloud.processing"))
-              end
-            end
+            env[:niftycloud_compute].stop(env)
 
             @app.call(env)
           rescue NIFTY::ConfigurationError => e
-            raise VagrantPlugins::NiftyCloud::Errors::NiftyCloudConfigurationError,
+            raise Errors::NiftyCloudConfigurationError,
               :message => e.message
           rescue NIFTY::ArgumentError => e
-            raise VagrantPlugins::NiftyCloud::Errors::NiftyCloudArgumentError,
+            raise Errors::NiftyCloudArgumentError,
               :message => e.message
           rescue NIFTY::ResponseFormatError => e
-            raise VagrantPlugins::NiftyCloud::Errors::NiftyCloudResponseFormatError,
+            raise Errors::NiftyCloudResponseFormatError,
               :message => e.message
           rescue NIFTY::ResponseError => e
-            raise VagrantPlugins::NiftyCloud::Errors::NiftyCloudResponseError,
+            raise Errors::NiftyCloudResponseError,
               :code    => e.error_code,
               :message => e.error_message
             ui.error("Could not locate server '#{env[:machine].id}'.  Please verify it was provisioned in the current zone.")

data/lib/vagrant-niftycloud/action/sync_folders.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require "log4r"
 
 require "vagrant/util/subprocess"

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

@@ -16,45 +16,24 @@ module VagrantPlugins
           # 例外の定義は以下参照
           # http://cloud.nifty.com/api/sdk/rdoc/
           begin
-            env[:ui].info(I18n.t("vagrant_niftycloud.terminating"))
-
-            # 起動直後等、terminate処理できないステータスの場合一旦待つ
-            server = env[:niftycloud_compute].describe_instances(:instance_id => env[:machine].id).reservationSet.item.first.instancesSet.item.first
-            while server.instanceState.name == 'pending'
-              sleep 5
-              server = env[:niftycloud_compute].describe_instances(:instance_id => env[:machine].id).reservationSet.item.first.instancesSet.item.first
-              env[:ui].info(I18n.t("vagrant_niftycloud.processing"))
-            end
-
-            attribute = env[:niftycloud_compute].describe_instance_attribute(:instance_id => env[:machine].id, :attribute => 'disableApiTermination')
-            if attribute.disableApiTermination.value == 'false'
-              # AWSのように即terminateができないため念のため一旦stopする
-              # TODO API経由でのterminate不可の場合を考慮する必要があるか
-              server = env[:niftycloud_compute].describe_instances(:instance_id => env[:machine].id).reservationSet.item.first.instancesSet.item.first
-              if server.instanceState.name != 'stopped'
-                env[:niftycloud_compute].stop_instances(:instance_id => env[:machine].id, :force => true)
-                while server.instanceState.name != 'stopped'
-                  sleep 5
-                  server = env[:niftycloud_compute].describe_instances(:instance_id => env[:machine].id).reservationSet.item.first.instancesSet.item.first
-                  env[:ui].info(I18n.t("vagrant_niftycloud.processing"))
-                end
-              end
-            end
-
             # terminate処理
-            server = env[:niftycloud_compute].describe_instances(:instance_id => env[:machine].id).reservationSet.item.first.instancesSet.item.first
-            if server.instanceState.name == 'stopped'
-              response = env[:niftycloud_compute].terminate_instances(:instance_id => env[:machine].id)
-              env[:machine].id = nil
+            response = env[:niftycloud_compute].delete(env)
+            env[:machine].id = nil
 
-              @app.call(env)
-            end
+            @app.call(env)
           rescue NIFTY::ConfigurationError => e
-            raise VagrantPlugins::NiftyCloud::Errors::NiftyCloudConfigurationError,
+            raise Errors::NiftyCloudConfigurationError,
               :message => e.message
           rescue NIFTY::ArgumentError => e
-            raise VagrantPlugins::NiftyCloud::Errors::NiftyCloudArgumentError,
+            raise Errors::NiftyCloudArgumentError,
+              :message => e.message
+          rescue NIFTY::ResponseFormatError => e
+            raise Errors::NiftyCloudResponseFormatError,
               :message => e.message
+          rescue NIFTY::ResponseError => e
+            raise Errors::NiftyCloudResponseError,
+              :code    => e.error_code,
+              :message => e.error_message
           end
         end
       end

data/lib/vagrant-niftycloud/servers/servers.rb

@@ -0,0 +1,99 @@
+# -*- coding: utf-8 -*-
+require 'log4r'
+require 'NIFTY'
+
+module VagrantPlugins
+  module NiftyCloud
+    module Servers
+      class Servers
+
+        def initialize(niftycloud_config)
+          if !ENV["VAGRANT_LOG"].nil? && ENV["VAGRANT_LOG"].upcase=='DEBUG'
+            NIFTY::LOG.level = Logger::DEBUG
+          end
+          @connection = NIFTY::Cloud::Base.new(niftycloud_config)
+        end
+
+        # Create instance
+        def create(options)
+          server = @connection.run_instances(options).instancesSet.item.first
+        end
+
+        # Get instance information
+        def get(machine)
+          server = @connection.describe_instances(:instance_id => machine.id).reservationSet.item.first.instancesSet.item.first
+        end
+
+        # Start instance
+        def start(env)
+          env[:ui].info(I18n.t("vagrant_niftycloud.resuming"))
+
+          # 起動直後等、resume処理できないステータスの場合一旦待つ
+          server = get(env[:machine])
+          while server.instanceState.name == 'pending'
+            sleep 5
+            server = get(env[:machine])
+            env[:ui].info(I18n.t("vagrant_niftycloud.processing"))
+          end
+
+          if server.instanceState.name != 'running'
+            @connection.start_instances(:instance_id => env[:machine].id)
+            while server.instanceState.name != 'running'
+              sleep 5
+              server = get(env[:machine])
+              env[:ui].info(I18n.t("vagrant_niftycloud.processing"))
+            end
+          end
+        end
+
+        # Stop instance
+        def stop(env)
+          env[:ui].info(I18n.t("vagrant_niftycloud.suspending"))
+
+          # 起動直後等、stop処理できないステータスの場合一旦待つ
+          server = get(env[:machine])
+          while server.instanceState.name == 'pending'
+            sleep 5
+            server = get(env[:machine])
+            env[:ui].info(I18n.t("vagrant_niftycloud.processing"))
+          end
+
+          if server.instanceState.name != 'stopped'
+            @connection.stop_instances(:instance_id => env[:machine].id, :force => false)
+            while server.instanceState.name != 'stopped'
+              sleep 5
+              server = get(env[:machine])
+              env[:ui].info(I18n.t("vagrant_niftycloud.processing"))
+            end
+          end
+        end
+
+        # Terminate instance
+        def delete(env)
+          env[:ui].info(I18n.t("vagrant_niftycloud.terminating"))
+
+          # 起動直後等、terminate処理できないステータスの場合一旦待つ
+          server = get(env[:machine])
+          while server.instanceState.name == 'pending'
+            sleep 5
+            server = get(env[:machine])
+            env[:ui].info(I18n.t("vagrant_niftycloud.processing"))
+          end
+
+          attribute = @connection.describe_instance_attribute(:instance_id => env[:machine].id, :attribute => 'disableApiTermination')
+          if attribute.disableApiTermination.value == 'false'
+            # AWSのように即terminateができないため一旦stopする
+            server = stop(env)
+          end
+
+          # terminate処理
+          server = get(env[:machine])
+          if server.instanceState.name == 'stopped'
+            response = @connection.terminate_instances(:instance_id => env[:machine].id)
+            return response
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-niftycloud/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module NiftyCloud
-    VERSION = "0.1.5"
+    VERSION = "0.1.6"
   end
 end

data/locales/en.yml

@@ -35,7 +35,7 @@ en:
       image_id_required: |-
         An Image ID must be configured via "image_id"
       private_key_missing: |-
-        The specified private key for NiftyCloud could not be found
+        The specified private key for Nifty Cloud could not be found
       zone_required: |-
         A zone must be specified via "zone"
       secret_access_key_required: |-
@@ -43,12 +43,12 @@ en:
 
     errors:
       instance_ready_timeout: |-
-        The instance never became "ready" in NiftyCloud. The timeout currently
+        The instance never became "ready" in Nifty Cloud. The timeout currently
         set waiting for the instance to become ready is %{timeout} seconds.
         Please verify that the machine properly boots. If you need more time
-        set the `instance_ready_timeout` configuration on the NiftyCloud provider.
+        set the `instance_ready_timeout` configuration on the Nifty Cloud provider.
       niftycloud_response_error: |-
-        Response Error occured while connecting to  Nifty Cloud API
+        Response Error occured while connecting to Nifty Cloud API
 
         Error Code: %{code}
         %{message}
@@ -81,6 +81,10 @@ en:
         not created
       long_not_created: |-
         The Nifty Cloud instance is not created. Run `vagrant up` to create it.
+      short_creating: |-
+        creating
+      long_creating: |-
+        The Nifty Cloud instance is now creating. Please wait for process to finish
       short_running: |-
         running
       long_running: |-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-niftycloud
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-27 00:00:00.000000000 Z
+date: 2013-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70242618690860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70242618690860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-core
-  requirement: &70242618689380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: 2.12.2
   type: :development
   prerelease: false
-  version_requirements: *70242618689380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.12.2
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
-  requirement: &70242618687580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +53,15 @@ dependencies:
         version: 2.12.1
   type: :development
   prerelease: false
-  version_requirements: *70242618687580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.12.1
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
-  requirement: &70242618685820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +69,15 @@ dependencies:
         version: 2.12.1
   type: :development
   prerelease: false
-  version_requirements: *70242618685820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.12.1
 - !ruby/object:Gem::Dependency
   name: nifty-cloud-sdk
-  requirement: &70242618685340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +85,12 @@ dependencies:
         version: '1.7'
   type: :runtime
   prerelease: false
-  version_requirements: *70242618685340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.7'
 description: Enables Vagrant to manage machines in Nifty Cloud.
 email: satoshiakama@gmail.com
 executables: []
@@ -95,6 +120,7 @@ files:
 - lib/vagrant-niftycloud/errors.rb
 - lib/vagrant-niftycloud/plugin.rb
 - lib/vagrant-niftycloud/provider.rb
+- lib/vagrant-niftycloud/servers/servers.rb
 - lib/vagrant-niftycloud/util/timer.rb
 - lib/vagrant-niftycloud/version.rb
 - lib/vagrant-niftycloud.rb
@@ -122,7 +148,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -102762255497424011
+      hash: -2659219092827590807
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -131,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 0.1.0
 requirements: []
 rubyforge_project: vagrant-nifycloud
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Enables Vagrant to manage machines in Nifty Cloud