.travis.yml

@@ -1,5 +1,5 @@
 ---
-dist: xenial
+dist: bionic
 language: ruby
 cache: bundler
 before_install:

CHANGELOG.md

@@ -4,6 +4,18 @@ All notable changes to this project will be documented in this file.
 Each new release typically also includes the latest modulesync defaults.
 These should not affect the functionality of the module.
 
+## [v4.1.1](https://github.com/voxpupuli/puppet-firewalld/tree/v4.1.1) (2019-11-01)
+
+[Full Changelog](https://github.com/voxpupuli/puppet-firewalld/compare/v4.1.0...v4.1.1)
+
+**Fixed bugs:**
+
+- Reoccurring firewall-cmd command execution [\#240](https://github.com/voxpupuli/puppet-firewalld/issues/240)
+
+**Merged pull requests:**
+
+- memoize self.state [\#241](https://github.com/voxpupuli/puppet-firewalld/pull/241) ([igalic](https://github.com/igalic))
+
 ## [v4.1.0](https://github.com/voxpupuli/puppet-firewalld/tree/v4.1.0) (2019-10-22)
 
 [Full Changelog](https://github.com/voxpupuli/puppet-firewalld/compare/v4.0.0...v4.1.0)

Dockerfile

@@ -15,7 +15,7 @@ RUN bundle install --without system_tests development release --path=${BUNDLE_PA
 COPY . .
 
 RUN bundle install
-RUN bundle exec release_checks
+RUN bundle exec rake release_checks
 
 # Container should not saved
 RUN exit 1

Gemfile

@@ -22,6 +22,7 @@ group :test do
   gem 'puppet-lint-variable_contains_upcase',                       :require => false
   gem 'puppet-lint-absolute_classname-check',                       :require => false
   gem 'puppet-lint-topscope-variable-check',                        :require => false
+  gem 'puppet-lint-legacy_facts-check',                             :require => false
   gem 'metadata-json-lint',                                         :require => false
   gem 'redcarpet',                                                  :require => false
   gem 'rubocop', '~> 0.49.1',                                       :require => false

Rakefile

@@ -77,6 +77,19 @@ begin
     metadata = JSON.load(File.read(metadata_json))
     config.project = metadata['name']
   end
+
+  # Workaround for https://github.com/github-changelog-generator/github-changelog-generator/issues/715
+  require 'rbconfig'
+  if RbConfig::CONFIG['host_os'] =~ /linux/
+    task :changelog do
+      puts 'Fixing line endings...'
+      changelog_file = File.join(__dir__, 'CHANGELOG.md')
+      changelog_txt = File.read(changelog_file)
+      new_contents = changelog_txt.gsub(%r{\r\n}, "\n")
+      File.open(changelog_file, "w") {|file| file.puts new_contents }
+    end
+  end
+
 rescue LoadError
 end
 # vim: syntax=ruby

lib/puppet/provider/firewalld.rb

@@ -15,8 +15,10 @@ def state
   end
 
   def self.state
+    if Puppet::Provider::Firewalld.runstate.nil?
+      Puppet::Provider::Firewalld.runstate = check_running_state
+    end
     Puppet::Provider::Firewalld.runstate
-    check_running_state
   end
 
   def check_running_state
@@ -26,7 +28,7 @@ def check_running_state
   def self.check_running_state
     debug("Executing --state command - current value #{@state}")
     ret = execute_firewall_cmd(['--state'], nil, false, false, false)
-    Puppet::Provider::Firewalld.runstate = ret.exitstatus.zero?
+    ret.exitstatus.zero?
   rescue Puppet::MissingCommand
     # This exception is caught in case the module is being run before
     # the package provider has installed the firewalld package, if we
@@ -92,7 +94,6 @@ def reload_firewall
   end
 
   def offline?
-    check_running_state if state.nil?
     state == false || state.nil?
   end
 
@@ -101,7 +102,10 @@ def online?
   end
 
   def self.online?
-    check_running_state unless state == true
+    # always re-check state unless we are already online:
+    # see #117 / 813141cbfebf98c4348b64189cb472b6f3238c99
+    # That means, `self.state` will be re-run, even if it has a valid value, such as `false`
+    Puppet::Provider::Firewalld.runstate = check_running_state unless state == true
     state == true
   end
 
@@ -114,7 +118,6 @@ def available?
   end
 
   def self.available?
-    check_running_state if state.nil?
     !state.nil?
   end
 end

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "puppet-firewalld",
-  "version": "4.1.0",
+  "version": "4.1.1",
   "author": "Vox Pupuli",
   "summary": "Configure firewalld zones, services, and rich rules and direct config",
   "license": "Apache-2.0",

spec/spec_helper.rb

@@ -42,7 +42,17 @@
 end
 
 RSpec.configure do |c|
-  c.default_facter_version = ENV['FACTERDB_FACTS_VERSION'] || '3.9'
+  # getting the correct facter version is tricky. We use facterdb as a source to mock facts
+  # see https://github.com/camptocamp/facterdb
+  # people might provide a specific facter version. In that case we use it.
+  # Otherwise we need to match the correct facter version to the used puppet version.
+  # as of 2019-10-31, puppet 5 ships facter 3.11 and puppet 6 ships facter 3.14
+  # https://puppet.com/docs/puppet/5.5/about_agent.html
+  c.default_facter_version = if ENV['FACTERDB_FACTS_VERSION']
+                               ENV['FACTERDB_FACTS_VERSION']
+                             else
+                               Gem::Dependency.new('', ENV['PUPPET_VERSION']).match?('', '5') ? '3.11.0' : '3.14.0'
+                             end
 
   # Coverage generation
   c.after(:suite) do