foreman_digitalocean 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7357254f2c88d41cd0a69e13f1d7b3a3a8729ef7
-  data.tar.gz: a1234f4af26b017a3dba33e3994718f1cedb2c44
+  metadata.gz: 9379a1ca3a8c5ad06c176ddbea6e97eb53eba36b
+  data.tar.gz: ffea1f5f5baa311ef1da930272ca4b1444988208
 SHA512:
-  metadata.gz: da0c4205ea0098f68aff3b6d177d70b81cb65cb48e104dc7ccb4520dea82bf73041b78a73e159cc320f9b7da2fb82d4b8a116b17ad91d4964ba30af9dccfe50d
-  data.tar.gz: 9cf73094139dd599e51bfaefa1d3e7c9daa0220dd8b6a8b6a319144b65f7dacc553ca9cfe6f5f43f5bbd174b35e68c05a5b7e5a12bc2688e61d2c0537282d8bc
+  metadata.gz: ebc9b5745ba635c92314d0b01f1b3cefa35dd6e045631f645d20fa45a1f39f6f70d623da3e436a0194f334895fb1e2a54846c4dd26bbedded65631a739362834
+  data.tar.gz: 4439ce81bf5365f1f5b117e6360e77423311d16d64e8a720052692093a805c00cd31eaaa127b661e36b57f2c85239d115d234694f3b84bf6b636b3fb063bcfd9

data/app/helpers/digitalocean_images_helper.rb

@@ -3,7 +3,7 @@ module DigitaloceanImagesHelper
     images = @compute_resource.available_images
     images.each { |image| image.name = image.id if image.name.nil? }
     select_f f, :uuid, images.to_a.sort_by(&:full_name),
-      :id, :full_name, {}, :label => _('Image')
+             :id, :full_name, {}, :label => _('Image')
   end
 
   def select_image(f, compute_resource)
@@ -14,8 +14,8 @@ module DigitaloceanImagesHelper
              images,
              :id,
              :slug,
-             { :include_blank => (images.empty? || images.size == 1) ? false : _('Please select an image') },
-             { :label => ('Image'), :disabled => images.empty? } )
+             { :include_blank => images.empty? || images.size == 1 ? false : _('Please select an image') },
+             { :label => 'Image', :disabled => images.empty? })
   end
 
   def select_region(f, compute_resource)
@@ -27,7 +27,7 @@ module DigitaloceanImagesHelper
              :slug,
              :slug,
              {},
-             :label => ('Region'),
+             :label => 'Region',
              :disabled => compute_resource.images.empty?)
   end
 end

data/app/models/concerns/fog_extensions/digitalocean/image.rb

@@ -1,5 +1,5 @@
 module FogExtensions
-  module DigitalOcean
+  module Digitalocean
     module Image
       extend ActiveSupport::Concern
 
@@ -11,7 +11,7 @@ module FogExtensions
         define_method :name=, instance_method(:full_name=)
       end
 
-      def full_name= value
+      def full_name=(value)
         self.os_version = value
       end
 
@@ -23,10 +23,10 @@ module FogExtensions
       # Attempt guessing arch based on the name from digital ocean
       def arch
         requires :os_version
-        if os_version.end_with?("x64")
-          "x86_64"
-        elsif os_version.end_with?("x32")
-          "i386"
+        if os_version.end_with?('x64')
+          'x86_64'
+        elsif os_version.end_with?('x32')
+          'i386'
         end
       end
     end

data/app/models/concerns/fog_extensions/digitalocean/server.rb

@@ -1,5 +1,5 @@
 module FogExtensions
-  module DigitalOcean
+  module Digitalocean
     module Server
       extend ActiveSupport::Concern
 

data/app/models/foreman_digitalocean/digitalocean.rb

@@ -20,7 +20,7 @@ module ForemanDigitalocean
       super.merge(
         :uuid => :identity_to_s,
         :ip => :ipv4_address,
-        :ip6 => :ipv6_address,
+        :ip6 => :ipv6_address
       )
     end
 
@@ -39,7 +39,7 @@ module ForemanDigitalocean
     end
 
     def create_vm(args = {})
-      args["ssh_keys"] = [ssh_key] if ssh_key
+      args['ssh_keys'] = [ssh_key] if ssh_key
       args['image'] = args['image_id']
       super(args)
     rescue Fog::Errors::Error => e
@@ -82,11 +82,11 @@ module ForemanDigitalocean
     end
 
     def self.provider_friendly_name
-      "DigitalOcean"
+      'DigitalOcean'
     end
 
     def associated_host(vm)
-      associate_by("ip", [vm.public_ip_address])
+      associate_by('ip', [vm.public_ip_address])
     end
 
     def user_data_supported?
@@ -103,8 +103,7 @@ module ForemanDigitalocean
 
     def client
       @client ||= Fog::Compute.new(
-        :provider => "DigitalOcean",
-        :version => 'V2',
+        :provider => 'DigitalOcean',
         :digitalocean_token => api_key
       )
     end
@@ -122,8 +121,8 @@ module ForemanDigitalocean
       key_name = "foreman-#{id}#{Foreman.uuid}"
       client.create_ssh_key key_name, public_key
       KeyPair.create! :name => key_name, :compute_resource_id => id, :secret => private_key
-    rescue => e
-      logger.warn "failed to generate key pair"
+    rescue StandardError => e
+      logger.warn 'failed to generate key pair'
       logger.error e.message
       logger.error e.backtrace.join("\n")
       destroy_key_pair
@@ -136,13 +135,13 @@ module ForemanDigitalocean
       client.destroy_ssh_key(ssh_key.id) if ssh_key
       key_pair.destroy
       true
-    rescue => e
+    rescue StandardError => e
       logger.warn "failed to delete key pair from DigitalOcean, you might need to cleanup manually : #{e}"
     end
 
     def ssh_key
       @ssh_key ||= begin
-        key = client.list_ssh_keys.data[:body]["ssh_keys"].find { |i| i["name"] == key_pair.name }
+        key = client.list_ssh_keys.data[:body]['ssh_keys'].find { |i| i['name'] == key_pair.name }
         key['id'] if key.present?
       end
     end

data/lib/foreman_digitalocean/engine.rb

@@ -16,7 +16,7 @@ module ForemanDigitalocean
 
     initializer 'foreman_digitalocean.register_plugin', :before => :finisher_hook do
       Foreman::Plugin.register :foreman_digitalocean do
-        requires_foreman '>= 1.8'
+        requires_foreman '>= 1.16'
         compute_resource ForemanDigitalocean::Digitalocean
         parameter_filter ComputeResource, :region, :api_key
       end
@@ -28,22 +28,16 @@ module ForemanDigitalocean
 
     config.to_prepare do
       require 'fog/digitalocean'
-      require 'fog/digitalocean/compute_v2'
-      require 'fog/digitalocean/models/compute_v2/image'
-      require 'fog/digitalocean/models/compute_v2/server'
-      require File.expand_path(
-        '../../../app/models/concerns/fog_extensions/digitalocean/server',
-        __FILE__)
-      require File.expand_path(
-        '../../../app/models/concerns/fog_extensions/digitalocean/image',
-        __FILE__)
-
-      Fog::Compute::DigitalOceanV2::Image.send :include,
-        FogExtensions::DigitalOcean::Image
-      Fog::Compute::DigitalOceanV2::Server.send :include,
-        FogExtensions::DigitalOcean::Server
+      require 'fog/digitalocean/compute'
+      require 'fog/digitalocean/models/compute/image'
+      require 'fog/digitalocean/models/compute/server'
+
+      Fog::Compute::DigitalOcean::Image.send :include,
+                                             FogExtensions::Digitalocean::Image
+      Fog::Compute::DigitalOcean::Server.send :include,
+                                              FogExtensions::Digitalocean::Server
       ::Host::Managed.send :include,
-        ForemanDigitalocean::Concerns::HostManagedExtensions
+                           ForemanDigitalocean::Concerns::HostManagedExtensions
     end
   end
 end

data/lib/foreman_digitalocean/tasks/test.rake

@@ -1,9 +1,9 @@
-require File.expand_path("../engine", File.dirname(__FILE__))
+require File.expand_path('../engine', File.dirname(__FILE__))
 namespace :test do
-  desc "Run the plugin unit test suite."
+  desc 'Run the plugin unit test suite.'
   task :digitalocean => ['db:test:prepare'] do
     test_task = Rake::TestTask.new('digitalocean_test_task') do |t|
-      t.libs << ["test", "#{ForemanDigitalocean::Engine.root}/test"]
+      t.libs << ['test', "#{ForemanDigitalocean::Engine.root}/test"]
       t.test_files = [
         "#{ForemanDigitalocean::Engine.root}/test/**/*_test.rb"
       ]
@@ -24,8 +24,8 @@ namespace :digitalocean do
                          "#{ForemanDigitalocean::Engine.root}/lib/**/*.rb",
                          "#{ForemanDigitalocean::Engine.root}/test/**/*.rb"]
       end
-    rescue
-      puts "Rubocop not loaded."
+    rescue StandardError
+      puts 'Rubocop not loaded.'
     end
 
     Rake::Task['rubocop_digitalocean'].invoke
@@ -38,7 +38,7 @@ end
 
 load 'tasks/jenkins.rake'
 if Rake::Task.task_defined?(:'jenkins:unit')
-  Rake::Task["jenkins:unit"].enhance do
+  Rake::Task['jenkins:unit'].enhance do
     Rake::Task['test:digitalocean'].invoke
     Rake::Task['digitalocean:rubocop'].invoke
   end

data/lib/foreman_digitalocean/version.rb

@@ -1,3 +1,3 @@
 module ForemanDigitalocean
-  VERSION = '1.2.0'
+  VERSION = '1.3.0'.freeze
 end

data/test/factories/compute_resources.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :container_resource, :class => ComputeResource do
     sequence(:name) { |n| "compute_resource#{n}" }
 

data/test/test_plugin_helper.rb

@@ -1,6 +1,6 @@
 # This calls the main test_helper in Foreman core
 require 'test_helper'
 
-# Add plugin to FactoryGirl's paths
-FactoryGirl.definition_file_paths << File.join(File.dirname(__FILE__), 'factories')
-FactoryGirl.reload
+# Add plugin to FactoryBot's paths
+FactoryBot.definition_file_paths << File.join(File.dirname(__FILE__), 'factories')
+FactoryBot.reload

data/test/unit/foreman_digitalocean/digitalocean_test.rb

@@ -9,7 +9,7 @@ module ForemanDigitalocean
     teardown { Fog.unmock! }
 
     test 'ssh key pair gets created after its saved' do
-      digitalocean = FactoryGirl.build(:digitalocean_cr)
+      digitalocean = FactoryBot.build(:digitalocean_cr)
       digitalocean.expects(:setup_key_pair)
       digitalocean.save
     end

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: foreman_digitalocean
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Tommy McNeely, Daniel Lobato
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-23 00:00:00.000000000 Z
+date: 2018-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: fog-digitalocean
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.42'
-  type: :development
+        version: '0.3'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.42'
+        version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.51.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.51.0
 description: Provision and manage DigitalOcean droplets from Foreman.
 email:
 - elobatocs@gmail.com
@@ -74,12 +88,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Provision and manage DigitalOcean droplets from Foreman
 test_files:
 - test/factories/compute_resources.rb
-- test/test_plugin_helper.rb
 - test/unit/foreman_digitalocean/digitalocean_test.rb
-has_rdoc: 
+- test/test_plugin_helper.rb