vagrant-google 0.2.5 → 1.0.0.rc0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8971a97ec0fbaaf02100bdd663a82a113a9db1e
-  data.tar.gz: ff938baae5e99f46cb83a0d5df6430d77c6b8415
+  metadata.gz: 986539c1bfd5784cb5732d473915fc64bc101aad
+  data.tar.gz: 7f9132a241dc5786c4d171d4c1180fc1c28471fd
 SHA512:
-  metadata.gz: b472fb5cd59a0d8cfc3c80c788a22f79c619d2354123e7eab686a95760692b6b62086098a43b20e1d2d34a7ca8ee16e5b86d6171c8cfa403f9c4678c8edc0bef
-  data.tar.gz: 4506ef15af5b23fee8ba00a75bc3640797494947de6328756fe16361ae8d7c4b4908275f73d324b1ac939e936f6312a3633fe383cf20c546c1006bf70f30a504
+  metadata.gz: 94f9216128e01feb318d17920cc15ecb50294ff82bb28d4dd9550379d2fa9007aeccf7d458124e40300b9c65ee0a61de4b94b888476939d7a909ef4fbcecc0b9
+  data.tar.gz: 7537253a0dde9d6d842b35e8453894da3dee4a4145b3f6cdb32832000c732f4f007b85ea67f4684db731aa91969f749c7ead68d72044da67d267096ed15d81de

data/.ruby-version

@@ -1,2 +1,2 @@
-2.2.3
-# Tracking Vagrant 1.8.5
+2.3.0
+# Tracking Vagrant 1.9.7

data/Gemfile

@@ -14,7 +14,10 @@
 
 source "https://rubygems.org"
 
-gemspec
+group :plugins do
+  # Dependencies need to be specified in vagrant-google.gemspec
+  gemspec
+end
 
 group :development do
   # We depend on Vagrant for development, but we don't add it as a
@@ -23,7 +26,3 @@ group :development do
   gem 'vagrant', git: "https://github.com/mitchellh/vagrant.git"
   gem 'vagrant-spec', git: "https://github.com/mitchellh/vagrant-spec.git"
 end
-
-group :plugins do
-  gem "vagrant-google" , path: "."
-end

data/README.md

@@ -1,9 +1,8 @@
 # Vagrant Google Compute Engine (GCE) Provider
 
-<span class="badges">
+
 [![Gem Version](https://badge.fury.io/rb/vagrant-google.png)][gem]
 [![Dependency Status](https://gemnasium.com/mitchellh/vagrant-google.png)][gemnasium]
-</span>
 
 [gem]: https://rubygems.org/gems/vagrant-google
 [gemnasium]: https://gemnasium.com/mitchellh/vagrant-google
@@ -12,7 +11,7 @@ This is a [Vagrant](http://www.vagrantup.com) 1.2+ plugin that adds an
 [Google Compute Engine](http://cloud.google.com/compute/) (GCE) provider to
 Vagrant, allowing Vagrant to control and provision instances in GCE.
 
-**NOTE:** This plugin requires Vagrant 1.2+.
+The maintainers for this plugin are @temikus(primary), @erjohnso(backup).
 
 ## Features
 
@@ -188,10 +187,12 @@ This provider exposes quite a few provider-specific configuration options:
   e.g. 10/08/2015 13:15:15 is "i-2015081013-15637fda".
 * `network` - The name of the network to use for the instance.  Default is
  "default".
+* `subnetwork` - The name of the subnetwork to use for the instance.
 * `tags` - An array of tags to apply to this instance.
 * `zone` - The zone name where the instance will be created.
 * `can_ip_forward` - Boolean whether to enable IP Forwarding.
-* `external_ip` - The external IP address to use (supports names).
+* `external_ip` - The external IP address to use (supports names). Set to `false` to not assign an external address.
+* `use_private_ip` - Boolean whether to use private IP for SSH/provisioning. Default is false.
 * `preemptible` - Boolean whether to enable preemptibility. Default is false.
 * `auto_restart` - Boolean whether to enable auto_restart. Default is true.
 * `on_host_maintenance` - What to do on host maintenance. Default is "MIGRATE".

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

@@ -42,11 +42,24 @@ module VagrantPlugins
             return nil
           end
 
-          # Read SSH network info
-          return {
+          # Get private_ip setting
+          use_private_ip = machine.provider_config.get_zone_config(zone).use_private_ip
+
+          # Default to use public ip address
+          ssh_info = {
             :host => server.public_ip_address,
             :port => 22
           }
+
+          if use_private_ip then
+            ssh_info = {
+              :host => server.private_ip_address,
+              :port => 22
+            }
+          end
+
+          # Return SSH network info
+          return ssh_info
         end
       end
     end

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

@@ -50,9 +50,11 @@ module VagrantPlugins
           disk_name           = zone_config.disk_name
           disk_type           = zone_config.disk_type
           network             = zone_config.network
+          subnetwork          = zone_config.subnetwork
           metadata            = zone_config.metadata
           tags                = zone_config.tags
           can_ip_forward      = zone_config.can_ip_forward
+          use_private_ip      = zone_config.use_private_ip
           external_ip         = zone_config.external_ip
           preemptible         = zone_config.preemptible
           auto_restart        = zone_config.auto_restart
@@ -71,9 +73,11 @@ module VagrantPlugins
           env[:ui].info(" -- Instance Group:  #{instance_group}")
           env[:ui].info(" -- Zone:            #{zone}") if zone
           env[:ui].info(" -- Network:         #{network}") if network
+          env[:ui].info(" -- Subnetwork:      #{subnetwork}") if subnetwork
           env[:ui].info(" -- Metadata:        '#{metadata}'")
           env[:ui].info(" -- Tags:            '#{tags}'")
           env[:ui].info(" -- IP Forward:      #{can_ip_forward}")
+          env[:ui].info(" -- Use private IP:  #{use_private_ip}")
           env[:ui].info(" -- External IP:     #{external_ip}")
           env[:ui].info(" -- Preemptible:     #{preemptible}")
           env[:ui].info(" -- Auto Restart:    #{auto_restart}")
@@ -124,9 +128,11 @@ module VagrantPlugins
               :disk_type           => disk_type,
               :image               => image,
               :network             => network,
+              :subnetwork          => subnetwork,
               :metadata            => metadata,
               :tags                => tags,
               :can_ip_forward      => can_ip_forward,
+              :use_private_ip      => use_private_ip,
               :external_ip         => external_ip,
               :preemptible         => preemptible,
               :auto_restart        => auto_restart,

data/lib/vagrant-google/config.rb

@@ -82,6 +82,11 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :network
 
+      # The name of the subnetwork
+      #
+      # @return [String]
+      attr_accessor :subnetwork
+
       # Tags to apply to the instance
       #
       # @return [Array]
@@ -97,6 +102,11 @@ module VagrantPlugins
       # @return String
       attr_accessor :external_ip
 
+      # Use private ip address
+      #
+      # @return Boolean
+      attr_accessor :use_private_ip
+
       # whether to autodelete disk on instance delete
       #
       # @return Boolean
@@ -154,9 +164,11 @@ module VagrantPlugins
         @metadata            = {}
         @name                = UNSET_VALUE
         @network             = UNSET_VALUE
+        @subnetwork          = UNSET_VALUE
         @tags                = []
         @can_ip_forward      = UNSET_VALUE
         @external_ip         = UNSET_VALUE
+        @use_private_ip      = UNSET_VALUE
         @autodelete_disk     = UNSET_VALUE
         @preemptible         = UNSET_VALUE
         @auto_restart        = UNSET_VALUE
@@ -204,6 +216,11 @@ module VagrantPlugins
         @__zone_config[zone] << block if block_given?
       end
 
+      def expand_path(path, root_path)
+        return path if not path
+        return Pathname.new(path).expand_path(root_path)
+      end
+
       #-------------------------------------------------------------------
       # Internal methods.
       #-------------------------------------------------------------------
@@ -269,6 +286,9 @@ module VagrantPlugins
         # Network defaults to 'default'
         @network = "default" if @network == UNSET_VALUE
 
+        # Subnetwork defaults to nil
+        @subnetwork = nil if @subnetwork == UNSET_VALUE
+
         # Default zone is us-central1-f.
         @zone = "us-central1-f" if @zone == UNSET_VALUE
 
@@ -281,6 +301,9 @@ module VagrantPlugins
         # external_ip defaults to nil
         @external_ip = nil if @external_ip == UNSET_VALUE
 
+        # use_private_ip defaults to false
+        @use_private_ip = false if @use_private_ip == UNSET_VALUE
+
         # preemptible defaults to false
         @preemptible = false if @preemptible == UNSET_VALUE
 
@@ -329,6 +352,9 @@ module VagrantPlugins
         if @zone
           config = get_zone_config(@zone)
 
+          config.google_key_location = expand_path(config.google_key_location, machine.env.root_path)
+          config.google_json_key_location = expand_path(config.google_json_key_location, machine.env.root_path)
+
           errors << I18n.t("vagrant_google.config.google_project_id_required") if \
             config.google_project_id.nil?
           errors << I18n.t("vagrant_google.config.google_client_email_required") if \

data/lib/vagrant-google/version.rb

@@ -13,6 +13,6 @@
 # limitations under the License.
 module VagrantPlugins
   module Google
-    VERSION = "0.2.5".freeze
+    VERSION = "1.0.0.rc0".freeze
   end
 end

data/vagrant-google.gemspec

@@ -28,12 +28,16 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project         = "vagrant-google"
 
-  s.add_runtime_dependency "fog-google", "~> 0.4.0"
-  s.add_runtime_dependency "google-api-client", "< 0.9", ">= 0.6.2"
+  s.add_runtime_dependency "fog-google", "~> 0.5.3"
+  s.add_runtime_dependency "google-api-client", "< 0.9", "> 0.8.5"
 
   s.add_development_dependency "pry"
   s.add_development_dependency "pry-byebug"
-  s.add_development_dependency "rake"
+
+  # This is a restriction to avoid an error "undefined method 'last_comment'"
+  # which is deprecated (see https://github.com/ruby/rake/issues/116)
+  # Remove it after update rspec-core to version greater than or equal to 3.4.4
+  s.add_development_dependency "rake", "< 11.0"
   s.add_development_dependency "rspec", "~> 2.14"
   s.add_development_dependency "rubocop", "~> 0.35"
   s.add_development_dependency "highline"

data/vagrantfile_examples/Vagrantfile.simple

@@ -15,7 +15,7 @@
 # limitations under the License.
 
 Vagrant.configure("2") do |config|
-  config.vm.box = "gce"
+  config.vm.box = "google/gce"
 
   config.vm.provider :google do |google, override|
     google.google_project_id = "YOUR_GOOGLE_CLOUD_PROJECT_ID"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-google
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 1.0.0.rc0
 platform: ruby
 authors:
 - Eric Johnson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-06 00:00:00.000000000 Z
+date: 2017-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-google
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.3
 - !ruby/object:Gem::Dependency
   name: google-api-client
   requirement: !ruby/object:Gem::Requirement
@@ -32,9 +32,9 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.9'
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 0.8.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,9 +42,9 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.9'
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 0.8.5
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -77,16 +77,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -221,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: vagrant-google
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Vagrant provider plugin for Google Compute Engine.