foreman_dhcp_browser 0.0.7 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b095b8d8898cdd086d2d6d0d7c0ae14bc256d250
-  data.tar.gz: f400cea5c4f428b74133ef5ed4b42885c84a7c49
+SHA256:
+  metadata.gz: 02ae35213d36cf1c734f151070ddb46a4f25ef5659510a8c0f92b38281155fa8
+  data.tar.gz: aa1e85ddbf55feaa4594708c87b566e45ce2e02e0360940cd81b5d948a872fa9
 SHA512:
-  metadata.gz: f7df3af03ecee31cf1c8c96759061ea45db850190f11b6aabb728fa23f5441d8c7efd113a3d4d6c363e54eff164b708451129b6a6c7a7ab851797cea830a0230
-  data.tar.gz: b535a68d44b34b13896c68dbee28653d54e48b7fd465566689ef9838de9f4de3ce77883b4eb6d793205e2f1fad64f87c04143cb965081e72db3c15c2cfca4b54
+  metadata.gz: b3dacdf1b797aa0d31ebce5e8cd6750f16cd5eaaba97887fef56b11b937f6b7a211d4d8f9d194272e0017da330a09f81501b71d3f3c029b0e3e7cb2ffa57c767
+  data.tar.gz: 4f1c67b029c07f0da80d1a9195fca0c2f5c7efdc58e771ceff5713940aaa8b1bb7d19badbbbd65ab0710efdd8fcc32949ccc39b0bdfa454898750229e700fcee

data/README.md

@@ -6,13 +6,16 @@ smart proxy.
 
 ## Installation
 
+The foreman_dhcp_browser plugin is available both via RPM/DEB.
+
+eg; yum install tfm-rubygem-foreman_dhcp_browser
+
 See [How_to_Install_a_Plugin](http://projects.theforeman.org/projects/foreman/wiki/How_to_Install_a_Plugin)
 for how to install Foreman plugins
 
-The gem name is "foreman_dhcp_browser".
-
 ## Latest code
 
+The gem name is "foreman_dhcp_browser".
 You can get the master branch of the plugin by specifying your Gemfile in this way:
 
     gem 'foreman_dhcp_browser', :git => "https://github.com/theforeman/foreman_dhcp_browser.git"

data/Rakefile

@@ -14,7 +14,7 @@ end
 
 RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'ForemanDhcpBrowser'
+  rdoc.title    = 'ForemanDHCPBrowser'
   rdoc.options << '--line-numbers'
   rdoc.rdoc_files.include('README.rdoc')
   rdoc.rdoc_files.include('lib/**/*.rb')
@@ -31,5 +31,4 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = false
 end
 
-
-task :default => :test
+task default: :test

data/app/controllers/dhcp_controller.rb

@@ -1,58 +1,54 @@
-class DhcpController < ApplicationController
-  before_filter :find_proxy
-  before_filter :find_record, :only => [:show, :edit, :update, :destroy]
+class DHCPController < ApplicationController
+  before_action :find_proxy
+  before_action :find_record, only: %i[show edit update destroy]
 
-  def index
-  end
+  def index; end
 
   def new
-    #hack hack hack, need to fix foreman core to validate on create/save instead of init
-    @record = Net::DHCP::Record.new :proxy   => @subnet.dhcp_proxy, :hostname => 'dummy', :mac => 'aa:bb:cc:dd:ee:ff',
-                                    :network => @subnet.network, :ip => '1.2.3.4'
+    # HACK: hack hack, need to fix foreman core to validate on create/save instead of init
+    @record = Net::DHCP::Record.new proxy: @subnet.dhcp_proxy, hostname: 'dummy', mac: 'aa:bb:cc:dd:ee:ff',
+                                    network: @subnet.network, ip: '1.2.3.4'
     @record.hostname = @record.mac = @record.ip = nil
   end
 
   def create
     @record = Net::DHCP::Record.new(params[:net_dhcp_record])
     if @record.create
-      process_success({ :success_redirect => subnet_dhcp_index_path(@subnet), :object_name => @record.to_s })
+      process_success(success_redirect: subnet_dhcp_index_path(@subnet), object_name: @record.to_s)
     else
-      process_error({ :redirect => subnet_dhcp_index_path(@subnet) })
+      process_error(redirect: subnet_dhcp_index_path(@subnet))
     end
   rescue ProxyAPI::ProxyException => e
     error_msg = (e.try(:wrapped_exception).try(:response) || e).to_s
-    process_error :error_msg => error_msg
+    process_error error_msg: error_msg
   end
 
-  def show
-  end
+  def show; end
 
-  def edit
-  end
+  def edit; end
 
   def update
-    #TODO
+    # TODO
   end
 
   def destroy
     if @record.destroy
-      process_success({ :success_redirect => subnet_dhcp_index_path(@subnet), :object_name => @record.to_s })
+      process_success(success_redirect: subnet_dhcp_index_path(@subnet), object_name: @record.to_s)
     else
-      process_error({ :redirect => subnet_dhcp_index_path(@subnet) })
+      process_error(redirect: subnet_dhcp_index_path(@subnet))
     end
   end
 
   private
 
   def find_proxy
-    return not_found unless params[:subnet_id].present?
+    return not_found if params[:subnet_id].blank?
     @subnet = ::Subnet.find(params[:subnet_id])
     return not_found unless @subnet.try(:dhcp?)
-    @entries = DhcpEntries.new(:subnet => @subnet)
+    @entries = DHCPEntries.new(subnet: @subnet)
   end
 
   def find_record
     @record = @entries.find(params[:id])
   end
-
 end

data/app/models/dhcp_entries.rb

@@ -1,5 +1,5 @@
-class DhcpEntries
-  delegate :dhcp_proxy, :to => :subnet
+class DHCPEntries
+  delegate :dhcp_proxy, to: :subnet
   alias_attribute :proxy, :dhcp_proxy
 
   def initialize(opts = {})
@@ -12,7 +12,7 @@ class DhcpEntries
 
   def reservations
     @reservations ||= all['reservations'].map do |reservation|
-      Net::DHCP::Record.new reservation.merge(:proxy => proxy, :network => subnet.network)
+      Net::DHCP::Record.new reservation.merge(proxy: proxy, network: subnet.network)
     end
   rescue ProxyAPI::ProxyException => e
     []
@@ -27,6 +27,6 @@ class DhcpEntries
   end
 
   private
-  attr_reader :subnet
 
-end
+  attr_reader :subnet
+end

data/app/models/foreman_dhcp_browser/concerns/net_record_extension.rb

@@ -1,4 +1,4 @@
-module ForemanDhcpBrowser::Concerns::NetRecordExtension
+module ForemanDHCPBrowser::Concerns::NetRecordExtension
   extend ActiveSupport::Concern
 
   included do
@@ -16,7 +16,7 @@ module ForemanDhcpBrowser::Concerns::NetRecordExtension
   end
 
   def subnet_id=(id)
-    subnet   = ::Subnet.find_by_id(id) || return
+    subnet   = ::Subnet.find_by(id: id) || return
     @network = subnet.network
     @proxy   = subnet.dhcp_proxy
   end

data/app/overrides/add_link_to_dhcp_entries.rb

@@ -1,4 +1,4 @@
-Deface::Override.new(:virtual_path => 'subnets/index',
-                     :name => 'add_subnets_dhcp',
-                     :insert_top => 'td:last',
-                     :text => "<%= link_to 'DHCP',subnet_dhcp_index_path(subnet), :class => 'btn btn-default btn-sm', :disabled => !subnet.dhcp? %>")
+Deface::Override.new(virtual_path: 'subnets/index',
+                     name: 'add_subnets_dhcp',
+                     insert_top: 'td:last',
+                     text: "<%= link_to 'DHCP',subnet_dhcp_index_path(subnet), :class => 'btn btn-default btn-sm', :disabled => !subnet.dhcp? %>")

data/app/views/dhcp/index.html.erb

@@ -1,6 +1,6 @@
 <% title "DHCP Reservations for #{@subnet}" %>
-<% title_actions button_group(link_to_if_authorized _('New DHCP Record'), hash_for_new_subnet_dhcp_path(params[:subnet_id])) %>
-<table class="table table-bordered table-striped table-condensed"  data-table='inline'>
+<% title_actions button_group(link_to_if_authorized _('New DHCP Record'), hash_for_new_subnet_dhcp_path(params[:subnet_id]), :class => 'btn btn-primary') %>
+<table class="<%= table_css_classes 'table-condensed' %>" data-table="inline">
   <thead>
   <th>Name</th>
   <th>IP</th>

data/app/views/dhcp/show.html.erb

@@ -1,4 +1,4 @@
-<table class='table'>
+<table class="<%= table_css_classes %>">
   <% @record.attrs.keys.each do |header| %>
     <th> <%= header %> </td>
   <% end %>

data/lib/foreman_dhcp_browser/engine.rb

@@ -1,16 +1,21 @@
 require 'deface'
-module ForemanDhcpBrowser
+module ForemanDHCPBrowser
   class Engine < ::Rails::Engine
-    initializer 'foreman_dhcp_browser.register_plugin', :after=> :finisher_hook do |app|
-      Foreman::Plugin.register :foreman_dhcp_browser do
+    engine_name 'foreman_dhcp_browser'
+
+    initializer 'foreman_dhcp_browser.register_plugin', before: :finisher_hook do |app|
+      app.reloader.to_prepare do
+        Foreman::Plugin.register :foreman_dhcp_browser do
+          requires_foreman '>= 3.14.0'
+        end
       end
     end
 
     config.to_prepare do
-        ::Net::Record.send :include, ::ActiveModel::AttributeMethods
-        ::Net::Record.send :include, ::ActiveModel::Conversion
-        ::Net::Record.send :extend, ::ActiveModel::Naming
-        ::Net::Record.send :include, ForemanDhcpBrowser::Concerns::NetRecordExtension
-      end
+      ::Net::Record.include ::ActiveModel::AttributeMethods
+      ::Net::Record.include ::ActiveModel::Conversion
+      ::Net::Record.extend ::ActiveModel::Naming
+      ::Net::Record.include ForemanDHCPBrowser::Concerns::NetRecordExtension
+    end
   end
 end

data/lib/foreman_dhcp_browser/version.rb

@@ -1,3 +1,3 @@
-module ForemanDhcpBrowser
-  VERSION = '0.0.7'
+module ForemanDHCPBrowser
+  VERSION = '0.1.1'.freeze
 end

data/lib/foreman_dhcp_browser.rb

@@ -1,4 +1,4 @@
 require 'foreman_dhcp_browser/engine'
 
-module ForemanDhcpBrowser
+module ForemanDHCPBrowser
 end

data/lib/tasks/foreman_dhcp_browser.rake

@@ -0,0 +1,21 @@
+require 'rake/testtask'
+
+# Tests
+namespace :test do
+  desc 'Test ForemanDHCPBrowser'
+  Rake::TestTask.new(:foreman_dhcp_browser) do |t|
+    test_dir = File.expand_path('../../test', __dir__)
+    t.libs << 'test'
+    t.libs << test_dir
+    t.pattern = "#{test_dir}/**/*_test.rb"
+    t.verbose = true
+    t.warning = false
+  end
+end
+
+Rake::Task[:test].enhance ['test:foreman_dhcp_browser']
+
+load 'tasks/jenkins.rake'
+if Rake::Task.task_defined?(:'jenkins:unit')
+  Rake::Task['jenkins:unit'].enhance ['test:foreman_dhcp_browser']
+end

metadata

@@ -1,29 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: foreman_dhcp_browser
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.1
 platform: ruby
 authors:
 - Ohad Levy
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-20 00:00:00.000000000 Z
+date: 2025-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 description: Plugin for Foreman to browse and add/edit/delete DHCP leases independent
   of Foreman's host creation
 email: ohadlevy@gmail.com
@@ -35,7 +34,6 @@ files:
 - README.md
 - Rakefile
 - app/controllers/dhcp_controller.rb
-- app/helpers/dhcp_helper.rb
 - app/models/dhcp_entries.rb
 - app/models/foreman_dhcp_browser/concerns/net_record_extension.rb
 - app/overrides/add_link_to_dhcp_entries.rb
@@ -48,10 +46,11 @@ files:
 - lib/foreman_dhcp_browser.rb
 - lib/foreman_dhcp_browser/engine.rb
 - lib/foreman_dhcp_browser/version.rb
+- lib/tasks/foreman_dhcp_browser.rake
 homepage: https://github.com/theforeman/foreman_dhcp_browser
-licenses: []
+licenses:
+- GPL-3.0
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -66,9 +65,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
-signing_key: 
+rubygems_version: 3.6.2
 specification_version: 4
 summary: DHCP browser plugin for Foreman
 test_files: []

data/app/helpers/dhcp_helper.rb

@@ -1,2 +0,0 @@
-module DhcpHelper
-end