fog 1.41.0 → 1.42.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 829e5ef73eff833c9d38e2133d28d8d47771812f
-  data.tar.gz: 73097280f69981f019fcae7a9fb4084340af30a3
+  metadata.gz: 3df7287f3ad261f271ddac68c159c71fc6584565
+  data.tar.gz: aaf6dd8347213c5813d8c15222c72471654c35cd
 SHA512:
-  metadata.gz: 6ed7fe7cbd1f522376d2ab935abad73a90b489ea2edca3b418d6b7e7b9d214837404834c015e564f6118b21619096af4a9c25c1fc175a6d200264d4b7e9ad186
-  data.tar.gz: 69a6552cc360e8f8bf4a05e473b31ff3e8230f481f6c857a4f6da662d9497c044a965999d83429dba2e4fcb4558bb9a06727a288493cdc0d7d383e0dd773a04b
+  metadata.gz: 22c044fa32910668a9e30e6a1ae0f397bc1af2f2969a9ecb70e825ab674bcd952fd63574982751e985b253c052372d240dc1173981a968a17bea69d6843a94f9
+  data.tar.gz: a46c5e2eb704fd4fc440db7a53045c43f0b883bc3e4f814229a1d58c3d7885bfde0b1c5918c32f447aac8e35590f4a9c26ce34dceddd43fbcf02fdce86ac8b2e

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+## 1.42.0 09/29/2017
+*Hash* 41a38068d34237b9639ac045f99a4b48160834a9
+
+Statistic     | Value
+------------- | --------:
+Collaborators | 2
+Forks         | 1556
+Open Issues   | 45
+Watchers      | 4060
+
+**MVP!** swamp09
+
+#### [misc]
+*   Upgrade JSON to ~> 2.0. thanks Denis Defreyne
+*   Removing ovirt provider. thanks Ori Rabin
+*   fix changelog task. thanks geemus
+*   Suppress `warning: ambiguous first argument; put parentheses or a space even after `/' operator`. thanks swamp09
+*   Suppress `warning: mismatched indentations at 'end' with 'class'`. thanks swamp09
+
+
 ## 1.41.0 08/01/2017
 *Hash* e5d3672e804149d38f91ccdfdaf7cfd7be52b75b
 

data/Rakefile

@@ -73,9 +73,6 @@ namespace :test do
   task :openvz do
       sh("export FOG_MOCK=#{mock} && bundle exec shindont tests/openvz")
   end
-  task :ovirt do
-      sh("export FOG_MOCK=#{mock} && bundle exec shindont tests/ovirt")
-  end
   task :cloudstack do
       sh("export FOG_MOCK=#{mock} && bundle exec shindont tests/cloudstack")
   end

data/fog.gemspec

@@ -11,8 +11,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = "fog"
-  s.version           = "1.41.0"
-  s.date              = "2017-08-01"
+  s.version           = "1.42.0"
+  s.date              = "2017-09-29"
   s.rubyforge_project = "fog"
 
   ## Make sure your summary is short. The description may be as long
@@ -47,9 +47,8 @@ Gem::Specification.new do |s|
   s.add_dependency("fog-core", "~> 1.45")
   s.add_dependency("fog-json")
   s.add_dependency("fog-xml", "~> 0.1.1")
-  
-  # JSON locked for Ruby 1.9, remove once deprecated
-  s.add_dependency("json", ">= 1.8", "< 2.0")
+
+  s.add_dependency("json", "~> 2.0")
   s.add_dependency("ipaddress", "~> 0.5")
 
   # Modular providers (please keep sorted)
@@ -67,6 +66,7 @@ Gem::Specification.new do |s|
   s.add_dependency("fog-joyent")
   s.add_dependency("fog-local")
   s.add_dependency("fog-openstack")
+  s.add_dependency("fog-ovirt")
   s.add_dependency("fog-powerdns", ">= 0.1.1")
   s.add_dependency("fog-profitbricks")
   s.add_dependency("fog-rackspace")
@@ -90,7 +90,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency("opennebula")
   s.add_development_dependency("pry")
   s.add_development_dependency("rake")
-  s.add_development_dependency("rbovirt", "0.1.3")
   s.add_development_dependency("rbvmomi")
   s.add_development_dependency("rubocop", "0.41.2")
   s.add_development_dependency("shindo", "~> 0.3.4")

data/lib/fog/vcloud_director/requests/compute/post_power_on_vapp.rb

@@ -65,7 +65,7 @@ module Fog
             :body => body
           )
         end
-        end
+      end
     end
   end
 end

data/lib/fog/version.rb

@@ -1,3 +1,3 @@
 module Fog
-  VERSION = '1.41.0'
+  VERSION = '1.42.0'
 end

data/lib/tasks/changelog_task.rb

@@ -148,6 +148,7 @@ Watchers      | #{watchers}
            'Rodrigo Estebanez',
            'Rupak Ganguly',
            'Stepan G. Fedorov',
+           'swamp09',
            'TerryHowe',
            'Wesley Beary'
          ].include?(committer)
@@ -177,7 +178,7 @@ Watchers      | #{watchers}
       end
 
       def committer_match
-        current_line.match /([-\w\s]+)\s+\(\d+\)/
+        @current_line.match (/([-\w\s]+)\s+\(\d+\)/)
       end
 
       def last_release_sha

data/lib/tasks/github_release_task.rb

@@ -47,7 +47,7 @@ module Fog
       end
 
       def release_match
-        @current_line.match /## (\d+\.\d+\.\d+) \d+\/\d+\d+/
+        @current_line.match (/## (\d+\.\d+\.\d+) \d+\/\d+\d+/)
       end
 
       def github

data/tests/helpers/mock_helper.rb

@@ -58,9 +58,6 @@ if Fog.mock?
     :openstack_username               => 'openstack_username',
     :openstack_tenant                 => 'openstack_tenant',
     :openstack_auth_url               => 'http://openstack:35357/v2.0/tokens',
-    :ovirt_url                        => 'http://ovirt:8080/api',
-    :ovirt_username                   => 'admin@internal',
-    :ovirt_password                   => '123123',
     :profitbricks_username            => 'profitbricks_username',
     :profitbricks_password            => 'profitbricks_password',
     :rackspace_api_key                => 'rackspace_api_key',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog
 version: !ruby/object:Gem::Version
-  version: 1.41.0
+  version: 1.42.0
 platform: ruby
 authors:
 - geemus (Wesley Beary)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-01 00:00:00.000000000 Z
+date: 2017-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -56,20 +56,14 @@ dependencies:
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.8'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.8'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
@@ -282,6 +276,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: fog-ovirt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fog-powerdns
   requirement: !ruby/object:Gem::Requirement
@@ -590,20 +598,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rbovirt
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.1.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: rbvmomi
   requirement: !ruby/object:Gem::Requirement
@@ -814,7 +808,6 @@ files:
 - lib/fog/bin/opennebula.rb
 - lib/fog/bin/openstack.rb
 - lib/fog/bin/openvz.rb
-- lib/fog/bin/ovirt.rb
 - lib/fog/bin/rackspace.rb
 - lib/fog/bin/rage4.rb
 - lib/fog/bin/softlayer.rb
@@ -1818,83 +1811,8 @@ files:
 - lib/fog/openvz/requests/compute/suspend_server.rb
 - lib/fog/openvz/requests/compute/umount_server.rb
 - lib/fog/ovirt.rb
-- lib/fog/ovirt/compute.rb
-- lib/fog/ovirt/core.rb
-- lib/fog/ovirt/models/compute/affinity_group.rb
-- lib/fog/ovirt/models/compute/affinity_groups.rb
-- lib/fog/ovirt/models/compute/cluster.rb
-- lib/fog/ovirt/models/compute/clusters.rb
-- lib/fog/ovirt/models/compute/instance_type.rb
-- lib/fog/ovirt/models/compute/instance_types.rb
-- lib/fog/ovirt/models/compute/interface.rb
-- lib/fog/ovirt/models/compute/interfaces.rb
-- lib/fog/ovirt/models/compute/quota.rb
-- lib/fog/ovirt/models/compute/quotas.rb
-- lib/fog/ovirt/models/compute/server.rb
-- lib/fog/ovirt/models/compute/servers.rb
-- lib/fog/ovirt/models/compute/template.rb
-- lib/fog/ovirt/models/compute/templates.rb
-- lib/fog/ovirt/models/compute/volume.rb
-- lib/fog/ovirt/models/compute/volumes.rb
 - lib/fog/ovirt/requests/compute/activate_volume.rb
-- lib/fog/ovirt/requests/compute/add_interface.rb
-- lib/fog/ovirt/requests/compute/add_to_affinity_group.rb
-- lib/fog/ovirt/requests/compute/add_volume.rb
-- lib/fog/ovirt/requests/compute/attach_volume.rb
-- lib/fog/ovirt/requests/compute/create_affinity_group.rb
-- lib/fog/ovirt/requests/compute/create_vm.rb
-- lib/fog/ovirt/requests/compute/datacenters.rb
 - lib/fog/ovirt/requests/compute/deactivate_volume.rb
-- lib/fog/ovirt/requests/compute/destroy_affinity_group.rb
-- lib/fog/ovirt/requests/compute/destroy_interface.rb
-- lib/fog/ovirt/requests/compute/destroy_vm.rb
-- lib/fog/ovirt/requests/compute/destroy_volume.rb
-- lib/fog/ovirt/requests/compute/detach_volume.rb
-- lib/fog/ovirt/requests/compute/get_affinity_group.rb
-- lib/fog/ovirt/requests/compute/get_api_version.rb
-- lib/fog/ovirt/requests/compute/get_cluster.rb
-- lib/fog/ovirt/requests/compute/get_instance_type.rb
-- lib/fog/ovirt/requests/compute/get_quota.rb
-- lib/fog/ovirt/requests/compute/get_template.rb
-- lib/fog/ovirt/requests/compute/get_virtual_machine.rb
-- lib/fog/ovirt/requests/compute/list_affinity_group_vms.rb
-- lib/fog/ovirt/requests/compute/list_affinity_groups.rb
-- lib/fog/ovirt/requests/compute/list_clusters.rb
-- lib/fog/ovirt/requests/compute/list_instance_types.rb
-- lib/fog/ovirt/requests/compute/list_networks.rb
-- lib/fog/ovirt/requests/compute/list_quotas.rb
-- lib/fog/ovirt/requests/compute/list_template_interfaces.rb
-- lib/fog/ovirt/requests/compute/list_template_volumes.rb
-- lib/fog/ovirt/requests/compute/list_templates.rb
-- lib/fog/ovirt/requests/compute/list_virtual_machines.rb
-- lib/fog/ovirt/requests/compute/list_vm_interfaces.rb
-- lib/fog/ovirt/requests/compute/list_vm_volumes.rb
-- lib/fog/ovirt/requests/compute/list_volumes.rb
-- lib/fog/ovirt/requests/compute/mock_files/affinitygroup.xml
-- lib/fog/ovirt/requests/compute/mock_files/affinitygroup_vms.xml
-- lib/fog/ovirt/requests/compute/mock_files/affinitygroups.xml
-- lib/fog/ovirt/requests/compute/mock_files/cluster.xml
-- lib/fog/ovirt/requests/compute/mock_files/clusters.xml
-- lib/fog/ovirt/requests/compute/mock_files/data_centers.xml
-- lib/fog/ovirt/requests/compute/mock_files/disks.xml
-- lib/fog/ovirt/requests/compute/mock_files/instance_type.xml
-- lib/fog/ovirt/requests/compute/mock_files/instance_types.xml
-- lib/fog/ovirt/requests/compute/mock_files/nics.xml
-- lib/fog/ovirt/requests/compute/mock_files/quotas.xml
-- lib/fog/ovirt/requests/compute/mock_files/storage_domains.xml
-- lib/fog/ovirt/requests/compute/mock_files/template.xml
-- lib/fog/ovirt/requests/compute/mock_files/templates.xml
-- lib/fog/ovirt/requests/compute/mock_files/vm.xml
-- lib/fog/ovirt/requests/compute/mock_files/vms.xml
-- lib/fog/ovirt/requests/compute/mock_files/volumes.xml
-- lib/fog/ovirt/requests/compute/remove_from_affinity_group.rb
-- lib/fog/ovirt/requests/compute/storage_domains.rb
-- lib/fog/ovirt/requests/compute/update_interface.rb
-- lib/fog/ovirt/requests/compute/update_vm.rb
-- lib/fog/ovirt/requests/compute/update_volume.rb
-- lib/fog/ovirt/requests/compute/vm_action.rb
-- lib/fog/ovirt/requests/compute/vm_start_with_cloudinit.rb
-- lib/fog/ovirt/requests/compute/vm_ticket.rb
 - lib/fog/rage4.rb
 - lib/fog/rage4/core.rb
 - lib/fog/rage4/dns.rb
@@ -2294,7 +2212,6 @@ files:
 - spec/fog/bin/opennebula_spec.rb
 - spec/fog/bin/openstack_spec.rb
 - spec/fog/bin/openvz_spec.rb
-- spec/fog/bin/ovirt_spec.rb
 - spec/fog/bin/powerdns_spec.rb
 - spec/fog/bin/profitbricks_spec.rb
 - spec/fog/bin/rackspace_spec.rb
@@ -2474,22 +2391,6 @@ files:
 - tests/openvz/helper.rb
 - tests/openvz/models/compute/server_tests.rb
 - tests/openvz/models/compute/servers_tests.rb
-- tests/ovirt/compute_tests.rb
-- tests/ovirt/models/compute/cluster_tests.rb
-- tests/ovirt/models/compute/clusters_tests.rb
-- tests/ovirt/models/compute/interface_tests.rb
-- tests/ovirt/models/compute/interfaces_tests.rb
-- tests/ovirt/models/compute/server_tests.rb
-- tests/ovirt/models/compute/servers_tests.rb
-- tests/ovirt/models/compute/template_tests.rb
-- tests/ovirt/models/compute/templates_tests.rb
-- tests/ovirt/requests/compute/create_vm_tests.rb
-- tests/ovirt/requests/compute/destroy_vm_tests.rb
-- tests/ovirt/requests/compute/list_datacenters_tests.rb
-- tests/ovirt/requests/compute/list_quotas_tests.rb
-- tests/ovirt/requests/compute/list_storage_domains_tests.rb
-- tests/ovirt/requests/compute/update_vm_tests.rb
-- tests/ovirt/requests/compute/update_volume_tests.rb
 - tests/rage4/requests/dns/dns_tests.rb
 - tests/storage/helper.rb
 - tests/storage/models/directories_tests.rb
@@ -2598,7 +2499,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: fog
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 2
 summary: brings clouds to you
@@ -2629,7 +2530,6 @@ test_files:
 - spec/fog/bin/opennebula_spec.rb
 - spec/fog/bin/openstack_spec.rb
 - spec/fog/bin/openvz_spec.rb
-- spec/fog/bin/ovirt_spec.rb
 - spec/fog/bin/powerdns_spec.rb
 - spec/fog/bin/profitbricks_spec.rb
 - spec/fog/bin/rackspace_spec.rb
@@ -2809,22 +2709,6 @@ test_files:
 - tests/openvz/helper.rb
 - tests/openvz/models/compute/server_tests.rb
 - tests/openvz/models/compute/servers_tests.rb
-- tests/ovirt/compute_tests.rb
-- tests/ovirt/models/compute/cluster_tests.rb
-- tests/ovirt/models/compute/clusters_tests.rb
-- tests/ovirt/models/compute/interface_tests.rb
-- tests/ovirt/models/compute/interfaces_tests.rb
-- tests/ovirt/models/compute/server_tests.rb
-- tests/ovirt/models/compute/servers_tests.rb
-- tests/ovirt/models/compute/template_tests.rb
-- tests/ovirt/models/compute/templates_tests.rb
-- tests/ovirt/requests/compute/create_vm_tests.rb
-- tests/ovirt/requests/compute/destroy_vm_tests.rb
-- tests/ovirt/requests/compute/list_datacenters_tests.rb
-- tests/ovirt/requests/compute/list_quotas_tests.rb
-- tests/ovirt/requests/compute/list_storage_domains_tests.rb
-- tests/ovirt/requests/compute/update_vm_tests.rb
-- tests/ovirt/requests/compute/update_volume_tests.rb
 - tests/rage4/requests/dns/dns_tests.rb
 - tests/storage/helper.rb
 - tests/storage/models/directories_tests.rb

data/lib/fog/bin/ovirt.rb

@@ -1,28 +0,0 @@
-class Ovirt < Fog::Bin
-  class << self
-    def class_for(key)
-      case key
-      when :compute
-        Fog::Compute::Ovirt
-      else
-        raise ArgumentError, "Unrecognized service: #{key}"
-      end
-    end
-
-    def [](service)
-      @@connections ||= Hash.new do |hash, key|
-        hash[key] = case key
-                    when :compute
-                      Fog::Compute.new(:provider => 'Ovirt')
-                    else
-                      raise ArgumentError, "Unrecognized service: #{key.inspect}"
-                    end
-      end
-      @@connections[service]
-    end
-
-    def services
-      Fog::Ovirt.services
-    end
-  end
-end

data/lib/fog/ovirt/compute.rb

@@ -1,155 +0,0 @@
-require 'fog/ovirt/core'
-
-module Fog
-  module Compute
-    class Ovirt < Fog::Service
-      requires   :ovirt_username, :ovirt_password
-      recognizes :ovirt_url,      :ovirt_server,  :ovirt_port, :ovirt_api_path, :ovirt_datacenter,
-                 :ovirt_filtered_api,
-                 :ovirt_ca_cert_store, :ovirt_ca_cert_file, :ovirt_ca_no_verify
-
-      model_path 'fog/ovirt/models/compute'
-      model      :server
-      collection :servers
-      model      :template
-      collection :templates
-      model      :instance_type
-      collection :instance_types
-      model      :cluster
-      collection :clusters
-      model      :interface
-      collection :interfaces
-      model      :volume
-      collection :volumes
-      model      :quota
-      collection :quotas
-      model      :affinity_group
-      collection :affinity_groups
-
-      request_path 'fog/ovirt/requests/compute'
-
-      request :vm_action
-      request :vm_start_with_cloudinit
-      request :destroy_vm
-      request :create_vm
-      request :update_vm
-      request :datacenters
-      request :storage_domains
-      request :list_virtual_machines
-      request :get_virtual_machine
-      request :list_templates
-      request :get_template
-      request :list_instance_types
-      request :get_instance_type
-      request :list_clusters
-      request :get_cluster
-      request :add_interface
-      request :destroy_interface
-      request :update_interface
-      request :list_vm_interfaces
-      request :list_template_interfaces
-      request :list_networks
-      request :vm_ticket
-      request :list_vm_volumes
-      request :list_template_volumes
-      request :list_volumes
-      request :add_volume
-      request :destroy_volume
-      request :update_volume
-      request :attach_volume
-      request :detach_volume
-      request :activate_volume
-      request :deactivate_volume
-      request :get_api_version
-      request :list_quotas
-      request :get_quota
-      request :list_affinity_groups
-      request :get_affinity_group
-      request :list_affinity_group_vms
-      request :create_affinity_group
-      request :destroy_affinity_group
-      request :add_to_affinity_group
-      request :remove_from_affinity_group
-
-      module Shared
-        # converts an OVIRT object into an hash for fog to consume.
-        def ovirt_attrs obj
-          opts = {:raw => obj}
-          obj.instance_variables.each do |v|
-            key = v.to_s.gsub("@","").to_sym
-            value = obj.instance_variable_get(v)
-            #ignore nil values
-            next if value.nil?
-
-            opts[key] = case value
-                        when OVIRT::Link
-                          value.id
-                        when OVIRT::TemplateVersion
-                          value
-                        when Array
-                          value
-                        when Hash
-                          value
-                        else
-                          value.to_s.strip
-                        end
-          end
-          opts
-        end
-      end
-
-      class Mock
-        include Shared
-
-        def initialize(options={})
-          require 'rbovirt'
-        end
-
-        private
-
-        def client
-          return @client if defined?(@client)
-        end
-
-        #read mocks xml
-        def read_xml(file_name)
-          file_path = File.join(File.dirname(__FILE__),"requests","compute","mock_files",file_name)
-          File.read(file_path)
-        end
-      end
-
-      class Real
-        include Shared
-
-        def initialize(options={})
-          require 'rbovirt'
-          username   = options[:ovirt_username]
-          password   = options[:ovirt_password]
-          server     = options[:ovirt_server]
-          port       = options[:ovirt_port]       || 8080
-          api_path   = options[:ovirt_api_path]   || '/api'
-          url        = options[:ovirt_url]        || "#{@scheme}://#{server}:#{port}#{api_path}"
-
-          connection_opts = {}
-          connection_opts[:datacenter_id] = options[:ovirt_datacenter]
-          connection_opts[:ca_cert_store] = options[:ovirt_ca_cert_store]
-          connection_opts[:ca_cert_file]  = options[:ovirt_ca_cert_file]
-          connection_opts[:ca_no_verify]  = options[:ovirt_ca_no_verify]
-          connection_opts[:filtered_api]  = options[:ovirt_filtered_api]
-
-          @client = OVIRT::Client.new(username, password, url, connection_opts)
-        end
-
-        def api_version
-          client.api_version
-        end
-
-        private
-
-        def client
-          @client
-        end
-      end
-    end
-  end
-end