vagrant-conoha 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e55c55029330657855c5becd515bcfc8ae8e6f86
-  data.tar.gz: 1be6292d3a3c9849df8e4b4c76db64233e9d3f28
+  metadata.gz: 1767c663991ea70fe2d5c9d703c9119463213bf5
+  data.tar.gz: 69bceaf3079b5a67efd0d9fcfb5959727b84a0cf
 SHA512:
-  metadata.gz: 9c9745af00896f08a0ac76af805aebbb71debb83773270afc3a398818f5bd0616c7c7b3682913e4a91290ea2a3599ae76c41cf9f22f5d79d291fa74a1df110d6
-  data.tar.gz: 6f753d00c73b33921b9deb19157e58ce6ef8555d630032b20d8254b13a567c9fa8d6a2c9cc3b111ba675efc6db43f61edd23744409ab8bfc34e2f32c6c812b79
+  metadata.gz: 8391aaacf1566fb391d750425b1e4ac9d465e1a30884775152994dc093c3243db6d28723956eefbbc86ea5318364d61084f1e052a5e5fbc0e9c4fedc9b9f959d
+  data.tar.gz: c53651f7a2cbad1dcf8d5ab8dd2289b3ba37d4877d373e753dd55995384151a70755d5b8cb470b373fccce85b43801a3be73a1e17f3f280441d25b64ba53ade5

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

@@ -1,7 +1,6 @@
 require 'log4r'
 require 'rbconfig'
 require 'vagrant/util/subprocess'
-
 require 'vagrant-conoha/action/abstract_action'
 
 module VagrantPlugins
@@ -57,6 +56,8 @@ module VagrantPlugins
           config          = env[:machine].provider_config
           rsync_includes  = config.rsync_includes.to_a
 
+          confirm_rsync_installed(env)
+
           env[:machine].config.vm.synced_folders.each do |_, data|
             hostpath  = File.expand_path(data[:hostpath], env[:root_path])
             guestpath = data[:guestpath]
@@ -113,6 +114,24 @@ module VagrantPlugins
 
         private
 
+        def confirm_rsync_installed(env)
+          # Install rsync if not installed
+          r = env[:machine].communicate.execute('which rsync', {error_check: false})
+          if r  == 0
+            return
+          end
+
+          config = env[:machine].provider_config
+
+          if config.image =~ /debian|ubuntu/
+            env[:ui].detail(I18n.t('vagrant_openstack.confirm_rsync_installed'))
+            env[:machine].communicate.sudo('apt-get update && apt-get install -y rsync')
+          elsif config.image =~ /centos/
+            env[:ui].detail(I18n.t('vagrant_openstack.confirm_rsync_installed'))
+            env[:machine].communicate.sudo('yum -y install rsync')
+          end
+        end
+
         def ssh_key_options(ssh_info)
           # Ensure that `private_key_path` is an Array (for Vagrant < 1.4)
           Array(ssh_info[:private_key_path]).map { |path| "-i '#{path}' " }.join

data/lib/vagrant-conoha/version.rb

@@ -4,7 +4,7 @@ module VagrantPlugins
     # Stable versions must respect the pattern given
     # by VagrantPlugins::ConoHa::VERSION_PATTERN
     #
-    VERSION = '0.1.3'
+    VERSION = '0.1.4'
 
     #
     # Stable version must respect the naming convention 'x.y.z'

data/locales/en.yml

@@ -67,6 +67,8 @@ en:
       Trying authentication...
     rsync_folder: |-
       Rsyncing folder: %{hostpath} => %{guestpath}
+    confirm_rsync_installed: |-
+      Installing rsync...
     using_floating_ip: |-
       Using floating IP %{floating_ip}
     waiting_for_build: |-

data/vagrant-conoha.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |gem|
   gem.license       = 'MIT'
 
   gem.add_dependency 'json', '~> 1.8.3'
-  gem.add_dependency 'rest-client', '~> 1.6.0'
+  gem.add_dependency 'rest-client', '>= 1.6.9'
   gem.add_dependency 'terminal-table', '1.5.2'
   gem.add_dependency 'sshkey', '1.7.0'
   gem.add_dependency 'colorize', '0.7.7'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-conoha
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Hironobu Saitoh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-05 00:00:00.000000000 Z
+date: 2016-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -28,16 +28,16 @@ dependencies:
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.6.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.6.9
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
@@ -298,7 +298,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Enables Vagrant to manage VPS in ConoHa.