foreman_salt 1.1.0 → 1.1.1

data/test/unit/grains_importer_test.rb

@@ -3,7 +3,7 @@ require 'test_plugin_helper'
 module ForemanSalt
   class GrainsImporterTest < ActiveSupport::TestCase
     setup do
-      User.current = User.find_by_login "admin"
+      User.current = User.find_by_login 'admin'
       Setting[:create_new_host_when_facts_are_uploaded] = true
 
       # I don't even know, the plug-in successfully registers the importer
@@ -11,24 +11,24 @@ module ForemanSalt
       # in the test itself...
       ::FactImporter.stubs(:importer_for).returns(ForemanSalt::FactImporter)
 
-      grains = JSON.parse(File.read(File.join(Engine.root, "test", "unit", "grains_centos.json")))
-      @host  = grains["name"]
-      @facts = grains["facts"]
+      grains = JSON.parse(File.read(File.join(Engine.root, 'test', 'unit', 'grains_centos.json')))
+      @host  = grains['name']
+      @facts = grains['facts']
     end
 
-    test "importing salt grains creates a host" do
+    test 'importing salt grains creates a host' do
       refute Host.find_by_name(@host)
       ::Host::Managed.import_host_and_facts @host, @facts
       assert Host.find_by_name(@host)
     end
 
-    test "grains are successfully imported for a host" do
-      (host, state) = ::Host::Managed.import_host_and_facts @host, @facts
+    test 'grains are successfully imported for a host' do
+      (host, _) = ::Host::Managed.import_host_and_facts @host, @facts
       assert_equal 'CentOS', host.facts_hash['operatingsystem']
     end
 
-    test "nested facts have valid parents" do
-      (host, state) = ::Host::Managed.import_host_and_facts @host, @facts
+    test 'nested facts have valid parents' do
+      (host, _) = ::Host::Managed.import_host_and_facts @host, @facts
       parent = ::FactName.find_by_name('cpu_flags')
       children = host.fact_values.with_fact_parent_id(parent)
       assert_not_empty children

data/test/unit/host_extensions_test.rb

@@ -3,26 +3,26 @@ require 'test_plugin_helper'
 module ForemanSalt
   class HostExtensionsTest < ActiveSupport::TestCase
     setup do
-      User.current = User.find_by_login "admin"
+      User.current = User.find_by_login 'admin'
     end
 
-    test "host has a salt smart proxy" do
+    test 'host has a salt smart proxy' do
       host = FactoryGirl.create :host, :with_salt_proxy
       assert host.salt_proxy.features.map(&:name).include? 'Salt'
     end
 
-    test "smart_proxy_ids returns salt smart proxy" do
+    test 'smart_proxy_ids returns salt smart proxy' do
       host = FactoryGirl.create :host, :with_salt_proxy
       assert host.smart_proxy_ids.include? host.salt_proxy_id
     end
 
-    test "host params includes salt_master" do
+    test 'host params includes salt_master' do
       host = FactoryGirl.create :host, :with_salt_proxy
-      assert host.params.key? "salt_master"
-      assert_equal host.params["salt_master"], host.salt_master
+      assert host.params.key? 'salt_master'
+      assert_equal host.params['salt_master'], host.salt_master
     end
 
-    test "host inherits salt proxy from host group" do
+    test 'host inherits salt proxy from host group' do
       hostgroup = FactoryGirl.create :hostgroup, :with_salt_proxy
       host = FactoryGirl.create :host, :hostgroup => hostgroup
       host.set_hostgroup_defaults

data/test/unit/hostgroup_extensions_test.rb

@@ -3,36 +3,36 @@ require 'test_plugin_helper'
 module ForemanSalt
   class HostgroupExtensionsTest < ActiveSupport::TestCase
     setup do
-      User.current = User.find_by_login "admin"
+      User.current = User.find_by_login 'admin'
     end
 
-    test "host group has a salt smart proxy" do
+    test 'host group has a salt smart proxy' do
       hostgroup = FactoryGirl.create :hostgroup, :with_salt_proxy
       assert hostgroup.salt_proxy.features.map(&:name).include? 'Salt'
     end
 
-    test "nested host group inherits salt modules from parent" do
+    test 'nested host group inherits salt modules from parent' do
       parent = FactoryGirl.create :hostgroup, :with_salt_modules
       child = FactoryGirl.create :hostgroup, :parent => parent
       assert_equal [], parent.salt_modules - child.salt_modules
     end
 
-    test "child host group inherits salt proxy from child parent" do
+    test 'child host group inherits salt proxy from child parent' do
       parent = FactoryGirl.create :hostgroup
       child_one = FactoryGirl.create :hostgroup, :with_salt_proxy, :parent => parent
       child_two = FactoryGirl.create :hostgroup, :parent => child_one
       assert_equal child_two.salt_proxy, child_one.salt_proxy
     end
 
-    test "child and parent salt modules are combined" do
+    test 'child and parent salt modules are combined' do
       parent = FactoryGirl.create :hostgroup, :with_salt_modules
       child = FactoryGirl.create :hostgroup, :with_salt_modules, :parent => parent
       assert_equal 10, (child.salt_modules - parent.salt_modules).length
     end
 
-    test "second child inherits from parent" do
+    test 'second child inherits from parent' do
       parent = FactoryGirl.create :hostgroup, :with_salt_modules
-      child_one = FactoryGirl.create :hostgroup, :parent => parent 
+      child_one = FactoryGirl.create :hostgroup, :parent => parent
       child_two = FactoryGirl.create :hostgroup, :parent => child_one
       assert_equal [], parent.salt_modules - child_two.salt_modules
     end

data/test/unit/report_importer_test.rb

@@ -17,7 +17,7 @@ module ForemanSalt
       assert Host.find_by_name(@host)
     end
 
-    test "importing report updates host status" do
+    test 'importing report updates host status' do
       ForemanSalt::ReportImporter.import(@report)
       assert_equal Host.find_by_name(@host).host_status, 'Error'
     end

data/test/unit/salt_keys_test.rb

@@ -2,7 +2,7 @@ require 'test_plugin_helper'
 
 class SaltKeysTest < ActiveSupport::TestCase
   setup do
-    User.current = User.find_by_login "admin"
+    User.current = User.find_by_login 'admin'
 
     # Fix for 1.8.7 OpenStruct http://stackoverflow.com/questions/9079441/populate-select-tag-ruby-rails
     OpenStruct.__send__(:define_method, :id) { @table[:id] }
@@ -11,39 +11,39 @@ class SaltKeysTest < ActiveSupport::TestCase
 
     ProxyAPI::Salt.any_instance.stubs(:key_list).returns(
       {
-       "saltstack.example.com"    => {"state"=>"accepted",   "fingerprint"=>"98:c2:63:c1:57:59:bc:bd:f1:ef:5a:38:b2:e9:71:c0"},
-       "saltclient01.example.com" => {"state"=>"unaccepted", "fingerprint"=>"98:c2:63:c1:57:59:bc:bd:f1:ef:5a:38:b2:e9:71:c1"},
-       "saltclient02.example.com" => {"state"=>"unaccepted", "fingerprint"=>"98:c2:63:c1:57:59:bc:bd:f1:ef:5a:38:b2:e9:71:c2"},
-       "saltclient03.example.com "=> {"state"=>"rejected",   "fingerprint"=>"98:c2:63:c1:57:59:bc:bd:f1:ef:5a:38:b2:e9:71:c3"}
+        'saltstack.example.com'    => {'state'=>'accepted',   'fingerprint'=>'98:c2:63:c1:57:59:bc:bd:f1:ef:5a:38:b2:e9:71:c0'},
+        'saltclient01.example.com' => {'state'=>'unaccepted', 'fingerprint'=>'98:c2:63:c1:57:59:bc:bd:f1:ef:5a:38:b2:e9:71:c1'},
+        'saltclient02.example.com' => {'state'=>'unaccepted', 'fingerprint'=>'98:c2:63:c1:57:59:bc:bd:f1:ef:5a:38:b2:e9:71:c2'},
+        'saltclient03.example.com' => {'state'=>'rejected',   'fingerprint'=>'98:c2:63:c1:57:59:bc:bd:f1:ef:5a:38:b2:e9:71:c3'}
       }
     )
   end
 
-  test "key has a name" do
+  test 'key has a name' do
     assert_not_empty ForemanSalt::SmartProxies::SaltKeys.all(@proxy).first.name
   end
 
-  test "key has a state" do
+  test 'key has a state' do
     assert_not_empty ForemanSalt::SmartProxies::SaltKeys.all(@proxy).first.state
   end
 
-  test "key has a fingerprint" do
+  test 'key has a fingerprint' do
     assert_not_empty ForemanSalt::SmartProxies::SaltKeys.all(@proxy).first.fingerprint
   end
 
-  test "key has a smart proxy id" do
+  test 'key has a smart proxy id' do
     assert_equal 1, ForemanSalt::SmartProxies::SaltKeys.all(@proxy).first.smart_proxy_id
   end
 
-  test "returns all keys" do
+  test 'returns all keys' do
     assert_equal 4, ForemanSalt::SmartProxies::SaltKeys.all(@proxy).count
   end
- 
-  test "finds a key by name" do
+
+  test 'finds a key by name' do
     assert_equal ForemanSalt::SmartProxies::SaltKeys.find(@proxy, 'saltstack.example.com').name, 'saltstack.example.com'
   end
 
-  test "find keys by state" do
+  test 'find keys by state' do
     assert_equal 2, ForemanSalt::SmartProxies::SaltKeys.find_by_state(@proxy, 'unaccepted').count
   end
 end

data/test/unit/salt_modules_test.rb

@@ -1,17 +1,17 @@
 require 'test_plugin_helper'
 
-class SaltKeysTest < ActiveSupport::TestCase
+class SaltModulesTest < ActiveSupport::TestCase
   setup do
-    User.current = User.find_by_login "admin"
+    User.current = User.find_by_login 'admin'
   end
 
-  test "salt module has a valid name" do
+  test 'salt module has a valid name' do
     salt_module = ForemanSalt::SaltModule.new(:name => 'foo.bar.baz')
     assert_valid salt_module
   end
 
-  test "salt module has invalid name" do
-    salt_module = ForemanSalt::SaltModule.new(:name => "&bad$name")
+  test 'salt module has invalid name' do
+    salt_module = ForemanSalt::SaltModule.new(:name => '&bad$name')
     refute_valid salt_module, :name, /alphanumeric/
   end
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: foreman_salt
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Stephen Benjamin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-19 00:00:00.000000000 Z
+date: 2015-01-14 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: Foreman Plug-in for Salt
@@ -31,75 +31,75 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- app/helpers/foreman_salt/salt_keys_helper.rb
-- app/helpers/concerns/foreman_salt/smart_proxies_helper_extensions.rb
-- app/helpers/concerns/foreman_salt/hosts_helper_extensions.rb
-- app/overrides/salt_modules_selector.rb
-- app/overrides/foreman/salt_modules/_host_tab.html.erb
-- app/overrides/foreman/salt_modules/_host_tab_pane.html.erb
-- app/overrides/salt_proxy_selector.rb
-- app/overrides/salt_environment_selector.rb
-- app/views/foreman_salt/salt_modules/index.html.erb
-- app/views/foreman_salt/salt_modules/new.html.erb
-- app/views/foreman_salt/salt_modules/_form.html.erb
-- app/views/foreman_salt/salt_modules/edit.html.erb
-- app/views/foreman_salt/salt_keys/index.erb
-- app/views/foreman_salt/salt_environments/index.html.erb
-- app/views/foreman_salt/salt_environments/new.html.erb
-- app/views/foreman_salt/salt_environments/_form.html.erb
-- app/views/foreman_salt/salt_environments/edit.html.erb
-- app/views/foreman_salt/salt_autosign/index.html.erb
-- app/views/foreman_salt/salt_autosign/new.html.erb
-- app/views/foreman_salt/salt_autosign/_form.html.erb
-- app/services/foreman_salt/smart_proxies/salt_keys.rb
-- app/services/foreman_salt/report_importer.rb
-- app/services/foreman_salt/fact_importer.rb
-- app/models/foreman_salt/salt_module.rb
-- app/models/foreman_salt/concerns/hostgroup_extensions.rb
-- app/models/foreman_salt/concerns/host_managed_extensions.rb
-- app/models/foreman_salt/concerns/orchestration/salt.rb
-- app/models/foreman_salt/salt_environment.rb
-- app/models/foreman_salt/fact_name.rb
-- app/controllers/foreman_salt/salt_modules_controller.rb
+- LICENSE
+- README.md
+- Rakefile
+- app/controllers/foreman_salt/api/v2/jobs_controller.rb
 - app/controllers/foreman_salt/application_controller.rb
-- app/controllers/foreman_salt/salt_autosign_controller.rb
-- app/controllers/foreman_salt/salt_keys_controller.rb
 - app/controllers/foreman_salt/concerns/hostgroups_controller_extensions.rb
-- app/controllers/foreman_salt/concerns/smart_proxy_auth_extensions.rb
 - app/controllers/foreman_salt/concerns/hosts_controller_extensions.rb
+- app/controllers/foreman_salt/concerns/smart_proxy_auth_extensions.rb
 - app/controllers/foreman_salt/concerns/unattended_controller_extensions.rb
-- app/controllers/foreman_salt/api/v2/jobs_controller.rb
+- app/controllers/foreman_salt/salt_autosign_controller.rb
 - app/controllers/foreman_salt/salt_environments_controller.rb
-- app/lib/proxy_api/salt.rb
+- app/controllers/foreman_salt/salt_keys_controller.rb
+- app/controllers/foreman_salt/salt_modules_controller.rb
+- app/helpers/concerns/foreman_salt/hosts_helper_extensions.rb
+- app/helpers/concerns/foreman_salt/smart_proxies_helper_extensions.rb
+- app/helpers/foreman_salt/salt_keys_helper.rb
 - app/lib/actions/foreman_salt/report_import.rb
+- app/lib/proxy_api/salt.rb
+- app/models/foreman_salt/concerns/host_managed_extensions.rb
+- app/models/foreman_salt/concerns/hostgroup_extensions.rb
+- app/models/foreman_salt/concerns/orchestration/salt.rb
+- app/models/foreman_salt/fact_name.rb
+- app/models/foreman_salt/salt_environment.rb
+- app/models/foreman_salt/salt_module.rb
+- app/overrides/foreman/salt_modules/_host_tab.html.erb
+- app/overrides/foreman/salt_modules/_host_tab_pane.html.erb
+- app/overrides/salt_environment_selector.rb
+- app/overrides/salt_modules_selector.rb
+- app/overrides/salt_proxy_selector.rb
+- app/services/foreman_salt/fact_importer.rb
+- app/services/foreman_salt/report_importer.rb
+- app/services/foreman_salt/smart_proxies/salt_keys.rb
+- app/views/foreman_salt/salt_autosign/_form.html.erb
+- app/views/foreman_salt/salt_autosign/index.html.erb
+- app/views/foreman_salt/salt_autosign/new.html.erb
+- app/views/foreman_salt/salt_environments/_form.html.erb
+- app/views/foreman_salt/salt_environments/edit.html.erb
+- app/views/foreman_salt/salt_environments/index.html.erb
+- app/views/foreman_salt/salt_environments/new.html.erb
+- app/views/foreman_salt/salt_keys/index.erb
+- app/views/foreman_salt/salt_modules/_form.html.erb
+- app/views/foreman_salt/salt_modules/edit.html.erb
+- app/views/foreman_salt/salt_modules/index.html.erb
+- app/views/foreman_salt/salt_modules/new.html.erb
 - config/routes.rb
-- db/seeds.d/75-salt-seeds.rb
-- db/migrate/20140920232200_create_salt_environments.rb
+- db/migrate/20140813081913_add_salt_proxy_to_host_and_host_group.rb
 - db/migrate/20140817210214_create_salt_modules.rb
 - db/migrate/20140829210214_add_salt_modules_to_hostgroups.rb
-- db/migrate/20140813081913_add_salt_proxy_to_host_and_host_group.rb
+- db/migrate/20140920232200_create_salt_environments.rb
+- db/seeds.d/75-salt-seeds.rb
+- lib/foreman_salt.rb
 - lib/foreman_salt/engine.rb
 - lib/foreman_salt/version.rb
 - lib/tasks/foreman_salt_tasks.rake
-- lib/foreman_salt.rb
-- LICENSE
-- Rakefile
-- README.md
-- test/integration/salt_keys_test.rb
+- test/factories/foreman_salt_factories.rb
+- test/functional/hosts_controller_test.rb
+- test/integration/salt_autosign_test.rb
 - test/integration/salt_environment_test.rb
+- test/integration/salt_keys_test.rb
 - test/integration/salt_module_test.rb
-- test/integration/salt_autosign_test.rb
-- test/unit/salt_keys_test.rb
+- test/test_plugin_helper.rb
 - test/unit/grains_centos.json
-- test/unit/host_extensions_test.rb
-- test/unit/salt_modules_test.rb
-- test/unit/highstate.json
 - test/unit/grains_importer_test.rb
+- test/unit/highstate.json
+- test/unit/host_extensions_test.rb
 - test/unit/hostgroup_extensions_test.rb
 - test/unit/report_importer_test.rb
-- test/test_plugin_helper.rb
-- test/factories/foreman_salt_factories.rb
-- test/functional/hosts_controller_test.rb
+- test/unit/salt_keys_test.rb
+- test/unit/salt_modules_test.rb
 homepage: http://github.com/theforeman/foreman_salt
 licenses:
 - GPL-3
@@ -110,17 +110,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.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Foreman Plug-in for Salt