From a7bea7fc881a1da55e370f4903d0af7a6c07bf2c Mon Sep 17 00:00:00 2001 From: erwanlr Date: Wed, 27 Mar 2019 13:34:06 +0000 Subject: [PATCH] Updates the example --- example/.rubocop.yml | 1 + example/Gemfile | 2 ++ example/Rakefile | 2 ++ example/app/app.rb | 4 +++- example/app/controllers.rb | 1 - example/app/controllers/example.rb | 2 ++ example/bin/cmsscan | 1 + example/cmsscan.gemspec | 4 ++-- example/lib/cmsscan.rb | 2 ++ example/lib/cmsscan/controller.rb | 2 ++ example/lib/cmsscan/target.rb | 9 +++++++++ example/lib/cmsscan/version.rb | 5 +++-- example/spec/spec_helper.rb | 2 ++ 13 files changed, 31 insertions(+), 6 deletions(-) delete mode 100644 example/app/controllers.rb diff --git a/example/.rubocop.yml b/example/.rubocop.yml index bcb55d61..df0a7a96 100644 --- a/example/.rubocop.yml +++ b/example/.rubocop.yml @@ -1,4 +1,5 @@ AllCops: + TargetRubyVersion: 2.3 Exclude: - '*.gemspec' - 'vendor/**/*' diff --git a/example/Gemfile b/example/Gemfile index 851fabc2..5f10ba8c 100644 --- a/example/Gemfile +++ b/example/Gemfile @@ -1,2 +1,4 @@ +# frozen_string_literal: true + source 'https://rubygems.org' gemspec diff --git a/example/Rakefile b/example/Rakefile index 7274f105..c6dd8276 100644 --- a/example/Rakefile +++ b/example/Rakefile @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'bundler/gem_tasks' require 'rspec/core/rake_task' require 'rubocop/rake_task' diff --git a/example/app/app.rb b/example/app/app.rb index 1d4a62a7..6c670b9a 100644 --- a/example/app/app.rb +++ b/example/app/app.rb @@ -1 +1,3 @@ -require_relative 'controllers' +# frozen_string_literal: true + +require_relative 'controllers/example' diff --git a/example/app/controllers.rb b/example/app/controllers.rb deleted file mode 100644 index e868bcc6..00000000 --- a/example/app/controllers.rb +++ /dev/null @@ -1 +0,0 @@ -require_relative 'controllers/example' diff --git a/example/app/controllers/example.rb b/example/app/controllers/example.rb index 3e9f0504..b7c05aaa 100644 --- a/example/app/controllers/example.rb +++ b/example/app/controllers/example.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module CMSScan module Controller # Example Controller diff --git a/example/bin/cmsscan b/example/bin/cmsscan index 428d4168..8caf7c15 100755 --- a/example/bin/cmsscan +++ b/example/bin/cmsscan @@ -1,4 +1,5 @@ #!/usr/bin/env ruby +# frozen_string_literal: true require 'cmsscan' diff --git a/example/cmsscan.gemspec b/example/cmsscan.gemspec index bdf7293d..03ad7749 100644 --- a/example/cmsscan.gemspec +++ b/example/cmsscan.gemspec @@ -21,14 +21,14 @@ Gem::Specification.new do |s| s.executables = ['cmsscan'] s.require_paths = ['lib'] - s.add_dependency 'cms_scanner', '~> 0.0.41.1' + s.add_dependency 'cms_scanner', '~> 0.0.42.0' s.add_development_dependency 'bundler', '>= 1.6' s.add_development_dependency 'coveralls', '~> 0.8.0' s.add_development_dependency 'rake', '~> 12.3' s.add_development_dependency 'rspec', '~> 3.8.0' s.add_development_dependency 'rspec-its', '~> 1.2.0' - s.add_development_dependency 'rubocop', '~> 0.62.0' + s.add_development_dependency 'rubocop', '~> 0.66.0' s.add_development_dependency 'simplecov', '~> 0.16.1' s.add_development_dependency 'webmock', '~> 3.5.1' end diff --git a/example/lib/cmsscan.rb b/example/lib/cmsscan.rb index 655b86be..13493d14 100644 --- a/example/lib/cmsscan.rb +++ b/example/lib/cmsscan.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # Gems require 'cms_scanner' require 'yajl/json_gem' diff --git a/example/lib/cmsscan/controller.rb b/example/lib/cmsscan/controller.rb index ddb69422..4867e61b 100644 --- a/example/lib/cmsscan/controller.rb +++ b/example/lib/cmsscan/controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module CMSScan # Needed to load at least the Core controller # Otherwise, the following error will be raised: diff --git a/example/lib/cmsscan/target.rb b/example/lib/cmsscan/target.rb index 74834e14..d79cfa33 100644 --- a/example/lib/cmsscan/target.rb +++ b/example/lib/cmsscan/target.rb @@ -1,6 +1,15 @@ +# frozen_string_literal: true + module CMSScan # Custom Target Class class Target < CMSScanner::Target # Put your own methods there + + # Method which should be defined. + # Used to set a specific exit code if the scan found issues + # See the CMSScanner/lib/cms_scanner/exit_code.rb + def vulnerable? + false + end end end diff --git a/example/lib/cmsscan/version.rb b/example/lib/cmsscan/version.rb index 25354b86..7eaab652 100644 --- a/example/lib/cmsscan/version.rb +++ b/example/lib/cmsscan/version.rb @@ -1,4 +1,5 @@ -# Version +# frozen_string_literal: true + module CMSScan - VERSION = '1.0'.freeze + VERSION = '1.0' end diff --git a/example/spec/spec_helper.rb b/example/spec/spec_helper.rb index 82d04b28..acacf43e 100644 --- a/example/spec/spec_helper.rb +++ b/example/spec/spec_helper.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib')) require 'simplecov'