vagrant-google 0.2.4 → 0.2.5.rc0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f08596de9a161ed1f61216096b5f7692a1459d09
-  data.tar.gz: 1120e3b316b5d776499757f35fdf23997f4635a3
+  metadata.gz: 81d0c7abfeee967b51db6cde7101ad89cc26c9a6
+  data.tar.gz: 1b6efb77b3d4586bdbe96052014406d13a29f788
 SHA512:
-  metadata.gz: 59ad9e52c85be68a78cdfc65254a7a77e011907ce8bc10707eb4e2dfb083ffa1bbbd2c6af7c2ec0511a7af35aa37553d984a1af96eb19ba0807325a64a112cf7
-  data.tar.gz: 5ddf509702c160023f006fc0f8c47efff95aea216b49d9727c5cb258535cdb87114a0fe19d3fd37d354d63b6fc6d1399ffd94b544b956566261550ee6d3647d9
+  metadata.gz: 2b4534fe5b088d80bdd0601659cbb5a07b23fa799e8071b130e2458e1644754f7fe078aacf6dd04680d45770a676448213e9f3729ed588376df2851693df1959
+  data.tar.gz: bc410589c8471c36cf6a4f46f6a6a461d314b43a5c729c19b53c1f6ef0a49cc057e7c1f06305878d4ff5f80fe696e8f75efc71854f9807985f20955b9264b14a

data/.ruby-version

@@ -1 +1,2 @@
-2.0.0-p598
+2.2.3
+# Tracking Vagrant 1.8.5

data/Gemfile

@@ -20,7 +20,7 @@ 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: "https://github.com/mitchellh/vagrant.git"
   gem 'vagrant-spec', git: "https://github.com/mitchellh/vagrant-spec.git"
 end
 

data/README.md

@@ -47,22 +47,26 @@ Service Account for API Access.
 
 1. Log in with your Google Account and go to
    [Google Cloud Platform](https://cloud.google.com) and click on the
-   `Try it now` button.
+   `Try it free` button.
 1. Create a new project and remember to record the `Project ID`
-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 `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. Next, enable the
+   [Google Compute Engine API](https://console.cloud.google.com/apis/api/compute_component/)
+   for your project in the API console. If prompted, review and agree to the
+   terms of service.
+1. While still in the API Console, go to
+   [Credentials subsection](https://console.cloud.google.com/apis/credentials),
+   and click `Create credentials` -> `Service account key`. In the
+   next dialog, create a new service account, select `JSON` key type and
+   click `Create`.
 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
-   `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. Still on the same page, click on
+   [Manage service accounts](https://console.cloud.google.com/permissions/serviceaccounts)
+   link to go to IAM console. Copy the `Service account id` value of the service
+   account you just selected. (it should end with `gserviceaccount.com`) 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` ->
    `Compute Engine` -> `Metadata` section of the console, `SSH Keys` tab. (Read
    the [SSH Support](https://github.com/mitchellh/vagrant-google#ssh-support)
@@ -71,21 +75,15 @@ Service Account for API Access.
 ## Quick Start
 
 After installing the plugin (instructions above), the quickest way to get
-started is to actually use a dummy Google box and specify all the details
-manually within a `config.vm.provider` block. So first, add the Google box
-using any name you want:
+started is to actually use a dummy Google box from Atlas and specify all the 
+details manually within a `config.vm.provider` block. 
 
-```sh
-$ vagrant box add gce https://github.com/mitchellh/vagrant-google/raw/master/google.box
-...
-```
-
-And then make a Vagrantfile that looks like the following, filling in
-your information where necessary.
+So first, make a Vagrantfile that looks like the following, filling in
+your information where necessary:
 
 ```ruby
 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"
@@ -102,7 +100,7 @@ end
 
 And then run `vagrant up --provider=google`.
 
-This will start a Debian 7 (Wheezy) instance in the `us-central1-f` zone,
+This will start a Debian 8 (Jessie) instance in the `us-central1-f` zone,
 with an `n1-standard-1` machine, and the `"default"` network within your
 project. And assuming your SSH information (see below) was filled in properly
 within your Vagrantfile, SSH and provisioning will work as well.
@@ -225,7 +223,7 @@ zone you want to actually use, however. This looks like this:
 ```ruby
 Vagrant.configure("2") do |config|
 
-  config.vm.box = "gce"
+  config.vm.box = "google/gce"
 
   config.vm.provider :google do |google|
     google.google_project_id = "YOUR_GOOGLE_CLOUD_PROJECT_ID"
@@ -237,7 +235,7 @@ Vagrant.configure("2") do |config|
 
     google.zone_config "us-central1-f" do |zone1f|
         zone1f.name = "testing-vagrant"
-        zone1f.image = "debian-7-wheezy-v20150127"
+        zone1f.image = "debian-8-jessie-v20160923"
         zone1f.machine_type = "n1-standard-4"
         zone1f.zone = "us-central1-f"
         zone1f.metadata = {'custom' => 'metadata', 'testing' => 'foobarbaz'}

data/example_boxes/gce-test/Vagrantfile

@@ -15,16 +15,10 @@
 # limitations under the License.
 
 Vagrant.configure("2") do |config|
-  config.vm.provider :google do |google, override|
-
+  config.vm.provider :google do |_google, override|
     if ENV['GOOGLE_SSH_USER'] and ENV['GOOGLE_SSH_KEY_LOCATION']
       override.ssh.username = ENV['GOOGLE_SSH_USER']
       override.ssh.private_key_path = ENV['GOOGLE_SSH_KEY_LOCATION']
     end
-
-    google.image = "debian-7-wheezy-v20150127"
-    google.machine_type = "n1-standard-1"
-    google.zone = "us-central1-f"
-
   end
 end

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

@@ -25,7 +25,8 @@ module VagrantPlugins
         def initialize(app, env)
           @app = app
           @logger = Log4r::Logger.new(
-            "vagrant_google::action::assign_instance_groups")
+            "vagrant_google::action::assign_instance_groups"
+          )
         end
 
         def call(env)
@@ -58,7 +59,8 @@ module VagrantPlugins
             )
             unless response.body["status"] == "DONE"
               operation = env[:google_compute].operations.get(
-                operation.body["name"], zone)
+                operation.body["name"], zone
+              )
               env[:ui].info(I18n.t("vagrant_google.waiting_for_operation",
                                    name: operation.body["name"]))
               operation.wait_for { ready? }

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

@@ -111,8 +111,8 @@ module VagrantPlugins
                     zone_name: zone,
                     source_image: image
                 )
-                disk_created_by_vagrant = true
                 disk.wait_for { disk.ready? }
+                disk_created_by_vagrant = true
               end
             end
 
@@ -137,11 +137,9 @@ module VagrantPlugins
             server = env[:google_compute].servers.create(defaults)
             @logger.info("Machine '#{zone}:#{name}' created.")
           rescue *FOG_ERRORS => e
-            # there is a chance Google responded with error but actually created
-            # instance, so we need to remove it
-            cleanup_instance(env)
-            # there is a chance Google has failed to create instance, so we need
-            # to remove created disk
+            # TODO: Cleanup the Fog catch-all once Fog implements better exceptions
+            # There is a chance Google has failed to create an instance, so we need
+            # to clean up the created disk.
             cleanup_disk(disk.name, env) if disk && disk_created_by_vagrant
             raise Errors::FogError, :message => e.message
           end
@@ -223,13 +221,6 @@ module VagrantPlugins
           address.address
         end
 
-        def cleanup_instance(env)
-          zone = env[:machine].provider_config.zone
-          zone_config = env[:machine].provider_config.get_zone_config(zone)
-          server = env[:google_compute].servers.get(zone_config.name, zone)
-          server.destroy(false) if server
-        end
-
         def cleanup_disk(disk_name, env)
           zone = env[:machine].provider_config.zone
           autodelete_disk = env[:machine].provider_config.get_zone_config(zone).autodelete_disk

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

@@ -64,7 +64,8 @@ module VagrantPlugins
             # Create the guest path
             env[:machine].communicate.sudo("mkdir -p '#{guestpath}'")
             env[:machine].communicate.sudo(
-              "chown #{ssh_info[:username]} '#{guestpath}'")
+              "chown #{ssh_info[:username]} '#{guestpath}'"
+            )
 
             # patch from https://github.com/tmatilai/vagrant-aws/commit/4a043a96076c332220ec4ec19470c4af5597dd51
             def ssh_key_options(ssh_info)
@@ -81,7 +82,8 @@ module VagrantPlugins
               *excludes.map{|e| ['--exclude', e]}.flatten,
               "-e", "ssh -p #{ssh_info[:port]} -o StrictHostKeyChecking=no #{ssh_key_options(ssh_info)}",
               hostpath,
-              "#{ssh_info[:username]}@#{ssh_info[:host]}:#{guestpath}"]
+              "#{ssh_info[:username]}@#{ssh_info[:host]}:#{guestpath}"
+            ]
 
             # we need to fix permissions when using rsync.exe on windows, see
             # http://stackoverflow.com/questions/5798807/rsync-permission-denied-created-directories-have-no-permissions
@@ -90,7 +92,7 @@ module VagrantPlugins
             end
 
             r = Vagrant::Util::Subprocess.execute(*command)
-            if r.exit_code != 0
+            if r.exit_code.nonzero?
               raise Errors::RsyncError,
                     :guestpath => guestpath,
                     :hostpath => hostpath,

data/lib/vagrant-google/config.rb

@@ -214,7 +214,8 @@ module VagrantPlugins
           # has it.
           new_zone_specific = other.instance_variable_get(:@__zone_specific)
           result.instance_variable_set(
-            :@__zone_specific, new_zone_specific || @__zone_specific)
+            :@__zone_specific, new_zone_specific || @__zone_specific
+          )
 
           # Go through all the zone configs and prepend ours onto
           # theirs.
@@ -242,7 +243,7 @@ module VagrantPlugins
         @google_project_id = ENV['GOOGLE_PROJECT_ID'] if @google_project_id == UNSET_VALUE
 
         # Image must be nil, since we can't default that
-        @image = "debian-7-wheezy-v20150127" if @image == UNSET_VALUE
+        @image = "debian-8-jessie-v20160511" if @image == UNSET_VALUE
 
         # Default instance group name is nil
         @instance_group = nil if @instance_group == UNSET_VALUE

data/lib/vagrant-google/version.rb

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

data/tasks/acceptance.rake

@@ -49,7 +49,8 @@ namespace :acceptance do
       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."
+          puts "Trying to add identity, executing ssh-add..."
+          system("ssh-add #{ENV["GOOGLE_SSH_KEY_LOCATION"]}")
         end
       end
     end

data/tasks/boxes.rake

@@ -7,7 +7,7 @@ namespace :boxes do
     Dir.chdir(boxes_dir)
 
     puts "Repacking main box"
-    system('tar cvzf ../google.box -C ./gce ./metadata.json ./Vagrantfile')
+    system('tar cvzf ../google.box -C ./gce ./metadata.json')
   end
 
   task :repack_testing do

data/test/acceptance/skeletons/generic/Vagrantfile

@@ -9,8 +9,8 @@ Vagrant.configure("2") do |config|
     google.zone = "europe-west1-d"
 
     google.zone_config "europe-west1-d" do |zone1d|
-      zone1d.image = "debian-7-wheezy-v20150603"
-      zone1d.zone = "europe-west1-d"
+      zone1d.name = "vagrant-acceptance-generic-#{('a'..'z').to_a.sample(8).join}"
+      zone1d.disk_type = "pd-ssd"
     end
   end
 end

data/test/acceptance/skeletons/instance_groups/Vagrantfile

@@ -6,10 +6,9 @@ Vagrant.configure("2") do |config|
     google.zone = "europe-west1-d"
 
     google.zone_config "europe-west1-d" do |zone1d|
-      zone1d.name = "vagrant-acceptance-instance-groups"
+      zone1d.name = "vagrant-acceptance-instance-groups-#{('a'..'z').to_a.sample(8).join}"
       zone1d.instance_group = "vagrant-acceptance-#{('a'..'z').to_a.sample(8).join}"
-      zone1d.image = "debian-7-wheezy-v20150603"
-      zone1d.zone = "europe-west1-d"
+      zone1d.disk_type = "pd-ssd"
     end
   end
 end

data/test/acceptance/skeletons/multi_instance/Vagrantfile

@@ -6,10 +6,9 @@ Vagrant.configure("2") do |config|
       google.zone = "europe-west1-c"
 
       google.zone_config "europe-west1-c" do |z1a_zone|
-        z1a_zone.name = "vagrant-acceptance-multi-z1a"
-        z1a_zone.image = "debian-7-wheezy-v20150603"
+        z1a_zone.name = "vagrant-acceptance-multi-z1a-#{('a'..'z').to_a.sample(8).join}"
         z1a_zone.machine_type = "n1-standard-1"
-        z1a_zone.zone = "europe-west1-c"
+        z1a_zone.disk_type = "pd-ssd"
       end
     end
   end
@@ -19,10 +18,9 @@ Vagrant.configure("2") do |config|
       google.zone = "europe-west1-d"
 
       google.zone_config "europe-west1-d" do |z1b_zone|
-        z1b_zone.name = "vagrant-testing-acceptance-multi-z1b"
-        z1b_zone.image = "debian-7-wheezy-v20150603"
+        z1b_zone.name = "vagrant-testing-acceptance-multi-z1b-#{('a'..'z').to_a.sample(8).join}"
         z1b_zone.machine_type = "n1-standard-2"
-        z1b_zone.zone = "europe-west1-d"
+        z1b_zone.disk_type = "pd-ssd"
       end
     end
   end

data/test/acceptance/skeletons/preemptible/Vagrantfile

@@ -6,9 +6,8 @@ Vagrant.configure("2") do |config|
     google.zone = "europe-west1-d"
 
     google.zone_config "europe-west1-d" do |zone1d|
-      zone1d.name = "vagrant-acceptance-preemptible"
-      zone1d.image = "debian-7-wheezy-v20150603"
-      zone1d.zone = "europe-west1-d"
+      zone1d.name = "vagrant-acceptance-preemptible-#{('a'..'z').to_a.sample(8).join}"
+      zone1d.disk_type = "pd-ssd"
       zone1d.preemptible = true
       zone1d.auto_restart = false
       zone1d.on_host_maintenance = "TERMINATE"

data/test/acceptance/skeletons/scopes/Vagrantfile

@@ -6,13 +6,11 @@ Vagrant.configure("2") do |config|
     google.zone = "europe-west1-d"
 
     google.zone_config "europe-west1-d" do |zone1d|
-      zone1d.name = "vagrant-acceptance-scopes"
+      zone1d.name = "vagrant-acceptance-scopes-#{('a'..'z').to_a.sample(8).join}"
       zone1d.scopes = ['sql-admin',
                        'bigquery',
-                       'https://www.googleapis.com/auth/compute'
-                      ]
-      zone1d.image = "debian-7-wheezy-v20150603"
-      zone1d.zone = "europe-west1-d"
+                       'https://www.googleapis.com/auth/compute']
+      zone1d.disk_type = "pd-ssd"
     end
   end
 end

data/test/unit/common/config_test.rb

@@ -31,7 +31,7 @@ describe VagrantPlugins::Google::Config do
     end
 
     its("name")                   { should match "i-[0-9]{10}-[0-9a-f]{4}" }
-    its("image")                  { should == "debian-7-wheezy-v20150127" }
+    its("image")                  { should == "debian-8-jessie-v20160511" }
     its("instance_group")         { should be_nil }
     its("zone")                   { should == "us-central1-f" }
     its("network")                { should == "default" }

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.2.0"
+  s.add_runtime_dependency "fog-google", "~> 0.4.0"
   s.add_runtime_dependency "google-api-client", "< 0.9", ">= 0.6.2"
 
   s.add_development_dependency "pry"
@@ -36,6 +36,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec", "~> 2.14"
   s.add_development_dependency "rubocop", "~> 0.35"
+  s.add_development_dependency "highline"
 
   # 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/vagrantfile_examples/Vagrantfile.multiple_machines

@@ -38,7 +38,7 @@ echo "== DEBIAN VERSION: ${ver}"
 echo "== UPDATING Debian repositories and packages"
 /usr/bin/apt-get update -y -qq > /dev/null 2>&1
 /usr/bin/apt-get upgrade -y -qq > /dev/null 2>&1
-extip=$(curl -s http://bot.whatismyipaddress.com)
+extip=$(curl -s http://metadata/computeMetadata/v1/instance/network-interfaces/0/access-configs/0/external-ip -H "Metadata-Flavor: Google")
 echo "== EXTERNAL IP: ${extip}"
 echo "== APPENDING /etc/motd"
 d=$(date +%r)
@@ -48,7 +48,7 @@ cat /etc/motd
 SCRIPT
 
 Vagrant.configure("2") do |config|
-  config.vm.box = "gce"
+  config.vm.box = "google/gce"
   config.vm.provision :shell, :inline => $PROVISION_DEBIAN
 
   config.vm.define :z1c do |z1c|
@@ -63,7 +63,7 @@ Vagrant.configure("2") do |config|
 
       google.zone_config "us-central1-c" do |z1c_zone|
         z1c_zone.name = "z1c"
-        z1c_zone.image = "debian-7-wheezy-v20150603"
+        z1c_zone.image = "debian-8-jessie-v20160923"
         z1c_zone.machine_type = "n1-standard-1"
         z1c_zone.zone = "us-central1-c"
         z1c_zone.metadata = {"zone" => "US Central 1c"}
@@ -83,7 +83,7 @@ Vagrant.configure("2") do |config|
 
       google.zone_config "us-central1-f" do |z1f_zone|
         z1f_zone.name = "z1f"
-        z1f_zone.image = "debian-7-wheezy-v20150603"
+        z1f_zone.image = "debian-8-jessie-v20160923"
         z1f_zone.machine_type = "n1-standard-2"
         z1f_zone.zone = "us-central1-f"
         z1f_zone.metadata = {"zone" => "US Central 1f"}

data/vagrantfile_examples/Vagrantfile.provision_single

@@ -27,7 +27,7 @@ $LOCAL_SSH_KEY = "~/.ssh/id_rsa"
 
 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 = $GOOGLE_PROJECT_ID
@@ -36,7 +36,7 @@ Vagrant.configure("2") do |config|
 
     # Override provider defaults
     google.name = "testing-vagrant"
-    google.image = "debian-7-wheezy-v20150603"
+    google.image = "debian-8-jessie-v20160923"
     google.machine_type = "n1-standard-1"
     google.zone = "us-central1-f"
     google.metadata = {'custom' => 'metadata', 'testing' => 'foobarbaz'}

data/vagrantfile_examples/Vagrantfile.zone_config

@@ -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"
@@ -30,7 +30,7 @@ Vagrant.configure("2") do |config|
 
     google.zone_config "us-central1-f" do |zone1a|
         zone1a.name = "testing-vagrant"
-        zone1a.image = "debian-7-wheezy-v20150603"
+        zone1a.image = "debian-8-jessie-v20160923"
         zone1a.machine_type = "n1-standard-4"
         zone1a.zone = "us-central1-f"
         zone1a.scopes = ['bigquery', 'monitoring', 'https://www.googleapis.com/auth/compute']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-google
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5.rc0
 platform: ruby
 authors:
 - Eric Johnson
@@ -9,127 +9,149 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-03 00:00:00.000000000 Z
+date: 2016-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-google
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: google-api-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '0.9'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '0.9'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.2
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.35'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.35'
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Enables Vagrant to manage Google Compute Engine instances.
 email: vagrant-google@google.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
+- ".ruby-version"
 - CHANGELOG.md
-- 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
+- LICENSE
+- README.md
+- Rakefile
+- example_boxes/README.md
+- example_boxes/gce-test/Vagrantfile
+- example_boxes/gce-test/metadata.json
+- example_boxes/gce/metadata.json
 - 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
@@ -147,18 +169,13 @@ 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
@@ -185,10 +202,6 @@ files:
 - vagrantfile_examples/Vagrantfile.provision_single
 - vagrantfile_examples/Vagrantfile.simple
 - vagrantfile_examples/Vagrantfile.zone_config
-- .gitignore
-- .rubocop.yml
-- .rubocop_todo.yml
-- .ruby-version
 homepage: http://www.vagrantup.com
 licenses: []
 metadata: {}
@@ -198,17 +211,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: vagrant-google
-rubygems_version: 2.0.14
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Vagrant provider plugin for Google Compute Engine.

data/example_boxes/gce/Vagrantfile

@@ -1,23 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-# Copyright 2013 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.
-
-Vagrant.configure("2") do |config|
-  config.vm.provider :google do |google|
-    google.image = "debian-7-wheezy-v20150127"
-    google.machine_type = "n1-standard-1"
-    google.zone = "us-central1-f"
-  end
-end