foreman_setup 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aee3bba2d86b044aed9a80f8471885ce2beb96d2
-  data.tar.gz: 76c68952a31762eb7acd279cd385fadb00b6cdc2
+  metadata.gz: 434f589a7bb85052066ff9c6efef3211425d87c4
+  data.tar.gz: b46d62022cc4e61fbaa5811b38f83aa7bfd9c2a2
 SHA512:
-  metadata.gz: 5386c649e2c6c846357bc9684d1742c256f571880060899ba406f597983a4f26bb967854805a436ad188adbcb6477ba30cb3bf9dcb0cc091b7177367d31fb2b7
-  data.tar.gz: f645970ef34860882d09ed6dd0e3b377fa8f3cf6fdddc2450588efd48553da85bc1927fbf19e87ac0f1a54ce4022ad80d4d711bd5669068077b78f100bc2c842
+  metadata.gz: c5b7134fc727011585ccba00b5c4f38d64a98b3bcee2a450eeb848c576954091cbfc4abaf6b838e6e4e3d9d6bf9d549173e0dd4e7134c008941ea8ac4c09a1a5
+  data.tar.gz: b732c89e72a1a9f0d65822759440eaae11b7013c53a14aae68ab213dc744427dae6e4342602deab182709a02ea01ccb445be5f35ed23189b2f8280b2f2078fc6

data/CHANGES.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v3.0.1
+* remove dashboard button, use the menu instead
+* remove unused deface dependency
+* fix missing false.png image (#11115)
+
 ## v3.0.0
 * show katello-installer commands if Katello is loaded
 * fix Foreman 1.9 compatibility due to template changes

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

@@ -13,7 +13,7 @@
     <% if f.object.host.present? %>
       <%= checked_icon f.object.host.present? %> <%= _("Found registered host %s") % f.object.host.name %>
     <% else %>
-      <%= image_tag 'false.png' %> <%= _("Missing registered host %s, please ensure it is checking in") % f.object.fqdn %>
+      <%= image_tag 'foreman_setup/false.png' %> <%= _("Missing registered host %s, please ensure it is checking in") % f.object.fqdn %>
     <% end %>
   </div>
   <div>
@@ -21,14 +21,14 @@
     <% if f.object.smart_proxy.present? %>
       <%= checked_icon f.object.smart_proxy.present? %> <%= _("Found registered smart proxy %s") % f.object.smart_proxy.name %>
     <% else %>
-      <%= image_tag 'false.png' %> <%= _("Missing registered smart proxy %s, please ensure it is registered") % f.object.fqdn %>
+      <%= image_tag 'foreman_setup/false.png' %> <%= _("Missing registered smart proxy %s, please ensure it is registered") % f.object.fqdn %>
     <% end %>
   </div>
   <div>
     <% if f.object.host.present? && f.object.interfaces.any? %>
       <%= checked_icon f.object.host.present? %> <%= _("Host %s has at least one network interface") % f.object.host.name %>
     <% else %>
-      <%= image_tag 'false.png' %> <%= _("No network interfaces listed in $interfaces fact") %>
+      <%= image_tag 'foreman_setup/false.png' %> <%= _("No network interfaces listed in $interfaces fact") %>
     <% end %>
   </div>
 

data/lib/foreman_setup.rb

@@ -1,7 +1,5 @@
 require 'foreman_setup/version'
 
 module ForemanSetup
-  ENGINE_NAME = 'setup'
-
   require 'foreman_setup/engine' if defined?(Rails) && Rails::VERSION::MAJOR == 3
 end

data/lib/foreman_setup/engine.rb

@@ -1,9 +1,8 @@
 require 'foreman_setup'
-require 'deface'
 
 module ForemanSetup
   class Engine < ::Rails::Engine
-    engine_name ForemanSetup::ENGINE_NAME
+    engine_name 'foreman_setup'
 
     config.autoload_paths += Dir["#{config.root}/app/controllers/concerns"]
     config.autoload_paths += Dir["#{config.root}/app/helpers/concerns"]
@@ -27,10 +26,6 @@ module ForemanSetup
              :step2, :step2_update, :step3, :step4, :step4_update, :step5] }, :resource_type => "ForemanSetup::Provisioner"
         end
         role "Provisioning setup", [:edit_provisioning]
-
-        # we deliberately replace some text on the dashboard page, so this breaks
-        # the test.  The setup button ought to be moved somewhere else.
-        tests_to_skip('DashboardTest' => ['dashboard page']) if respond_to? :tests_to_skip
       end
     end
 
@@ -39,14 +34,21 @@ module ForemanSetup
       locale_domain = 'foreman_setup'
       Foreman::Gettext::Support.add_text_domain locale_domain, locale_dir
     end
+
+    initializer 'foreman_setup.assets.precompile' do |app|
+      app.config.assets.precompile += ['foreman_setup/false.png']
+    end
+    initializer 'foreman_setup.configure_assets', group: :assets do
+      SETTINGS[:foreman_setup] = { assets: { precompile: ['foreman_setup/false.png'] } }
+    end
   end
 
   def table_name_prefix
-    ForemanSetup::ENGINE_NAME + '_'
+    'setup_'
   end
 
   def self.table_name_prefix
-    ForemanSetup::ENGINE_NAME + '_'
+    'setup_'
   end
 
   def use_relative_model_naming

data/lib/foreman_setup/version.rb

@@ -1,3 +1,3 @@
 module ForemanSetup
-  VERSION = '3.0.0'
+  VERSION = '3.0.1'
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: foreman_setup
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Dominic Cleal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-06 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'
+date: 2015-07-30 00:00:00.000000000 Z
+dependencies: []
 description: Plugin for Foreman that helps set up provisioning.
 email: dcleal@redhat.com
 executables: []
@@ -33,16 +19,14 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files:
-- ".tx/config"
+- .tx/config
 - CHANGES.md
 - LICENSE
 - README.md
+- app/assets/images/foreman_setup/false.png
 - app/controllers/foreman_setup/provisioners_controller.rb
 - app/helpers/foreman_setup/provisioner_helper.rb
 - app/models/foreman_setup/provisioner.rb
-- app/overrides/add_dashboard_provisioners_link.rb
-- app/overrides/remove_subnet_domains.rb
-- app/overrides/remove_subnet_proxies.rb
 - app/views/foreman_setup/provisioners/_step1.html.erb
 - app/views/foreman_setup/provisioners/_step2.html.erb
 - app/views/foreman_setup/provisioners/_step3.html.erb
@@ -101,19 +85,18 @@ 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.2
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: Helps set up Foreman for provisioning
 test_files: []
-has_rdoc: 

data/app/overrides/add_dashboard_provisioners_link.rb

@@ -1,12 +0,0 @@
-Deface::Override.new(:virtual_path => 'dashboard/index',
-                     :name => 'add_dashboard_provisioners_link',
-                     :surround_contents => 'code[erb-loud]:contains("title_actions")',
-                     :original => '35e276b7102eaa4feb8a4a84f66fd4812216fd48',
-                     :text => <<EOS
-if ForemanSetup::Provisioner.any?
-  <%= render_original %>
-else
-  title_actions link_to_if_authorized(_("Set up provisioning"), hash_for_new_foreman_setup_provisioner_path)
-end
-EOS
-)

data/app/overrides/remove_subnet_domains.rb

@@ -1,9 +0,0 @@
-Deface::Override.new(:virtual_path => 'subnets/_fields',
-                     :name => 'remove_subnet_domains',
-                     :surround_contents => 'code[erb-loud]:contains("multiple_checkboxes f, :domain")',
-                     :text => <<EOS
-unless controller.controller_name == 'provisioners'
-  <%= render_original %>
-end
-EOS
-)

data/app/overrides/remove_subnet_proxies.rb

@@ -1,9 +0,0 @@
-Deface::Override.new(:virtual_path => 'subnets/_fields',
-                     :name => 'remove_subnet_proxies',
-                     :surround_contents => 'code[erb-loud]:contains("SmartProxy.")',
-                     :text => <<EOS
-unless controller.controller_name == 'provisioners'
-  <%= render_original %>
-end
-EOS
-)