Merge branch 'theforeman:master' into fix_default_prefix

Author: martencassel

Gemfile

@@ -1,12 +1,9 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 gemspec
 
 group :development do
-  if RUBY_VERSION < '2.2.2'
-    gem 'rack-test', '~> 0.7.0'
-  else
-    gem 'rack-test'
-  end
-
+  gem 'rack-test'
   gem 'smart_proxy', :git => 'https://github.com/theforeman/smart-proxy.git', :branch => 'develop'
 end

Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rake'
 require 'rake/testtask'
 

bundler.d/realm_ad_plugin.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 gem 'smart_proxy_realm_ad_plugin'
 gem 'radcli'

lib/smart_proxy_realm_ad/configuration_loader.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Proxy::AdRealm
   class ConfigurationLoader
     def load_classes

lib/smart_proxy_realm_ad/plugin.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'smart_proxy_realm_ad/version'
 
 module Proxy::AdRealm

lib/smart_proxy_realm_ad/provider.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'proxy/kerberos'
 require 'radcli'
 require 'digest'

lib/smart_proxy_realm_ad/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Proxy
   module AdRealm
     VERSION = '0.1'.freeze

lib/smart_proxy_realm_ad_plugin.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'smart_proxy_realm_ad/configuration_loader'
 require 'smart_proxy_realm_ad/plugin'
 

smart_proxy_realm_ad_plugin.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require File.expand_path('../lib/smart_proxy_realm_ad/version', __FILE__)
 require 'date'
 

test/ad_provider_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rubygems'
 require 'test_helper'
 require 'smart_proxy_realm_ad/provider'
@@ -72,7 +74,7 @@ def test_rebuild_host_returns_password
   end
 
   def test_generate_password_returns_random_passwords
-    assert_not_equal @provider.generate_password, @provider.generate_password
+    refute_equal @provider.generate_password, @provider.generate_password
   end
 
   def test_generate_password_returns_20_char_long_password
@@ -81,22 +83,22 @@ def test_generate_password_returns_20_char_long_password
 
   def test_apply_computername_prefix_should_return_false_when_prefix_is_nil
     provider = Proxy::AdRealm::Provider.new(computername_prefix: nil, realm: 'example.com')
-    assert_false provider.apply_computername_prefix?('host.example.com')
+    refute provider.apply_computername_prefix?('host.example.com')
   end
 
   def test_apply_computername_prefix_should_return_false_when_prefix_is_empty
     provider = Proxy::AdRealm::Provider.new(computername_prefix: '', realm: 'example.com')
-    assert_false provider.apply_computername_prefix?('host.example.com')
+    refute provider.apply_computername_prefix?('host.example.com')
   end
 
   def test_apply_computername_prefix_should_return_false_when_hostname_contains_prefix
     provider = Proxy::AdRealm::Provider.new(computername_prefix: 'PREFIX-', realm: 'example.com')
-    assert_false provider.apply_computername_prefix?('prefix-host.example.com')
+    refute provider.apply_computername_prefix?('prefix-host.example.com')
   end
 
   def test_apply_computername_prefix_should_return_true_when_computername_hash_is_used
     provider = Proxy::AdRealm::Provider.new(computername_prefix: 'PREFIX-', computername_hash: true, realm: 'example.com')
-    assert_true provider.apply_computername_prefix?('host.example.com')
+    assert provider.apply_computername_prefix?('host.example.com')
   end
 
   def test_hostfqdn_to_computername_uses_prefix
@@ -119,7 +121,7 @@ def test_unrecognized_realm_raises_exception
   end
 
   def test_find
-    assert_true @provider.find('a_host_fqdn')
+    assert @provider.find('a_host_fqdn')
   end
 
   def test_delete

test/internal_api_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 require 'rack/test'
 require 'realm/configuration_loader'
@@ -25,28 +27,28 @@ def app
   end
 
   def setup
-    @server = Proxy::AdRealm::Provider.new(:realm => "test.com")
+    @server = Proxy::AdRealm::Provider.new(:realm => 'test.com')
   end
 
   def test_create_host
-    realm = "TEST.COM"
-    hostname = "test.com"
+    realm = 'TEST.COM'
+    hostname = 'test.com'
     @server.expects(:create).with(realm, hostname, is_a(Hash))
     post "/#{realm}", :hostname => 'test.com'
     assert last_response.ok?, "Last response was not ok: #{last_response.status} #{last_response.body}"
   end
 
   def test_rebuild_host
-    realm = "TEST.COM"
-    hostname = "test.com"
+    realm = 'TEST.COM'
+    hostname = 'test.com'
     @server.expects(:create).with(realm, hostname, has_entry('rebuild', 'true'))
     post "/#{realm}", :hostname => 'test.com', :rebuild => true
     assert last_response.ok?, "Last response was not ok: #{last_response.status} #{last_response.body}"
   end
 
   def test_delete_host
-    realm = "TEST.COM"
-    hostname = "test.com"
+    realm = 'TEST.COM'
+    hostname = 'test.com'
     @server.expects(:delete).with(realm, hostname)
     delete "/#{realm}/#{hostname}"
     assert last_response.ok?, "Last response was not ok: #{last_response.status} #{last_response.body}"

test/test_helper.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 require 'test/unit'
-require 'mocha/setup'
+require 'mocha/test_unit'
 
 require 'smart_proxy_for_testing'
 
 # create log directory in our (not smart-proxy) directory
-FileUtils.mkdir_p File.dirname(Proxy::SETTINGS.log_file)
+FileUtils.mkdir_p File.dirname(Proxy::SETTINGS.log_file)

test/test_radcli.rb

@@ -1,57 +1,59 @@
+# frozen_string_literal: true
+
 require 'radcli'
 
 # Connect using password
-adconn = Adcli::AdConn.new("example.com")
-adconn.set_domain_realm("EXAMPLE.COM")
-adconn.set_domain_controller("dc.example.com")
-adconn.set_login_user("realm-proxy")
-adconn.set_user_password("password")
+adconn = Adcli::AdConn.new('example.com')
+adconn.set_domain_realm('EXAMPLE.COM')
+adconn.set_domain_controller('dc.example.com')
+adconn.set_login_user('realm-proxy')
+adconn.set_user_password('password')
 res = adconn.connect
 
 # Connect using kerberos keytab
 require 'radcli'
-require "rkerberos"
-principal = "realm-proxy"
-keytab="/etc/foreman-proxy/realm-proxy.keytab"
+require 'rkerberos'
+principal = 'realm-proxy'
+keytab='/etc/foreman-proxy/realm-proxy.keytab'
 krb5 = Kerberos::Krb5.new
 ccache = Kerberos::Krb5::CredentialsCache.new
 krb5.get_init_creds_keytab principal, keytab, nil, ccache
-adconn = Adcli::AdConn.new("example.com")
-adconn.set_domain_realm("EXAMPLE.COM")
-adconn.set_domain_controller("dc.example.com")
-adconn.set_login_ccache_name("")
+adconn = Adcli::AdConn.new('example.com')
+adconn.set_domain_realm('EXAMPLE.COM')
+adconn.set_domain_controller('dc.example.com')
+adconn.set_login_ccache_name('')
 res = adconn.connect
 
 
 # Delete the computer accounts object
 enroll = Adcli::AdEnroll.new(adconn)
-enroll.set_computer_name("server1")
+enroll.set_computer_name('server1')
 enroll.delete()
 
 # Create a computer account object
 enroll = Adcli::AdEnroll.new(adconn)
-enroll.set_computer_name("server1")
-enroll.set_host_fqdn("server1.example.com")
-enroll.set_computer_password("password")
+enroll.set_computer_name('server1')
+enroll.set_host_fqdn('server1.example.com')
+enroll.set_computer_password('password')
 enroll.join()
 
 # Reset a computer accounts password
-adconn.set_domain_controller("dc.example.com")
+adconn.set_domain_controller('dc.example.com')
 enroll = Adcli::AdEnroll.new(adconn)
-enroll.set_computer_name("server1")
-enroll.set_computer_password("newpass")
+enroll.set_computer_name('server1')
+enroll.set_computer_password('newpass')
 enroll.password()
 
 # Delete the computer accounts object
 enroll = Adcli::AdEnroll.new(adconn)
-enroll.set_computer_name("server1")
+enroll.set_computer_name('server1')
 enroll.delete()
 
 
 # Create a computer account object in specific OU
 enroll = Adcli::AdEnroll.new(adconn)
 enroll.set_domain_ou('OU=Computers,OU=Foobar,DC=example,DC=com')
-enroll.set_computer_name("server1")
-enroll.set_host_fqdn("server1.example.com")
-enroll.set_computer_password("password")
+enroll.set_computer_name('server1')
+enroll.set_host_fqdn('server1.example.com')
+enroll.set_computer_password('password')
 enroll.join()