Merge pull request #11 from dev-sec/fix_lint

Fix lint

Author: rndmh3ro

.rubocop.yml

@@ -26,3 +26,7 @@ Metrics/PerceivedComplexity:
   Max: 10
 Metrics/AbcSize:
   Max: 30
+# Lint/AmbiguousBlockAssociation is incompatible with RSpec
+# https://github.com/rubocop-hq/rubocop/issues/4222
+Lint/AmbiguousBlockAssociation:
+  Enabled: false

Rakefile

@@ -1,5 +1,4 @@
-#!/usr/bin/env rake
-# encoding: utf-8
+# frozen_string_literal: true
 
 require 'rake/testtask'
 require 'rubocop/rake_task'
@@ -20,23 +19,30 @@ task default: [:lint, 'test:check']
 namespace :test do
   # run inspec check to verify that the profile is properly configured
   task :check do
-    dir = File.join(File.dirname(__FILE__))
-    sh("bundle exec inspec check #{dir}")
+    require 'inspec'
+    puts "Checking profile with InSpec Version: #{Inspec::VERSION}"
+    profile = Inspec::Profile.for_target('.', backend: Inspec::Backend.create(Inspec::Config.mock))
+    pp profile.check
   end
 end
 
-# Automatically generate a changelog for this project. Only loaded if
-# the necessary gem is installed. By default its picking up the version from
-# inspec.yml. You can override that behavior with s`rake changelog to=1.2.0`
-begin
-  require 'yaml'
-  metadata = YAML.load_file('inspec.yml')
-  v = ENV['to'] || metadata['version']
-  puts "Generate changelog for version #{v}"
-  require 'github_changelog_generator/task'
-  GitHubChangelogGenerator::RakeTask.new :changelog do |config|
-    config.future_release = v
+task :changelog do
+  # Automatically generate a changelog for this project. Only loaded if
+  # the necessary gem is installed. By default its picking up the version from
+  # inspec.yml. You can override that behavior with `rake changelog to=1.2.0`
+  begin
+    require 'yaml'
+    metadata = YAML.load_file('inspec.yml')
+    v = ENV['to'] || metadata['version']
+    puts " * Generating changelog for version #{v}"
+    require 'github_changelog_generator/task'
+    GitHubChangelogGenerator::RakeTask.new :changelog do |config|
+      config.future_release = v
+      config.user = 'dev-sec'
+      config.project = 'php-baseline'
+    end
+    Rake::Task[:changelog].execute
+  rescue LoadError
+    puts '>>>>> GitHub Changelog Generator not loaded, omitting tasks'
   end
-rescue LoadError
-  puts '>>>>> GitHub Changelog Generator not loaded, omitting tasks'
 end

controls/php_conf.rb

@@ -1,4 +1,6 @@
 # encoding: utf-8
+# frozen_string_literal: true
+
 #
 # Copyright 2015, Dominik Richter
 # Copyright 2016, Christoph Hartmann

libraries/php.rb

@@ -1,4 +1,6 @@
 # encoding: utf-8
+# frozen_string_literal: true
+
 #
 # Copyright 2016, Christoph Hartmann
 #
@@ -33,6 +35,7 @@ class PHP < Inspec.resource(1)
   "
 
   def initialize(options = {})
+    super()
     @options = options
   end
 
@@ -49,13 +52,15 @@ def config(param)
   def extension(extension)
     ext = Class.new do
       def initialize(parent, extension)
+        super
         @parent = parent
         @extension = extension
       end
 
       def loaded?
         cmd = @parent._run("#{@parent._php_executable} --ri '#{@extension}'")
         return true if cmd.exit_status.zero?
+
         false
       end
 
@@ -90,6 +95,7 @@ class PHPConfig < PHP
   "
 
   def initialize(param)
+    super()
     warn '[DEPRECATION] `php_config(param)` is deprecated.  Please use `php.config(param)` instead.'
     @param = param
   end
@@ -118,6 +124,7 @@ class PHPExtension < PHP
   "
 
   def initialize(extension)
+    super
     warn '[DEPRECATION] `php_extension(ext)` is deprecated.  Please use `php.extension(ext)` instead.'
     @extension = extension
   end