foreman_ansible 1.1 → 1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7394d81e94f7dd6bfda57b0a539adc09a1c068e0
-  data.tar.gz: 87475c40db6d3a594517de1443878ffe107b85f6
+  metadata.gz: 171a0853e2f5429814160c53ebad9511bf38420d
+  data.tar.gz: e6921e84713038550370c6af692ee7a5db632a6d
 SHA512:
-  metadata.gz: 48d0c08d791d3543d6cbf2341c6a3ed66ba9c0d4b9a8c9e5bbcc0344444ef9c8c94db91ae4b7bf193ef915c75d9162470877140c46cd9d3c44e110d3593d809b
-  data.tar.gz: 79df637cc5ce51f5f6d9ee40ae0587b18c4dc9f339ae0edd4d813dd97fcfe1965bc589d7c176fcabcbd202cd47d75a839695ed652a9636ff32e37175164e168b
+  metadata.gz: d83512f1d44933fe302100df714cb66c5f7dc3947b4ab7d1d93c4ea82f82f9aeaaf7a6c74307055578283849e121a8719836678cc076748951b8e90103d7e2a8
+  data.tar.gz: e43b9174db2e5cc4f8f265ca2ec462a1fc186e2828007d43bc4b5d84a6b70368ca632be144977e1b80a6ee94950a963acd31fa2c91004c2afa013b05460cd338

data/app/models/foreman_ansible/fact_name.rb

@@ -1,3 +1,10 @@
 module ForemanAnsible
-  class FactName < ::FactName; end
+  # Define the class that fact names that come from Ansible should have
+  # It allows us to filter facts by origin, and also to display the origin
+  # in the fact values table (/fact_values)
+  class FactName < ::FactName
+    def origin
+      'Ansible'
+    end
+  end
 end

data/app/services/foreman_ansible/fact_importer.rb

@@ -47,9 +47,16 @@ module ForemanAnsible
     end
 
     def missing_facts
+      db_fact_names = if db_facts.is_a? Hash
+                        db_facts.keys
+                      else
+                        db_facts
+                      end
+      # In Foreman versions prior to 1.14, the db_facts key
+      # used to be a hash. Now it's an ActiveRecord::AssociationRelation
       @missing_facts ||= facts.keys +
                          FactSparser.sparse(@original_facts).keys -
-                         db_facts.keys
+                         db_fact_names
     end
 
     # Returns pairs [id, fact_name]

data/lib/foreman_ansible/engine.rb

@@ -72,6 +72,12 @@ module ForemanAnsible
       end
     end
 
+    initializer 'foreman_ansible.apipie' do
+      Apipie.configuration.api_controllers_matcher <<
+        "#{ForemanAnsible::Engine.root}/app/controllers/api/v2/*.rb"
+      Apipie.configuration.checksum_path += ['/foreman_ansible/api/']
+    end
+
     config.to_prepare do
       begin
         ::FactImporter.register_fact_importer(:ansible,

data/lib/foreman_ansible/version.rb

@@ -2,5 +2,5 @@
 # This way other parts of Foreman can just call ForemanAnsible::VERSION
 # and detect what version the plugin is running.
 module ForemanAnsible
-  VERSION = '1.1'.freeze
+  VERSION = '1.2'.freeze
 end

data/test/unit/{fact_importer_test.rb → services/fact_importer_test.rb}

@@ -19,7 +19,7 @@ module ForemanAnsible
     test 'missing_facts returns facts we do not have in the database' do
       @fact_importer = FactImporter.new(@host, facts_json)
       @fact_importer.expects(:db_facts).
-        returns('ansible_cmdline' => 'fakevalue')
+        returns('ansible_cmdline' => 'fakevalue').twice
       refute @fact_importer.send(:missing_facts).include?('ansible_cmdline')
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_ansible
 version: !ruby/object:Gem::Version
-  version: '1.1'
+  version: '1.2'
 platform: ruby
 authors:
 - Daniel Lobato Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-14 00:00:00.000000000 Z
+date: 2016-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -90,6 +90,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- app/assets/images/Ansible.png
 - app/controllers/ansible_roles_controller.rb
 - app/controllers/api/v2/ansible_roles_controller.rb
 - app/controllers/foreman_ansible/concerns/hosts_controller_extensions.rb
@@ -159,15 +160,15 @@ files:
 - test/unit/ansible_role_test.rb
 - test/unit/concerns/host_managed_extensions_test.rb
 - test/unit/concerns/hostgroup_extensions_test.rb
-- test/unit/fact_importer_test.rb
-- test/unit/fact_parser_test.rb
-- test/unit/fact_sparser_test.rb
 - test/unit/helpers/foreman_ansible/ansible_reports_helper_test.rb
 - test/unit/host_ansible_role_test.rb
 - test/unit/hostgroup_ansible_role_test.rb
 - test/unit/lib/foreman_ansible_core/playbook_runner_test.rb
 - test/unit/lib/proxy_api/ansible_test.rb
 - test/unit/services/api_roles_importer_test.rb
+- test/unit/services/fact_importer_test.rb
+- test/unit/services/fact_parser_test.rb
+- test/unit/services/fact_sparser_test.rb
 - test/unit/services/proxy_selector_test.rb
 - test/unit/services/roles_importer_test.rb
 - test/unit/services/ui_roles_importer_test.rb
@@ -207,17 +208,17 @@ test_files:
 - test/functional/ansible_roles_controller_test.rb
 - test/functional/hosts_controller_test.rb
 - test/test_plugin_helper.rb
-- test/unit/fact_parser_test.rb
 - test/unit/concerns/hostgroup_extensions_test.rb
 - test/unit/concerns/host_managed_extensions_test.rb
+- test/unit/services/fact_parser_test.rb
 - test/unit/services/proxy_selector_test.rb
+- test/unit/services/fact_importer_test.rb
 - test/unit/services/ui_roles_importer_test.rb
 - test/unit/services/roles_importer_test.rb
+- test/unit/services/fact_sparser_test.rb
 - test/unit/services/api_roles_importer_test.rb
 - test/unit/host_ansible_role_test.rb
 - test/unit/ansible_role_test.rb
-- test/unit/fact_importer_test.rb
-- test/unit/fact_sparser_test.rb
 - test/unit/lib/proxy_api/ansible_test.rb
 - test/unit/lib/foreman_ansible_core/playbook_runner_test.rb
 - test/unit/hostgroup_ansible_role_test.rb