foreman_setup 1.0.4 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da5e328806b88cd3747ffbc70cae928ce9c5c8b2
-  data.tar.gz: e9e716397bd1c04ebfa7264dc4a18000d84b2211
+  metadata.gz: 5dcdedbef7bdb8de44908f4043e201d11bfdbd49
+  data.tar.gz: 37b24908a75c247c024f8416f1dfc499792591ca
 SHA512:
-  metadata.gz: eddc32856664befabe4461e7e6abc8fc70727daababd8d65c022067df211674ad6123bf2ebb05647c1eba923ee8be16ea12660e72108bab80a18b07a5765e66b
-  data.tar.gz: 7f3c04ade6e8c10a592492334c40eb9d496c7748e63a640b544c5e1bb548dc290142223a44b4e3a3b1d25adf6114b8a6eb40fbba73191e96c5592ac45e5e9fb9
+  metadata.gz: 5c9f82d19bf197bfd150b384cc5eeefa5425cf6f7ec0e71e81971f5fa4455f0b61f9eb4da5e90bae36c6c20bc58ffae85a309aa7de21303ff3b249756c7fd3a7
+  data.tar.gz: 2a23e156c06ec9154dc82b735b24b3279f4d473c7da4cc42b8be0616143cb8eba1d86ed9c7e168330e5ffbf6b2177435e938edb2e4807e1b1d032110de8e27fc

data/CHANGES.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v2.0.0
+* add support for Foreman 1.5 auth system (#4538)
+* this version (2.x) drops support for Foreman 1.4 and earlier
+* update menu references for Foreman 1.4 (Jean-Baptiste Rouault)
+
 ## v1.0.4
 * further Foreman 1.4 fixes, template renames and CSS
 

data/app/controllers/foreman_setup/provisioners_controller.rb

@@ -201,7 +201,7 @@ module ForemanSetup
     end
 
     def find_resource
-      @provisioner = Provisioner.find(params[:id]) or raise('unknown id')
+      @provisioner = Provisioner.authorized(:edit_provisioning).find(params[:id]) or raise('unknown id')
     end
 
   end

data/app/models/foreman_setup/provisioner.rb

@@ -2,7 +2,7 @@ require 'ipaddr'
 
 module ForemanSetup
   class Provisioner < ActiveRecord::Base
-    include ::Authorization
+    include ::Authorizable
     include ::Host::Hostmix
 
     before_save :populate_hostgroup

data/app/views/foreman_setup/provisioners/_step5.html.erb

@@ -9,7 +9,7 @@
   </p>
 
   <p>
-    <%= _("The configuration set up is all accessible under the More menu, e.g. More > Provisioning > Subnets, and can be changed in the web interface.  You can return to this set up process through <b>More > Provisioning > Provisioning Setup</b> to change settings or add new provisioning capabilities.").html_safe %>
+    <%= _("The configuration set up is all accessible under the Infrastructure menu, e.g. Infrastructure > Subnets, and can be changed in the web interface.  You can return to this set up process through <b>Infrastructure > Provisioning Setup</b> to change settings or add new provisioning capabilities.").html_safe %>
   </p>
 
   <h4><%= _("Next steps") %></h4>

data/db/migrate/20140305165000_update_foreman_setup_permissions.rb

@@ -0,0 +1,10 @@
+class UpdateForemanSetupPermissions < ActiveRecord::Migration
+  def self.up
+    old_permission = ::Permission.where(:name => "edit_provisioning", :resource_type => nil).first
+    new_permission = ::Permission.where(:name => "edit_provisioning", :resource_type => "ForemanSetup::Provisioner").first
+    unless old_permission.nil?
+      Filtering.where(:permission_id => old_permission.id).update_all(:permission_id => new_permission.id)
+      old_permission.delete
+    end
+  end
+end

data/lib/foreman_setup/engine.rb

@@ -15,16 +15,19 @@ module ForemanSetup
 
     initializer 'foreman_setup.register_plugin', :after=> :finisher_hook do |app|
       Foreman::Plugin.register :foreman_setup do
+        requires_foreman '> 1.4'
+
         menu :top_menu, :provisioners, :url_hash => {:controller=> :'foreman_setup/provisioners', :action=>:index},
                  :caption=> N_('Provisioning setup'),
                  :parent => :infrastructure_menu,
                  :first => true
 
         security_block :provisioning do
-          permission :edit_provisioning, {:'foreman_setup/provisioners' => [:index, :new, :update, :create, :show, :destroy, :step1, :step2, :step2_update, :step3, :step4, :step4_update, :step5] }
+          permission :edit_provisioning, {:'foreman_setup/provisioners' => [:index, :new, :update, :create, :show, :destroy, :step1,
+             :step2, :step2_update, :step3, :step4, :step4_update, :step5] }, :resource_type => "ForemanSetup::Provisioner"
         end
         role "Provisioning setup", [:edit_provisioning]
-      end if defined? Foreman::Plugin
+      end
     end
 
     config.to_prepare do

data/lib/foreman_setup/version.rb

@@ -1,3 +1,3 @@
 module ForemanSetup
-  VERSION = '1.0.4'
+  VERSION = '2.0.0'
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: foreman_setup
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 2.0.0
 platform: ruby
 authors:
 - Dominic Cleal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-30 00:00:00.000000000 Z
+date: 2014-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '1.0'
 description: Plugin for Foreman that helps set up provisioning.
@@ -59,6 +59,7 @@ files:
 - db/migrate/20131023140100_add_provisioners.rb
 - db/migrate/20131025180600_add_provisioners_hostgroup.rb
 - db/migrate/20131028161000_add_provisioners_domain.rb
+- db/migrate/20140305165000_update_foreman_setup_permissions.rb
 - lib/foreman_setup.rb
 - lib/foreman_setup/engine.rb
 - lib/foreman_setup/version.rb
@@ -72,17 +73,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: Helps set up Foreman for provisioning