Throw in a travis config file to try using travis
This commit is contained in:
parent
c78e903794
commit
ac8587290a
2 changed files with 13 additions and 3 deletions
6
.travis.yml
Normal file
6
.travis.yml
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
rvm:
|
||||
- ree
|
||||
- 1.9.2
|
||||
|
||||
script: "rake cruise"
|
||||
env: "TRAVIS=true"
|
||||
|
|
@ -9,7 +9,7 @@ class AppConfig < Settingslogic
|
|||
namespace Rails.env
|
||||
|
||||
def self.load!
|
||||
if no_config_file? && !have_old_config_file?
|
||||
if no_config_file? && !have_old_config_file? && !travis?
|
||||
$stderr.puts <<-HELP
|
||||
******** You haven't set up your Diaspora settings file. **********
|
||||
Please do the following:
|
||||
|
|
@ -36,7 +36,7 @@ HELP
|
|||
end
|
||||
|
||||
super
|
||||
|
||||
|
||||
normalize_pod_url
|
||||
normalize_admins
|
||||
end
|
||||
|
|
@ -53,6 +53,10 @@ HELP
|
|||
File.exists?(File.join(Rails.root, "config", "app.yml")) || (File.exists?(File.join(Rails.root, "config", "app_config.yml")))
|
||||
end
|
||||
|
||||
def self.travis?
|
||||
ENV["TRAVIS"]
|
||||
end
|
||||
|
||||
def self.normalize_pod_url
|
||||
unless self[:pod_url] =~ /^(https?:\/\/)/ # starts with http:// or https://
|
||||
self[:pod_url] = "http://#{self[:pod_url]}"
|
||||
|
|
@ -94,4 +98,4 @@ HELP
|
|||
end
|
||||
return @@pod_uri
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
Loading…
Reference in a new issue