From ab3cda6e5838e16a782beb6745c481a256b68e98 Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Thu, 26 May 2016 12:00:01 -0500 Subject: [PATCH 1/2] Rubocop: features/support/formatter.rb --- features/support/formatter.rb | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/features/support/formatter.rb b/features/support/formatter.rb index 9e82a4e5..8ce03bd1 100644 --- a/features/support/formatter.rb +++ b/features/support/formatter.rb @@ -1,7 +1,7 @@ -require 'fileutils' -require 'colorator' -require 'cucumber/formatter/console' -require 'cucumber/formatter/io' +require "fileutils" +require "colorator" +require "cucumber/formatter/console" +require "cucumber/formatter/io" module Jekyll module Cucumber @@ -17,7 +17,7 @@ module Jekyll :undefined => "\u2718".red, :passed => "\u2714".green, :skipped => "\u203D".blue - } + }.freeze # @@ -34,7 +34,7 @@ module Jekyll # - def before_features(features) + def before_features(_features) print_profile_information end @@ -47,7 +47,7 @@ module Jekyll # - def before_feature(feature) + def before_feature(_feature) @exceptions = [] @indent = 0 end @@ -55,20 +55,23 @@ module Jekyll # def tag_name(tag_name); end + def comment_line(comment_line); end + def after_feature_element(feature_element); end + def after_tags(tags); end # - def before_feature_element(feature_element) + def before_feature_element(_feature_element) @indent = 2 @scenario_indent = 2 end # - def before_background(background) + def before_background(_background) @scenario_indent = 2 @in_background = true @indent = 2 @@ -76,7 +79,7 @@ module Jekyll # - def after_background(background) + def after_background(_background) @in_background = nil end @@ -104,8 +107,9 @@ module Jekyll # - def before_step_result(keyword, step_match, multiline_arg, status, exception, \ - source_indent, background, file_colon_line) + # rubocop:disable Metrics/ParameterLists + def before_step_result(_keyword, _step_match, _multiline_arg, status, exception, \ + _source_indent, background, _file_colon_line) @hide_this_step = false if exception @@ -127,10 +131,11 @@ module Jekyll # - def step_name(keyword, step_match, status, source_indent, background, file_colon_line) + def step_name(_keyword, _step_match, status, _source_indent, _background, _file_colon_line) @io.print CHARS[status] @io.print " " end + # rubocop:enable Metrics/ParameterLists # @@ -153,7 +158,7 @@ module Jekyll # private - def print_feature_element_name(keyword, name, source_line, indent) + def print_feature_element_name(keyword, name, source_line, _indent) @io.puts names = name.empty? ? [name] : name.each_line.to_a From 45a5a976f0a701021c505e46a54450f2b3522ed5 Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Thu, 26 May 2016 12:00:21 -0500 Subject: [PATCH 2/2] Rubocop: features/support/helpers.rb --- features/support/helpers.rb | 39 +++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/features/support/helpers.rb b/features/support/helpers.rb index b8334cfd..29333075 100644 --- a/features/support/helpers.rb +++ b/features/support/helpers.rb @@ -7,26 +7,31 @@ require "safe_yaml/load" class Paths SOURCE_DIR = Pathname.new(File.expand_path("../..", __dir__)) def self.test_dir; source_dir.join("tmp", "jekyll"); end + def self.output_file; test_dir.join("jekyll_output.txt"); end + def self.status_file; test_dir.join("jekyll_status.txt"); end + def self.jekyll_bin; source_dir.join("bin", "jekyll"); end + def self.source_dir; SOURCE_DIR; end end # def file_content_from_hash(input_hash) - matter_hash = input_hash.reject { |k, v| k == "content" } - matter = matter_hash.map do |k, v| "#{k}: #{v}\n" + matter_hash = input_hash.reject { |k, _v| k == "content" } + matter = matter_hash.map do |k, v| + "#{k}: #{v}\n" end matter = matter.join.chomp content = \ - if !input_hash['input'] || !input_hash['filter'] - then input_hash['content'] - else "{{ #{input_hash['input']} | " \ - "#{input_hash['filter']} }}" - end + if !input_hash["input"] || !input_hash["filter"] + then input_hash["content"] + else "{{ #{input_hash["input"]} | " \ + "#{input_hash["filter"]} }}" + end Jekyll::Utils.strip_heredoc(<<-EOF) --- @@ -78,7 +83,7 @@ end # def run_bundle(args) - run_in_shell("bundle", *args.strip.split(' ')) + run_in_shell("bundle", *args.strip.split(" ")) end # @@ -91,14 +96,13 @@ end # +# rubocop:disable Metrics/AbcSize def run_in_shell(*args) i, o, e, p = Open3.popen3(*args) out = o.read.strip err = e.read.strip - [i, o, e].each do |m| - m.close - end + [i, o, e].each(&:close) File.write(Paths.status_file, p.value.exitstatus) File.open(Paths.output_file, "wb") do |f| @@ -110,13 +114,14 @@ def run_in_shell(*args) p.value end +# rubocop:enable Metrics/AbcSize # def slug(title = nil) if !title then Time.now.strftime("%s%9N") # nanoseconds since the Epoch - else title.downcase.gsub(/[^\w]/, " ").strip.gsub(/\s+/, '-') + else title.downcase.gsub(/[^\w]/, " ").strip.gsub(/\s+/, "-") end end @@ -124,12 +129,12 @@ end def location(folder, direction) if folder - before = folder if direction == "in" + before = folder if direction == "in" after = folder if direction == "under" end - [before || '.', - after || '.'] + [before || ".", + after || "."] end # @@ -149,13 +154,13 @@ def seconds_agnostic_datetime(datetime = Time.now) "#{time}:\\d{2}", Regexp.escape(zone) ] \ - .join("\\ ") + .join("\\ ") end # def seconds_agnostic_time(time) time = time.strftime("%H:%M:%S") if time.is_a?(Time) - hour, minutes, _ = time.split(":") + hour, minutes, = time.split(":") "#{hour}:#{minutes}" end