vagrant-niftycloud 0.1.4 → 0.1.5

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+before_install:
+  - gem install bundler
+rvm:
+  - 1.9.3
+  - 2.0.0

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.1.5 (July 27, 2013)
+
+* gemspecファイルのライセンス表示を追加
+
 # 0.1.4 (July 25, 2013)
 
 * Vagrantfileでinstance_idを指定せずにvagrant upした場合に、instance_id決定ロジックが can't convert nil into String を吐くケースがある問題を修正

data/Gemfile

@@ -6,5 +6,5 @@ group :development do
   # We depend on Vagrant for development, but we don't add it as a
   # gem dependency because we expect to be installed within the
   # Vagrant environment itself using `vagrant plugin`.
-  #gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git"
+  gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git"
 end

data/README.md

@@ -1,13 +1,16 @@
-# Vagrant NiftyCloud Provider
+# 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)
 
 `開発中！8月頭を目処に処理をブラッシュアップします`
 
 `リージョン・ゾーン周り以外のロジックはほぼ問題ないと思います`
 
-[Vagrant](http://www.vagrantup.com) 1.2以降のバージョンで[ニフティクラウド](http://cloud.nifty.com/)
-を操作するためのprovider機能を追加するプラグインです。
+[Vagrant](http://www.vagrantup.com) 1.2以降のバージョンのproviderとして[ニフティクラウド](http://cloud.nifty.com/) を使えるようにするためのプラグインです。
 
-Vagrantでニフティクラウド上のサーバインスタンスの制御や[Chef](http://www.opscode.com/chef/)や[Puppet](https://puppetlabs.com/) 等を使ったサーバのprovisioningが可能となります。
+Vagrantでニフティクラウド上のサーバインスタンスの制御や、[Chef](http://www.opscode.com/chef/)や[Puppet](https://puppetlabs.com/) 等を使ったサーバのprovisioningが可能となります。
 
 Chef以外の動作確認は行なっていませんが、プラグインで行なっているのはSSH実行可能な状態にすることとrsyncによるファイル転送だけなので、Vagrantでサポートされているものであれば動作するのではないかと思います。
 

data/lib/vagrant-niftycloud/version.rb

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

data/spec/vagrant-niftycloud/config_spec.rb

@@ -19,7 +19,7 @@ describe VagrantPlugins::NiftyCloud::Config do
     its("image_id")          { should be_nil }
     its("key_name")          { should be_nil }
     its("zone")              { should be_nil }
-    its("instance_ready_timeout") { should == 120 }
+    its("instance_ready_timeout") { should == 300 }
     its("instance_type")     { should == "mini" }
     its("secret_access_key") { should be_nil }
     its("firewall")          { should == [] }
@@ -57,8 +57,8 @@ describe VagrantPlugins::NiftyCloud::Config do
 
     context "with NiftyCloud credential environment variables" do
       before :each do
-        ENV.stub(:[]).with("NIFTY_ACCESS_KEY").and_return("access_key")
-        ENV.stub(:[]).with("NIFTY_SECRET_KEY").and_return("secret_key")
+        ENV.stub(:[]).with("NIFTY_CLOUD_ACCESS_KEY").and_return("access_key_id")
+        ENV.stub(:[]).with("NIFTY_CLOUD_SECRET_KEY").and_return("secret_access_key")
       end
 
       subject do
@@ -67,8 +67,8 @@ describe VagrantPlugins::NiftyCloud::Config do
         end
       end
 
-      its("access_key_id")     { should == "access_key" }
-      its("secret_access_key") { should == "secret_key" }
+      its("access_key_id")     { should == "access_key_id" }
+      its("secret_access_key") { should == "secret_access_key" }
     end
   end
 
@@ -87,6 +87,11 @@ describe VagrantPlugins::NiftyCloud::Config do
       instance.secret_access_key = config_secret_access_key
     end
 
+    it "should raise an exception if not finalized" do
+      expect { instance.get_zone_config("east-12") }.
+        to raise_error
+    end
+
     context "with no specific config set" do
       subject do
         # Set the values on the top-level object
@@ -95,6 +100,7 @@ describe VagrantPlugins::NiftyCloud::Config do
         # Finalize so we can get the zone config
         instance.finalize!
 
+        instance.get_zone_config("east-12")
       end
 
       its("access_key_id")     { should == config_access_key_id }
@@ -105,6 +111,21 @@ describe VagrantPlugins::NiftyCloud::Config do
     end
 
     context "with a specific config set" do
+      let(:zone_name) { "hashi-zone" }
+
+      subject do
+        # Set the values on a specific region
+        instance.zone_config zone_name do |config|
+          set_test_values(config)
+        end
+
+        # Finalize so we can get the region config
+        instance.finalize!
+
+        # Get the region
+        instance.get_zone_config(zone_name)
+      end
+
       its("access_key_id")     { should == config_access_key_id }
       its("image_id")          { should == config_image_id }
       its("key_name")          { should == config_key_name }
@@ -145,10 +166,5 @@ describe VagrantPlugins::NiftyCloud::Config do
 
       its("image_id") { should == "child" }
     end
-
-    describe "merging" do
-      let(:first)  { described_class.new }
-      let(:second) { described_class.new }
-    end
   end
 end

data/vagrant-niftycloud.gemspec

@@ -4,10 +4,11 @@ require "vagrant-niftycloud/version"
 Gem::Specification.new do |s|
   s.name          = "vagrant-niftycloud"
   s.version       = VagrantPlugins::NiftyCloud::VERSION
+  s.license       = 'MIT'
   s.platform      = Gem::Platform::RUBY
   s.authors       = "Satoshi Akama"
   s.email         = "satoshiakama@gmail.com"
-  s.homepage      = "http://www.vagrantup.com"
+  s.homepage      = "https://github.com/sakama/vagrant-niftycloud"
   s.summary       = "Enables Vagrant to manage machines in Nifty Cloud"
   s.description   = "Enables Vagrant to manage machines in Nifty Cloud."
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-niftycloud
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-25 00:00:00.000000000 Z
+date: 2013-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70242618690860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,15 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70242618690860
 - !ruby/object:Gem::Dependency
   name: rspec-core
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70242618689380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -37,15 +32,10 @@ dependencies:
         version: 2.12.2
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.12.2
+  version_requirements: *70242618689380
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70242618687580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -53,15 +43,10 @@ dependencies:
         version: 2.12.1
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.12.1
+  version_requirements: *70242618687580
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70242618685820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -69,15 +54,10 @@ dependencies:
         version: 2.12.1
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.12.1
+  version_requirements: *70242618685820
 - !ruby/object:Gem::Dependency
   name: nifty-cloud-sdk
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70242618685340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -85,12 +65,7 @@ dependencies:
         version: '1.7'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '1.7'
+  version_requirements: *70242618685340
 description: Enables Vagrant to manage machines in Nifty Cloud.
 email: satoshiakama@gmail.com
 executables: []
@@ -131,8 +106,10 @@ files:
 - vagrant-niftycloud.gemspec
 - Vagrantfile.chef.sample
 - .gitignore
-homepage: http://www.vagrantup.com
-licenses: []
+- .travis.yml
+homepage: https://github.com/sakama/vagrant-niftycloud
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -145,7 +122,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1485453421114679184
+      hash: -102762255497424011
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -154,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 0.1.0
 requirements: []
 rubyforge_project: vagrant-nifycloud
-rubygems_version: 1.8.23
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Enables Vagrant to manage machines in Nifty Cloud