diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2018-07-01 19:05:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-01 19:05:01 +0200 |
| commit | 350b7cc9f0c69be529cae1e91294e51d41ea5952 (patch) | |
| tree | b2fd9d6395aa8e5414c3bc5108eded9bc7ac4388 /railties/lib/rails/generators | |
| parent | dca5596f997b863a2de6a0fe1ed2c26a9f027359 (diff) | |
| parent | 696ca427be70d95401a39384e2e0d2e3074e0d3e (diff) | |
| download | rails-350b7cc9f0c69be529cae1e91294e51d41ea5952.tar.gz rails-350b7cc9f0c69be529cae1e91294e51d41ea5952.tar.bz2 rails-350b7cc9f0c69be529cae1e91294e51d41ea5952.zip | |
Merge pull request #32706 from yhirano55/fix-app-update-when-hyphenated-name-is-given
Fix app:update when hyphenated name is given
Diffstat (limited to 'railties/lib/rails/generators')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/app_generator.rb | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb index 34067240d7..9d6bc9c76a 100644 --- a/railties/lib/rails/generators/rails/app/app_generator.rb +++ b/railties/lib/rails/generators/rails/app/app_generator.rb @@ -488,7 +488,11 @@ module Rails end def app_name - @app_name ||= (defined_app_const_base? ? defined_app_name : File.basename(destination_root)).tr('\\', "").tr(". ", "_") + @app_name ||= original_app_name.tr("-", "_") + end + + def original_app_name + @original_app_name ||= (defined_app_const_base? ? defined_app_name : File.basename(destination_root)).tr('\\', "").tr(". ", "_") end def defined_app_name @@ -513,13 +517,13 @@ module Rails def valid_const? if app_const =~ /^\d/ - raise Error, "Invalid application name #{app_name}. Please give a name which does not start with numbers." - elsif RESERVED_NAMES.include?(app_name) - raise Error, "Invalid application name #{app_name}. Please give a " \ + raise Error, "Invalid application name #{original_app_name}. Please give a name which does not start with numbers." + elsif RESERVED_NAMES.include?(original_app_name) + raise Error, "Invalid application name #{original_app_name}. Please give a " \ "name which does not match one of the reserved rails " \ "words: #{RESERVED_NAMES.join(", ")}" elsif Object.const_defined?(app_const_base) - raise Error, "Invalid application name #{app_name}, constant #{app_const_base} is already in use. Please choose another application name." + raise Error, "Invalid application name #{original_app_name}, constant #{app_const_base} is already in use. Please choose another application name." end end |