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

Make sure the path is correctly escaped in case it contains spaces. #1045

Merged
merged 5 commits into from
Mar 31, 2018
Merged

Make sure the path is correctly escaped in case it contains spaces. #1045

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3831bba
Make sure the path is correctly escaped in case it contains spaces.
Mar 11, 2018
d9d1bf3
Wrap it in quotes instead of parsing it through a regex.
Mar 12, 2018
144ecba
Fix broken spec
Mar 23, 2018
eeb1e23
Merge remote-tracking branch 'upstream/master' into escape-path-fix
Mar 31, 2018
455b33e
Add changelog
Mar 31, 2018
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
4 changes: 3 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ Contributors: please follow the recommendations outlined at [keepachangelog.com]
Changes since last non-beta release.

#### Fixed
- Changed i18n parsing to convert ruby i18n argument syntax into FormatJS argument syntax. by [sepehr500](https://github.com/sepehr500)
- Changed i18n parsing to convert ruby i18n argument syntax into FormatJS argument syntax. by [sepehr500](https://github.com/sepehr500)

- Fixed an issue where the spec compiler check would fail if the project path contained spaces. [PR 1045](https://github.com/shakacode/react_on_rails/pull/1045) by [andrewmarkle](https://github.com/andrewmarkle)

*Please add entries here for your pull requests that are not yet released.*

Expand Down
2 changes: 1 addition & 1 deletion lib/react_on_rails/utils.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ def required(arg_name)
end

def self.prepend_cd_node_modules_directory(cmd)
"cd #{ReactOnRails.configuration.node_modules_location} && #{cmd}"
"cd \"#{ReactOnRails.configuration.node_modules_location}\" && #{cmd}"
end

def self.source_path
Expand Down
2 changes: 1 addition & 1 deletion spec/react_on_rails/test_helper/webpack_assets_compiler_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
expected_output = <<-MSG.strip_heredoc
React on Rails FATAL ERROR!
Error in building webpack assets!
cmd: cd #{Rails.root} && #{invalid_command}
cmd: cd \"#{Rails.root}\" && #{invalid_command}
MSG

expect do
Expand Down