foreman_digitalocean 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09968431a3ccdbbd31a0dde996cfff6358a2a254
-  data.tar.gz: d044e4f386bd33594bcab16953e3380f2e334de7
+  metadata.gz: 40e7592a3281e8c3a309dea6de05fe97d6e38625
+  data.tar.gz: 84c63f6d23de034071ee0fb632cbbed358eb18cb
 SHA512:
-  metadata.gz: 83c7f182dfabf192159f2c2678f9aafceaece54ba60f9d9a19d397456d54c6c969a588242b25df274b5e349e3dd21bd77dff86324c867a9df36e06715ca94a7d
-  data.tar.gz: 9a861c05403d615412a39530860cca00cc2193bd921aaee5ea9d63dd2b34fd2315e5208ab46d78685720a30b8803b3289a0258bb658dc38cd0af7d12bf336f8a
+  metadata.gz: 441f829ee9a1642edfc3144000aa71ae7046ac903915a266dd6d075ee7ec1cbaeb0cd5bb76ea3b1b7700b0e45862fc88927ef3280b87eb6d7ca50091b7f9025f
+  data.tar.gz: 6e35c6b39759de2a4ac1bdfb3ebcfb346a55f767e3a4cfdb0e2b5a333bdf9ccbc0ea56e15c911993df395baa112cc1fc91f43970337663adf391cda8dfc6d3a3

data/README.md

@@ -52,12 +52,14 @@ To verify that the installation was successful, go to Foreman, top bar **Adminis
 | --------------- | --------------:|
 | <= 1.7.x        | ~> 0.1.x       |
 | >= 1.8.0        | ~> 0.2.x       |
+| >= 1.11.0       | ~> 1.x         |
+| >= 1.13.0       | ~> 1.1         |
 
 ## Configuration
 
 Go to **Infrastructure > Compute Resources** and click on "New Compute Resource".
 
-Choose the **DigitalOcean provider**, and fill in all the fields. The API client and secret keys can be retrieved from [the API v1 DigitalOcean site](https://cloud.digitalocean.com/api_access). The secret key will be encrypted in the database.
+Choose the **DigitalOcean provider**, and fill in all the fields. You need an API token with read and write access, which can be created at the [DigitalOcean API section](https://cloud.digitalocean.com/settings/api/tokens). It will be encrypted in the database.
 
 That's it. You're now ready to create and manage droplets in your new DigitalOcean compute resource.
 

data/app/models/foreman_digitalocean/digitalocean.rb

@@ -12,8 +12,6 @@ module ForemanDigitalocean
     after_create :setup_key_pair
     after_destroy :destroy_key_pair
 
-    attr_accessible :region, :api_key
-
     def to_label
       "#{name} (#{provider_friendly_name})"
     end
@@ -79,8 +77,7 @@ module ForemanDigitalocean
     end
 
     def associated_host(vm)
-      Host.authorized(:view_hosts, Host).
-        where(:ip => [vm.public_ip_address, vm.private_ip_address]).first
+      associate_by("ip", [vm.public_ip_address])
     end
 
     def user_data_supported?

data/app/views/compute_resources/form/_digitalocean.html.erb

@@ -1,14 +1,12 @@
-<%= password_f f, :api_key, :label => _("API Key"), :unset => unset_password? %>
+<%= password_f f, :password, :label => _("API Key"), :unset => unset_password? %>
 <% regions = f.object.regions rescue [] %>
 
 <div id='region_selection'>
-  <%= select_f(
-    f, :region, regions, :slug, :name, {},
+  <%= selectable_f(f, :region, regions.map(&:slug), {},
     :label => _('Default Region'), :disabled => regions.empty?,
     :help_inline => link_to_function(
       regions.empty? ? _("Load Regions") : _("Test Connection"), "testConnection(this)",
       :class => "btn + #{regions.empty? ? "btn-default" : "btn-success"}",
       :'data-url' => test_connection_compute_resources_path) +
-     spinner('', :id => 'test_connection_indicator',
-             :class => 'hide').html_safe) %>
+     hidden_spinner('', :id => 'test_connection_indicator').html_safe) %>
 </div>

data/lib/foreman_digitalocean/engine.rb

@@ -18,6 +18,7 @@ module ForemanDigitalocean
       Foreman::Plugin.register :foreman_digitalocean do
         requires_foreman '>= 1.8'
         compute_resource ForemanDigitalocean::Digitalocean
+        parameter_filter ComputeResource, :region, :api_key
       end
     end
 

data/lib/foreman_digitalocean/tasks/test.rake

@@ -8,6 +8,7 @@ namespace :test do
         "#{ForemanDigitalocean::Engine.root}/test/**/*_test.rb"
       ]
       t.verbose = true
+      t.warning = false
     end
 
     Rake::Task[test_task.name].invoke

data/lib/foreman_digitalocean/version.rb

@@ -1,3 +1,3 @@
 module ForemanDigitalocean
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/test/unit/foreman_digitalocean/digitalocean_test.rb

@@ -1,18 +1,17 @@
 require 'test_plugin_helper'
 
-class ForemanDigitalocean::DigitaloceanTest < ActiveSupport::TestCase
-  should validate_presence_of(:api_key)
-  should allow_mass_assignment_of(:region)
-  should allow_mass_assignment_of(:api_key)
-  should delegate_method(:flavors).to(:client)
-  should have_one(:key_pair)
+module ForemanDigitalocean
+  class DigitaloceanTest < ActiveSupport::TestCase
+    should validate_presence_of(:api_key)
+    should have_one(:key_pair)
 
-  setup { Fog.mock! }
-  teardown { Fog.unmock! }
+    setup { Fog.mock! }
+    teardown { Fog.unmock! }
 
-  test 'ssh key pair gets created after its saved' do
-    digitalocean = FactoryGirl.build(:digitalocean_cr)
-    digitalocean.expects(:setup_key_pair)
-    digitalocean.save
+    test 'ssh key pair gets created after its saved' do
+      digitalocean = FactoryGirl.build(:digitalocean_cr)
+      digitalocean.expects(:setup_key_pair)
+      digitalocean.save
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_digitalocean
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Tommy McNeely, Daniel Lobato
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-15 00:00:00.000000000 Z
+date: 2016-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.26'
+        version: '0.42'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.26'
+        version: '0.42'
 description: Provision and manage DigitalOcean droplets from Foreman.
 email:
 - elobatocs@gmail.com
@@ -74,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: Provision and manage DigitalOcean droplets from Foreman