vcloud-walker 3.2.2 → 3.2.3

data/vcloud-walker.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.name        = 'vcloud-walker'
   s.version     = Vcloud::Walker::VERSION
   s.authors     = ['Government Digital Service']
-  s.homepage    = 'https://github.com/alphagov/vcloud-walker'
+  s.homepage    = 'https://github.com/gds-operations/vcloud-walker'
   s.summary     = %q{Command line tool to describe vCloud entities}
   s.description = %q{Vcloud-walker is a command line tool to describe different vCloud entities.
                     This tool is a thin layer around fog api, which exposes summarized vCloud entities
@@ -18,14 +18,16 @@ Gem::Specification.new do |s|
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ["lib"]
 
+  s.required_ruby_version = '>= 1.9.3'
+
+  s.add_runtime_dependency 'fog', '>= 1.21.0'
+  s.add_runtime_dependency 'json', '~> 1.8.0'
+  s.add_runtime_dependency 'vcloud-core', '~> 0.6.0'
+  s.add_development_dependency 'gem_publisher', '1.2.0'
+  s.add_development_dependency 'json_spec', '~> 1.1.1'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec', '~> 2.14.1'
   s.add_development_dependency 'rspec-mocks', '~> 2.14.3'
-  s.add_development_dependency 'json_spec', '~> 1.1.1'
-  s.add_runtime_dependency 'json', '~> 1.8.0'
-  s.add_runtime_dependency 'methadone'
-  s.add_runtime_dependency 'fog', '>= 1.21.0'
-  s.add_runtime_dependency 'vcloud-core', '~> 0.0.12'
-  s.add_development_dependency 'simplecov', '~> 0.8.2'
-  s.add_development_dependency 'gem_publisher', '1.2.0'
+  s.add_development_dependency 'rubocop', '~> 0.23.0'
+  s.add_development_dependency 'simplecov', '~> 0.7.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vcloud-walker
 version: !ruby/object:Gem::Version
-  version: 3.2.2
+  version: 3.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,97 +9,97 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-01 00:00:00.000000000 Z
+date: 2014-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: fog
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 1.21.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.21.0
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: json
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.14.1
-  type: :development
+        version: 1.8.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
-  name: rspec-mocks
+  name: vcloud-core
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.14.3
-  type: :development
+        version: 0.6.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.14.3
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
-  name: json_spec
+  name: gem_publisher
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
-  name: json
+  name: json_spec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.0
-  type: :runtime
+        version: 1.1.1
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
-  name: methadone
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -108,45 +108,45 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fog
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.21.0
-  type: :runtime
+        version: 2.14.1
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.21.0
+        version: 2.14.1
 - !ruby/object:Gem::Dependency
-  name: vcloud-core
+  name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.12
-  type: :runtime
+        version: 2.14.3
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.12
+        version: 2.14.3
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 0.23.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -154,23 +154,23 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 0.23.0
 - !ruby/object:Gem::Dependency
-  name: gem_publisher
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 0.7.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 0.7.1
 description: ! "Vcloud-walker is a command line tool to describe different vCloud
   entities.\n                    This tool is a thin layer around fog api, which exposes
   summarized vCloud entities\n                    in the form of JSON"
@@ -181,7 +181,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - CHANGELOG.md
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE
 - README.md
@@ -194,6 +196,7 @@ files:
 - jenkins.sh
 - jenkins_integration_tests.sh
 - lib/vcloud/walker.rb
+- lib/vcloud/walker/cli.rb
 - lib/vcloud/walker/fog_interface.rb
 - lib/vcloud/walker/resource.rb
 - lib/vcloud/walker/resource/catalog.rb
@@ -216,18 +219,19 @@ files:
 - spec/spec_helper.rb
 - spec/stubs/service_layer_stub.rb
 - spec/stubs/stubs.rb
+- spec/vcloud/walker/cli_spec.rb
+- spec/vcloud/walker/resource/catalogs_spec.rb
+- spec/vcloud/walker/resource/entity_spec.rb
+- spec/vcloud/walker/resource/gateway_ipsec_vpn_service_spec.rb
+- spec/vcloud/walker/resource/network_spec.rb
+- spec/vcloud/walker/resource/organization_spec.rb
+- spec/vcloud/walker/resource/vapp_spec.rb
+- spec/vcloud/walker/resource/vdcs_spec.rb
+- spec/vcloud/walker/resource/vm_spec.rb
 - spec/vcloud/walker_spec.rb
-- spec/walk/catalogs_spec.rb
-- spec/walk/entity_spec.rb
-- spec/walk/gateway_ipsec_vpn_service_spec.rb
-- spec/walk/network_spec.rb
-- spec/walk/organization_spec.rb
-- spec/walk/vapp_spec.rb
-- spec/walk/vdcs_spec.rb
-- spec/walk/vm_spec.rb
 - tools/fog_credentials.rb
 - vcloud-walker.gemspec
-homepage: https://github.com/alphagov/vcloud-walker
+homepage: https://github.com/gds-operations/vcloud-walker
 licenses:
 - MIT
 post_install_message: 
@@ -239,10 +243,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 523235107079612422
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -251,7 +252,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 523235107079612422
+      hash: 2006502224418708712
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -264,12 +265,13 @@ test_files:
 - spec/spec_helper.rb
 - spec/stubs/service_layer_stub.rb
 - spec/stubs/stubs.rb
+- spec/vcloud/walker/cli_spec.rb
+- spec/vcloud/walker/resource/catalogs_spec.rb
+- spec/vcloud/walker/resource/entity_spec.rb
+- spec/vcloud/walker/resource/gateway_ipsec_vpn_service_spec.rb
+- spec/vcloud/walker/resource/network_spec.rb
+- spec/vcloud/walker/resource/organization_spec.rb
+- spec/vcloud/walker/resource/vapp_spec.rb
+- spec/vcloud/walker/resource/vdcs_spec.rb
+- spec/vcloud/walker/resource/vm_spec.rb
 - spec/vcloud/walker_spec.rb
-- spec/walk/catalogs_spec.rb
-- spec/walk/entity_spec.rb
-- spec/walk/gateway_ipsec_vpn_service_spec.rb
-- spec/walk/network_spec.rb
-- spec/walk/organization_spec.rb
-- spec/walk/vapp_spec.rb
-- spec/walk/vdcs_spec.rb
-- spec/walk/vm_spec.rb

data/spec/walk/catalogs_spec.rb

@@ -1,31 +0,0 @@
-require 'spec_helper'
-require 'rspec/mocks'
-
-describe Vcloud::Walker::Resource::Catalogs do
-
-    it "should summarize catalogs" do
-      set_login_credential
-      mock_fog_item = double(:catalog_item,
-                       :id => "12345",
-                       :name => 'ubuntu 11.04',
-                       :description => 'image for ubuntu 11.04',
-                       :vapp_template_id => 'vapp-template-01')
-      mock_fog_catalog = double(:catalog,
-                          :id => 'catalog_id_1',
-                          :name => 'Default catalog',
-                          :description => 'default catalog for infrastructure',
-                          :catalog_items => double(:catalog_items, :all => [mock_fog_item]))
-
-      catalog_summary = Vcloud::Walker::Resource::Catalogs.new([mock_fog_catalog]).to_summary
-      catalog_summary.count.should == 1
-      catalog_summary.first[:items].count.should == 1
-      catalog_summary.should == [{
-                                     :id => "catalog_id_1",
-                                     :name => "Default catalog",
-                                     :description => "default catalog for infrastructure",
-                                     :items => [
-                                         {:id => "12345", :name => "ubuntu 11.04", :description => "image for ubuntu 11.04", :vapp_template_id => "vapp-template-01"}
-                                     ]
-                                 }]
-    end
-end

data/spec/walk/organization_spec.rb

@@ -1,53 +0,0 @@
-require 'spec_helper'
-
-describe Vcloud::Walker::Resource::Organization do
-
-  it "should retrieve networks" do
-    fog_networks = double(:fog_networks)
-    Vcloud::Walker::FogInterface.should_receive(:get_networks).and_return(fog_networks)
-    Vcloud::Walker::Resource::Networks.should_receive(:new).with(fog_networks).and_return(double(:walker_networks, :to_summary => [:network => "Network 1"]))
-    Vcloud::Walker::Resource::Organization.networks.should == [:network => "Network 1"]
-  end
-
-  it "should retrieve catalogs" do
-    fog_catalogs = double(:fog_catalogs)
-    Vcloud::Walker::FogInterface.should_receive(:get_catalogs).and_return(fog_catalogs)
-    Vcloud::Walker::Resource::Catalogs.should_receive(:new).with(fog_catalogs).and_return(double(:walker_catalogs, :to_summary => [:catalog => "Catalog 1"]))
-    Vcloud::Walker::Resource::Organization.catalogs.should == [:catalog => "Catalog 1"]
-  end
-
-  it "should retrieve vdcs" do
-    fog_vdcs = double(:fog_vdcs)
-    Vcloud::Walker::FogInterface.should_receive(:get_vdcs).and_return(fog_vdcs)
-    Vcloud::Walker::Resource::Vdcs.should_receive(:new).with(fog_vdcs).and_return(double(:walker_vdcs, :to_summary => [:vdc => "VDC 1"]))
-    Vcloud::Walker::Resource::Organization.vdcs.should == [:vdc => "VDC 1"]
-  end
-
-  it "should retrieve edgegateways" do
-    fog_edgegateways = [{:id => 'urn:vcloud:gateway:1', :href => 'host/1', :name => 'Gateway 1',
-                         :Configuration => { :EdgeGatewayServiceConfiguration => {}}}]
-    Vcloud::Walker::FogInterface.should_receive(:get_edge_gateways).and_return(fog_edgegateways)
-
-    Vcloud::Walker::Resource::Organization.edgegateways.should == [{:id => '1',
-                                                                    name: 'Gateway 1',
-                                                                    :href => 'host/1',
-                                                                    :Configuration => {
-                                                                      :EdgeGatewayServiceConfiguration => {}}
-                                                                   }]
-  end
-
-  it "should retrive entire organization" do
-    Vcloud::Walker::Resource::Organization.should_receive(:edgegateways).and_return([:edgegateway => 'Gateway 1'])
-    Vcloud::Walker::Resource::Organization.should_receive(:vdcs).and_return([:vdc => "VDC 1"])
-    Vcloud::Walker::Resource::Organization.should_receive(:catalogs).and_return([:catalog => "Catalog 1"])
-    Vcloud::Walker::Resource::Organization.should_receive(:networks).and_return([:network => "Network 1"])
-
-    Vcloud::Walker::Resource::Organization.organization.should == {
-        :vdcs => [{ :vdc => "VDC 1" }],
-        :networks => [{ :network => "Network 1" }],
-        :catalogs => [{ :catalog => "Catalog 1" }],
-        :edgegateways => [{ :edgegateway => "Gateway 1" }]
-    }
-  end
-end
-

data/spec/walk/vapp_spec.rb

@@ -1,24 +0,0 @@
-require 'spec_helper'
-
-describe Vcloud::Walker::Resource::VApp do
-
-  context 'populate summary vapp model' do
-    before(:each) do
-      fog_vapp = Fog::ServiceLayerStub.vapp_body
-      @metadata = {:name => 'web-app-1', :shutdown => true}
-      Vcloud::Core::Vapp.should_receive(:get_metadata).with("vapp-aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee").and_return(@metadata)
-      Vcloud::Walker::Resource::Vms.should_receive(:new).with(fog_vapp[:Children][:Vm])
-
-      @vapp_summary = Vcloud::Walker::Resource::VApp.new(fog_vapp)
-    end
-
-    it 'should report id from the href' do
-      @vapp_summary.id.should == 'vapp-aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee'
-    end
-
-    it "should report metadata" do
-      @vapp_summary.metadata.count.should == 2
-      @vapp_summary.metadata.should == @metadata
-    end
-  end
-end

data/spec/walk/vdcs_spec.rb

@@ -1,30 +0,0 @@
-require 'spec_helper'
-require 'fog'
-
-describe Vcloud::Walker::Resource::Vdcs do
-  let(:api_session) { double(:fog_session) }
-
-  context 'vdcs' do
-
-    it "should summarize vdcs" do
-      Fog::Compute::VcloudDirector.should_receive(:new).with(any_args()).and_return(api_session)
-      mock_fog_vdcs = StubCollectionBuilders.vdcs(StubVdc.new.vapps([mock_vapp]).build)
-      api_session.should_receive(:get_vapp).with(1).and_return(Fog::ServiceLayerStub.mock_vapp)
-      Vcloud::Core::Vm.should_receive(:get_metadata).with("vm-d19d84a5-c950-4497-a638-23eccc4226a5").and_return({})
-      Vcloud::Core::Vapp.should_receive(:get_metadata).with("vapp-aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee").and_return({})
-
-      vdcs_summary = Vcloud::Walker::Resource::Vdcs.new(mock_fog_vdcs).to_summary
-
-      vdc_summary = vdcs_summary.first
-      vdc_summary[:vapps].count.should == 1
-      vdc_summary[:vapps].first[:vms].count == 1
-    end
-
-    private
-
-    def mock_vapp
-      double(:vapp, :id => 1)
-    end
-
-  end
-end