From dcbe7c32553b6022d6233836f2ec27fb8af4904d Mon Sep 17 00:00:00 2001 From: Rick Carlino Date: Mon, 9 Mar 2015 05:31:05 -0500 Subject: [PATCH] rename application from `dss` to `farmbot` --- .coveralls.yml | 0 .ruby-gemset | 2 +- .travis.yaml | 7 ++++--- config/application.rb | 2 +- config/environment.rb | 2 +- config/environments/development.rb | 4 ++-- config/environments/production.rb | 2 +- config/environments/test.rb | 2 +- config/initializers/secret_token.rb | 2 +- config/initializers/session_store.rb | 2 +- config/mongoid.yml | 6 +++--- config/routes.rb | 2 +- 12 files changed, 17 insertions(+), 16 deletions(-) create mode 100644 .coveralls.yml diff --git a/.coveralls.yml b/.coveralls.yml new file mode 100644 index 000000000..e69de29bb diff --git a/.ruby-gemset b/.ruby-gemset index e1a1a6afb..f21c422e0 100755 --- a/.ruby-gemset +++ b/.ruby-gemset @@ -1 +1 @@ -farmbot-dss \ No newline at end of file +farmbot-web-app diff --git a/.travis.yaml b/.travis.yaml index ffe34b1e9..8100a5046 100755 --- a/.travis.yaml +++ b/.travis.yaml @@ -1,10 +1,11 @@ language: ruby rvm: - - 2.2.0 +- 2.2.0 services: - - mongodb +- mongodb notifications: - irc: chat.freenode.net#farmbot + irc: + - "chat.freenode.net#farmbot" env: # A 'fake' secret token for use in our CI env. # Don't worry- this isn't the real one. diff --git a/config/application.rb b/config/application.rb index b17a1eaf9..ccea7d960 100755 --- a/config/application.rb +++ b/config/application.rb @@ -12,7 +12,7 @@ require "sprockets/railtie" Bundler.require(:default, Rails.env) # TODO: Rename this to Farmbot. -module Dss +module FarmBot class Application < Rails::Application # Settings in config/environments/* take precedence over those specified # here. Application configuration should go into files in diff --git a/config/environment.rb b/config/environment.rb index f2e7ffacf..d4312bf9a 100755 --- a/config/environment.rb +++ b/config/environment.rb @@ -2,4 +2,4 @@ require File.expand_path('../application', __FILE__) # Initialize the Rails application. -Dss::Application.initialize! +FarmBot::Application.initialize! diff --git a/config/environments/development.rb b/config/environments/development.rb index e2d56e534..73848eaf2 100755 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -1,4 +1,4 @@ -Dss::Application.configure do +FarmBot::Application.configure do # Settings specified here will take precedence over those in config/application.rb. # In the development environment your application's code is reloaded on @@ -15,7 +15,7 @@ Dss::Application.configure do # Don't care if the mailer can't send. config.action_mailer.raise_delivery_errors = false - config.action_mailer.default_url_options = { + config.action_mailer.default_url_options = { host: 'localhost', port: 3000 } # Print deprecation notices to the Rails logger. config.active_support.deprecation = :log diff --git a/config/environments/production.rb b/config/environments/production.rb index ab76841bf..f558b2349 100755 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -1,4 +1,4 @@ -Dss::Application.configure do +FarmBot::Application.configure do # Settings specified here will take precedence over those in config/application.rb. # Code is not reloaded between requests. diff --git a/config/environments/test.rb b/config/environments/test.rb index 29689d7d1..1ce90f838 100755 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -1,4 +1,4 @@ -Dss::Application.configure do +FarmBot::Application.configure do # Settings specified here will take precedence over those in config/application.rb. # The test environment is used exclusively to run your application's diff --git a/config/initializers/secret_token.rb b/config/initializers/secret_token.rb index 636fc1108..cf9dba09f 100755 --- a/config/initializers/secret_token.rb +++ b/config/initializers/secret_token.rb @@ -10,4 +10,4 @@ # Make sure your secret_key_base is kept private # if you're sharing your code publicly. - Dss::Application.config.secret_key_base = '78d21d901ba79defae9ddf6359eb70c6d8203f7ea7eec3e8f3e3791c6b1fe04a5b0313f149b2b81dd108aae49254dd2b905c00f863e1923916dbac70bba63134' + FarmBot::Application.config.secret_key_base = '78d21d901ba79defae9ddf6359eb70c6d8203f7ea7eec3e8f3e3791c6b1fe04a5b0313f149b2b81dd108aae49254dd2b905c00f863e1923916dbac70bba63134' diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb index 1a88f115a..6ea958e39 100755 --- a/config/initializers/session_store.rb +++ b/config/initializers/session_store.rb @@ -1,3 +1,3 @@ # Be sure to restart your server when you modify this file. -Dss::Application.config.session_store :cookie_store, key: '_dss_session' +FarmBot::Application.config.session_store :cookie_store, key: '_farmbot_session' diff --git a/config/mongoid.yml b/config/mongoid.yml index b2166b0a9..7f69d8b05 100644 --- a/config/mongoid.yml +++ b/config/mongoid.yml @@ -1,7 +1,7 @@ development: sessions: default: - database: dss_development + database: farmbot_web_development hosts: - localhost:27017 options: @@ -9,9 +9,9 @@ development: test: sessions: default: - database: dss_test + database: farmbot_web_test hosts: - - localhost:27017 + - <%= ENV['MONGO_HOST'] || 'localhost:27017' %> options: read: primary # In the test environment we lower the retries and retry interval to diff --git a/config/routes.rb b/config/routes.rb index 098088766..8f967b127 100755 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,4 @@ -Dss::Application.routes.draw do +FarmBot::Application.routes.draw do mount JasmineRails::Engine => '/specs' if defined?(JasmineRails) namespace :api, defaults: {format: :json} do