vagrant-google 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37c9594b020e4a74df8366e5e1f3fcdf0485c44d
-  data.tar.gz: 085e323ca610795a1159b8d2594028d962d6feae
+  metadata.gz: f08596de9a161ed1f61216096b5f7692a1459d09
+  data.tar.gz: 1120e3b316b5d776499757f35fdf23997f4635a3
 SHA512:
-  metadata.gz: 3c67a320ce73ced7004bfcd893463ff28f2d652aa6ef73f69758a48a72bf04b684d8ae23fd93db8b46a052ec05cd345c92dc24f7c1f567611c9171e79ff27d03
-  data.tar.gz: d0b4c0d7a71fb51663f6d327d4010704c0b59f70f19e594d3c52a4a8f55c5376500a733d66462dc342b375a4c4fca84d43cc9e15b73d63aff46474325d975428
+  metadata.gz: 59ad9e52c85be68a78cdfc65254a7a77e011907ce8bc10707eb4e2dfb083ffa1bbbd2c6af7c2ec0511a7af35aa37553d984a1af96eb19ba0807325a64a112cf7
+  data.tar.gz: 5ddf509702c160023f006fc0f8c47efff95aea216b49d9727c5cb258535cdb87114a0fe19d3fd37d354d63b6fc6d1399ffd94b544b956566261550ee6d3647d9

data/.rubocop.yml

@@ -1,7 +1,11 @@
 # Importing TODO list to sanely lint new submissions.
 inherit_from: .rubocop_todo.yml
 
+# Custom project config
 AllCops:
   Exclude:
   - './Vagrantfile'
-  - './vagrant-google.gemspec'
+  - './vagrant-google.gemspec'
+
+Style/EmptyLinesAroundBlockBody:
+  Enabled: false

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2016-01-03 11:45:58 +0100 using RuboCop version 0.35.1.
+# on 2016-03-25 19:11:49 +0100 using RuboCop version 0.38.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -17,28 +17,19 @@ Lint/NestedMethodDefinition:
   Exclude:
     - 'lib/vagrant-google/action/sync_folders.rb'
 
-# Offense count: 3
-Lint/ParenthesesAsGroupedExpression:
-  Exclude:
-    - 'tasks/acceptance.rake'
-
 # Offense count: 1
 Lint/RescueException:
   Exclude:
     - 'lib/vagrant-google/action/read_state.rb'
 
-# Offense count: 6
+# Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: IgnoreEmptyBlocks.
 Lint/UnusedBlockArgument:
   Exclude:
     - 'lib/vagrant-google/action/sync_folders.rb'
-    - 'test/acceptance/skeletons/generic/Vagrantfile'
-    - 'test/acceptance/skeletons/multi_instance/Vagrantfile'
-    - 'test/acceptance/skeletons/preemptible/Vagrantfile'
-    - 'test/acceptance/skeletons/scopes/Vagrantfile'
 
-# Offense count: 16
+# Offense count: 17
 # Cop supports --auto-correct.
 # Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods.
 Lint/UnusedMethodArgument:
@@ -51,30 +42,26 @@ Lint/UselessAssignment:
 
 # Offense count: 11
 Metrics/AbcSize:
-  Max: 133
-
-# Offense count: 1
-# Configuration parameters: CountComments.
-Metrics/ClassLength:
-  Max: 146
+  Max: 54
 
-# Offense count: 5
+# Offense count: 4
 Metrics/CyclomaticComplexity:
-  Max: 22
+  Max: 16
 
-# Offense count: 68
-# Configuration parameters: AllowURI, URISchemes.
+# Offense count: 71
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes.
+# URISchemes: http, https
 Metrics/LineLength:
   Max: 131
 
-# Offense count: 14
+# Offense count: 15
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
   Max: 35
 
-# Offense count: 4
+# Offense count: 3
 Metrics/PerceivedComplexity:
-  Max: 22
+  Max: 16
 
 # Offense count: 1
 Style/AccessorMethodName:
@@ -84,14 +71,14 @@ Style/AccessorMethodName:
 # Offense count: 8
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: always, conditionals
 Style/AndOr:
   Exclude:
     - 'example_boxes/gce-test/Vagrantfile'
     - 'lib/vagrant-google/config.rb'
     - 'test/unit/common/config_test.rb'
 
-# Offense count: 19
-# Configuration parameters: Exclude.
+# Offense count: 18
 Style/Documentation:
   Exclude:
     - 'spec/**/*'
@@ -108,31 +95,26 @@ Style/Documentation:
     - 'lib/vagrant-google/plugin.rb'
     - 'lib/vagrant-google/provider.rb'
     - 'lib/vagrant-google/util/timer.rb'
-    - 'lib/vagrant-google/version.rb'
 
 # Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: leading, trailing
 Style/DotPosition:
   Enabled: false
 
 # Offense count: 9
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: empty_lines, no_empty_lines
 Style/EmptyLinesAroundBlockBody:
   Exclude:
-    - 'example_boxes/gce-test/Vagrantfile'
-    - 'lib/vagrant-google/action/start_instance.rb'
-    - 'tasks/acceptance.rake'
-    - 'test/acceptance/shared/context_google.rb'
-    - 'test/acceptance/skeletons/generic/Vagrantfile'
-    - 'test/acceptance/skeletons/preemptible/Vagrantfile'
-    - 'test/acceptance/skeletons/scopes/Vagrantfile'
-    - 'test/unit/common/config_test.rb'
+
 
 # Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: empty_lines, no_empty_lines
 Style/EmptyLinesAroundClassBody:
   Exclude:
     - 'lib/vagrant-google/action/stop_instance.rb'
@@ -140,12 +122,13 @@ Style/EmptyLinesAroundClassBody:
 # Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: empty_lines, no_empty_lines
 Style/EmptyLinesAroundModuleBody:
   Exclude:
     - 'lib/vagrant-google/action/stop_instance.rb'
 
 # Offense count: 2
-# Configuration parameters: Exclude.
+# Configuration parameters: ExpectMatchingDefinition, Regex, IgnoreExecutableScripts.
 Style/FileName:
   Exclude:
     - 'lib/vagrant-google.rb'
@@ -153,12 +136,13 @@ Style/FileName:
 
 # Offense count: 2
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
+# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
+# SupportedStyles: consistent, special_for_inner_method_call, special_for_inner_method_call_in_parentheses
 Style/FirstParameterIndentation:
   Exclude:
     - 'lib/vagrant-google/action/run_instance.rb'
 
-# Offense count: 2
+# Offense count: 1
 # Configuration parameters: MinBodyLength.
 Style/GuardClause:
   Exclude:
@@ -167,6 +151,7 @@ Style/GuardClause:
 # Offense count: 40
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, UseHashRocketsWithSymbolValues.
+# SupportedStyles: ruby19, ruby19_no_mixed_keys, hash_rockets
 Style/HashSyntax:
   Enabled: false
 
@@ -186,6 +171,7 @@ Style/LeadingCommentSpace:
 # Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, MinBodyLength, SupportedStyles.
+# SupportedStyles: skip_modifier_ifs, always
 Style/Next:
   Exclude:
     - 'lib/vagrant-google/action/sync_folders.rb'
@@ -219,34 +205,22 @@ Style/RedundantSelf:
 # Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, AllowInnerSlashes.
+# SupportedStyles: slashes, percent_r, mixed
 Style/RegexpLiteral:
   Exclude:
     - 'lib/vagrant-google/action/sync_folders.rb'
 
-# Offense count: 10
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/SignalException:
-  Exclude:
-    - 'lib/vagrant-google/action/run_instance.rb'
-    - 'lib/vagrant-google/action/sync_folders.rb'
-    - 'lib/vagrant-google/config.rb'
-    - 'lib/vagrant-google/plugin.rb'
-    - 'test/acceptance/provider/halt_spec.rb'
-    - 'test/acceptance/provider/multi_instance_spec.rb'
-    - 'test/acceptance/provider/preemptible_spec.rb'
-    - 'test/acceptance/provider/reload_spec.rb'
-    - 'test/acceptance/provider/scopes_spec.rb'
-
 # Offense count: 2
 # Cop supports --auto-correct.
 # Configuration parameters: SupportedStyles.
+# SupportedStyles: space, no_space
 Style/SpaceAroundEqualsInParameterDefault:
   EnforcedStyle: no_space
 
 # Offense count: 3
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: space, no_space
 Style/SpaceBeforeBlockBraces:
   Enabled: false
 
@@ -259,24 +233,28 @@ Style/SpaceBeforeComma:
 # Offense count: 2
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, EnforcedStyleForEmptyBraces, SpaceBeforeBlockParameters.
+# SupportedStyles: space, no_space
 Style/SpaceInsideBlockBraces:
   Enabled: false
 
-# Offense count: 384
+# Offense count: 392
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
+# Configuration parameters: EnforcedStyle, SupportedStyles, ConsistentQuotesInMultiline.
+# SupportedStyles: single_quotes, double_quotes
 Style/StringLiterals:
   Enabled: false
 
 # Offense count: 7
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: single_quotes, double_quotes
 Style/StringLiteralsInInterpolation:
   Enabled: false
 
 # Offense count: 4
 # Cop supports --auto-correct.
 # Configuration parameters: IgnoredMethods.
+# IgnoredMethods: respond_to
 Style/SymbolProc:
   Exclude:
     - 'test/unit/common/config_test.rb'

data/README.md

@@ -52,16 +52,15 @@ Service Account for API Access.
 1. Next, visit the [Developers Console](https://console.developers.google.com)
    make sure to enable the `Google Compute Engine` service for your project
    If prompted, review and agree to the terms of service.
-1. While still in the Developers Console, go to `API & AUTH`, `Credentials`
-   section and click the `Create new Client ID` button.  In the pop-up dialog,
-   select the `Service Account` radio button and the click the
-   `Create Client ID` button.
-1. Make sure to download the *P12 private key* and save this file in a secure
+1. While still in the Developers Console, go to `Permissions`, `Service Accounts`
+   section and click the `Create service account` button.  In the pop-up dialog,
+   click the `Furnish a new private key` box.
+1. Download the JSON private key and save this file in a secure
    and reliable location.  This key file will be used to authorize all API
    requests to Google Compute Engine.
-1. Still on the same page, find the newly created `Service Account` text
-   block on the API Access page.  Record the `Email address` (it should end
-   with `@developer.gserviceaccount.com`) associated with the new Service
+1. Still on the same page, find the
+   `Email address` (it should end
+   with `gserviceaccount.com`) associated with the new Service
    Account you just created.  You will need this email address and the
    location of the private key file to properly configure this Vagrant plugin.
 1. Add the SSH key you're going to use to GCE Metadata in `Compute` ->
@@ -167,18 +166,25 @@ configuration for this provider.
 
 This provider exposes quite a few provider-specific configuration options:
 
-* `google_client_email` - The Client Email address for your Service Account.
+* `google_client_email` - The Client Email address for your Service Account.  
+  (Can also be configured with `GOOGLE_CLIENT_EMAIL` environment variable.)
 * `google_key_location` - The location of the P12 private key file matching your
-  Service Account.
+  Service Account.  
+  (Can also be configured with `GOOGLE_KEY_LOCATION` environment variable.)
 * `google_json_key_location` - The location of the JSON private key file matching your
-  Service Account.
-* `google_project_id` - The Project ID for your Google Cloud Platform account.
+  Service Account.  
+  (Can also be configured with `GOOGLE_JSON_KEY_LOCATION` environment variable.)
+* `google_project_id` - The Project ID for your Google Cloud Platform account.  
+  (Can also be configured with `GOOGLE_PROJECT_ID` environment variable.)
 * `image` - The image name to use when booting your instance.
+* `instance_group` - Unmanaged instance group to add the machine to. If one
+  doesn't exist it will be created.
 * `instance_ready_timeout` - The number of seconds to wait for the instance
   to become "ready" in GCE. Defaults to 20 seconds.
 * `machine_type` - The machine type to use.  The default is "n1-standard-1".
 * `disk_size` - The disk size in GB.  The default is 10.
 * `disk_name` - The disk name to use.  If the disk exists, it will be reused, otherwise created.
+* `disk_type` - Whether to use Standard disk or SSD disk. Use either `pd-ssd` or `pd-standard`.
 * `metadata` - Custom key/value pairs of metadata to add to the instance.
 * `name` - The name of your instance.  The default is "i-yyyymmddhh-randomsd",
   e.g. 10/08/2015 13:15:15 is "i-2015081013-15637fda".

data/lib/vagrant-google/action.rb

@@ -149,6 +149,7 @@ module VagrantPlugins
               b1.use WarnNetworks
               b1.use WarnSshKeys
               b1.use RunInstance
+              b1.use AssignInstanceGroups
             end
           end
         end
@@ -173,6 +174,7 @@ module VagrantPlugins
 
       # The autoload farm
       action_root = Pathname.new(File.expand_path("../action", __FILE__))
+      autoload :AssignInstanceGroups, action_root.join("assign_instance_groups")
       autoload :ConnectGoogle, action_root.join("connect_google")
       autoload :IsCreated, action_root.join("is_created")
       autoload :IsTerminated, action_root.join("is_terminated")

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

@@ -0,0 +1,73 @@
+# Copyright 2016 Google Inc. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+module VagrantPlugins
+  module Google
+    module Action
+      # Action to assign instance groups. Looks for the 'instance_group'
+      # parameter in the zone config and adds the instance to it.
+      # If the instance group does not exist in the specified zone, it tries to
+      # create one first.
+      #
+      # This action manipulates unmanaged instance groups
+      # https://cloud.google.com/compute/docs/instance-groups/unmanaged-groups
+      class AssignInstanceGroups
+        def initialize(app, env)
+          @app = app
+          @logger = Log4r::Logger.new(
+            "vagrant_google::action::assign_instance_groups")
+        end
+
+        def call(env)
+          zone = env[:machine].provider_config.zone
+          zone_config = env[:machine].provider_config.get_zone_config(zone)
+          instance_name = zone_config.name
+          instance_group_name = zone_config.instance_group
+
+          if instance_group_name
+            group = env[:google_compute].instance_groups.get(instance_group_name,
+                                                             zone)
+            if group.nil?
+              # If instance group doesn't exist, attempt to create it
+              env[:ui].info(I18n.t("vagrant_google.instance_group_create"))
+              instance_group_config = {
+                name: instance_group_name,
+                zone: zone,
+                description: "Created by Vagrant"
+              }
+              env[:google_compute].instance_groups.create(instance_group_config)
+            end
+
+            # Add the machine to instance group
+            env[:ui].info(I18n.t("vagrant_google.instance_group_add"))
+
+            response = env[:google_compute].instance_groups.add_instance(
+              group: instance_group_name,
+              zone: zone,
+              instance: instance_name
+            )
+            unless response.body["status"] == "DONE"
+              operation = env[:google_compute].operations.get(
+                operation.body["name"], zone)
+              env[:ui].info(I18n.t("vagrant_google.waiting_for_operation",
+                                   name: operation.body["name"]))
+              operation.wait_for { ready? }
+            end
+          end
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -26,14 +26,14 @@ module VagrantPlugins
           Fog::Compute::Google::NotFound,
           Fog::Compute::Google::Error,
           Fog::Errors::Error
-        ]
+        ].freeze
 
         def initialize(app, env)
           @app    = app
           @logger = Log4r::Logger.new("vagrant_google::action::run_instance")
         end
 
-        def call(env) # rubocop:disable Metrics/MethodLength
+        def call(env) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
           # Initialize metrics if they haven't been
           env[:metrics] ||= {}
 
@@ -43,6 +43,7 @@ module VagrantPlugins
           # Get the configs
           zone_config         = env[:machine].provider_config.get_zone_config(zone)
           image               = zone_config.image
+          instance_group      = zone_config.instance_group
           name                = zone_config.name
           machine_type        = zone_config.machine_type
           disk_size           = zone_config.disk_size
@@ -67,6 +68,7 @@ module VagrantPlugins
           env[:ui].info(" -- Disk size:       #{disk_size} GB")
           env[:ui].info(" -- Disk name:       #{disk_name}")
           env[:ui].info(" -- Image:           #{image}")
+          env[:ui].info(" -- Instance Group:  #{instance_group}")
           env[:ui].info(" -- Zone:            #{zone}") if zone
           env[:ui].info(" -- Network:         #{network}") if network
           env[:ui].info(" -- Metadata:        '#{metadata}'")

data/lib/vagrant-google/config.rb

@@ -16,7 +16,7 @@ require "securerandom"
 
 module VagrantPlugins
   module Google
-    class Config < Vagrant.plugin("2", :config)
+    class Config < Vagrant.plugin("2", :config) # rubocop:disable Metrics/ClassLength
       # The Service Account Client ID Email address
       #
       # @return [String]
@@ -42,6 +42,11 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :image
 
+      # The instance group name to put the instance in.
+      #
+      # @return [String]
+      attr_accessor :instance_group
+
       # The type of machine to launch, such as "n1-standard-1"
       #
       # @return [String]
@@ -132,8 +137,8 @@ module VagrantPlugins
       #
       # @return [Array]
       attr_accessor :service_accounts
-      alias_method :scopes, :service_accounts
-      alias_method :scopes=, :service_accounts=
+      alias scopes service_accounts
+      alias scopes= service_accounts=
 
       def initialize(zone_specific=false)
         @google_client_email = UNSET_VALUE
@@ -141,6 +146,7 @@ module VagrantPlugins
         @google_json_key_location = UNSET_VALUE
         @google_project_id   = UNSET_VALUE
         @image               = UNSET_VALUE
+        @instance_group      = UNSET_VALUE
         @machine_type        = UNSET_VALUE
         @disk_size           = UNSET_VALUE
         @disk_name           = UNSET_VALUE
@@ -227,7 +233,7 @@ module VagrantPlugins
         end
       end
 
-      def finalize!
+      def finalize! # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
         # Try to get access keys from standard Google environment variables; they
         # will default to nil if the environment variables are not present.
         @google_client_email = ENV['GOOGLE_CLIENT_EMAIL'] if @google_client_email == UNSET_VALUE
@@ -238,6 +244,9 @@ module VagrantPlugins
         # Image must be nil, since we can't default that
         @image = "debian-7-wheezy-v20150127" if @image == UNSET_VALUE
 
+        # Default instance group name is nil
+        @instance_group = nil if @instance_group == UNSET_VALUE
+
         # Default instance type is an n1-standard-1
         @machine_type = "n1-standard-1" if @machine_type == UNSET_VALUE
 

data/lib/vagrant-google/version.rb

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

data/locales/en.yml

@@ -4,6 +4,10 @@ en:
       The machine is already created.
     already_status: |-
       The machine is already in %{status} status.
+    instance_group_create: |-
+      Instance group doesn't exist, trying to create...
+    instance_group_add: |-
+      Adding machine to the instance group...
     launching_instance: |-
       Launching an instance with the following settings...
     not_created: |-
@@ -23,6 +27,8 @@ en:
       Stopping the instance...
     terminating: |-
       Terminating the instance...
+    waiting_for_operation: |-
+      Waiting for GCP operation '%{name}' to finish...
     waiting_for_ready: |-
       Waiting for instance to become "ready"...
     waiting_for_ssh: |-

data/tasks/acceptance.rake

@@ -30,19 +30,28 @@ namespace :acceptance do
     yellow "NOTE: For acceptance tests to be functional, correct ssh key needs to be added to GCE metadata."
 
     if !ENV["GOOGLE_JSON_KEY_LOCATION"] && !ENV["GOOGLE_KEY_LOCATION"]
-      abort ("Environment variables GOOGLE_JSON_KEY_LOCATION or GOOGLE_KEY_LOCATION are not set. Aborting.")
+      abort "Environment variables GOOGLE_JSON_KEY_LOCATION or GOOGLE_KEY_LOCATION are not set. Aborting."
     end
 
     unless ENV["GOOGLE_PROJECT_ID"]
-      abort ("Environment variable GOOGLE_PROJECT_ID is not set. Aborting.")
+      abort "Environment variable GOOGLE_PROJECT_ID is not set. Aborting."
     end
 
     unless ENV["GOOGLE_CLIENT_EMAIL"]
-      abort ("Environment variable GOOGLE_CLIENT_EMAIL is not set. Aborting.")
+      abort "Environment variable GOOGLE_CLIENT_EMAIL is not set. Aborting."
     end
 
     unless ENV["GOOGLE_SSH_USER"]
-      puts "WARNING: GOOGLE_SSH_USER variable is not set. Will try to start tests using insecure Vagrant private key."
+      yellow "WARNING: GOOGLE_SSH_USER variable is not set. Will try to start tests using insecure Vagrant private key."
+    end
+
+    if ENV["GOOGLE_SSH_KEY_LOCATION"]
+      if File.read(ENV["GOOGLE_SSH_KEY_LOCATION"]).include?('ENCRYPTED')
+        unless `ssh-add -L`.include?(ENV["GOOGLE_SSH_KEY_LOCATION"])
+          yellow "WARNING: It looks like ssh key is encrypted and ssh-agent doesn't contain any identities."
+          yellow "This will likely cause the connection to the machine to fail."
+        end
+      end
     end
   end
 
@@ -53,6 +62,7 @@ namespace :acceptance do
       preemptible
       reload
       scopes
+      instance_groups
       provisioner/shell
       provisioner/chef-solo
     ).map{ |s| "provider/google/#{s}" }

data/tasks/boxes.rake

@@ -0,0 +1,20 @@
+# Boxes maintenance tasks
+namespace :boxes do
+  task :update => [:repack_main, :repack_testing]
+
+  task :repack_main do
+    boxes_dir = File.expand_path("../../example_boxes", __FILE__)
+    Dir.chdir(boxes_dir)
+
+    puts "Repacking main box"
+    system('tar cvzf ../google.box -C ./gce ./metadata.json ./Vagrantfile')
+  end
+
+  task :repack_testing do
+    boxes_dir = File.expand_path("../../example_boxes", __FILE__)
+    Dir.chdir(boxes_dir)
+
+    puts "Repacking test box"
+    system('tar cvzf ../google-test.box -C ./gce-test ./metadata.json ./Vagrantfile')
+  end
+end

data/test/acceptance/provider/instance_groups_spec.rb

@@ -0,0 +1,30 @@
+# This test check that the instance groups logic doesn't break the provisioning
+# process.
+#
+# TODO: Reach out using Fog credentials and verify group existence.
+# TODO: Clean up the created instance groups automatically
+shared_examples 'provider/instance_groups' do |provider, options|
+  unless options[:box]
+    raise ArgumentError,
+          "box option must be specified for provider: #{provider}"
+  end
+
+  include_context 'acceptance'
+
+  before do
+    environment.skeleton('instance_groups')
+    assert_execute('vagrant', 'box', 'add', 'basic', options[:box])
+    assert_execute('vagrant', 'up', "--provider=#{provider}")
+  end
+
+  after do
+    assert_execute('vagrant', 'destroy', '--force')
+  end
+
+  it 'should bring up machine with an instance group' do
+    status("Test: machine is running after up")
+    result = execute("vagrant", "ssh", "-c", "echo foo")
+    expect(result).to exit_with(0)
+    expect(result.stdout).to match(/foo\n$/)
+  end
+end

data/test/acceptance/skeletons/generic/Vagrantfile

@@ -4,7 +4,7 @@
 Vagrant.configure("2") do |config|
   config.vm.box = "basic"
 
-  config.vm.provider :google do |google, override|
+  config.vm.provider :google do |google|
 
     google.zone = "europe-west1-d"
 

data/test/acceptance/skeletons/instance_groups/Vagrantfile

@@ -0,0 +1,15 @@
+Vagrant.configure("2") do |config|
+  config.vm.box = "basic"
+
+  config.vm.provider :google do |google|
+
+    google.zone = "europe-west1-d"
+
+    google.zone_config "europe-west1-d" do |zone1d|
+      zone1d.name = "vagrant-acceptance-instance-groups"
+      zone1d.instance_group = "vagrant-acceptance-#{('a'..'z').to_a.sample(8).join}"
+      zone1d.image = "debian-7-wheezy-v20150603"
+      zone1d.zone = "europe-west1-d"
+    end
+  end
+end

data/test/acceptance/skeletons/multi_instance/Vagrantfile

@@ -2,11 +2,11 @@ Vagrant.configure("2") do |config|
   config.vm.box = "basic"
 
   config.vm.define :z1a do |z1a|
-    z1a.vm.provider :google do |google, override|
+    z1a.vm.provider :google do |google|
       google.zone = "europe-west1-c"
 
       google.zone_config "europe-west1-c" do |z1a_zone|
-        z1a_zone.name = "vagrant-testing-acceptance-multi-z1a"
+        z1a_zone.name = "vagrant-acceptance-multi-z1a"
         z1a_zone.image = "debian-7-wheezy-v20150603"
         z1a_zone.machine_type = "n1-standard-1"
         z1a_zone.zone = "europe-west1-c"
@@ -15,7 +15,7 @@ Vagrant.configure("2") do |config|
   end
 
   config.vm.define :z1b do |z1b|
-    z1b.vm.provider :google do |google, override|
+    z1b.vm.provider :google do |google|
       google.zone = "europe-west1-d"
 
       google.zone_config "europe-west1-d" do |z1b_zone|

data/test/acceptance/skeletons/preemptible/Vagrantfile

@@ -1,12 +1,12 @@
 Vagrant.configure("2") do |config|
   config.vm.box = "basic"
 
-  config.vm.provider :google do |google, override|
+  config.vm.provider :google do |google|
 
     google.zone = "europe-west1-d"
 
     google.zone_config "europe-west1-d" do |zone1d|
-      zone1d.name = "vagrant-testing-preemptible"
+      zone1d.name = "vagrant-acceptance-preemptible"
       zone1d.image = "debian-7-wheezy-v20150603"
       zone1d.zone = "europe-west1-d"
       zone1d.preemptible = true

data/test/acceptance/skeletons/scopes/Vagrantfile

@@ -1,12 +1,12 @@
 Vagrant.configure("2") do |config|
   config.vm.box = "basic"
 
-  config.vm.provider :google do |google, override|
+  config.vm.provider :google do |google|
 
     google.zone = "europe-west1-d"
 
     google.zone_config "europe-west1-d" do |zone1d|
-      zone1d.name = "vagrant-testing-acceptance-scopes"
+      zone1d.name = "vagrant-acceptance-scopes"
       zone1d.scopes = ['sql-admin',
                        'bigquery',
                        'https://www.googleapis.com/auth/compute'

data/test/unit/common/config_test.rb

@@ -32,6 +32,7 @@ describe VagrantPlugins::Google::Config do
 
     its("name")                   { should match "i-[0-9]{10}-[0-9a-f]{4}" }
     its("image")                  { should == "debian-7-wheezy-v20150127" }
+    its("instance_group")         { should be_nil }
     its("zone")                   { should == "us-central1-f" }
     its("network")                { should == "default" }
     its("machine_type")           { should == "n1-standard-1" }

data/vagrant-google.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project         = "vagrant-google"
 
-  s.add_runtime_dependency "fog-google", "~> 0.0.7"
+  s.add_runtime_dependency "fog-google", "~> 0.2.0"
   s.add_runtime_dependency "google-api-client", "< 0.9", ">= 0.6.2"
 
   s.add_development_dependency "pry"

data/vagrant-spec.config.rb

@@ -5,6 +5,6 @@ Vagrant::Spec::Acceptance.configure do |c|
   c.skeleton_paths << File.expand_path("../test/acceptance/skeletons", __FILE__)
 
   c.provider "google",
-             box: "https://github.com/mitchellh/vagrant-google/raw/master/google-test.box",
+             box: File.expand_path("../google-test.box", __FILE__),
              contexts: ["provider-context/google"]
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-google
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Eric Johnson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-26 00:00:00.000000000 Z
+date: 2016-04-03 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.0.7
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: google-api-client
   requirement: !ruby/object:Gem::Requirement
@@ -122,19 +122,15 @@ extensions: []
 extra_rdoc_files: []
 files:
 - CHANGELOG.md
-- Gemfile
-- LICENSE
-- README.md
-- Rakefile
-- example_boxes/README.md
-- example_boxes/gce-test/Vagrantfile
-- example_boxes/gce-test/metadata.json
-- example_boxes/gce/Vagrantfile
 - example_boxes/gce/metadata.json
+- example_boxes/gce/Vagrantfile
+- example_boxes/gce-test/metadata.json
+- example_boxes/gce-test/Vagrantfile
+- example_boxes/README.md
+- Gemfile
 - google-test.box
 - google.box
-- lib/vagrant-google.rb
-- lib/vagrant-google/action.rb
+- lib/vagrant-google/action/assign_instance_groups.rb
 - lib/vagrant-google/action/connect_google.rb
 - lib/vagrant-google/action/is_created.rb
 - lib/vagrant-google/action/is_terminated.rb
@@ -151,36 +147,44 @@ files:
 - lib/vagrant-google/action/timed_provision.rb
 - lib/vagrant-google/action/warn_networks.rb
 - lib/vagrant-google/action/warn_ssh_keys.rb
+- lib/vagrant-google/action.rb
 - lib/vagrant-google/config.rb
 - lib/vagrant-google/errors.rb
 - lib/vagrant-google/plugin.rb
 - lib/vagrant-google/provider.rb
 - lib/vagrant-google/util/timer.rb
 - lib/vagrant-google/version.rb
+- lib/vagrant-google.rb
+- LICENSE
 - locales/en.yml
+- Rakefile
+- README.md
 - tasks/acceptance.rake
+- tasks/boxes.rake
 - tasks/bundler.rake
 - tasks/lint.rake
 - tasks/test.rake
 - test/acceptance/base.rb
 - test/acceptance/provider/halt_spec.rb
+- test/acceptance/provider/instance_groups_spec.rb
 - test/acceptance/provider/multi_instance_spec.rb
 - test/acceptance/provider/preemptible_spec.rb
 - test/acceptance/provider/reload_spec.rb
 - test/acceptance/provider/scopes_spec.rb
 - test/acceptance/shared/context_google.rb
 - test/acceptance/skeletons/generic/Vagrantfile
+- test/acceptance/skeletons/instance_groups/Vagrantfile
 - test/acceptance/skeletons/multi_instance/Vagrantfile
 - test/acceptance/skeletons/preemptible/Vagrantfile
 - test/acceptance/skeletons/scopes/Vagrantfile
 - test/unit/base.rb
 - test/unit/common/config_test.rb
+- vagrant-google.gemspec
 - vagrant-spec.config.rb
 - vagrantfile_examples/Vagrantfile.multiple_machines
 - vagrantfile_examples/Vagrantfile.provision_single
 - vagrantfile_examples/Vagrantfile.simple
 - vagrantfile_examples/Vagrantfile.zone_config
-- vagrant-google.gemspec
 - .gitignore
 - .rubocop.yml
 - .rubocop_todo.yml