Skip to content

Commit

Permalink
Reverting to last passing Travis tests
Browse files Browse the repository at this point in the history
  • Loading branch information
simonc committed Dec 18, 2015
1 parent 3600193 commit 12c79d7
Show file tree
Hide file tree
Showing 11 changed files with 77 additions and 384 deletions.
2 changes: 0 additions & 2 deletions .hound.yml

This file was deleted.

3 changes: 1 addition & 2 deletions .rspec
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
--color
--require spec_helper
--order random
--format=documentation
1 change: 0 additions & 1 deletion .rubocop.yml

This file was deleted.

29 changes: 29 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
AlignParameters:
Enabled: false

Blocks:
Enabled: false

ClassLength:
Enabled: false

Documentation:
Enabled: false

DoubleNegation:
Enabled: false

EmptyLinesAroundBody:
Enabled: false

LineLength:
Enabled: false

PercentLiteralDelimiters:
Enabled: false

SpecialGlobalVars:
Enabled: false

TrivialAccessors:
Enabled: false
322 changes: 0 additions & 322 deletions .ruby-style.yml

This file was deleted.

7 changes: 2 additions & 5 deletions lib/memfs/fake/directory.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def entry_names
end

def find(path)
path = path.sub(%r{\A/+}, '')
path = path.sub(/\A\/+/, '')
parts = path.split('/', 2)

if entry_names.include?(path)
Expand All @@ -44,10 +44,7 @@ def path
end

def paths
[path] + entries.reject { |p| %w[. ..].include?(p) }
.values
.map(&:paths)
.flatten
[path] + entries.reject { |p| %w[. ..].include?(p) }.values.map(&:paths).flatten
end

def remove_entry(entry)
Expand Down

0 comments on commit 12c79d7

Please sign in to comment.