foreman_salt 5.0.0 → 5.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9868208c4e4fcafc333d26d1328d26fda1aedbe
-  data.tar.gz: 5123aa03c84c55a2b2bcf7781bd20a4c8f8c0bc7
+  metadata.gz: db1aa26e9f75b7b0673e373a1bfb7b7c6a1e7333
+  data.tar.gz: cb9ea975a7a1ea549cf2f6006a3ae88ce49f1361
 SHA512:
-  metadata.gz: f3eb26a7c80cfd36770eeaa6fd758641e24942940964c4a97d2e516ecd3e80f59b7806f1828cea71dc3abee4623f30e6056e66df97a6143f12e67087e23244ba
-  data.tar.gz: 2912f3b5f10639dfd156bc5b7b3110fcc18eb732b49c04f1b4e036f2fc32c75916ad739d08456423c8c846c71486651aa73348f401a22e5e87bf49c52c64917e
+  metadata.gz: af94628121430ff29a6cefaf22cd0e882d6b3f5ff80d412b8c9ce890c6338f74983f71f251716f8012012ae3c13d1e8dd1e0fd6382f29638ad8af10f61698e34
+  data.tar.gz: 827eda4f3ef2e520e782e4f0d69b01d35bb4a8e0494e0cd93de351eba54ca373734d64d763d1685ec37ede0c397b2736c306e62db7ae5e06bf4bd256914a3cd4

data/app/services/foreman_salt/fact_importer.rb

@@ -57,7 +57,7 @@ module ForemanSalt
     end
 
     def fact_names
-      @fact_names ||= fact_name_class.maximum(:id, :group => 'name')
+      @fact_names ||= fact_name_class.group(:name).maximum(:id)
     end
 
     # if the host does not exists yet, we don't have an host_id to use the fact_values table.

data/app/services/foreman_salt/report_importer.rb

@@ -114,6 +114,10 @@ module ForemanSalt
                    else
                      result['duration']
                    end
+        # Convert duration from milliseconds to seconds
+        if duration.is_a? Float
+          duration = duration / 1000
+        end
 
         time[resource] = duration || 0
       end

data/lib/foreman_salt/version.rb

@@ -1,3 +1,3 @@
 module ForemanSalt
-  VERSION = '5.0.0'
+  VERSION = '5.0.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_salt
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.0.1
 platform: ruby
 authors:
 - Stephen Benjamin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-27 00:00:00.000000000 Z
+date: 2016-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -180,27 +180,27 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Foreman Plug-in for Salt
 test_files:
 - test/factories/foreman_salt_factories.rb
+- test/functional/api/v2/salt_autosign_controller_test.rb
+- test/functional/api/v2/salt_environments_controller_test.rb
+- test/functional/api/v2/salt_keys_controller_test.rb
+- test/functional/api/v2/salt_states_controller_test.rb
+- test/functional/minions_controller_test.rb
 - test/integration/salt_autosign_test.rb
-- test/integration/salt_module_test.rb
 - test/integration/salt_environment_test.rb
 - test/integration/salt_keys_test.rb
-- test/unit/highstate.json
-- test/unit/report_importer_test.rb
+- test/integration/salt_module_test.rb
 - test/unit/grains_centos.json
-- test/unit/host_extensions_test.rb
-- test/unit/salt_modules_test.rb
 - test/unit/grains_importer_test.rb
+- test/unit/highstate.json
 - test/unit/salt_keys_test.rb
+- test/unit/salt_modules_test.rb
+- test/unit/host_extensions_test.rb
 - test/unit/hostgroup_extensions_test.rb
+- test/unit/report_importer_test.rb
 - test/test_plugin_helper.rb
-- test/functional/api/v2/salt_keys_controller_test.rb
-- test/functional/api/v2/salt_autosign_controller_test.rb
-- test/functional/api/v2/salt_environments_controller_test.rb
-- test/functional/api/v2/salt_states_controller_test.rb
-- test/functional/minions_controller_test.rb