foreman_salt 2.0.2 → 2.1.0

data/app/overrides/{salt_environment_selector.rb → salt_environment_hostgroup_selector.rb}

@@ -1,11 +1,7 @@
 selector_text = "<%= select_f f, :salt_environment_id, ForemanSalt::SaltEnvironment.all, :id, :name,
                                  { :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',
-                     :insert_bottom => 'div#primary',
-                     :text          =>  selector_text)
+                                 { :label => _('Salt Environment'), :onchange => 'update_salt_states(this)', :'data-url' => salt_environment_selected_hostgroups_path,
+                                   :'data-host-id' => (@host || @hostgroup).id, :help_inline => :indicator} %>"
 
 Deface::Override.new(:virtual_path  => 'hostgroups/_form',
                      :name          => 'add_salt_environment_to_hostgroup',

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',
                      :insert_after => 'li.active',
-                     :partial => '../overrides/foreman/salt_modules/host_tab')
+                     :partial => 'foreman_salt/salt_modules/host_tab')
 
 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')
+                     :partial => 'foreman_salt/salt_modules/host_tab_pane')
 
 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')
+                     :partial => 'foreman_salt/salt_modules/host_tab')
 
 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')
+                     :partial => 'foreman_salt/salt_modules/host_tab_pane')

data/app/services/foreman_salt/fact_importer.rb

@@ -102,7 +102,7 @@ module ForemanSalt
       sparse(hash).each do |k, v|
         current            = ret
         key                = k.to_s.split(options.fetch(:separator, FactName::SEPARATOR))
-        current            = (current[key.shift] ||= Hash.new) until (key.size <= 1)
+        current            = (current[key.shift] ||= {}) until (key.size <= 1)
         current[key.first] = v
       end
       ret

data/app/services/foreman_salt/report_importer.rb

@@ -43,7 +43,7 @@ module ForemanSalt
     private
 
     def find_or_create_host(host)
-      @host ||= Host::Base.find_by_name(host)
+      @host ||= Host::Managed.find_by_name(host)
 
       unless @host
         new = Host::Managed.new(:name => host)
@@ -106,14 +106,16 @@ module ForemanSalt
           end
         end
 
-        time[resource] = if result['duration'].is_a? String
-                           Float(result['duration'].delete(' ms')) rescue nil
-                         else
-                           result['duration']
-                         end
+        duration = if result['duration'].is_a? String
+                     Float(result['duration'].delete(' ms')) rescue nil
+                   else
+                     result['duration']
+                   end
+
+        time[resource] = duration || 0
       end
 
-      time[:total] = time.values.inject(&:+)
+      time[:total] = time.values.compact.inject(&:+) || 0
       events = { :total => changed + failed + restarted + restarted_failed, :success => success + restarted, :failure => failed + restarted_failed }
 
       changes = { :total => changed + restarted }

data/app/services/foreman_salt/smart_proxies/salt_keys.rb

@@ -22,7 +22,7 @@ module ForemanSalt
       end
 
       def find(proxy, name)
-        all(proxy).select { |c| c.name == name }.first
+        all(proxy).find { |c| c.name == name }
       end
 
       def find_by_state(proxy, state)

data/app/views/foreman_salt/salt_environments/index.html.erb

@@ -5,14 +5,20 @@
 <table class="table table-bordered table-striped">
   <tr>
     <th><%= sort :name, :as => s_('SaltEnvironment|Name') %></th>
+    <th><%= _('States') %></th>
+    <th><%= sort :host, :as => _('Hosts'), :default => 'DESC'  %></th>
+    <th><%= sort :hostgroup, :as => _('Host groups'), :default => 'DESC' %></th>
     <th></th>
   </tr>
   <% for salt_environment in @salt_environments %>
     <tr>
       <td><%=link_to_if_authorized h(salt_environment.name), hash_for_edit_salt_environment_path(:id => salt_environment).merge(:auth_object => salt_environment, :authorizer => authorizer) %></td>
+      <td><%= link_to_if_authorized(salt_environment.salt_modules.count, hash_for_salt_modules_path(:search => "environment = #{salt_environment}")) %></td>
+      <td><%= link_to_if_authorized(salt_environment.hosts.count, hash_for_hosts_path(:search => "salt_environment = #{salt_environment}")) %></td>
+      <td><%= link_to_if_authorized(salt_environment.hostgroups.count, hash_for_hostgroups_path(:search => "salt_environment = #{salt_environment}")) %></td>
       <td>
-        <%= action_buttons(display_delete_if_authorized hash_for_salt_environment_path(:id => salt_environment).merge(:auth_object => salt_environment, :authorizer => authorizer),
-                            :confirm => _('Delete %s?') % salt_environment.name) %>
+          <%= action_buttons(display_delete_if_authorized(hash_for_salt_environment_path(:id => salt_environment).merge(:auth_object => salt_environment, :authorizer => authorizer),
+                            :confirm => _('Delete %s?') % salt_environment.name)) %>
       </td>
     </tr>
   <% end %>

data/app/views/foreman_salt/salt_modules/_form.html.erb

@@ -2,14 +2,20 @@
   <%= base_errors_for @salt_module %>
   <ul class="nav nav-tabs" data-tabs="tabs">
     <li class="active"><a href="#primary" data-toggle="tab"><%= _('Salt States') %></a></li>
+    <li><a href="#environments" data-toggle="tab"><%= _('Environments') %></a></li>
   </ul>
 
   <div class="tab-content">
     <div class="tab-pane active" id="primary">
       <%= text_f f, :name %>
     </div>
+
+    <div class="tab-pane" id="environments">
+      <%= multiple_selects f, :salt_environment, ::ForemanSalt::SaltEnvironment, @salt_environments.try(:map, &:id), :label => _("Environments").html_safe %>
+    </div>
   </div>
 
-  <%= submit_or_cancel f %>
+<%= submit_or_cancel f %>
+
 <% end %>
 

data/app/views/foreman_salt/salt_modules/_host_tab_pane.html.erb

@@ -0,0 +1,33 @@
+<%= javascript "foreman_salt/states" %>
+
+<%
+    object_name = @obj.kind_of?(Hostgroup) ? 'hostgroup' : 'host'
+    @salt_modules ||= []
+    @selected ||= []
+%>
+
+<div class="tab-pane" id="salt_modules">
+    <div id="state_selector" style="<%= @salt_environment.blank? ? 'display: none' : 'visibility: block' %>;">
+    <% @inherited_salt_modules = [] if @inherited_salt_modules.blank? %>
+    <div class="row">
+      <div class="col-md-4">
+         <h3>Inherited States</h3>
+         <ul id="inherited_states">
+         <% @inherited_salt_modules.sort.each do |salt_module| -%>
+           <li title="Inherited from hostgroup"><%= salt_module.name -%></li>
+         <% end -%>
+         </ul>
+       </div>
+       <div class="col-md-8">
+         <h3>Salt States</h3>
+         <%= fields_for "#{object_name}".to_sym do |states| %>
+             <%= states.collection_select(:salt_module_ids, @salt_modules, :id, :to_s, {:selected => @selected.map(&:id), :size => "col-md-10"},
+                                          :multiple => true) %>
+           <% end %>
+       </div>
+     </div>
+   </div>
+   <div id="no_env" style="visibility: <%= @salt_environment.blank? ? 'block' : 'hidden' %>;">
+     <div class="alert alert-block alert-warning"><%= _('Please select a Salt environment first') %></div>
+   </div>
+</div>

data/app/views/foreman_salt/salt_modules/import.html.erb

@@ -0,0 +1,43 @@
+<% title _('Import from %s') % @proxy.name %>
+
+<%= form_tag apply_changes_salt_modules_path do %>
+
+<h4><%= _("Select the changes you want to realize in Foreman") %></h4>
+<br/>
+<h6>
+  <%= _("Toggle") %>:
+  <%= link_to_function(icon_text("check", _("Added")),
+                       "toggleCheckboxesBySelector('.state_check_add')",
+                       :title => _("Check/Uncheck Added")) %> |
+  <%= link_to_function(icon_text("check", _("Removed")),
+                       "toggleCheckboxesBySelector('.state_check_remove')",
+                       :title => _("Check/Uncheck Removed")) %>
+</h6>
+
+<table class="table table-bordered table-striped">
+    <tr>
+    <th class="ca"><%= link_to_function(icon_text("check"),
+                         "toggleCheckboxesBySelector('.state_check')",
+                         :title => _("Check/Uncheck All")) %></th>
+    <th><%= _('Environment') %></th>
+    <th><%= _('Operation')  %></th>
+    <th><%= _('States') %></th>
+  </tr>
+  <% @changes.each do |environment, changed| -%>
+    <% [:add, :remove].each do |operation| -%>
+        <% if changed[operation] %>
+          <tr>
+            <td class="ca"><%= check_box_tag "changed[#{environment}][#{operation}]", changed[operation].to_json, false, :class => "state_check state_check_#{operation}" %></td>
+            <td><%= environment %><%= '*' if @deletes.include? environment %></td>
+            <td><%= operation.to_s.titleize %></td>
+            <td><%= changed[operation].to_sentence -%></td>
+          </tr>
+        <% end -%>
+      <% end -%>
+  <% end -%>
+</table>
+<%= '<p>* Environment will contain no states, and will be deleted'.html_safe if @deletes.any? %>
+
+<p><%= link_to _("Cancel"), salt_modules_path, :class => "btn btn-default" %>
+<%= submit_tag _("Update"), :class => "btn btn-primary" %>
+<% end -%>

data/app/views/foreman_salt/salt_modules/index.html.erb

@@ -1,18 +1,31 @@
 <% title _('Salt States') %>
 
-<% title_actions button_group(display_link_if_authorized(_('New Salt State'), hash_for_new_salt_module_path)) %>
+<% title_actions import_from_proxies,
+                 button_group(display_link_if_authorized(_('New Salt State'), hash_for_new_salt_module_path)) %>
+
 
 <table class="table table-bordered table-striped">
   <tr>
     <th><%= sort :name, :as => s_('SaltModule|Name') %></th>
+    <th><%= _('Environments') %></th>
+    <th><%= sort :host, :as => _('Hosts'), :default => 'DESC'  %></th>
+    <th><%= sort :hostgroup, :as => _('Host groups'), :default => 'DESC' %></th>
     <th></th>
   </tr>
   <% for salt_module in @salt_modules %>
     <tr>
-      <td><%=link_to_if_authorized h(salt_module.name), hash_for_edit_salt_module_path(:id => salt_module).merge(:auth_object => salt_module, :authorizer => authorizer) %></td>
+      <td><%= link_to_if_authorized(colorize(salt_module.name), hash_for_edit_salt_module_path(:id => salt_module)) %></td>
+      <td>
+          <% salt_module.salt_environments.sort.each do |environment| -%>
+              <%= link_to environment.name, :controller => :'foreman_salt/salt_modules', :action => :index, :search => "environment = #{environment.name}" %>
+          <% end -%>
+      </td>
+      <td><%= link_to_if_authorized(salt_module.hosts.count, hash_for_hosts_path(:search => "salt_state = #{salt_module}")) %></td>
+      <td><%= link_to_if_authorized(salt_module.hostgroups.count, hash_for_hostgroups_path(:search => "salt_state = #{salt_module}")) %></td>
       <td>
-        <%= action_buttons(display_delete_if_authorized hash_for_salt_module_path(:id => salt_module).merge(:auth_object => salt_module, :authorizer => authorizer),
-                            :confirm => _('Delete %s?') % salt_module.name) %>
+          <%= action_buttons([display_link_if_authorized(_('Edit'), hash_for_edit_salt_module_path(:id => salt_module).merge(:auth_object => salt_module, :authorizer => authorizer)),
+                             display_delete_if_authorized(hash_for_salt_module_path(:id => salt_module).merge(:auth_object => salt_module, :authorizer => authorizer),
+                            :confirm => _('Delete %s?') % salt_module.name)]) %>
       </td>
     </tr>
   <% end %>
@@ -20,4 +33,3 @@
 
 <%= page_entries_info @salt_modules %>
 <%= will_paginate @salt_modules %>
-

data/config/routes.rb

@@ -5,18 +5,30 @@ Rails.application.routes.draw do
       match '/run/:id'  => 'foreman_salt/minions#run'
     end
 
-    resources :salt_environments, :controller => 'foreman_salt/salt_environments' do
+    resources :minions, :controller => 'foreman_salt/minions', :only => [] do
       collection do
-        get 'auto_complete_search'
+        constraints(:id => /[^\/]+/) do
+          post 'salt_environment_selected'
+        end
       end
     end
 
-    resources :salt_modules, :controller => 'foreman_salt/salt_modules' do
+    resources :salt_environments, :controller => 'foreman_salt/salt_environments' do
       collection do
         get 'auto_complete_search'
       end
     end
 
+    constraints :id => /[\w\.-]+/ do
+      resources :salt_modules, :controller => 'foreman_salt/salt_modules' do
+        collection do
+          get 'import'
+          get 'auto_complete_search'
+          post 'apply_changes'
+        end
+      end
+    end
+
     scope :api, :path => '/api', :defaults => { :format => 'json' } do
       scope '(:apiv)', :defaults => { :apiv => 'v2' },
                        :apiv => /v1|v2/, :constraints => ApiConstraints.new(:version => 2) do
@@ -30,6 +42,8 @@ Rails.application.routes.draw do
           match '/salt_autosign/:smart_proxy_id' => 'foreman_salt/api/v2/salt_autosign#index', :via => :get
           match '/salt_autosign/:smart_proxy_id' => 'foreman_salt/api/v2/salt_autosign#create', :via => :post
           match '/salt_autosign/:smart_proxy_id/:record' => 'foreman_salt/api/v2/salt_autosign#destroy', :via => :delete
+
+          match '/salt_states/import/:smart_proxy_id' => 'foreman_salt/api/v2/salt_states#import', :via => :post
         end
 
         constraints(:id => /[\w\.-]+/) do
@@ -52,4 +66,10 @@ Rails.application.routes.draw do
       end
     end
   end
+
+  resources :hostgroups do
+    collection do
+      post 'salt_environment_selected'
+    end
+  end
 end

data/db/migrate/20150411003302_add_environments_to_modules.rb

@@ -0,0 +1,17 @@
+class AddEnvironmentsToModules < ActiveRecord::Migration
+  def up
+    create_table 'salt_module_environments' do |t|
+      t.references :salt_module
+      t.references :salt_environment
+    end
+
+    environments = ForemanSalt::SaltEnvironment.all
+    ForemanSalt::SaltModule.all.each do |state|
+      state.salt_environments << environments
+    end
+  end
+
+  def down
+    drop_table :salt_module_environments
+  end
+end

data/db/migrate/20150509094409_rename_join_tables.rb

@@ -0,0 +1,11 @@
+class RenameJoinTables < ActiveRecord::Migration
+  def up
+    rename_table :hosts_salt_modules, :host_salt_modules
+    rename_table :hostgroups_salt_modules, :hostgroup_salt_modules
+  end
+
+  def down
+    rename_table :host_salt_modules, :hosts_salt_modules
+    rename_table :hostgroup_salt_modules, :hostgroups_salt_modules
+  end
+end

data/db/migrate/20150509101505_add_primary_keys.rb

@@ -0,0 +1,6 @@
+class AddPrimaryKeys < ActiveRecord::Migration
+  def change
+    add_column :host_salt_modules, :id, :primary_key
+    add_column :hostgroup_salt_modules, :id, :primary_key
+  end
+end

data/lib/foreman_salt/engine.rb

@@ -2,6 +2,8 @@ require 'deface'
 
 module ForemanSalt
   class Engine < ::Rails::Engine
+    engine_name 'foreman_salt'
+
     config.autoload_paths += Dir["#{config.root}/app/controllers/concerns"]
     config.autoload_paths += Dir["#{config.root}/app/helpers/concerns"]
     config.autoload_paths += Dir["#{config.root}/app/models/concerns"]
@@ -21,6 +23,14 @@ module ForemanSalt
       app.config.paths['db/migrate'] += ForemanSalt::Engine.paths['db/migrate'].existent
     end
 
+    initializer "foreman_salt.assets.precompile" do |app|
+      app.config.assets.precompile += %w(foreman_salt/states.js)
+    end
+
+    initializer 'foreman_salt.configure_assets', :group => :assets do
+      SETTINGS[:foreman_salt] = {:assets => {:precompile => ['foreman_salt/states.js']}}
+    end
+
     initializer 'foreman_salt.apipie' do
       Apipie.configuration.checksum_path += ['/salt/api/']
     end
@@ -93,7 +103,8 @@ module ForemanSalt
                      :resource_type => 'Host'
 
           permission :edit_hosts,
-                     { :'foreman_salt/api/v2/salt_minions' => [:update] },
+                     { :'foreman_salt/api/v2/salt_minions' => [:update],
+                       :'foreman_salt/minions' => [:salt_environment_selected] },
                      :resource_type => 'Host'
 
           permission :view_hosts,
@@ -101,6 +112,10 @@ module ForemanSalt
                        :'foreman_salt/api/v2/salt_minions' => [:index, :show] },
                      :resource_type => 'Host'
 
+          permission :edit_hostgroups,
+                     { :hostgroups => [:salt_environment_selected] },
+                     :resource_type => 'Hostgroup'
+
           permission :view_smart_proxies_salt_keys,
                      { :'foreman_salt/salt_keys' => [:index],
                        :'foreman_salt/api/v2/salt_keys' => [:index] },
@@ -121,6 +136,11 @@ module ForemanSalt
                        :'foreman_salt/api/v2/salt_states' => [:create] },
                      :resource_type => 'ForemanSalt::SaltModule'
 
+          permission :import_salt_modules,
+                     { :'foreman_salt/salt_modules' => [:import, :apply_changes],
+                       :'foreman_salt/api/v2/salt_states' => [:import] },
+                     :resource_type => 'ForemanSalt::SaltModule'
+
           permission :view_salt_modules,
                      { :'foreman_salt/salt_modules' => [:index, :show, :auto_complete_search],
                        :'foreman_salt/api/v2/salt_states' => [:index, :show] },

data/lib/foreman_salt/version.rb

@@ -1,3 +1,3 @@
 module ForemanSalt
-  VERSION = '2.0.2'
+  VERSION = '2.1.0'
 end

data/lib/tasks/foreman_salt_tasks.rake

@@ -33,6 +33,5 @@ load 'tasks/jenkins.rake'
 if Rake::Task.task_defined?(:'jenkins:unit')
   Rake::Task['jenkins:unit'].enhance do
     Rake::Task['test:foreman_salt'].invoke
-    Rake::Task['foreman_salt:rubocop'].invoke
   end
 end

data/test/unit/host_extensions_test.rb

@@ -8,7 +8,7 @@ module ForemanSalt
 
     test 'host has a salt smart proxy' do
       host = FactoryGirl.create :host, :with_salt_proxy
-      assert host.salt_proxy.features.map(&:name).include? 'Salt'
+      assert host.salt_proxy.has_feature? 'Salt'
     end
 
     test 'smart_proxy_ids returns salt smart proxy' do
@@ -28,5 +28,19 @@ module ForemanSalt
       host.set_hostgroup_defaults
       assert_equal host.salt_proxy, hostgroup.salt_proxy
     end
+
+    test 'host does not accept salt modules outside its environment' do
+      hosts_environment = FactoryGirl.create :salt_environment
+      other_environment = FactoryGirl.create :salt_environment
+
+      state = FactoryGirl.create :salt_module
+      other_environment.salt_modules << state
+
+      host = FactoryGirl.create :host, :with_salt_proxy, :salt_environment => hosts_environment
+      host.salt_modules = [state]
+
+      refute host.save
+      assert host.errors.full_messages.include? 'Salt states must be in the environment of the host'
+    end
   end
 end

data/test/unit/hostgroup_extensions_test.rb

@@ -14,7 +14,7 @@ module ForemanSalt
     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
+      assert_equal [], parent.all_salt_modules - child.all_salt_modules
     end
 
     test 'child host group inherits salt proxy from child parent' do
@@ -34,7 +34,7 @@ module ForemanSalt
       parent = FactoryGirl.create :hostgroup, :with_salt_modules
       child_one = FactoryGirl.create :hostgroup, :parent => parent
       child_two = FactoryGirl.create :hostgroup, :parent => child_one
-      assert_equal [], parent.salt_modules - child_two.salt_modules
+      assert_equal [], parent.all_salt_modules - child_two.all_salt_modules
     end
   end
 end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: foreman_salt
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.0
 platform: ruby
 authors:
 - Stephen Benjamin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-17 00:00:00.000000000 Z
+date: 2015-05-10 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'
 - !ruby/object:Gem::Dependency
   name: foreman-tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.6.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.6.9
 description: Foreman Plug-in for Salt
@@ -48,6 +48,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- app/assets/javascripts/foreman_salt/states.js
 - app/controllers/foreman_salt/api/v2/base_controller.rb
 - app/controllers/foreman_salt/api/v2/jobs_controller.rb
 - app/controllers/foreman_salt/api/v2/salt_autosign_controller.rb
@@ -64,21 +65,25 @@ files:
 - app/controllers/foreman_salt/salt_environments_controller.rb
 - app/controllers/foreman_salt/salt_keys_controller.rb
 - app/controllers/foreman_salt/salt_modules_controller.rb
+- app/controllers/foreman_salt/state_importer.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/helpers/foreman_salt/salt_modules_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/host_salt_module.rb
+- app/models/foreman_salt/hostgroup_salt_module.rb
 - app/models/foreman_salt/salt_environment.rb
 - app/models/foreman_salt/salt_module.rb
+- app/models/foreman_salt/salt_module_environment.rb
 - app/models/setting/salt.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_environment_host_selector.rb
+- app/overrides/salt_environment_hostgroup_selector.rb
 - app/overrides/salt_modules_selector.rb
 - app/overrides/salt_proxy_selector.rb
 - app/services/foreman_salt/fact_importer.rb
@@ -116,7 +121,10 @@ files:
 - 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/_host_tab.html.erb
+- app/views/foreman_salt/salt_modules/_host_tab_pane.html.erb
 - app/views/foreman_salt/salt_modules/edit.html.erb
+- app/views/foreman_salt/salt_modules/import.html.erb
 - app/views/foreman_salt/salt_modules/index.html.erb
 - app/views/foreman_salt/salt_modules/new.html.erb
 - config/routes.rb
@@ -125,6 +133,9 @@ files:
 - db/migrate/20140829210214_add_salt_modules_to_hostgroups.rb
 - db/migrate/20140920232200_create_salt_environments.rb
 - db/migrate/20150220122707_fix_incorrect_report_metrics.rb
+- db/migrate/20150411003302_add_environments_to_modules.rb
+- db/migrate/20150509094409_rename_join_tables.rb
+- db/migrate/20150509101505_add_primary_keys.rb
 - db/seeds.d/75-salt-seeds.rb
 - lib/foreman_salt.rb
 - lib/foreman_salt/engine.rb
@@ -159,12 +170,12 @@ 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: []
@@ -174,22 +185,22 @@ signing_key:
 specification_version: 4
 summary: Foreman Plug-in for Salt
 test_files:
-- test/integration/salt_keys_test.rb
-- test/integration/salt_environment_test.rb
-- test/integration/salt_module_test.rb
-- test/integration/salt_autosign_test.rb
+- test/functional/minions_controller_test.rb
+- test/functional/api/v2/salt_states_controller_test.rb
+- test/functional/api/v2/salt_autosign_controller_test.rb
+- test/functional/api/v2/salt_keys_controller_test.rb
+- test/functional/api/v2/salt_environments_controller_test.rb
+- test/factories/foreman_salt_factories.rb
 - test/unit/salt_keys_test.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_centos.json
 - test/unit/grains_importer_test.rb
 - test/unit/hostgroup_extensions_test.rb
 - test/unit/report_importer_test.rb
+- test/unit/salt_modules_test.rb
+- test/unit/highstate.json
 - test/test_plugin_helper.rb
-- test/factories/foreman_salt_factories.rb
-- test/functional/minions_controller_test.rb
-- test/functional/api/v2/salt_environments_controller_test.rb
-- test/functional/api/v2/salt_autosign_controller_test.rb
-- test/functional/api/v2/salt_states_controller_test.rb
-- test/functional/api/v2/salt_keys_controller_test.rb
+- test/integration/salt_keys_test.rb
+- test/integration/salt_environment_test.rb
+- test/integration/salt_autosign_test.rb
+- test/integration/salt_module_test.rb