nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Throw in a travis config file to try using travis

Browse source
This commit is contained in:
Raphael Sofaer 2011-06-09 15:31:16 -07:00
parent c78e903794
commit ac8587290a
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.travis.yml Normal file
View file

@ -0,0 +1,6 @@
rvm:
- ree
- 1.9.2
script: "rake cruise"
env: "TRAVIS=true"

6
app/models/app_config.rb
View file

@ -9,7 +9,7 @@ class AppConfig < Settingslogic
namespace Rails.env namespace Rails.env
def self.load! def self.load!
if no_config_file? && !have_old_config_file? if no_config_file? && !have_old_config_file? && !travis?
$stderr.puts <<-HELP $stderr.puts <<-HELP
******** You haven't set up your Diaspora settings file. ********** ******** You haven't set up your Diaspora settings file. **********
Please do the following: Please do the following:
@ -53,6 +53,10 @@ HELP
File.exists?(File.join(Rails.root, "config", "app.yml")) || (File.exists?(File.join(Rails.root, "config", "app_config.yml"))) File.exists?(File.join(Rails.root, "config", "app.yml")) || (File.exists?(File.join(Rails.root, "config", "app_config.yml")))
end end
def self.travis?
ENV["TRAVIS"]
end
def self.normalize_pod_url def self.normalize_pod_url
unless self[:pod_url] =~ /^(https?:\/\/)/ # starts with http:// or https:// unless self[:pod_url] =~ /^(https?:\/\/)/ # starts with http:// or https://
self[:pod_url] = "http://#{self[:pod_url]}" self[:pod_url] = "http://#{self[:pod_url]}"