Merge pull request #62 from bastelfreak/restore_archlinux_support

Restore archlinux support
dgolja · Mar 20, 2017 · 33c9f50 · 33c9f50
2 parents 24599ba + 86784d6
commit 33c9f50
Show file tree

Hide file tree

Showing 17 changed files with 710 additions and 271 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
diff --git a/.travis.yml b/.travis.yml
@@ -14,5 +14,7 @@ matrix:
     env: PUPPET_GEM_VERSION="~> 3.8.1"
   - rvm: 2.1.6
     env: PUPPET_VERSION="~> 4.0.0"
+  - rvm: 2.3.3
+    env: PUPPET_VERSION="~> 4.0" CHECK=rubocop
 notifications:
   email: [email protected]
diff --git a/Gemfile b/Gemfile
@@ -18,17 +18,19 @@ else
 end
 
 group :development, :test do
-  gem 'rake',                   require: false
-  gem 'rspec',                  require: false
-  gem 'rspec-puppet',           require: false
-  gem 'puppetlabs_spec_helper', require: false
-  gem 'puppet-lint',            require: false
-  gem 'simplecov',              require: false
-  gem 'puppet_facts',           require: false
-  gem 'json_pure', '~> 1.8',    require: false
-  gem 'json',                   require: false
-  gem 'metadata-json-lint',     require: false
-  gem 'rspec-puppet-facts',     require: false
+  gem 'rake',                       require: false
+  gem 'rspec',                      require: false
+  gem 'rspec-puppet',               require: false
+  gem 'puppetlabs_spec_helper',     require: false
+  gem 'puppet-lint',                require: false
+  gem 'simplecov',                  require: false
+  gem 'puppet_facts',               require: false
+  gem 'json_pure', '~> 1.8',        require: false
+  gem 'json',                       require: false
+  gem 'metadata-json-lint',         require: false
+  gem 'rspec-puppet-facts',         require: false
+  gem 'rubocop', '~> 0.47.0',       require: false if RUBY_VERSION >= '2.3.0'
+  gem 'rubocop-rspec', '~> 1.10.0', require: false if RUBY_VERSION >= '2.3.0'
 end
 
 group :system_tests do

diff --git a/lib/facter/influxdb_version.rb b/lib/facter/influxdb_version.rb
@@ -1,18 +1,14 @@
 #
 
 Facter.add(:influxdb_version) do
-
   setcode do
-
     if Facter::Util::Resolution.which('influx')
 
       # InfluxDB shell version: 1.1.1
       version_stdout = Facter::Util::Resolution.exec('influx --version')
-      match = version_stdout.match(/[0-9]+\.[0-9]+\.[0-9]+/)
+      match = version_stdout.match(%r{[0-9]+\.[0-9]+\.[0-9]+})
 
       match ? match[0] : nil
     end
-
   end
-
 end
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -11,8 +11,6 @@
 
   $config_file           = '/etc/influxdb/influxdb.conf'
 
-  $manage_repos          = false
-
   $influxdb_stderr_log   = '/var/log/influxdb/influxd.log'
   $influxdb_stdout_log   = '/var/log/influxdb/influxd.log'
   $influxd_opts          = undef
@@ -176,29 +174,24 @@
   $hinted_handoff_config = {}
 
   case $::osfamily {
-
     'Debian': {
-
-      $startup_conf          = '/etc/default/influxdb'
-
+      $startup_conf = '/etc/default/influxdb'
+      $manage_repos = false
     }
-
     'RedHat': {
-
       $startup_conf = $::operatingsystemmajrelease ? {
         /7/     => '/etc/default/influxdb',
         default => '/etc/sysconfig/influxdb'
       }
-
+      $manage_repos = false
+    }
+    'Archlinux': {
+      $startup_conf = '/etc/default/influxdb'
+      $manage_repos = false
     }
-
     default: {
-
       fail("Unsupported managed repository for osfamily: ${::osfamily}, operatingsystem: ${::operatingsystem},\
-
       module ${module_name} currently only supports managing repos for osfamily RedHat, Debian and Archlinux")
     }
-
   }
-
 }
diff --git a/metadata.json b/metadata.json
@@ -39,13 +39,12 @@
         "12.04",
         "14.04"
       ]
+    },
+    {
+      "operatingsystem": "Archlinux"
     }
   ],
   "requirements": [
-    {
-      "name": "pe",
-      "version_requirement": ">= 3.0.0 < 2015.4.0"
-    },
     {
       "name": "puppet",
       "version_requirement": ">= 3.0.0 < 5.0.0"

diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb
@@ -1,9 +1,7 @@
 require 'spec_helper_acceptance'
 
-describe 'influxdb class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-
+describe 'influxdb class', unless: UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
   context 'default parameters' do
-
     pp = <<-EOS
 
     class { 'influxdb':
@@ -12,32 +10,31 @@ class { 'influxdb':
 
     EOS
 
-    it 'should work with no errors' do
+    it 'works with no errors' do
       # Run it twice and test for idempotency
-      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, catch_failures: true)
       # wait because influxdb takes few seconds to start
-      shell("/bin/sleep 10")
+      shell('/bin/sleep 10')
     end
 
     describe package('influxdb') do
       it { is_expected.to be_installed }
     end
 
     describe port('8086') do
-      it { should be_listening }
+      it { is_expected.to be_listening }
     end
 
-    describe process("influxd") do
-      its(:user) { should eq "influxdb" }
+    describe process('influxd') do
+      its(:user) { is_expected.to eq 'influxdb' }
     end
 
-    describe command("/usr/bin/test_facter.sh influxdb_version") do
+    describe command('/usr/bin/test_facter.sh influxdb_version') do
       its(:stdout) { is_expected.to eq "1.2.0\n" }
     end
 
     describe port('8089') do
-      it { should_not be_listening }
+      it { is_expected.not_to be_listening }
     end
   end
-
 end