Skip to content

Commit

Permalink
Merge branch 'rubocop'
Browse files Browse the repository at this point in the history
  • Loading branch information
hsbt committed Sep 5, 2016
2 parents 01657b9 + 3352b5f commit a76dd19
Show file tree
Hide file tree
Showing 84 changed files with 948 additions and 915 deletions.
63 changes: 51 additions & 12 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,57 @@
StringLiterals:
Enabled: false
AllCops:
TargetRubyVersion: 2.3
DisabledByDefault: true
Exclude:
- doc/**/*.rb
- rake.gemspec

SpaceAroundEqualsInParameterDefault:
Enabled: false
Style/LineLength:
Enabled: true
Max: 120

Style/HashSyntax:
Enabled: true

Style/StringLiterals:
Enabled: true
EnforcedStyle: double_quotes

Style/IndentationWidth:
Enabled: true

Style/Tab:
Enabled: true

Style/EmptyLines:
Enabled: true

Style/TrailingBlankLines:
Enabled: true

HashSyntax:
Enabled: false
Style/TrailingWhitespace:
Enabled: true

Style/SpaceBeforeBlockBraces:
Enabled: true

LineLength:
Style/SpaceInsideBlockBraces:
Enabled: true
Max: 90

WhileUntilModifier:
Enabled: false
Style/SpaceInsideHashLiteralBraces:
Enabled: true

IfUnlessModifier:
Enabled: false
Style/CaseIndentation:
Enabled: true

Style/MultilineIfThen:
Enabled: true

Style/MethodDefParentheses:
Enabled: true

Style/BracesAroundHashParameters:
Enabled: true

Lint/EndAlignment:
Enabled: true
AlignWith: variable
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source 'https://rubygems.org'
source "https://rubygems.org"

gemspec
30 changes: 15 additions & 15 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,33 +6,33 @@
# This file may be distributed under an MIT style license. See
# MIT-LICENSE for details.

lib = File.expand_path('../lib', __FILE__)
lib = File.expand_path("../lib", __FILE__)
$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)

require 'bundler/gem_tasks'
require 'rake/testtask'
require 'rdoc/task'
require "bundler/gem_tasks"
require "rake/testtask"
require "rdoc/task"

Rake::TestTask.new(:test) do |t|
t.libs << "test"
t.verbose = true
t.test_files = FileList['test/**/test_*.rb']
t.test_files = FileList["test/**/test_*.rb"]
end

RDoc::Task.new do |doc|
doc.main = 'README.rdoc'
doc.title = 'Rake -- Ruby Make'
doc.main = "README.rdoc"
doc.title = "Rake -- Ruby Make"
doc.rdoc_files = FileList.new %w[lib MIT-LICENSE doc/**/*.rdoc *.rdoc]
doc.rdoc_dir = 'html'
doc.rdoc_dir = "html"
end

task :ghpages => :rdoc do
task ghpages: :rdoc do
`git checkout gh-pages`
require 'fileutils'
FileUtils.rm_rf '/tmp/html'
FileUtils.mv 'html', '/tmp'
FileUtils.rm_rf '*'
FileUtils.cp_r Dir.glob('/tmp/html/*'), '.'
require "fileutils"
FileUtils.rm_rf "/tmp/html"
FileUtils.mv "html", "/tmp"
FileUtils.rm_rf "*"
FileUtils.cp_r Dir.glob("/tmp/html/*"), "."
end

task :default => :test
task default: :test
2 changes: 1 addition & 1 deletion exe/rake
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@
# IN THE SOFTWARE.
#++

require 'rake'
require "rake"

Rake.application.run
68 changes: 34 additions & 34 deletions lib/rake.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,44 +22,44 @@

module Rake; end

require 'rake/version'
require "rake/version"

require 'rbconfig'
require 'fileutils'
require 'singleton'
require 'monitor'
require 'optparse'
require 'ostruct'
require "rbconfig"
require "fileutils"
require "singleton"
require "monitor"
require "optparse"
require "ostruct"

require 'rake/ext/string'
require 'rake/ext/fixnum'
require "rake/ext/string"
require "rake/ext/fixnum"

require 'rake/win32'
require "rake/win32"

require 'rake/linked_list'
require 'rake/cpu_counter'
require 'rake/scope'
require 'rake/task_argument_error'
require 'rake/rule_recursion_overflow_error'
require 'rake/rake_module'
require 'rake/trace_output'
require 'rake/pseudo_status'
require 'rake/task_arguments'
require 'rake/invocation_chain'
require 'rake/task'
require 'rake/file_task'
require 'rake/file_creation_task'
require 'rake/multi_task'
require 'rake/dsl_definition'
require 'rake/file_utils_ext'
require 'rake/file_list'
require 'rake/default_loader'
require 'rake/early_time'
require 'rake/late_time'
require 'rake/name_space'
require 'rake/task_manager'
require 'rake/application'
require 'rake/backtrace'
require "rake/linked_list"
require "rake/cpu_counter"
require "rake/scope"
require "rake/task_argument_error"
require "rake/rule_recursion_overflow_error"
require "rake/rake_module"
require "rake/trace_output"
require "rake/pseudo_status"
require "rake/task_arguments"
require "rake/invocation_chain"
require "rake/task"
require "rake/file_task"
require "rake/file_creation_task"
require "rake/multi_task"
require "rake/dsl_definition"
require "rake/file_utils_ext"
require "rake/file_list"
require "rake/default_loader"
require "rake/early_time"
require "rake/late_time"
require "rake/name_space"
require "rake/task_manager"
require "rake/application"
require "rake/backtrace"

$trace = false

Expand Down
Loading

0 comments on commit a76dd19

Please sign in to comment.