fog-google 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a924fff0c53902ab17cf84ba699c35cfb2139898
-  data.tar.gz: f2a1df01bb2be2dccf652d477c80b38fd20ce86d
+  metadata.gz: 0511793f96bfb19f9b6aeb03d9255aa75e9e80bc
+  data.tar.gz: 11cad15a2d43d83bf7610a46868ecadba74035b5
 SHA512:
-  metadata.gz: ab467619990b86e9dd1d9144e928434f9343516a12f589f815879471b841372b2b3b020dea667336d0f5473b8a5f7e813bc5d798a5f72d67208a1fbf89111522
-  data.tar.gz: 1a640d9fd9479034e6445febe59eff84ff22a7033502f4bbf24c9a953210546578a84ccd89fd55707e2c99c9fe17119607b5c5a079aa5b88065624ed3e60745a
+  metadata.gz: 8dbfd29a46fadd9e640e0e9cca7c8bda8c7e213ada72badfff8f2e7f55ae3e25382efa6213590461745060d8918997fa8ec52128583a4c3cc950aff5236bd02f
+  data.tar.gz: 15b829e415184704289d27260d23472cc1a73907ac0afbb8cab6cc568a5042a92d80b3a77dfa2bc8848096b02819d42e289581ab4affcb01593a5730e5361e86

data/CONTRIBUTING.md

@@ -74,6 +74,16 @@ or just one:
 $ rake test TEST=test/integration/compute/test_servers.rb TESTOPTS="--name=TestServers#test_bootstrap_ssh_destroy"
 ```
 
+#### The transition from `shindo` to Minitest
+
+Previously, [shindo](https://github.com/geemus/shindo) was the primary testing framework.  We've started moving away from it, and to Minitest, but some artifacts remain.
+
+- The `test` directory contains the new Minitest tests, which currently only cover live integration testing for `compute`.
+- The `tests` directory contains the old `shindo` tests, which generally pass if mocking is turned on.  No promises if mocking is off.
+- Travis CI runs the mocked `shindo` tests, though hopefully in the long run it will run the unit and integration `Minitest` tests.  Currently, Google maintains its own Jenkins instance that runs the Minitest integraiton tests.
+
+Follow [#50](https://github.com/fog/fog-google/issues/50) for the status of the transition from `shindo` to Minitest.
+
 #### Some notes about the tests as they stand
 
 The live integration tests for resources, (servers, disks, etc.,) have a few components:

data/lib/fog/google/models/compute/server.rb

@@ -30,6 +30,7 @@ module Fog
         attribute :external_ip, :aliases => 'externalIP'
         attribute :auto_restart
         attribute :on_host_maintenance
+        attribute :preemptible
 
         # Security account scope aliases used by official gcloud utility
         # List derived from 'gcloud compute instances create --help'
@@ -172,10 +173,10 @@ module Fog
           Fog::Compute::Google::Operations.new(:service => service).get(data.body['name'], data.body['zone'])
         end
 
-        def set_scheduling(on_host_maintenance, automatic_restart)
+        def set_scheduling(on_host_maintenance, automatic_restart, preemptible)
           requires :identity, :zone
 
-          data = service.set_server_scheduling(identity, zone_name, on_host_maintenance, automatic_restart)
+          data = service.set_server_scheduling(identity, zone_name, on_host_maintenance, automatic_restart, preemptible)
           Fog::Compute::Google::Operations.new(:service => service).get(data.body['name'], data.body['zone'])
         end
 
@@ -270,6 +271,7 @@ module Fog
               'tags' => tags,
               'auto_restart' => auto_restart,
               'on_host_maintenance' => on_host_maintenance,
+              'preemptible' => preemptible,
               'can_ip_forward' => can_ip_forward
           }.delete_if {|key, value| value.nil?}
 

data/lib/fog/google/requests/compute/insert_server.rb

@@ -151,12 +151,17 @@ module Fog
 
           scheduling = {
             'automaticRestart' => false,
-            'onHostMaintenance' => "MIGRATE"
+            'onHostMaintenance' => "MIGRATE",
+            'preemptible' => false
           }
           if options.key? 'auto_restart'
             scheduling['automaticRestart'] = options.delete 'auto_restart'
             scheduling['automaticRestart'] = scheduling['automaticRestart'].class == TrueClass
           end
+          if options.key? 'preemptible'
+            scheduling['preemptible'] = options.delete 'preemptible'
+            scheduling['preemptible'] = scheduling['preemptible'].class == TrueClass
+          end
           if options.key? 'on_host_maintenance'
             ohm = options.delete 'on_host_maintenance'
             scheduling['onHostMaintenance'] = (ohm.respond_to?("upcase") &&

data/lib/fog/google/requests/compute/set_server_scheduling.rb

@@ -2,13 +2,13 @@ module Fog
   module Compute
     class Google
       class Mock
-        def set_server_scheduling(identity, zone, on_host_maintenance, automatic_restart)
+        def set_server_scheduling(identity, zone, on_host_maintenance, automatic_restart, preemptible)
           Fog::Mock.not_implemented
         end
       end
 
       class Real
-        def set_server_scheduling(identity, zone, on_host_maintenance, automatic_restart)
+        def set_server_scheduling(identity, zone, on_host_maintenance, automatic_restart, preemptible)
           api_method = @compute.instances.set_scheduling
           parameters = {
             'project'  => @project,
@@ -19,6 +19,7 @@ module Fog
           body_object = {
             'onHostMaintenance' => on_host_maintenance,
             'automaticRestart'  => automatic_restart,
+            'preemptible' => preemptible
           }
 
           request(api_method, parameters, body_object)

data/lib/fog/google/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Google
-    VERSION = "0.0.6"
+    VERSION = "0.0.7"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-google
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Nat Welch
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-23 00:00:00.000000000 Z
+date: 2015-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core