vagrant-niftycloud 0.3.0 → 0.4.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c1d39766870a53dd54b93e45b3b396cb44345a53
+  data.tar.gz: 1afdd84531a88a4d2258524c639ff8063e130bc5
+SHA512:
+  metadata.gz: 41fbc0d7f907b684f158a2e68c2890a8401097a048e51098d1df9beed0f26f414f56324fcb8f84d1c7d048a3796522566ba300de1f1ba6b091711c2d3cbb9a20
+  data.tar.gz: 59ef9322df75acb17a88abb3eab5ddf594ecf338d8481dcf57706eab99ccfe64425936cdfdfad90d735f3c10b6f12b09236e2b2cf769a2ca488571a6766b0d9f

data/.ruby-version

@@ -0,0 +1 @@
+2.4.1

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.4.0 (Mar 12, 2018)
+
+* Windows/Cygwin環境下でrsyncが正しく動作しない問題を修正 #12 @s-tomura thanks!
+* ニフクラの新タイプのサーバをサポートするため、Nifty Cloud SDKのバージョンをアップデート #9 @s-tomura thanks!
+
 ## 0.3.0 (Aug 7, 2013)
 
 * ニフティクラウドの[サーバ起動時スクリプト](http://cloud.nifty.com/service/svscript.htm)を正式サポート

data/README.md

@@ -32,7 +32,7 @@ vagrant upを実行する前に、VirtualBox等でVagrantを使用する時と
 
 自分でboxファイルを作成するか、こちらで用意しているboxファイルを使用して、任意の名前でダミーのboxを追加して下さい。
 
-```
+```sh
 $ vagrant plugin install vagrant-niftycloud
 $ vagrant box add dummy https://github.com/sakama/vagrant-niftycloud/raw/master/dummy.box
 ```
@@ -55,7 +55,7 @@ chef-soloやchef-clientを予めインストールしておくかどうかはケ
 
 vagrant up時に[vagrant-omnibus](https://github.com/schisamo/vagrant-omnibus)を使うという手もあります。
 
-```
+```sh
 ## rootで実行
 # groupadd vagrant
 # useradd vagrant -g vagrant -G wheel
@@ -88,7 +88,7 @@ Vagrantfileを以下のような内容で作成します。
 
 Vagrantfileの`config.vm.provider`ブロックで各種パラメータを指定して下さい。
 
-```
+```ruby
 Vagrant.configure("2") do |config|
   config.vm.box = "dummy"
 
@@ -109,7 +109,7 @@ end
 
 ### コマンド
 
-```
+```sh
 
 # サーバ立ち上げ、provisioningの実行
 $ vagrant up --provider=niftycloud
@@ -178,7 +178,7 @@ VirtualBoxやVMWare Fusion向けの数GBあるboxと比較すると遙かに軽
 上記のパラメータはVagrantfile中で以下のように設定することができます。
 
 
-```
+```ruby
 Vagrant.configure("2") do |config|
   # ... other stuff
 
@@ -194,7 +194,7 @@ end
 記述は以下のようになります。
 
 
-```
+```ruby
 Vagrant.configure("2") do |config|
   # ... other stuff
 
@@ -233,7 +233,7 @@ zone_configブロックでリージョン/ゾーン特有の設定を指定し
 
 以下のコマンドを実行するか、.bashrcや.zshrc等に追記するなどして下さい。
 
-```
+```sh
 # 東日本リージョンでAPI最新版を使用
 export NIFTY_CLOUD_ENDPOINT_URL='https://east-1.cp.cloud.nifty.com/api/'
 # 西日本リージョンでAPI最新版を使用
@@ -245,7 +245,7 @@ export NIFTY_CLOUD_ENDPOINT_URL='https://west-1.cp.cloud.nifty.com/api/'
 
 以下のように指定して下さい。
 
-```
+```ruby
 Vagrant.configure("2") do |config|
   # ... other stuff
 
@@ -276,13 +276,13 @@ Vagrantの`config.vm.network`で設定可能なネットワーク機能につい
 
 `vagrant-niftycloud`プラグインをこのレポジトリからgit cloneした後、[Bundler](http://gembundler.com) を使用して必要なgem等のインストールを行なって下さい。
 
-```
+```sh
 $ bundle
 ```
 
 上記コマンド実行後、以下のコマンドにより`rake`を使用したユニットテストを実行することができます。
 
-```
+```sh
 $ bundle exec rake
 ```
 
@@ -294,7 +294,7 @@ $ bundle exec rake
 * bundle execコマンドにより実行
 
 
-```
+```sh
 $ bundle exec vagrant up --provider=niftycloud
 ```
 

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

@@ -26,6 +26,13 @@ module VagrantPlugins
               hostpath  = File.expand_path(data[:hostpath], env[:root_path])
               guestpath = data[:guestpath]
 
+              private_key_paths = ssh_info[:private_key_path]
+              private_key_path = private_key_paths[0]
+              if Vagrant::Util::Platform.windows? && ENV['PATH'].include?("cygwin")
+                hostpath  = hostpath.gsub(/\A(\w):/,'/cygdrive/\1')
+                private_key_path = private_key_path.gsub(/\A(\w):/,'/cygdrive/\1')
+              end
+
               # Make sure there is a trailing slash on the host path to
               # avoid creating an additional directory with rsync
               hostpath = "#{hostpath}/" if hostpath !~ /\/$/
@@ -43,7 +50,7 @@ module VagrantPlugins
               command = [
                 "rsync", "--verbose", "--archive", "-z",
                 "--exclude", ".vagrant/", "--exclude", ".git/",
-                "-e", "ssh -p #{ssh_info[:port]} -o StrictHostKeyChecking=no -i '#{ssh_info[:private_key_path]}'",
+                "-e", "ssh -p #{ssh_info[:port]} -o StrictHostKeyChecking=no -i '#{private_key_path}'",
                 hostpath,
                 "#{ssh_info[:username]}@#{ssh_info[:host]}:#{guestpath}"]
 

data/lib/vagrant-niftycloud/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module NiftyCloud
-    VERSION = "0.3.0"
+    VERSION = "0.4.0"
   end
 end

data/spec/vagrant-niftycloud/config_spec.rb

@@ -1,4 +1,5 @@
 require "vagrant-niftycloud/config"
+require 'rspec/its'
 
 describe VagrantPlugins::NiftyCloud::Config do
   let(:instance) { described_class.new }

data/vagrant-niftycloud.gemspec

@@ -16,10 +16,9 @@ Gem::Specification.new do |s|
   s.rubyforge_project         = "vagrant-nifycloud"
 
   s.add_development_dependency "rake"
-  s.add_development_dependency "rspec-core", "~> 2.12.2"
-  s.add_development_dependency "rspec-expectations", "~> 2.12.1"
-  s.add_development_dependency "rspec-mocks", "~> 2.12.1"
-  s.add_dependency "nifty-cloud-sdk", ">= 1.7"
+  s.add_development_dependency "rspec", "3.7.0"
+  s.add_development_dependency "rspec-its"
+  s.add_dependency "nifty-cloud-sdk", "1.11.beta7"
 
   # The following block of code determines the files that should be included
   # in the gem. It does this by reading all the files in the directory where

data/vagrant-niftycloud.iml

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="RUBY_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="jdk" jdkName="rbenv: 2.4.1" jdkType="RUBY_SDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="PROVIDED" name="builder (v3.2.3, rbenv: 2.4.1, vagrant-niftycloud) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="bundler (v1.16.1, rbenv: 2.4.1, vagrant-niftycloud) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="childprocess (v0.6.3, rbenv: 2.4.1, vagrant-niftycloud) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.3, rbenv: 2.4.1, vagrant-niftycloud) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="domain_name (v0.5.20170404, rbenv: 2.4.1, vagrant-niftycloud) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="erubis (v2.7.0, rbenv: 2.4.1, vagrant-niftycloud) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="ffi (v1.9.23, rbenv: 2.4.1, vagrant-niftycloud) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="gssapi (v1.2.0, rbenv: 2.4.1, vagrant-niftycloud) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="gyoku (v1.3.1, rbenv: 2.4.1, vagrant-niftycloud) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="hashicorp-checkpoint (v0.1.5, rbenv: 2.4.1, vagrant-niftycloud) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="http-cookie (v1.0.3, rbenv: 2.4.1, vagrant-niftycloud) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="httpclient (v2.8.3, rbenv: 2.4.1, vagrant-niftycloud) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="i18n (v0.8.0, rbenv: 2.4.1, vagrant-niftycloud) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="listen (v3.1.5, rbenv: 2.4.1, vagrant-niftycloud) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="little-plugger (v1.1.4, rbenv: 2.4.1, vagrant-niftycloud) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="log4r (v1.1.10, rbenv: 2.4.1, vagrant-niftycloud) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="logging (v2.2.2, rbenv: 2.4.1, vagrant-niftycloud) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="mime-types (v3.1, rbenv: 2.4.1, vagrant-niftycloud) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="mime-types-data (v3.2016.0521, rbenv: 2.4.1, vagrant-niftycloud) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="multi_json (v1.13.1, rbenv: 2.4.1, vagrant-niftycloud) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="net-scp (v1.2.1, rbenv: 2.4.1, vagrant-niftycloud) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="net-sftp (v2.1.2, rbenv: 2.4.1, vagrant-niftycloud) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="net-ssh (v4.2.0, rbenv: 2.4.1, vagrant-niftycloud) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="netrc (v0.11.0, rbenv: 2.4.1, vagrant-niftycloud) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="nifty-cloud-sdk (v1.11.beta7, rbenv: 2.4.1, vagrant-niftycloud) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="nori (v2.6.0, rbenv: 2.4.1, vagrant-niftycloud) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rake (v12.3.0, rbenv: 2.4.1, vagrant-niftycloud) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rb-fsevent (v0.10.2, rbenv: 2.4.1, vagrant-niftycloud) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rb-inotify (v0.9.10, rbenv: 2.4.1, vagrant-niftycloud) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rb-kqueue (v0.2.5, rbenv: 2.4.1, vagrant-niftycloud) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rest-client (v2.0.2, rbenv: 2.4.1, vagrant-niftycloud) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-core (v3.7.0, rbenv: 2.4.1, vagrant-niftycloud) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v3.7.0, rbenv: 2.4.1, vagrant-niftycloud) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v3.7.0, rbenv: 2.4.1, vagrant-niftycloud) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-support (v3.7.1, rbenv: 2.4.1, vagrant-niftycloud) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="ruby_dep (v1.3.1, rbenv: 2.4.1, vagrant-niftycloud) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rubyntlm (v0.6.2, rbenv: 2.4.1, vagrant-niftycloud) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rubyzip (v1.2.1, rbenv: 2.4.1, vagrant-niftycloud) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="unf (v0.1.4, rbenv: 2.4.1, vagrant-niftycloud) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="unf_ext (v0.0.7.5, rbenv: 2.4.1, vagrant-niftycloud) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="vagrant (v2.0.3.dev@0b9212, rbenv: 2.4.1, vagrant-niftycloud) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="wdm (v0.1.1, rbenv: 2.4.1, vagrant-niftycloud) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="winrm (v2.2.3, rbenv: 2.4.1, vagrant-niftycloud) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="winrm-elevated (v1.1.0, rbenv: 2.4.1, vagrant-niftycloud) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="winrm-fs (v1.2.0, rbenv: 2.4.1, vagrant-niftycloud) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="xml-simple (v1.1.5, rbenv: 2.4.1, vagrant-niftycloud) [gem]" level="application" />
+  </component>
+  <component name="RModuleSettingsStorage">
+    <LOAD_PATH number="0" />
+    <I18N_FOLDERS number="1" string0="$MODULE_DIR$/locales" />
+  </component>
+</module>

metadata

@@ -1,107 +1,91 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-niftycloud
 version: !ruby/object:Gem::Version
-  version: 0.3.0
-  prerelease: 
+  version: 0.4.0
 platform: ruby
 authors:
 - Satoshi Akama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-07 00:00:00.000000000 Z
+date: 2018-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-core
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.12.2
+        version: 3.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.12.2
+        version: 3.7.0
 - !ruby/object:Gem::Dependency
-  name: rspec-expectations
+  name: rspec-its
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        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
-- !ruby/object:Gem::Dependency
-  name: rspec-mocks
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.12.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.12.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nifty-cloud-sdk
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 1.11.beta7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 1.11.beta7
 description: Enables Vagrant to manage machines in Nifty Cloud.
 email: satoshiakama@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
+- ".ruby-version"
+- ".travis.yml"
 - CHANGELOG.md
+- Gemfile
+- LICENSE
+- README.md
+- Rakefile
+- Vagrantfile.chef.sample
 - dummy.box
-- example_box/metadata.json
 - example_box/README.md
-- Gemfile
+- example_box/metadata.json
+- lib/vagrant-niftycloud.rb
+- lib/vagrant-niftycloud/action.rb
 - lib/vagrant-niftycloud/action/connect_niftycloud.rb
 - lib/vagrant-niftycloud/action/is_created.rb
 - lib/vagrant-niftycloud/action/message_already_created.rb
@@ -115,7 +99,6 @@ files:
 - lib/vagrant-niftycloud/action/sync_folders.rb
 - lib/vagrant-niftycloud/action/terminate_instance.rb
 - lib/vagrant-niftycloud/action/timed_provision.rb
-- lib/vagrant-niftycloud/action.rb
 - lib/vagrant-niftycloud/config.rb
 - lib/vagrant-niftycloud/errors.rb
 - lib/vagrant-niftycloud/plugin.rb
@@ -123,42 +106,32 @@ files:
 - lib/vagrant-niftycloud/servers/servers.rb
 - lib/vagrant-niftycloud/util/timer.rb
 - lib/vagrant-niftycloud/version.rb
-- lib/vagrant-niftycloud.rb
-- LICENSE
 - locales/en.yml
-- Rakefile
-- README.md
 - spec/vagrant-niftycloud/config_spec.rb
 - vagrant-niftycloud.gemspec
-- Vagrantfile.chef.sample
-- .gitignore
-- .travis.yml
+- vagrant-niftycloud.iml
 homepage: https://github.com/sakama/vagrant-niftycloud
 licenses:
 - MIT
+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'
-      segments:
-      - 0
-      hash: 647630623550404957
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 0.1.0
 requirements: []
 rubyforge_project: vagrant-nifycloud
-rubygems_version: 1.8.23
+rubygems_version: 2.6.13
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Enables Vagrant to manage machines in Nifty Cloud
 test_files: []