foreman_default_hostgroup 1.0.1 → 1.1.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YjIyNTViYmQ0MmVjZTkxZDU2N2JlZDNkY2ZiNmRiNTJkNTE1MzYxOQ==
+  data.tar.gz: !binary |-
+    MDQ1ZTIwZDczYWYyNzgwYzQxYTk1ODdiOTgzMmI5MWJmMzAyYzQzZA==
+SHA512:
+  metadata.gz: !binary |-
+    ZDQyMTNlOWU0ZWIyYmQ0MzA5MGNiNmQ3Njc4M2JkMTBiMDM0MTA3OTlkMTNk
+    M2NmYzU2ZjNkMjc0MzYzZGEzNzhkNDM2MTlmODMwMWU5ZjIzOTEyYWEzZDU3
+    OTRhMWRiYTAxNzllOGE5ZjkwYmQyZTg5ZDY4MzM1ZmM1NDk1ODc=
+  data.tar.gz: !binary |-
+    M2E4MDBlNDg2ZDBiYjMxNWE3OWY1OTJiMzU3NGMyYTQwOGYwNjNkMWIxZTg0
+    ZGU1ZTRmMzcxYmIxNDljNjc4OGEwNGRiZWUyODJjZWUxOTE5N2FmOTdiYmY1
+    ZWVkMzgwN2FlNWVlMDMxZmQ2YmU2Nzg2OTQ4OTgxNmFmNjdlNTk=

data/lib/default_hostgroup.rake

@@ -13,3 +13,9 @@ Rake::Task[:test].enhance do
   Rake::Task['test:default_hostgroup'].invoke
 end
 
+load 'tasks/jenkins.rake'
+if Rake::Task.task_defined?(:'jenkins:setup')
+  Rake::Task["jenkins:unit"].enhance do
+    Rake::Task['test:default_hostgroup'].invoke
+  end
+end

data/lib/default_hostgroup_managed_host_patch.rb

@@ -10,8 +10,8 @@ module DefaultHostgroupManagedHostPatch
   end
 
   module ClassMethods
-    def importHostAndFacts_with_apply_hostgroup hostname, facts, certname = nil
-      host, result = importHostAndFacts_without_apply_hostgroup(hostname, facts, certname)
+    def importHostAndFacts_with_apply_hostgroup hostname, facts, certname = nil, proxy_id = nil
+      host, result = importHostAndFacts_without_apply_hostgroup(hostname, facts, certname, proxy_id)
       Rails.logger.debug "DefaultHostgroup: performing Hostgroup check"
 
       unless valid_hostgroup?

data/lib/foreman_default_hostgroup/engine.rb

@@ -11,6 +11,11 @@ module ForemanDefaultHostgroup
       require_dependency File.expand_path("../../../app/models/setting/default_hostgroup.rb", __FILE__) if (Setting.table_exists? rescue(false))
     end
 
+    initializer 'foreman_default_hostgroup.register_plugin', :after=> :finisher_hook do |app|
+      Foreman::Plugin.register :foreman_default_hostgroup do
+      end if (Rails.env == "development" or defined? Foreman::Plugin)
+    end
+
     config.to_prepare do
       ::Host::Managed.send :include, DefaultHostgroupManagedHostPatch
     end

data/lib/foreman_default_hostgroup/version.rb

@@ -1,3 +1,3 @@
 module ForemanDefaultHostgroup
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

data/test/factories/environments.rb

@@ -0,0 +1,5 @@
+FactoryGirl.define do
+  factory :environment do
+    name 'defaulthostgrouptest'
+  end
+end

data/test/test_plugin_helper.rb

@@ -0,0 +1,6 @@
+# This calls the main test_helper in Foreman-core
+require 'test_helper'
+
+# Add plugin to FactoryGirl's paths
+FactoryGirl.definition_file_paths << File.join(File.dirname(__FILE__), 'factories')
+FactoryGirl.reload

data/test/unit/default_hostgroup_test.rb

@@ -1,13 +1,9 @@
-require 'test_helper'
+require 'test_plugin_helper'
 
 class DefaultHostgroupTest < ActiveSupport::TestCase
   setup do
     disable_orchestration
     User.current = User.find_by_login "admin"
-
-    # this is not being run automatically by the
-    # initializers, for some strange reason....
-    Setting::DefaultHostgroup.load_defaults
   end
 
   def parse_json_fixture(relative_path)
@@ -15,6 +11,11 @@ class DefaultHostgroupTest < ActiveSupport::TestCase
   end
 
   def setup_hostgroup
+    # The settings.yml fixture in Core wipes out the Setting table,
+    # so we use FactoryGirl to re-create it
+    FactoryGirl.create(:setting,
+                       :name => 'default_hostgroup',
+                       :category => 'Setting::DefaultHostgroup')
     @hostgroup = Hostgroup.create :name => "MyGroup"
     Setting[:default_hostgroup] = @hostgroup.name
   end
@@ -34,4 +35,11 @@ class DefaultHostgroupTest < ActiveSupport::TestCase
     refute Host.find_by_name('sinn1636.lan').hostgroup
   end
 
+  # Contrived example to check new plugin factories are loaded
+  test "my factory exists" do
+    refute Environment.find_by_name('defaulthostgrouptest')
+    FactoryGirl.create(:environment)
+    assert Environment.find_by_name('defaulthostgrouptest')
+  end
+
 end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_default_hostgroup
 version: !ruby/object:Gem::Version
-  version: 1.0.1
-  prerelease: 
+  version: 1.1.0
 platform: ruby
 authors:
 - Greg Sutcliffe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-10 00:00:00.000000000 Z
+date: 2014-02-07 00:00:00.000000000 Z
 dependencies: []
 description: Adds the option to specify a default hostgroup for new hosts created
   from facts/reports
@@ -20,42 +19,45 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files:
+- LICENSE
+- README.md
 - app/models/setting/default_hostgroup.rb
 - config/environment.rb
 - lib/default_hostgroup.rake
 - lib/default_hostgroup_managed_host_patch.rb
+- lib/foreman_default_hostgroup.rb
 - lib/foreman_default_hostgroup/engine.rb
 - lib/foreman_default_hostgroup/version.rb
-- lib/foreman_default_hostgroup.rb
-- LICENSE
-- README.md
-- test/unit/facts.json
+- test/factories/environments.rb
+- test/test_plugin_helper.rb
 - test/unit/default_hostgroup_test.rb
+- test/unit/facts.json
 homepage: http://github.com/GregSutcliffe/foreman_default_hostgroup
 licenses:
 - GPL-3
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Default Hostgroup Plugin for Foreman
 test_files:
+- test/factories/environments.rb
 - test/unit/facts.json
 - test/unit/default_hostgroup_test.rb
+- test/test_plugin_helper.rb