foreman_salt 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 763554c758fd70adb3a4feef13ceb720c6711caa
-  data.tar.gz: 0b86628a2277d95a26cc75bf6ef45070361c35d0
+  metadata.gz: ce1b4cb399d2e977121144ef5e214df9cfb96c14
+  data.tar.gz: 7ae9a7bfe423ed887ae6b6a4b553bebc2a493197
 SHA512:
-  metadata.gz: 8d874dcf278f82b3b5bce1da5373bc37ccd758a5ee3ab9cccca65bc7cd8e0518a74a4cb9580d47e9d3187b4b2191e9b5d4b69b102cb420b4815719344eae35de
-  data.tar.gz: 5fd385f82b6dd1a8f9fef3d8061e221e127123176afeda78ea07b1075092b62ac7cab162d8b143a60f4bb6f88c991657fcf3c5511602977b825fa1aa9127d37e
+  metadata.gz: 642dccb0a0683cee2885bcf2a9446c13687fb8af7685537d1b2db45532c81c59476fb326e91c1e1144ccb0882f236ee18497b3fd64d580aaf68de4891e1070e0
+  data.tar.gz: 3cc3ab238b85f88d1c60f8bf6e8c29985de38a28ebfdadb58e010ddf25c6458c8d69b9f8c354b6aeebe8ba6690f33482f5cf04c02d264f7e913363fd5e9de40f

data/README.md

@@ -2,16 +2,9 @@
 
 This plug-in adds support for Salt to Foreman. 
 
-## Compatibility
-
-| Foreman Version | Plugin Version |
-| --------------- | --------------:|
-| >= 1.6          | ~> 0.0         |
-| >= 1.7          | ~> 1.0         |
-
 ## Documentation
 
-More info is available in the Wiki https://github.com/theforeman/foreman_salt/wiki
+Available in the Wiki https://github.com/theforeman/foreman_salt/wiki
 
 ## Contributing
 

data/Rakefile

@@ -20,7 +20,7 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path('../test/dummy/Rakefile', __FILE__)
 load 'rails/tasks/engine.rake'
 
 

data/app/controllers/foreman_salt/api/v2/jobs_controller.rb

@@ -11,14 +11,14 @@ module ForemanSalt
         add_puppetmaster_filters :upload
 
         resource_description do
-          api_base_url "/salt/api"
+          api_base_url '/salt/api'
         end
 
         def_param_group :job do
           param :job, Hash, :required => true, :action_aware => true do
-            param :job_id, Integer, :required => true, :desc => N_("JID")
-            param :function, String, :required => true, :desc => N_("Function")
-            param :result, Hash, :required => true, :desc => N_("Result")
+            param :job_id, Integer, :required => true, :desc => N_('JID')
+            param :function, String, :required => true, :desc => N_('Function')
+            param :result, Hash, :required => true, :desc => N_('Result')
           end
         end
 

data/app/controllers/foreman_salt/concerns/hosts_controller_extensions.rb

@@ -13,7 +13,7 @@ module ForemanSalt
 
       def saltrun
         if @host.saltrun!
-          notice _("Successfully executed, check log files for more details")
+          notice _('Successfully executed, check log files for more details')
         else
           error @host.errors[:base].to_sentence
         end
@@ -25,9 +25,9 @@ module ForemanSalt
           @host = resource_base.find(params[:name])
           enc = {}
           env = @host.salt_environment.blank? ? 'base' : @host.salt_environment.name
-          enc["classes"] = @host.salt_modules.any? ? @host.salt_modules.map(&:name) : []
-          enc["parameters"] = @host.info["parameters"]
-          enc["environment"] = env
+          enc['classes'] = @host.salt_modules.any? ? @host.salt_modules.map(&:name) : []
+          enc['parameters'] = @host.info['parameters']
+          enc['environment'] = env
           respond_to do |format|
             format.html { render :text => "<pre>#{ERB::Util.html_escape(enc.to_yaml)}</pre>" }
             format.yml  { render :text => enc.to_yaml }

data/app/controllers/foreman_salt/concerns/smart_proxy_auth_extensions.rb

@@ -12,9 +12,9 @@ module ForemanSalt
       end
 
       def require_puppetmaster_or_login_with_salt
-        if auth_smart_proxy(::SmartProxy.with_features("Salt"), ::Setting[:require_ssl_puppetmasters])
+        if auth_smart_proxy(::SmartProxy.with_features('Salt'), ::Setting[:require_ssl_puppetmasters])
           set_admin_user
-          return true
+          true
         else
           require_puppetmaster_or_login_without_salt
         end

data/app/controllers/foreman_salt/concerns/unattended_controller_extensions.rb

@@ -11,7 +11,7 @@ module ForemanSalt
 
       def handle_salt
         return true if @spoof
-        render(:text => _("Failed to set autosign for host. Terminating the build!"), :status => 500) unless @host.respond_to?(:handle_salt) && @host.handle_salt
+        render(:text => _('Failed to set autosign for host. Terminating the build!'), :status => 500) unless @host.respond_to?(:handle_salt) && @host.handle_salt
       end
     end
   end

data/app/controllers/foreman_salt/salt_environments_controller.rb

@@ -27,7 +27,7 @@ module ForemanSalt
 
     def update
       if @salt_environment.update_attributes(params[:foreman_salt_salt_environment])
-        notice _("Successfully updated %s." % @salt_environment.to_s)
+        notice _('Successfully updated %s.' % @salt_environment.to_s)
         redirect_to salt_environments_path
       else
         process_error

data/app/controllers/foreman_salt/salt_keys_controller.rb

@@ -4,7 +4,7 @@ module ForemanSalt
     def index
       @proxy = find_proxy
 
-      Rails.cache.delete("saltkeys_#{@proxy.id}") if params[:expire_cache] == "true"
+      Rails.cache.delete("saltkeys_#{@proxy.id}") if params[:expire_cache] == 'true'
       keys = if params[:state].blank?
                SmartProxies::SaltKeys.all @proxy
              else
@@ -14,7 +14,7 @@ module ForemanSalt
     end
 
     def accept
-      @proxy = find_proxy(permission = :edit_smart_proxies_salt_keys)
+      @proxy = find_proxy(:edit_smart_proxies_salt_keys)
       key = SmartProxies::SaltKeys.find(@proxy, params[:salt_key_id])
       if key.accept
         process_success({:success_redirect => hash_for_smart_proxy_salt_keys_path(:state => params[:state], :expire_cache => true),
@@ -25,7 +25,7 @@ module ForemanSalt
     end
 
     def reject
-      @proxy = find_proxy(permission = :edit_smart_proxies_salt_keys)
+      @proxy = find_proxy(:edit_smart_proxies_salt_keys)
       key = SmartProxies::SaltKeys.find(@proxy, params[:salt_key_id])
       if key.reject
         process_success({:success_redirect => hash_for_smart_proxy_salt_keys_path(:state => params[:state], :expire_cache => true),
@@ -36,7 +36,7 @@ module ForemanSalt
     end
 
     def destroy
-      @proxy = find_proxy(permission = :destroy_smart_proxies_salt_keys)
+      @proxy = find_proxy(:destroy_smart_proxies_salt_keys)
       key = SmartProxies::SaltKeys.find(@proxy, params[:id])
       if key.delete
         process_success({:success_redirect => hash_for_smart_proxy_salt_keys_path(:state => params[:state], :expire_cache => true),

data/app/controllers/foreman_salt/salt_modules_controller.rb

@@ -27,7 +27,7 @@ module ForemanSalt
 
     def update
       if @salt_module.update_attributes(params[:foreman_salt_salt_module])
-        notice _("Successfully updated %s." % @salt_module.to_s)
+        notice _('Successfully updated %s.' % @salt_module.to_s)
         redirect_to salt_modules_path
       else
         process_error

data/app/helpers/concerns/foreman_salt/hosts_helper_extensions.rb

@@ -9,16 +9,16 @@ module ForemanSalt
 
     def show_appropriate_host_buttons_with_salt(host)
       (show_appropriate_host_buttons_without_salt(host) +
-         [(link_to_if_authorized(_("Salt ENC"), {:controller => :hosts, :action => :salt_external_node, :name => host},
-         :title => _("Salt external nodes YAML dump"), :class => 'btn btn-default') unless host.salt_master.blank?)]).flatten.compact
+         [(link_to_if_authorized(_('Salt ENC'), {:controller => :hosts, :action => :salt_external_node, :name => host},
+         :title => _('Salt external nodes YAML dump'), :class => 'btn btn-default') unless host.salt_master.blank?)]).flatten.compact
     end
 
     def host_title_actions_with_salt_run(host)
         title_actions(
           button_group(
             if host.try(:salt_proxy)
-              link_to_if_authorized(_("Run Salt"), {:controller => :hosts, :action => :saltrun, :id => @host},
-                                    :title => _("Trigger a state.highstate run on a node"))
+              link_to_if_authorized(_('Run Salt'), {:controller => :hosts, :action => :saltrun, :id => @host},
+                                    :title => _('Trigger a state.highstate run on a node'))
             end
           )
         )

data/app/helpers/concerns/foreman_salt/smart_proxies_helper_extensions.rb

@@ -10,11 +10,11 @@ module ForemanSalt
       salt = proxy.features.detect { |feature| feature.name == 'Salt' }
       [
         if salt
-          display_link_if_authorized(_("Salt Keys"), {:controller => 'foreman_salt/salt_keys', :action => 'index', :smart_proxy_id => proxy})
+          display_link_if_authorized(_('Salt Keys'), {:controller => 'foreman_salt/salt_keys', :action => 'index', :smart_proxy_id => proxy})
         end,
 
         if salt
-          display_link_if_authorized(_("Salt Autosign"), {:controller => 'foreman_salt/salt_autosign', :action => 'index', :smart_proxy_id => proxy})
+          display_link_if_authorized(_('Salt Autosign'), {:controller => 'foreman_salt/salt_autosign', :action => 'index', :smart_proxy_id => proxy})
         end
       ] + proxy_actions_without_salt_proxy(proxy, authorizer)
     end

data/app/helpers/foreman_salt/salt_keys_helper.rb

@@ -1,7 +1,7 @@
 module ForemanSalt
   module SaltKeysHelper
     def salt_keys_state_filter
-      select_tag "Filter", options_for_select(["", _("Accepted"),_("Rejected"), _("Unaccepted")], params[:state]),
+      select_tag 'Filter', options_for_select(['', _('Accepted'),_('Rejected'), _('Unaccepted')], params[:state]),
         :onchange => "window.location.href = location.protocol + '//' + location.host + location.pathname + (this.value == '' ? '' : ('?state=' + this.value))"
     end
   end

data/app/lib/proxy_api/salt.rb

@@ -1,60 +1,60 @@
 module ::ProxyAPI
   class Salt < ::ProxyAPI::Resource
-    def initialize args
-      @url  = args[:url] + "/salt/"
+    def initialize(args)
+      @url  = args[:url] + '/salt/'
       super args
     end
 
     def autosign_list
-      parse(get("autosign"))
+      parse(get('autosign'))
     rescue => e
-      raise ProxyException.new(url, e, N_("Unable to fetch autosign list"))
+      raise ProxyException.new(url, e, N_('Unable to fetch autosign list'))
     end
 
-    def autosign_create name
-      parse(post("", "autosign/#{URI.escape(name)}"))
+    def autosign_create(name)
+      parse(post('', "autosign/#{URI.escape(name)}"))
     rescue => e
-      raise ProxyException.new(url, e, N_("Unable to set Salt autosign for %s"), name)
+      raise ProxyException.new(url, e, N_('Unable to set Salt autosign for %s'), name)
     end
 
-    def autosign_remove name
+    def autosign_remove(name)
       parse(delete("autosign/#{URI.escape(name)}"))
     rescue RestClient::ResourceNotFound
       true # entry doesn't exists anyway
     rescue => e
-      raise ProxyException.new(url, e, N_("Unable to delete Salt autosign for %s"), name)
+      raise ProxyException.new(url, e, N_('Unable to delete Salt autosign for %s'), name)
     end
 
     def key_list
-      parse(get("key"))
+      parse(get('key'))
     rescue => e
-      raise ProxyException.new(url, e, N_("Unable to fetch Salt key list"))
+      raise ProxyException.new(url, e, N_('Unable to fetch Salt key list'))
     end
 
-    def key_accept name
-      parse(post("","key/#{name}"))
+    def key_accept(name)
+      parse(post('',"key/#{name}"))
     rescue => e
-      raise ProxyException.new(url, e, N_("Unable to accept Salt key for %s"), name)
+      raise ProxyException.new(url, e, N_('Unable to accept Salt key for %s'), name)
     end
 
-    def key_reject name
+    def key_reject(name)
       parse(delete("key/reject/#{name}"))
     rescue => e
-      raise ProxyException.new(url, e, N_("Unable to reject Salt key for %s"), name)
+      raise ProxyException.new(url, e, N_('Unable to reject Salt key for %s'), name)
     end
 
-    def key_delete name
+    def key_delete(name)
       parse(delete("key/#{name}"))
     rescue RestClient::ResourceNotFound
       true
     rescue => e
-      raise ProxyException.new(url, e, N_("Unable to delete Salt key for %s"), name)
+      raise ProxyException.new(url, e, N_('Unable to delete Salt key for %s'), name)
     end
 
-    def highstate name
-      parse(post("", "highstate/#{name}"))
+    def highstate(name)
+      parse(post('', "highstate/#{name}"))
     rescue => e
-      raise ProxyException.new(url, e, N_("Unable to run Salt state.highstate for %s"), name)
+      raise ProxyException.new(url, e, N_('Unable to run Salt state.highstate for %s'), name)
     end
   end
 end

data/app/models/foreman_salt/concerns/host_managed_extensions.rb

@@ -4,9 +4,9 @@ module ForemanSalt
       extend ActiveSupport::Concern
 
       included do
-        has_and_belongs_to_many :salt_modules, :class_name => "ForemanSalt::SaltModule", :join_table => "hosts_salt_modules", :foreign_key => "host_id"
-        belongs_to :salt_proxy, :class_name => "SmartProxy"
-        belongs_to :salt_environment, :class_name => "ForemanSalt::SaltEnvironment"
+        has_and_belongs_to_many :salt_modules, :class_name => 'ForemanSalt::SaltModule', :join_table => 'hosts_salt_modules', :foreign_key => 'host_id'
+        belongs_to :salt_proxy, :class_name => 'SmartProxy'
+        belongs_to :salt_environment, :class_name => 'ForemanSalt::SaltEnvironment'
         alias_method_chain :params, :salt_proxy
         alias_method_chain :set_hostgroup_defaults, :salt_proxy
         alias_method_chain :smart_proxy_ids, :salt_proxy
@@ -14,12 +14,12 @@ module ForemanSalt
 
       def handle_salt
         return true unless salt?
-        salt_autosign_create
+        set_salt_autosign
       end
 
       def params_with_salt_proxy
         params = params_without_salt_proxy
-        params["salt_master"] = salt_master unless salt_master.blank?
+        params['salt_master'] = salt_master unless salt_master.blank?
         params
       end
 
@@ -40,12 +40,12 @@ module ForemanSalt
       def saltrun!
         unless salt_proxy.present?
           errors.add(:base, _("No Salt master defined - can't continue"))
-          logger.warn "Unable to execute salt run, no salt proxies defined"
+          logger.warn 'Unable to execute salt run, no salt proxies defined'
           return false
         end
         ProxyAPI::Salt.new({:url => salt_proxy.url}).highstate name
       rescue => e
-        errors.add(:base, _("Failed to execute state.highstate: %s") % e)
+        errors.add(:base, _('Failed to execute state.highstate: %s') % e)
         false
       end
 

data/app/models/foreman_salt/concerns/hostgroup_extensions.rb

@@ -4,9 +4,9 @@ module ForemanSalt
       extend ActiveSupport::Concern
 
       included do
-        has_and_belongs_to_many :salt_modules, :class_name => "ForemanSalt::SaltModule"
-        belongs_to :salt_proxy, :class_name => "SmartProxy"
-        belongs_to :salt_environment, :class_name => "ForemanSalt::SaltEnvironment"
+        has_and_belongs_to_many :salt_modules, :class_name => 'ForemanSalt::SaltModule'
+        belongs_to :salt_proxy, :class_name => 'SmartProxy'
+        belongs_to :salt_environment, :class_name => 'ForemanSalt::SaltEnvironment'
       end
 
       def salt_modules
@@ -38,7 +38,7 @@ module ForemanSalt
 
       def inherited_salt_proxy_id
         if ancestry.present?
-          read_attribute(:salt_proxy_id) || self.class.sort_by_ancestry(ancestors.where("salt_proxy_id is not NULL")).last.try(:salt_proxy_id)
+          read_attribute(:salt_proxy_id) || self.class.sort_by_ancestry(ancestors.where('salt_proxy_id is not NULL')).last.try(:salt_proxy_id)
         else
           self.salt_proxy_id
         end
@@ -51,7 +51,7 @@ module ForemanSalt
 
       def inherited_salt_environment_id
         if ancestry.present?
-          read_attribute(:salt_environment_id) || self.class.sort_by_ancestry(ancestors.where("salt_environment_id is not NULL")).last.try(:salt_environment_id)
+          read_attribute(:salt_environment_id) || self.class.sort_by_ancestry(ancestors.where('salt_environment_id is not NULL')).last.try(:salt_environment_id)
         else
           self.salt_environment_id
         end

data/app/models/foreman_salt/concerns/orchestration/salt.rb

@@ -20,41 +20,41 @@ module ForemanSalt
 
         def queue_salt_autosign
           return unless salt? && errors.empty?
-          new_record? ? queue_salt_autosign_create : queue_salt_autosign_update
+          new_record? ? queue_set_salt_autosign : queue_update_salt_autosign
         end
 
-        def queue_salt_autosign_create
+        def queue_set_salt_autosign
           # do nothing - we'll set autosign at the last second: when a host requests a provision URL
         end
 
-        def queue_salt_autosign_update
+        def queue_update_salt_autosign
           # Host has been built --> remove auto sign
           if old.build? and !build?
-            queue.create(:name => _("Remove autosign entry for %s") % self, :priority => 50, :action => [self, :salt_autosign_remove])
+            queue.create(:name => _('Remove autosign entry for %s') % self, :priority => 50, :action => [self, :del_salt_autosign])
           end
         end
 
         def queue_salt_destroy
           return unless salt? && errors.empty?
-          queue.create(:name => _("Remove autosign entry for %s") % self, :priority => 50, :action => [self, :salt_autosign_remove])
-          queue.create(:name => _("Delete existing salt key for %s") % self, :priority => 50, :action => [self, :salt_key_delete])
+          queue.create(:name => _('Remove autosign entry for %s') % self, :priority => 50, :action => [self, :del_salt_autosign])
+          queue.create(:name => _('Delete existing salt key for %s') % self, :priority => 50, :action => [self, :del_salt_key])
         end
 
-        def queue_salt_autosign_remove
+        def queue_del_salt_autosign
           return unless salt? && errors.empty?
-          queue.create(:name => _("Remove autosign entry for %s") % self, :priority => 50, :action => [self, :salt_autosign_remove])
+          queue.create(:name => _('Remove autosign entry for %s') % self, :priority => 50, :action => [self, :del_salt_autosign])
         end
 
-        def salt_autosign_create
+        def set_salt_autosign
           logger.info "Create autosign entry for #{name}"
           initialize_salt
-          salt_key_delete # if there's already an existing key
+          del_salt_key # if there's already an existing key
           @salt_api.autosign_create name
         rescue => e
           failure _("Failed to create %{name}'s Salt autosign entry: %{e}") % { :name => name, :e => e }
         end
 
-        def salt_autosign_remove
+        def del_salt_autosign
           logger.info "Remove autosign entry for #{name}"
           initialize_salt
           @salt_api.autosign_remove name
@@ -62,7 +62,7 @@ module ForemanSalt
           failure _("Failed to remove %{name}'s Salt autosign entry: %{e}") % { :name => name, :e => e }
         end
 
-        def salt_key_delete
+        def del_salt_key
           logger.info "Delete salt key for #{name}"
           initialize_salt
           @salt_api.key_delete name

data/app/models/foreman_salt/salt_environment.rb

@@ -5,13 +5,13 @@ module ForemanSalt
 
     before_destroy EnsureNotUsedBy.new(:hosts, :hostgroups)
 
-    has_many :hosts, :class_name => "::Host::Managed"
-    has_many :hostgroups, :class_name => "::Hostgroup"
+    has_many :hosts, :class_name => '::Host::Managed'
+    has_many :hostgroups, :class_name => '::Hostgroup'
 
-    validates :name, :uniqueness => true, :presence => true, :format => { :with => /\A[\w\d\.]+\z/, :message => N_("is alphanumeric and cannot contain spaces") }
+    validates :name, :uniqueness => true, :presence => true, :format => { :with => /\A[\w\d\.]+\z/, :message => N_('is alphanumeric and cannot contain spaces') }
 
     default_scope lambda {
-      order("salt_environments.name")
+      order('salt_environments.name')
     }
 
     scoped_search :on => :name, :complete_value => true

data/app/models/foreman_salt/salt_module.rb

@@ -4,15 +4,15 @@ module ForemanSalt
     include Authorizable
 
     before_destroy EnsureNotUsedBy.new(:hosts, :hostgroups)
-    has_and_belongs_to_many :hosts, :class_name => "::Host::Managed", :join_table => "hosts_salt_modules",
+    has_and_belongs_to_many :hosts, :class_name => '::Host::Managed', :join_table => 'hosts_salt_modules',
                             :association_foreign_key => 'host_id'
 
-    has_and_belongs_to_many :hostgroups, :class_name => "::Hostgroup", :join_table => "hostgroups_salt_modules"
+    has_and_belongs_to_many :hostgroups, :class_name => '::Hostgroup', :join_table => 'hostgroups_salt_modules'
 
-    validates :name, :uniqueness => true, :presence => true, :format => { :with => /\A(?:[\w\d]+\.{0,1})+[^\.]\z/, :message => N_("must be alphanumeric, can contain dots and must not contain spaces") }
+    validates :name, :uniqueness => true, :presence => true, :format => { :with => /\A(?:[\w\d]+\.{0,1})+[^\.]\z/, :message => N_('must be alphanumeric, can contain dots and must not contain spaces') }
 
     default_scope lambda {
-      order("salt_modules.name")
+      order('salt_modules.name')
     }
 
     scoped_search :on => :name, :complete_value => true

data/app/overrides/foreman/salt_modules/_host_tab_pane.html.erb

@@ -12,9 +12,9 @@
      <div class="col-md-8">
        <h3>Salt States</h3>
        <% if @inherited_salt_modules.blank? -%>
-         <%= multiple_selects f, :salt_module, ::ForemanSalt::SaltModule, @salt_modules.try(:map, &:id), :label => "" %>
+         <%= multiple_selects f, :salt_module, ::ForemanSalt::SaltModule, @salt_modules.try(:map, &:id), :label => '' %>
        <% else -%>
-         <%= multiple_selects f, :salt_module, ::ForemanSalt::SaltModule.where('id NOT IN (?)', @inherited_salt_modules.map(&:id)), @salt_modules.try(:map, &:id), :label => "" %>
+         <%= multiple_selects f, :salt_module, ::ForemanSalt::SaltModule.where('id NOT IN (?)', @inherited_salt_modules.map(&:id)), @salt_modules.try(:map, &:id), :label => '' %>
        <% end -%>
      </div>
    </div>

data/app/overrides/salt_environment_selector.rb

@@ -2,12 +2,12 @@ selector_text = "<%= select_f f, :salt_environment_id, ForemanSalt::SaltEnvironm
                                  { :include_blank => blank_or_inherit_f(f, :salt_environment) },
                                  { :label         => _('Salt Environment') } %>"
 
-Deface::Override.new(:virtual_path  => "hosts/_form",
-                     :name          => "add_salt_environment_to_host",
+Deface::Override.new(:virtual_path  => 'hosts/_form',
+                     :name          => 'add_salt_environment_to_host',
                      :insert_bottom => 'div#primary',
                      :text          =>  selector_text)
 
-Deface::Override.new(:virtual_path  => "hostgroups/_form",
-                     :name          => "add_salt_environment_to_hostgroup",
+Deface::Override.new(:virtual_path  => 'hostgroups/_form',
+                     :name          => 'add_salt_environment_to_hostgroup',
                      :insert_bottom => 'div#primary',
                      :text          =>  selector_text)

data/app/overrides/salt_modules_selector.rb

@@ -1,19 +1,19 @@
-Deface::Override.new(:virtual_path => "hosts/_form",
-  :name => "add_salt_modules_tab_to_host",
+Deface::Override.new(:virtual_path => 'hosts/_form',
+  :name => 'add_salt_modules_tab_to_host',
   :insert_after => 'li.active',
   :partial => '../overrides/foreman/salt_modules/host_tab')
 
-Deface::Override.new(:virtual_path => "hosts/_form",
-  :name => "add_salt_modules_tab_pane_to_host",
+Deface::Override.new(:virtual_path => 'hosts/_form',
+  :name => 'add_salt_modules_tab_pane_to_host',
   :insert_before => 'div#puppet_klasses',
   :partial => '../overrides/foreman/salt_modules/host_tab_pane')
-  
-Deface::Override.new(:virtual_path => "hostgroups/_form",
-  :name => "add_salt_modules_tab_to_hg",
+
+Deface::Override.new(:virtual_path => 'hostgroups/_form',
+  :name => 'add_salt_modules_tab_to_hg',
   :insert_after => 'li.active',
   :partial => '../overrides/foreman/salt_modules/host_tab')
 
-Deface::Override.new(:virtual_path => "hostgroups/_form",
-  :name => "add_salt_modules_tab_pane_to_hg",
+Deface::Override.new(:virtual_path => 'hostgroups/_form',
+  :name => 'add_salt_modules_tab_pane_to_hg',
   :insert_before => 'div#puppet_klasses',
   :partial => '../overrides/foreman/salt_modules/host_tab_pane')

data/app/overrides/salt_proxy_selector.rb

@@ -2,12 +2,12 @@ selector_text = "<%= select_f f, :salt_proxy_id, SmartProxy.unscoped.with_featur
                                  { :include_blank => blank_or_inherit_f(f, :salt_proxy) },
                                  { :label         => _('Salt Master') } %>"
 
-Deface::Override.new(:virtual_path  => "hosts/_form",
-                     :name          => "add_salt_proxy_to_host",
+Deface::Override.new(:virtual_path  => 'hosts/_form',
+                     :name          => 'add_salt_proxy_to_host',
                      :insert_bottom => 'div#primary',
                      :text          =>  selector_text)
 
-Deface::Override.new(:virtual_path  => "hostgroups/_form",
-                     :name          => "add_salt_proxy_to_hostgroup",
+Deface::Override.new(:virtual_path  => 'hostgroups/_form',
+                     :name          => 'add_salt_proxy_to_hostgroup',
                      :insert_bottom => 'div#primary',
                      :text          =>  selector_text)

data/app/services/foreman_salt/fact_importer.rb

@@ -72,8 +72,8 @@ module ForemanSalt
         name_parts = fact_name.split(FactName::SEPARATOR)
 
         name_parts.inject([]) do |memo, name|
-          memo           = memo + [name]
-          key            = memo.join(FactName::SEPARATOR)
+          memo += [name]
+          key = memo.join(FactName::SEPARATOR)
           new_facts[key] ||= name_parts == memo ? value : nil
           memo
         end
@@ -85,7 +85,7 @@ module ForemanSalt
       hash.sort_by { |k, v| k.to_s }
     end
 
-    def sparse(hash, options={})
+    def sparse(hash, options = {})
       hash.map do |k, v|
         prefix = (options.fetch(:prefix, [])+[k])
         next Sparsify::sparse(v, options.merge(:prefix => prefix)) if v.is_a? Hash
@@ -93,7 +93,7 @@ module ForemanSalt
       end.reduce(:merge) || Hash.new
     end
 
-    def unsparse(hash, options={})
+    def unsparse(hash, options = {})
       ret = Hash.new
       sparse(hash).each do |k, v|
         current            = ret
@@ -101,7 +101,7 @@ module ForemanSalt
         current            = (current[key.shift] ||= Hash.new) until (key.size<=1)
         current[key.first] = v
       end
-      return ret
+      ret
     end
   end
 end