8000 Add configs of rubocop gem and fix some rubocop warnings by ShockwaveNN · Pull Request #226 · rubyzip/rubyzip · GitHub
[go: up one dir, main page]

Skip to content

Add configs of rubocop gem and fix some rubocop warnings #226

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 107 commits into from
Jun 8, 2015
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
107 commits
Select commit Hold shift + click to select a range
715f064
add rubocop configs
ShockwaveNN Mar 20, 2015
7c4fed2
fix name of file
ShockwaveNN Mar 20, 2015
fc8e042
fix rubocop Style/WordArray warning
ShockwaveNN Mar 20, 2015
7a8a8b6
fix rubocop Style/WhileUntilModifier warning
ShockwaveNN Mar 20, 2015
f507a01
rename .rubocop.yml .rubocop_rubyzip.yml
ShockwaveNN Mar 20, 2015
b7cda26
fix rubocop Style/WhileUntilDo сщз
ShockwaveNN Mar 20, 2015
c677730
fix rubocop Style/UnneededPercentQ cop
ShockwaveNN Mar 20, 2015
6fac8c7
fix rubocop Style/TrailingWhitespace cop
ShockwaveNN Mar 20, 2015
7dcba79
fix rubocop Style/TrailingComma cop
ShockwaveNN Mar 20, 2015
c45a639
fix rubocop Style/TrailingBlankLines cop
ShockwaveNN Mar 20, 2015
5d47830
fix rubocop Style/Tab cop
ShockwaveNN Mar 20, 2015
d928aee
make parse_zip64_extra check for empty @extra['Zip64'] easier to read
ShockwaveNN Mar 20, 2015
6d19df4
fix rubocop Lint/AssignmentInCondition cop
ShockwaveNN Mar 20, 2015
52623a4
fix rubocop Lint/DeprecatedClassMethods cop
ShockwaveNN Mar 20, 2015
67838e1
fix rubocop Lint/EndAlignment cop
ShockwaveNN Mar 20, 2015
bfc8b3c
fix rubocop Lint/ShadowingOuterLocalVariable cop
ShockwaveNN Mar 20, 2015
eae8112
fix rubocop Lint/StringConversionInInterpolation cop
ShockwaveNN Mar 20, 2015
d3e911f
fix rubocop Lint/UnusedBlockArgument cop
ShockwaveNN Mar 20, 2015
4ee6d6b
fix rubocop Lint/UnusedMethodArgument cop
ShockwaveNN Mar 20, 2015
7ef15bd
fix rubocop Lint/UselessAssignment cop
ShockwaveNN Mar 20, 2015
bb08213
fix rubocop Style/Alias cop
ShockwaveNN Mar 20, 2015
f401fff
fix rubocop Style/AlignArray cop
ShockwaveNN Mar 20, 2015
98e6b5d
fix rubocop Style/AlignParameters cop
ShockwaveNN Mar 21, 2015
a2afbaf
fix rubocop Style/AndOr cop
ShockwaveNN Mar 21, 2015
0c6a10e
fix rubocop Style/AndOr cop
ShockwaveNN Mar 21, 2015
d2d8590
fix rubocop Style/Blocks cop
ShockwaveNN Mar 21, 2015
a0da550
fix rubocop Style/CaseIndentation cop
ShockwaveNN Mar 21, 2015
6c46c21
fix rubocop Style/ColonMethodCall cop
ShockwaveNN Mar 21, 2015
0aa70b8
fix rubocop Style/DefWithParentheses cop
ShockwaveNN Mar 21, 2015
d0c8e8d
fix rubocop Style/EmptyLines cop
ShockwaveNN Mar 21, 2015
eba5fa1
fix rubocop Style/EmptyLinesAroundAccessModifier cop
ShockwaveNN Mar 21, 2015
b1c0dc2
fix rubocop Style/EmptyLinesAroundBlockBody cop
ShockwaveNN Mar 21, 2015
b9a757e
fix rubocop Style/EmptyLinesAroundClassBody cop
ShockwaveNN Mar 21, 2015
2ac8086
fix rubocop Style/EmptyLinesAroundMethodBody cop
ShockwaveNN Mar 21, 2015
f67cf18
fix rubocop Style/EmptyLinesAroundModuleBody cop
ShockwaveNN Mar 21, 2015
f0dc815
fix rubocop Style/EndOfLine cop
ShockwaveNN Mar 21, 2015
70dd0d0
fix rubocop Style/IndentArray cop
ShockwaveNN Mar 21, 2015
b93ef12
fix rubocop Style/StringLiterals cop
ShockwaveNN Mar 21, 2015
3efd167
Merge pull request #1 from rubyzip/master
ShockwaveNN Mar 21, 2015
da863e4
Merge branch 'master' into rubocop_fixes
ShockwaveNN Mar 21, 2015
b730387
redone fixes by rubocop Style/Alias to be in style of https://github.…
ShockwaveNN Mar 21, 2015
e0d5617
update .rubocop_rubyzip.yml after all previous changes
ShockwaveNN Mar 22, 2015
7624740
fix rubocop Style/IndentationWidth cop
ShockwaveNN Mar 22, 2015
06e5a93
fix rubocop Style/ParenthesesAroundCondition cop
ShockwaveNN Mar 22, 2015
225a4f7
fix rubocop Style/RedundantReturn cop
ShockwaveNN Mar 22, 2015
abf9cbe
fix rubocop Style/RedundantSelf cop
ShockwaveNN Mar 22, 2015
105c2c7
fix rubocop Style/RedundantException cop
ShockwaveNN Mar 22, 2015
735a055
fix rubocop Style/RedundantBegin cop
ShockwaveNN Mar 22, 2015
707bd44
fix rubocop Style/SingleLineMethods cop
ShockwaveNN Mar 22, 2015
d2b4a52
fix rubocop Style/SpaceAfterComma cop
ShockwaveNN Mar 22, 2015
73e5f70
fix rubocop Style/SpaceAfterMethodName cop
ShockwaveNN Mar 22, 2015
77ef05c
fix rubocop Style/SpaceAfterNot cop
ShockwaveNN Mar 22, 2015
cb143f0
fix rubocop Style/SpaceAroundEqualsInParameterDefault cop
ShockwaveNN Mar 22, 2015
b311998
fix rubocop Style/SpaceInsideBlockBraces cop
ShockwaveNN Mar 22, 2015
2c7a990
fix rubocop Style/TrailingWhitespace cop
ShockwaveNN Mar 22, 2015
b13fafb
fix rubocop Style/StringLiterals cop
ShockwaveNN Mar 22, 2015
d92d8d6
fix rubocop Style/SpaceInsideParens cop
ShockwaveNN Mar 22, 2015
987dbf1
fix rubocop Style/SpaceInsideBrackets cop
ShockwaveNN Mar 22, 2015
5ea5710
fix rubocop Style/SpaceBeforeBlockBraces cop
ShockwaveNN Mar 22, 2015
8d6f23b
fix rubocop Style/SpaceAroundOperators cop
ShockwaveNN Mar 22, 2015
7eb06a1
fix some rubocop Style/Semicolon cop
ShockwaveNN Mar 22, 2015
edf3126
EntrySet.dub fix for code-style
ShockwaveNN Mar 23, 2015
d5f7982
fix rubocop Style/LineEndConcatenation cop
ShockwaveNN Mar 23, 2015
b6f9176
fix rubocop Style/Lambda cop
ShockwaveNN Mar 23, 2015
47b72f5
fix rubocop Style/LeadingCommentSpace cop
ShockwaveNN Mar 23, 2015
930b5ae
fix rubocop Style/MethodCallParentheses cop
ShockwaveNN Mar 23, 2015
04f6902
fix rubocop Style/MultilineBlockLayout cop
ShockwaveNN Mar 23, 2015
6a7a22f
fix rubocop Style/MultilineOperationIndentation cop
ShockwaveNN Mar 23, 2015
f291e1f
fix rubocop Style/NegatedIf cop
ShockwaveNN Mar 23, 2015
31fb9d7
fix rubocop Style/PredicateName cop
ShockwaveNN Mar 23, 2015
77b7d6c
fix rubocop Style/PercentLiteralDelimiters cop
ShockwaveNN Mar 23, 2015
1ba81ff
fix rubocop Style/NumericLiterals cop
ShockwaveNN Mar 23, 2015
8533708
fix rubocop Style/Not cop
ShockwaveNN Mar 23, 2015
abb8c02
fix rubocop Style/Next cop
ShockwaveNN Mar 23, 2015
d6cc880
fix rubocop Style/MultilineTernaryOperator cop
ShockwaveNN Mar 23, 2015
b1bfb1a
fix some rubocop Style/ModuleFunction cop
ShockwaveNN Mar 23, 2015
23cfcc7
fix rubocop Style/MethodName cop
ShockwaveNN Mar 24, 2015
2c8f6f8
fix correct initialization for ExtraField
ShockwaveNN Mar 24, 2015
b9aefaf
fix rubocop Style/IfUnlessModifier cop
ShockwaveNN Mar 24, 2015
63b3ee3
fix rubocop Style/HashSyntax cop
ShockwaveNN Mar 24, 2015
b920a1e
fix rubocop Style/GuardClause cop
ShockwaveNN Mar 24, 2015
112a77d
fix some Style/FormatString cop
ShockwaveNN Mar 24, 2015
68b5fcf
fix some Style/FormatString cop
ShockwaveNN Mar 24, 2015
068a3e7
fix rubocop Style/FileName cop
ShockwaveNN Mar 24, 2015
f6693af
fix rubocop Style/EmptyLinesAroundMethodBody cop
ShockwaveNN Mar 24, 2015
94c1df1
fix rubocop Style/EmptyLinesAroundAccessModifier cop
ShockwaveNN Mar 24, 2015
4b60095
fix rubocop Style/EmptyLines cop
ShockwaveNN Mar 24, 2015
784e70b
fix rubocop Style/EmptyElse cop
ShockwaveNN Mar 24, 2015
ce7e01a
fix rubocop Style/CommentIndentation cop
ShockwaveNN Mar 24, 2015
96f3997
fix rubocop Style/GuardClause cop
ShockwaveNN Mar 24, 2015
1759f71
fix rubocop Style/CommentAnnotation cop
ShockwaveNN Mar 24, 2015
aa83776
fix rubocop Style/ClassMethods cop
ShockwaveNN Mar 24, 2015
fd864bd
fix rubocop Style/CaseEquality cop
ShockwaveNN Mar 24, 2015
2007be0
fix rubocop Lint/UselessAccessModifier cop
ShockwaveNN Mar 24, 2015
e211434
fix rubocop Lint/UnusedBlockArgument cop
ShockwaveNN Mar 24, 2015
8000
63d388c
Merge pull request #2 from rubyzip/master
ShockwaveNN Jun 8, 2015
c0177a4
Merge branch 'master' into rubocop_fixes
ShockwaveNN Jun 8, 2015
53fba8a
fix after merge fix
ShockwaveNN Jun 8, 2015
47aa16f
update .rubocop_rubyzip for latest version of rubocop
ShockwaveNN Jun 8, 2015
68181da
fix rubocop cop Style/TrailingBlankLines
ShockwaveNN Jun 8, 2015
f7eec2d
fix rubocop cop Style/SpaceAroundOperators
ShockwaveNN Jun 8, 2015
37ede3c
fix rubocop cop Style/SingleSpaceBeforeFirstArg
ShockwaveNN Jun 8, 2015
13658b0
fix rubocop cop Style/NonNilCheck
ShockwaveNN Jun 8, 2015
4c81b11
fix rubocop cop Style/NilComparison
ShockwaveNN Jun 8, 2015
753eab1
fix rubocop cop Style/EmptyLinesAroundClassBody
ShockwaveNN Jun 8, 2015
8c13dfc
fix rubocop cop Style/ClassCheck
ShockwaveNN Jun 8, 2015
1e99ff6
Revert "fix rubocop cop Style/ClassCheck". It cause regression in tests
ShockwaveNN Jun 8, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix rubocop Style/EmptyLinesAroundModuleBody cop
  • Loading branch information
ShockwaveNN committed Mar 21, 2015
commit f67cf18e454e63251c3b88489b58df10ddfd49fb
6 changes: 0 additions & 6 deletions .rubocop_rubyzip.yml
Original file line number Diff line number Diff line change
Expand Up @@ -110,12 +110,6 @@ Style/ElseAlignment:
Style/EmptyElse:
Enabled: false

# Offense count: 13
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, SupportedStyles.
Style/EmptyLinesAroundModuleBody:
Enabled: false

# Offense count: 1
Style/EndOfLine:
Enabled: false
Expand Down
1 change: 0 additions & 1 deletion lib/zip/extra_field/old_unix.rb
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,4 @@ def pack_for_c_dir
[@atime, @mtime].pack("VV")
end
end

end
1 change: 0 additions & 1 deletion lib/zip/extra_field/unix.rb
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,4 @@ def pack_for_c_dir
''
end
end

end
2 changes: 0 additions & 2 deletions lib/zip/filesystem.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
require 'zip'

module Zip

# The ZipFileSystem API provides an API for accessing entries in
# a zip archive that is similar to ruby's builtin File and Dir
# classes.
Expand Down Expand Up @@ -35,7 +34,6 @@ module Zip
# }

module FileSystem

def initialize # :nodoc:
mappedZip = ZipFileNameMapper.new(self)
@zipFsDir = ZipFsDir.new(mappedZip)
Expand Down
2 changes: 0 additions & 2 deletions lib/zip/ioextras.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
module Zip
module IOExtras #:nodoc:

CHUNK_SIZE = 131072

RANGE_ALL = 0..-1
Expand All @@ -26,7 +25,6 @@ def kind_of?(object)
object == IO || super
end
end

end # IOExtras namespace module
end

Expand Down
1 change: 0 additions & 1 deletion lib/zip/ioextras/abstract_output_stream.rb
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ def puts(*params)
self << "\n" unless val[-1, 1] == "\n"
end
end

end
end
end
3 changes: 0 additions & 3 deletions samples/zipfind.rb
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,11 @@ def self.find_file(path, fileNamePattern, zipFilePattern = /\.zip$/i)
yield(fileName) if fileNamePattern.match(fileName)
end
end

end
end

if __FILE__ == $0
module ZipFindConsoleRunner

PATH_ARG_INDEX = 0;
FILENAME_PATTERN_ARG_INDEX = 1;
ZIPFILE_PATTERN_ARG_INDEX = 2;
Expand Down Expand Up @@ -63,7 +61,6 @@ def self.usage
def self.report_entry_found(fileName)
puts fileName
end

end

ZipFindConsoleRunner.run(ARGV)
Expand Down
3 changes: 0 additions & 3 deletions test/test_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,6 @@ def assert_entryContents(zipFile, entryName, filename = entryName.to_s)
end

module CrcTest

class TestOutputStream
include ::Zip::IOExtras::AbstractOutputStream

Expand Down Expand Up @@ -198,7 +197,6 @@ def setup
end

module ExtraAssertions

def assert_forwarded(anObject, method, retVal, *expectedArgs)
callArgs = nil
setCallArgsProc = proc { |args| callArgs = args }
Expand All @@ -215,5 +213,4 @@ def #{method}(*args)
ensure
anObject.instance_eval "undef #{method}; alias #{method} #{method}_org"
end

end
0