knife-google 1.1.0 → 1.2.0

data/spec/google/compute/snapshot_spec.rb

@@ -16,9 +16,9 @@ require 'spec_helper'
 describe Google::Compute::Snapshot do
 
   before(:each) do
-    @mock_api_client=mock(Google::APIClient, :authorization= =>{}, :auto_refresh_token= =>{})
-    @mock_api_client.stub!(:discovered_api).and_return(mock_compute)
-    Google::APIClient.stub!(:new).and_return(@mock_api_client)
+    @mock_api_client=double(Google::APIClient, :authorization= => {}, :auto_refresh_token= => {})
+    @mock_api_client.stub(:discovered_api).and_return(mock_compute)
+    Google::APIClient.stub(:new).and_return(@mock_api_client)
   end
 
   let(:client) do
@@ -29,8 +29,8 @@ describe Google::Compute::Snapshot do
 
   it '#get should return an individual snapshot' do
     @mock_api_client.should_receive(:execute).
-      with(:api_method=>mock_compute.snapshots.get, 
-           :parameters=>{'snapshot'=>'mock-snapshot', :project=>'mock-project'},:body_object=>nil).
+      with(:api_method => mock_compute.snapshots.get,
+           :parameters => {'snapshot' => 'mock-snapshot', :project => 'mock-project'}, :body_object => nil).
            and_return(mock_response(Google::Compute::Snapshot))
     snapshot = client.snapshots.get('mock-snapshot')
     snapshot.should be_a_kind_of Google::Compute::Snapshot
@@ -39,9 +39,9 @@ describe Google::Compute::Snapshot do
 
   it '#list should return an array of snapshots' do
     @mock_api_client.should_receive(:execute).
-      with(:api_method=>mock_compute.snapshots.list, 
-           :parameters=>{:project=>'mock-project'},:body_object=>nil).
-           and_return(mock_response(Google::Compute::Snapshot,true))
+      with(:api_method => mock_compute.snapshots.list,
+           :parameters => {:project => 'mock-project'}, :body_object => nil).
+           and_return(mock_response(Google::Compute::Snapshot, true))
     snapshots = client.snapshots.list
     snapshots.should_not be_empty
     snapshots.all?{|s| s.is_a?(Google::Compute::Snapshot)}.should be_true
@@ -49,9 +49,9 @@ describe Google::Compute::Snapshot do
 
   it '#delete should delete an existing snapshot' do
     @mock_api_client.should_receive(:execute).
-      with(:api_method=>mock_compute.snapshots.delete, 
-           :parameters=>{:project=>'mock-project','snapshot'=>'mock-snapshot'},:body_object=>nil).
+      with(:api_method => mock_compute.snapshots.delete,
+           :parameters => {:project => 'mock-project', 'snapshot' => 'mock-snapshot'}, :body_object => nil).
            and_return(mock_response(Google::Compute::GlobalOperation))
-    o =  client.snapshots.delete('mock-snapshot')
+    o = client.snapshots.delete('mock-snapshot')
   end
 end

data/spec/google/compute/zone_operation_spec.rb

@@ -16,9 +16,9 @@ require 'spec_helper'
 describe Google::Compute::ZoneOperation do
 
   before(:each) do
-    @mock_api_client=mock(Google::APIClient, :authorization= =>{}, :auto_refresh_token= =>{})
-    @mock_api_client.stub!(:discovered_api).and_return(mock_compute)
-    Google::APIClient.stub!(:new).and_return(@mock_api_client)
+    @mock_api_client=double(Google::APIClient, :authorization= => {}, :auto_refresh_token= => {})
+    @mock_api_client.stub(:discovered_api).and_return(mock_compute)
+    Google::APIClient.stub(:new).and_return(@mock_api_client)
   end
 
   let(:client) do
@@ -29,8 +29,8 @@ describe Google::Compute::ZoneOperation do
 
   it '#list should return an array of zone operations' do
     @mock_api_client.should_receive(:execute).
-      with(:api_method=>mock_compute.zone_operations.list, 
-           :parameters=>{ :project=>'mock-project'},:body_object=>nil).
+      with(:api_method => mock_compute.zone_operations.list,
+           :parameters => { :project => 'mock-project'}, :body_object => nil).
            and_return(mock_response(Google::Compute::ZoneOperation, true))
 
     operations = client.zoneOperations.list
@@ -40,8 +40,8 @@ describe Google::Compute::ZoneOperation do
 
   it '#get should return an individual zone operation' do
     @mock_api_client.should_receive(:execute).
-      with(:api_method=>mock_compute.zone_operations.get, 
-           :parameters=>{'zoneOperation'=>'mock-zone-operation', :project=>'mock-project'},:body_object=>nil).
+      with(:api_method => mock_compute.zone_operations.get,
+           :parameters => {'zoneOperation' => 'mock-zone-operation', :project => 'mock-project'}, :body_object => nil).
            and_return(mock_response(Google::Compute::ZoneOperation))
 
     operation = client.zoneOperations.get('mock-zone-operation')
@@ -53,8 +53,8 @@ describe Google::Compute::ZoneOperation do
 
   it '#delete should delete an existing zone operation' do
     @mock_api_client.should_receive(:execute).
-      with(:api_method=>mock_compute.zone_operations.delete, 
-           :parameters=>{'zoneOperation'=>'mock-zone-operation', :project=>'mock-project'},:body_object=>nil).
+      with(:api_method => mock_compute.zone_operations.delete,
+           :parameters => {'zoneOperation' => 'mock-zone-operation', :project => 'mock-project'}, :body_object => nil).
            and_return(mock_response)
 
     client.zoneOperations.delete('mock-zone-operation')

data/spec/google/compute/zone_spec.rb

@@ -17,9 +17,9 @@ require 'spec_helper'
 describe Google::Compute::Zone do
 
   before(:each) do
-    @mock_api_client=mock(Google::APIClient, :authorization= =>{}, :auto_refresh_token= =>{})
-    @mock_api_client.stub!(:discovered_api).and_return(mock_compute)
-    Google::APIClient.stub!(:new).and_return(@mock_api_client)
+    @mock_api_client=double(Google::APIClient, :authorization= => {}, :auto_refresh_token= => {})
+    @mock_api_client.stub(:discovered_api).and_return(mock_compute)
+    Google::APIClient.stub(:new).and_return(@mock_api_client)
   end
 
   let(:client) do
@@ -30,8 +30,8 @@ describe Google::Compute::Zone do
 
   it '#get should return an individual zone' do
     @mock_api_client.should_receive(:execute).
-      with(:api_method=>mock_compute.zones.get, 
-           :parameters=>{'zone'=>'mock-zone', :project=>'mock-project'},:body_object=>nil).
+      with(:api_method => mock_compute.zones.get,
+           :parameters => {'zone' => 'mock-zone', :project => 'mock-project'}, :body_object => nil).
            and_return(mock_response(Google::Compute::Zone))
     zone = client.zones.get('mock-zone')
     zone.should be_a_kind_of Google::Compute::Zone
@@ -40,8 +40,8 @@ describe Google::Compute::Zone do
 
   it '#list should return an array of zones' do
     @mock_api_client.should_receive(:execute).
-      with(:api_method=>mock_compute.zones.list, 
-           :parameters=>{ :project=>'mock-project'},:body_object=>nil).
+      with(:api_method => mock_compute.zones.list,
+           :parameters => { :project => 'mock-project'}, :body_object => nil).
            and_return(mock_response(Google::Compute::Zone, true))
     zones = client.zones.list
     zones.should_not be_empty

data/spec/spec_helper.rb

@@ -33,6 +33,7 @@ require 'chef/knife/google_server_list'
 require 'chef/knife/google_disk_list'
 require 'chef/knife/google_disk_create'
 require 'chef/knife/google_disk_delete'
+require 'chef/knife/google_region_list'
 require 'chef/knife/google_zone_list'
 require 'chef/knife/google_setup'
 

data/spec/support/mocks.rb

@@ -1,11 +1,11 @@
 # 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.
@@ -26,9 +26,9 @@ module Mocks
   def mock_data_file(klass)
     class_name = klass.name.split('::').last.snake_case
     if class_name == "instance"
-      json_file = File.expand_path(File.join(SPEC_DATA_FOLDER ,  'server.json'))
+      json_file = File.expand_path(File.join(SPEC_DATA_FOLDER,  'server.json'))
     else
-      json_file = File.expand_path(File.join(SPEC_DATA_FOLDER ,  class_name + '.json'))
+      json_file = File.expand_path(File.join(SPEC_DATA_FOLDER,  class_name + '.json'))
     end
   end
 
@@ -43,13 +43,13 @@ module Mocks
   def mock_compute
     @compute ||=
       begin
-        data_file = File.join(SPEC_DATA_FOLDER,'compute-v1beta15.json')
-        u = Addressable::URI.parse('URI:https://www.googleapis.com/discovery/v1/apis/compute/v1beta15/rest')
-        compute = Google::APIClient::API.new(u,MultiJson.load(File.read(data_file)))
+        data_file = File.join(SPEC_DATA_FOLDER, 'compute-v1.json')
+        u = Addressable::URI.parse('URI:https://www.googleapis.com/discovery/v1/apis/compute/v1/rest')
+        compute = Google::APIClient::API.new(u, MultiJson.load(File.read(data_file)))
       end
   end
 
-  def mock_response(klass=nil,list = false)
+  def mock_response(klass=nil, list = false)
     body = if klass.nil?
              nil
            elsif list
@@ -57,6 +57,6 @@ module Mocks
            else
              mock_data(klass)
            end
-    mock(klass,:success? => true, :response=>mock('some',:body=>body))
+    double(klass, :success? => true, :response => double('some', :body => body))
   end
 end

data/spec/support/resource_examples.rb

@@ -1,11 +1,11 @@
 # 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.
@@ -30,14 +30,14 @@ shared_examples Google::Compute::Resource do
     resource.id.should be_a_kind_of(Integer)
   end
 
-  it "#creation_timestamp should have a  valid creation timestamp" do
+  it "#creation_timestamp should have a valid creation timestamp" do
     unless resource.creation_timestamp.nil?
       resource.creation_timestamp.should be_a_kind_of(Time)
     end
   end
 
   it "#type should have same type is class" do
-    # TODO(erjohnso): {global,zone}operations are not resources
+    # TODO(erjohnso): {global, zone}operations are not resources
     #                 and instances are servers
     if ["globaloperation", "zoneoperation"].include? resource.class.class_name
       resource.type.downcase.should eq("operation")
@@ -49,8 +49,8 @@ shared_examples Google::Compute::Resource do
   end
 
   it "should have a valid description" do
-    # TODO(erjohnso): {global,zone}operations are not resources
-    # mock-{zone,global}-operation
+    # TODO(erjohnso): {global, zone}operations are not resources
+    # mock-{zone, global}-operation
     unless resource.name.split('-').last == "operation"
       resource.description.should_not be_nil
     end

data/spec/support/spec_google_base.rb

@@ -34,6 +34,10 @@ module SpecData
     @disk ||= Google::Compute::Disk.new(load_json("disk.json"))
   end
 
+  def stored_region
+    @region ||= Google::Compute::Region.new(load_json("region.json"))
+  end
+
   def stored_zone
     @zone ||= Google::Compute::Zone.new(load_json("zone.json"))
   end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-google
 version: !ruby/object:Gem::Version
-  version: 1.1.0
-  prerelease: 
+  version: 1.2.0
 platform: ruby
 authors:
 - Chiraq Jog
@@ -13,12 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-14 00:00:00.000000000 Z
+date: 2014-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -26,7 +24,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -34,7 +31,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: google-api-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -42,7 +38,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -50,7 +45,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -58,7 +52,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -66,7 +59,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-config
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -74,7 +66,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -82,7 +73,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -90,7 +80,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -98,7 +87,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -106,7 +94,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -114,7 +101,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -122,13 +108,12 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Google Compute Engine Support for Chef's Knife Command
-email: raggi@google.com
+email: paulrossman@google.com
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -148,6 +133,8 @@ files:
 - lib/chef/knife/google_disk_create.rb
 - lib/chef/knife/google_disk_delete.rb
 - lib/chef/knife/google_disk_list.rb
+- lib/chef/knife/google_project_list.rb
+- lib/chef/knife/google_region_list.rb
 - lib/chef/knife/google_server_create.rb
 - lib/chef/knife/google_server_delete.rb
 - lib/chef/knife/google_server_list.rb
@@ -163,12 +150,13 @@ files:
 - lib/google/compute/firewall.rb
 - lib/google/compute/global_operation.rb
 - lib/google/compute/image.rb
-- lib/google/compute/kernel.rb
 - lib/google/compute/listable_resource_collection.rb
 - lib/google/compute/machine_type.rb
 - lib/google/compute/mixins/utils.rb
 - lib/google/compute/network.rb
 - lib/google/compute/project.rb
+- lib/google/compute/region.rb
+- lib/google/compute/region_operation.rb
 - lib/google/compute/resource.rb
 - lib/google/compute/resource_collection.rb
 - lib/google/compute/server.rb
@@ -185,21 +173,22 @@ files:
 - spec/chef/knife/google_disk_create_spec.rb
 - spec/chef/knife/google_disk_delete_spec.rb
 - spec/chef/knife/google_disk_list_spec.rb
+- spec/chef/knife/google_region_list_spec.rb
 - spec/chef/knife/google_server_create_spec.rb
 - spec/chef/knife/google_server_delete_spec.rb
 - spec/chef/knife/google_server_list_spec.rb
 - spec/chef/knife/google_setup_spec.rb
 - spec/chef/knife/google_zone_list_spec.rb
 - spec/data/client.json
-- spec/data/compute-v1beta15.json
+- spec/data/compute-v1.json
 - spec/data/disk.json
 - spec/data/firewall.json
 - spec/data/global_operation.json
 - spec/data/image.json
-- spec/data/kernel.json
 - spec/data/machine_type.json
 - spec/data/network.json
 - spec/data/project.json
+- spec/data/region.json
 - spec/data/serial_port_output.json
 - spec/data/server.json
 - spec/data/snapshot.json
@@ -209,10 +198,10 @@ files:
 - spec/google/compute/firewall_spec.rb
 - spec/google/compute/global_operation_spec.rb
 - spec/google/compute/image_spec.rb
-- spec/google/compute/kernel_spec.rb
 - spec/google/compute/machine_type_spec.rb
 - spec/google/compute/network_spec.rb
 - spec/google/compute/project_spec.rb
+- spec/google/compute/region_spec.rb
 - spec/google/compute/server_spec.rb
 - spec/google/compute/snapshot_spec.rb
 - spec/google/compute/zone_operation_spec.rb
@@ -223,26 +212,25 @@ files:
 - spec/support/spec_google_base.rb
 homepage: http://wiki.opscode.com/display/chef
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Manage Google Compute Engine servers, disks, and zones
 test_files: []