diff options
| author | Mark Longair <mhl@pobox.com> | 2013-10-14 19:09:25 +0100 |
|---|---|---|
| committer | Mark Longair <mhl@pobox.com> | 2013-10-15 10:27:37 +0100 |
| commit | 944b1432fa06ba7a67f2a90c3528c95b6853120c (patch) | |
| tree | 7a49412add8c1014ff0d63243dd40ba217b7f820 /lib/tasks | |
| parent | 48ede95299e286c03a45966b00990b544b727206 (diff) | |
Make theme URL to theme name mapping consistent
The code that extracted the theme name from each entry in THEME_URLS (in
order to require code from a directory whose leaf name is the theme
name) only supported git URLs that ended in '.git'. However, the
themes:install rake task usefully supports a wider range of git URLs -
for example, all of the following were supported:
/home/whoever/themes/blah-theme => blah-theme
/home/whoever/themes/blah-theme/ => blah-theme
git://wherever/blah-theme.git => blah-theme
ssh://wherever/blah-theme.git// => blah-theme
This commit factors out a theme_url_to_theme_name method,
adds tests for it, and uses that method in both:
lib/tasks/themes.rake
config/initializers/theme_loader.rb
... so that a wider range of theme URLs are consistently supported.
Diffstat (limited to 'lib/tasks')
| -rw-r--r-- | lib/tasks/themes.rake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/tasks/themes.rake b/lib/tasks/themes.rake index a8d16f108..1eed92f1e 100644 --- a/lib/tasks/themes.rake +++ b/lib/tasks/themes.rake @@ -85,7 +85,7 @@ namespace :themes do def install_theme(theme_url, verbose, deprecated=false) deprecation_string = deprecated ? " using deprecated THEME_URL" : "" - theme_name = File.basename(theme_url, '.git') + theme_name = theme_url_to_theme_name theme_url puts "Installing theme #{theme_name}#{deprecation_string} from #{theme_url}" uninstall(theme_name, verbose) if installed?(theme_name) install_theme_using_git(theme_name, theme_url, verbose) |