Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Fix for ruby_parser > 3.x #85

Merged
merged 3 commits into from Jan 21, 2013
Merged

Fix for ruby_parser > 3.x #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
42ac04b
Extractor now is subclass of Ruby19Parser to fix haml support
JeroenKnoops Jan 20, 2013
5552be3
Added support for Ruby 1.8
JeroenKnoops Jan 20, 2013
0922e28
Only run spec for 1.9 when ruby_version is 1.9.. this fixes the travi…
JeroenKnoops Jan 20, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@ gem 'gettext'
gem 'haml'
gem 'rails'
gem 'rake'
gem 'ruby_parser', '~> 2.3' # 3 breaks haml/slim parsing
gem 'ruby_parser'
gem 'rspec'
gem 'slim'
gem 'sqlite3'
101 changes: 52 additions & 49 deletions Gemfile.lock
View file
Open in desktop
Expand Up @@ -7,102 +7,105 @@ PATH
GEM
remote: http://rubygems.org/
specs:
actionmailer (3.2.8)
actionpack (= 3.2.8)
actionmailer (3.2.11)
actionpack (= 3.2.11)
mail (~> 2.4.4)
actionpack (3.2.8)
activemodel (= 3.2.8)
activesupport (= 3.2.8)
actionpack (3.2.11)
activemodel (= 3.2.11)
activesupport (= 3.2.11)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
rack (~> 1.4.0)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.1.3)
activemodel (3.2.8)
activesupport (= 3.2.8)
sprockets (~> 2.2.1)
activemodel (3.2.11)
activesupport (= 3.2.11)
builder (~> 3.0.0)
activerecord (3.2.8)
activemodel (= 3.2.8)
activesupport (= 3.2.8)
activerecord (3.2.11)
activemodel (= 3.2.11)
activesupport (= 3.2.11)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activeresource (3.2.8)
activemodel (= 3.2.8)
activesupport (= 3.2.8)
activesupport (3.2.8)
activeresource (3.2.11)
activemodel (= 3.2.11)
activesupport (= 3.2.11)
activesupport (3.2.11)
i18n (~> 0.6)
multi_json (~> 1.0)
appraisal (0.5.1)
bundler
rake
arel (3.0.2)
builder (3.0.4)
bump (0.3.5)
bump (0.3.9)
diff-lcs (1.1.3)
erubis (2.7.0)
fast_gettext (0.6.11)
gettext (2.3.3)
fast_gettext (0.7.0)
gettext (2.3.7)
levenshtein
locale
haml (3.1.7)
hike (1.2.1)
i18n (0.6.1)
journey (1.0.4)
json (1.7.5)
json (1.7.6)
levenshtein (0.2.2)
locale (2.0.8)
mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.19)
multi_json (1.3.7)
multi_json (1.5.0)
polyglot (0.3.3)
rack (1.4.1)
rack (1.4.4)
rack-cache (1.2)
rack (>= 0.4)
rack-ssl (1.3.2)
rack
rack-test (0.6.2)
rack (>= 1.0)
rails (3.2.8)
actionmailer (= 3.2.8)
actionpack (= 3.2.8)
activerecord (= 3.2.8)
activeresource (= 3.2.8)
activesupport (= 3.2.8)
rails (3.2.11)
actionmailer (= 3.2.11)
actionpack (= 3.2.11)
activerecord (= 3.2.11)
activeresource (= 3.2.11)
activesupport (= 3.2.11)
bundler (~> 1.0)
railties (= 3.2.8)
railties (3.2.8)
actionpack (= 3.2.8)
activesupport (= 3.2.8)
railties (= 3.2.11)
railties (3.2.11)
actionpack (= 3.2.11)
activesupport (= 3.2.11)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
rake (0.9.2.2)
rake (10.0.3)
rdoc (3.12)
json (~> 1.4)
rspec (2.11.0)
rspec-core (~> 2.11.0)
rspec-expectations (~> 2.11.0)
rspec-mocks (~> 2.11.0)
rspec-core (2.11.1)
rspec-expectations (2.11.3)
rspec (2.12.0)
rspec-core (~> 2.12.0)
rspec-expectations (~> 2.12.0)
rspec-mocks (~> 2.12.0)
rspec-core (2.12.2)
rspec-expectations (2.12.1)
diff-lcs (~> 1.1.3)
rspec-mocks (2.11.3)
ruby_parser (2.3.1)
sexp_processor (~> 3.0)
sexp_processor (3.2.0)
slim (1.0.4)
temple (~> 0.3.4)
tilt (~> 1.3.2)
sprockets (2.1.3)
rspec-mocks (2.12.1)
ruby_parser (3.1.1)
sexp_processor (~> 4.1)
sexp_processor (4.1.3)
slim (1.3.6)
temple (~> 0.5.5)
tilt (~> 1.3.3)
sprockets (2.2.2)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.6)
temple (0.3.5)
sqlite3 (1.3.7)
temple (0.5.5)
thor (0.16.0)
tilt (1.3.3)
treetop (1.4.12)
Expand All @@ -122,6 +125,6 @@ DEPENDENCIES
rails
rake
rspec
ruby_parser (~> 2.3)
ruby_parser
slim
sqlite3
2 changes: 1 addition & 1 deletion gemfiles/rails.2.3.gemfile
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@ gem "bump"
gem "gettext"
gem "haml"
gem "rake"
gem "ruby_parser", "~> 2.3"
gem "ruby_parser"
gem "rspec"
gem "slim"
gem "sqlite3"
Expand Down
44 changes: 23 additions & 21 deletions gemfiles/rails.2.3.gemfile.lock
View file
Open in desktop
@@ -1,5 +1,5 @@
PATH
remote: /Users/mgrosser/code/tools/gettext_i18n_rails
remote: /Users/jeroenknoops/projects/github/gettext_i18n_rails
specs:
gettext_i18n_rails (0.8.0)
fast_gettext (>= 0.4.8)
Expand All @@ -20,12 +20,14 @@ GEM
appraisal (0.5.1)
bundler
rake
bump (0.3.5)
bump (0.3.9)
diff-lcs (1.1.3)
fast_gettext (0.6.11)
gettext (2.3.3)
fast_gettext (0.7.0)
gettext (2.3.7)
levenshtein
locale
haml (3.1.7)
levenshtein (0.2.2)
locale (2.0.8)
rack (1.1.3)
rails (2.3.14)
Expand All @@ -35,23 +37,23 @@ GEM
activeresource (= 2.3.14)
activesupport (= 2.3.14)
rake (>= 0.8.3)
rake (0.9.2.2)
rspec (2.11.0)
rspec-core (~> 2.11.0)
rspec-expectations (~> 2.11.0)
rspec-mocks (~> 2.11.0)
rspec-core (2.11.1)
rspec-expectations (2.11.3)
rake (10.0.3)
rspec (2.12.0)
rspec-core (~> 2.12.0)
rspec-expectations (~> 2.12.0)
rspec-mocks (~> 2.12.0)
rspec-core (2.12.2)
rspec-expectations (2.12.1)
diff-lcs (~> 1.1.3)
rspec-mocks (2.11.3)
ruby_parser (2.3.1)
sexp_processor (~> 3.0)
sexp_processor (3.2.0)
slim (1.0.4)
temple (~> 0.3.4)
tilt (~> 1.3.2)
sqlite3 (1.3.6)
temple (0.3.5)
rspec-mocks (2.12.1)
ruby_parser (3.1.1)
sexp_processor (~> 4.1)
sexp_processor (4.1.3)
slim (1.3.6)
temple (~> 0.5.5)
tilt (~> 1.3.3)
sqlite3 (1.3.7)
temple (0.5.5)
tilt (1.3.3)

PLATFORMS
Expand All @@ -66,6 +68,6 @@ DEPENDENCIES
rails (~> 2.3.0)
rake
rspec
ruby_parser (~> 2.3)
ruby_parser
slim
sqlite3
2 changes: 1 addition & 1 deletion gemfiles/rails.3.0.gemfile
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@ gem "bump"
gem "gettext"
gem "haml"
gem "rake"
gem "ruby_parser", "~> 2.3"
gem "ruby_parser"
gem "rspec"
gem "slim"
gem "sqlite3"
Expand Down
46 changes: 24 additions & 22 deletions gemfiles/rails.3.0.gemfile.lock
View file
Open in desktop
@@ -1,5 +1,5 @@
PATH
remote: /Users/mgrosser/code/tools/gettext_i18n_rails
remote: /Users/jeroenknoops/projects/github/gettext_i18n_rails
specs:
gettext_i18n_rails (0.8.0)
fast_gettext (>= 0.4.8)
Expand Down Expand Up @@ -39,16 +39,18 @@ GEM
rake
arel (2.0.10)
builder (2.1.2)
bump (0.3.5)
bump (0.3.9)
diff-lcs (1.1.3)
erubis (2.6.6)
abstract (>= 1.0.0)
fast_gettext (0.6.11)
gettext (2.3.3)
fast_gettext (0.7.0)
gettext (2.3.7)
levenshtein
locale
haml (3.1.7)
i18n (0.5.0)
json (1.7.5)
json (1.7.6)
levenshtein (0.2.2)
locale (2.0.8)
mail (2.2.19)
activesupport (>= 2.3.6)
Expand Down Expand Up @@ -76,25 +78,25 @@ GEM
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.4)
rake (0.9.2.2)
rake (10.0.3)
rdoc (3.12)
json (~> 1.4)
rspec (2.11.0)
rspec-core (~> 2.11.0)
rspec-expectations (~> 2.11.0)
rspec-mocks (~> 2.11.0)
rspec-core (2.11.1)
rspec-expectations (2.11.3)
rspec (2.12.0)
rspec-core (~> 2.12.0)
rspec-expectations (~> 2.12.0)
rspec-mocks (~> 2.12.0)
rspec-core (2.12.2)
rspec-expectations (2.12.1)
diff-lcs (~> 1.1.3)
rspec-mocks (2.11.3)
ruby_parser (2.3.1)
sexp_processor (~> 3.0)
sexp_processor (3.2.0)
slim (1.0.4)
temple (~> 0.3.4)
tilt (~> 1.3.2)
sqlite3 (1.3.6)
temple (0.3.5)
rspec-mocks (2.12.1)
ruby_parser (3.1.1)
sexp_processor (~> 4.1)
sexp_processor (4.1.3)
slim (1.3.6)
temple (~> 0.5.5)
tilt (~> 1.3.3)
sqlite3 (1.3.7)
temple (0.5.5)
thor (0.14.6)
tilt (1.3.3)
treetop (1.4.12)
Expand All @@ -114,6 +116,6 @@ DEPENDENCIES
rails (~> 3.0.0)
rake
rspec
ruby_parser (~> 2.3)
ruby_parser
slim
sqlite3
2 changes: 1 addition & 1 deletion gemfiles/rails.3.1.gemfile
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@ gem "bump"
gem "gettext"
gem "haml"
gem "rake"
gem "ruby_parser", "~> 2.3"
gem "ruby_parser"
gem "rspec"
gem "slim"
gem "sqlite3"
Expand Down