kitchen-gce 0.0.4 → 0.0.6

data/CHANGELOG.md

@@ -1,11 +1,29 @@
+## 0.0.6 / 2014-02-23:
+
+* Require Ruby 1.9 or greater.
+
+### Improvements
+
+* Add support for specifying GCE network and tags.
+
+### Bug fixes
+
+* Temporarily pin Fog version to 1.19.0 until 1.20.0 support is added.
+* Require Faraday Gem version to be ~> 0.8.9; 0.9.0 breaks test-kitchen.
+
+## 0.0.4 / 2013-12-28
+
 ### Bug fixes
 
 * In GCE, instance names must be unique; derive by default from
   `<suite>-<platform>` and a UUID.
-* README formatting and clarity fixes.
+* Fix bug where running `kitchen create` multiple times would create
+  duplicate instances.
+* Require version of Fog with exponential backoff in GCE API queries.
 
 ### Improvements
 
+* README formatting and clarity fixes.
 * Add concept of an "area" (us, europe, any) to automatically select
   an availability zone from those that are up within the requested
   area for each instance.

data/README.md

@@ -11,6 +11,8 @@ providers, GCE has a couple of advantages for Chef cookbook testing:
 
 ## Requirements
 
+Ruby 1.9 or greater.
+
 A [Google Cloud Platform](https://cloud.google.com) account is
 required.  If you do not already have an appropriate "project" in
 which to run your test-kitchen instances, create one, noting the
@@ -38,7 +40,6 @@ source 'https://rubygems.org'
 gem 'berkshelf'
 
 group :integration do
-  gem 'test-kitchen', '~> 1.0.0.beta'
   gem 'kitchen-gce'
 end
 ```
@@ -77,10 +78,6 @@ instances will be launched.
 
 **Required** Operating system image to deploy.
 
-### machine_type
-
-GCE instance type (size) to launch; default: `n1-standard-1`
-
 ### inst_name
 
 Name to give to instance; unlike EC2's "Name" tag, this is used as an
@@ -89,6 +86,18 @@ name will be auto-generated; note that auto-generated names must be
 used if there is more than one test suite.  Default:
 `<suite>-<platform>-<UUID>`
 
+### machine_type
+
+GCE instance type (size) to launch; default: `n1-standard-1`
+
+### network
+
+GCE network that instance will be attached to; default: `default`
+
+### tags
+
+Array of tags to associate with instance; default: `[]`
+
 ### username
 
 Username to log into instance as; this user is assumed to have access
@@ -112,12 +121,14 @@ driver_config:
   google_client_email: "123456789012@developer.gserviceaccount.com"
   google_key_location: "<%= ENV['HOME']%>/gce/1234567890abcdef1234567890abcdef12345678-privatekey.p12"
   google_project: "alpha-bravo-123"
+  network: "kitchenci"
 
 platforms:
 - name: debian-7
   driver_config:
     image_name: debian-7-wheezy-v20130926
     require_chef_omnibus: true
+    tags: ["somerole"]
 
 suites:
 - name: default

data/kitchen-gce.gemspec

@@ -1,20 +1,24 @@
+# -*- coding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = 'kitchen-gce'
-  s.version     = '0.0.4'
-  s.date        = '2013-10-20'
+  s.version     = '0.0.6'
+  s.date        = '2014-02-23'
   s.summary     = 'Kitchen::Driver::Gce'
   s.description = 'A Test-Kitchen driver for Google Compute Engine'
   s.authors     = ['Andrew Leonard']
   s.email       = 'andy@hurricane-ridge.com'
-  s.files       = `git ls-files`.split($/)
+  s.files       = `git ls-files`.split($/) # rubocop:disable SpecialGlobalVars
   s.homepage    = 'https://github.com/anl/kitchen-gce'
   s.license     = 'Apache 2.0'
 
   s.add_dependency 'test-kitchen'
-  s.add_dependency 'fog', '>= 1.19.0'
+  s.add_dependency 'faraday', '~> 0.8.9'
+  s.add_dependency 'fog', '1.19.0'
   s.add_dependency 'google-api-client'
 
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'rspec'
-  s.add_development_dependency 'tailor'
+  s.add_development_dependency 'rubocop'
+
+  s.required_ruby_version = '>= 1.9'
 end

data/lib/kitchen/driver/gce.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+#
 # Author:: Andrew Leonard (<andy@hurricane-ridge.com>)
 #
 # Copyright (C) 2013, Andrew Leonard
@@ -21,11 +23,15 @@ require 'kitchen'
 
 module Kitchen
   module Driver
+    # Google Compute Engine driver for Test Kitchen
+    #
+    # @author Andrew Leonard <andy@hurricane-ridge.com>
     class Gce < Kitchen::Driver::SSHBase
-
       default_config :area, 'us'
       default_config :machine_type, 'n1-standard-1'
+      default_config :network, 'default'
       default_config :inst_name, nil
+      default_config :tags, []
       default_config :username, ENV['USER']
       default_config :zone_name, nil
 
@@ -37,15 +43,13 @@ module Kitchen
       def create(state)
         return if state[:server_id]
 
-        config[:inst_name] ||= generate_name
         server = create_instance
         state[:server_id] = server.identity
 
         info("GCE instance <#{state[:server_id]}> created.")
-        server.wait_for { print '.'; ready? } ; print '(server ready)'
-        state[:hostname] = server.public_ip_address || server.private_ip_address
-        wait_for_sshd(state[:hostname], config[:username])
-        puts '(ssh ready)'
+
+        wait_for_up_instance(server, state)
+
       rescue Fog::Errors::Error, Excon::Errors::Error => ex
         raise ActionFailed, ex.message
       end
@@ -63,48 +67,26 @@ module Kitchen
       private
 
       def connection
-        Fog::Compute.new({
-          :provider            => 'google',
-          :google_client_email => config[:google_client_email],
-          :google_key_location => config[:google_key_location],
-          :google_project      => config[:google_project],
-        })
+        Fog::Compute.new(
+          provider: 'google',
+          google_client_email: config[:google_client_email],
+          google_key_location: config[:google_key_location],
+          google_project: config[:google_project]
+        )
       end
 
       def create_instance
-        connection.servers.create({
-          :name         => config[:inst_name],
-          :image_name   => config[:image_name],
-          :machine_type => config[:machine_type],
-          :zone_name    => get_zone,
-        })
-      end
-
-      def get_zone
-        if config[:zone_name].nil?
-          zones = []
-          connection.zones.each do |z|
-            case config[:area]
-            when 'us'
-              if z.name.match(/^us/) and z.status == 'UP'
-                zones.push(z)
-              end
-            when 'europe'
-              if z.name.match(/^europe/) and z.status == 'UP'
-                zones.push(z)
-              end
-            when 'any'
-              if z.status == 'UP'
-                zones.push(z)
-              end
-            else
-              raise ArgumentError, 'Unknown area'
-            end
-          end
-          return zones.sample.name
-        else
-          return config[:zone_name]
-        end
+        config[:inst_name] ||= generate_name
+        config[:zone_name] ||= select_zone
+
+        connection.servers.create(
+          name: config[:inst_name],
+          image_name: config[:image_name],
+          machine_type: config[:machine_type],
+          network: config[:network],
+          tags: config[:tags],
+          zone_name: config[:zone_name]
+        )
       end
 
       def generate_name
@@ -113,6 +95,30 @@ module Kitchen
         "#{base_name}-#{SecureRandom.uuid}"
       end
 
+      def select_zone
+        if config[:area] == 'any'
+          zone_regexp = /^[a-z]+\-/
+        else
+          zone_regexp = /^#{config[:area]}\-/
+        end
+        zones = connection.zones.select do |z|
+          z.status == 'UP' && z.name.match(zone_regexp)
+        end
+        fail 'No up zones in area' unless zones.length >= 1
+        zones.sample.name
+      end
+
+      def wait_for_up_instance(server, state)
+        server.wait_for do
+          print '.'
+          ready?
+        end
+        print '(server ready)'
+        state[:hostname] = server.public_ip_address ||
+          server.private_ip_address
+        wait_for_sshd(state[:hostname], config[:username])
+        puts '(ssh ready)'
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-gce
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-20 00:00:00.000000000 Z
+date: 2014-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -27,12 +27,28 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.9
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.9
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.19.0
   type: :runtime
@@ -40,7 +56,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.19.0
 - !ruby/object:Gem::Dependency
@@ -92,7 +108,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: tailor
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -132,10 +148,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -3638187786435759861
+      version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -144,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3638187786435759861
+      hash: 134419407739648312
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23