foreman_dhcp_browser 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b095b8d8898cdd086d2d6d0d7c0ae14bc256d250
-  data.tar.gz: f400cea5c4f428b74133ef5ed4b42885c84a7c49
+  metadata.gz: 472bfadb4dcc78e34f7f9a09e2d90042aceb7ca1
+  data.tar.gz: 03cf35804684e3ef9493cd59164f0aae36c07683
 SHA512:
-  metadata.gz: f7df3af03ecee31cf1c8c96759061ea45db850190f11b6aabb728fa23f5441d8c7efd113a3d4d6c363e54eff164b708451129b6a6c7a7ab851797cea830a0230
-  data.tar.gz: b535a68d44b34b13896c68dbee28653d54e48b7fd465566689ef9838de9f4de3ce77883b4eb6d793205e2f1fad64f87c04143cb965081e72db3c15c2cfca4b54
+  metadata.gz: 77aedddc41e01118954f6ae5a30998d8019115d84c1b3800f15e96dab31f9bbc6f0abfc0dbdfb82ed8ece7798b75d09bb01fdede747ec6c8c2c0d32508b163c0
+  data.tar.gz: bafc5387624b2388f734e7a79c00dc6a3365fbee3c15d6fefadedf924e7fe74124ff65c8b3bc1254ecdd9413f3fc9b2c79c67ee6476cc2590aafeada644cb463

data/Rakefile

@@ -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]
+  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
+  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

@@ -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/lib/foreman_dhcp_browser/engine.rb

@@ -1,16 +1,16 @@
 require 'deface'
 module ForemanDhcpBrowser
   class Engine < ::Rails::Engine
-    initializer 'foreman_dhcp_browser.register_plugin', :after=> :finisher_hook do |app|
+    initializer 'foreman_dhcp_browser.register_plugin', before: :finisher_hook do |_app|
       Foreman::Plugin.register :foreman_dhcp_browser do
       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.send :include, ::ActiveModel::AttributeMethods
+      ::Net::Record.send :include, ::ActiveModel::Conversion
+      ::Net::Record.send :extend, ::ActiveModel::Naming
+      ::Net::Record.send :include, ForemanDhcpBrowser::Concerns::NetRecordExtension
+    end
   end
 end

data/lib/foreman_dhcp_browser/version.rb

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

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: foreman_dhcp_browser
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Ohad Levy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-20 00:00:00.000000000 Z
+date: 2017-07-11 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
@@ -67,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: DHCP browser plugin for Foreman