Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
annotate
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
open-source
annotate
Commits
672a22ab
Commit
672a22ab
authored
Dec 10, 2011
by
Turadg Aleahmad
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #61 from ndbroadbent/master
Optional trailing newlines after schema info block
parents
a709a87d
7f44f0e3
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
annotate_models.rb
lib/annotate/annotate_models.rb
+2
-2
No files found.
lib/annotate/annotate_models.rb
View file @
672a22ab
...
...
@@ -138,7 +138,7 @@ module AnnotateModels
false
else
# Replace the old schema info with the new schema info
new_content
=
old_content
.
sub
(
/^#
#{
COMPAT_PREFIX
}
.*?\n(#.*\n)*\n/
,
info_block
)
new_content
=
old_content
.
sub
(
/^#
#{
COMPAT_PREFIX
}
.*?\n(#.*\n)*\n
*
/
,
info_block
)
# But, if there *was* no old schema info, we simply need to insert it
if
new_content
==
old_content
old_content
.
sub!
(
encoding
,
''
)
...
...
@@ -157,7 +157,7 @@ module AnnotateModels
if
File
.
exist?
(
file_name
)
content
=
File
.
read
(
file_name
)
content
.
sub!
(
/^#
#{
COMPAT_PREFIX
}
.*?\n(#.*\n)*\n/
,
''
)
content
.
sub!
(
/^#
#{
COMPAT_PREFIX
}
.*?\n(#.*\n)*\n
*
/
,
''
)
File
.
open
(
file_name
,
"wb"
)
{
|
f
|
f
.
puts
content
}
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment