Skip to content

Commit 53ad44e

Browse files
committed
Enable Travis CI for project
Configures project according to [Appraisal installation instructions][appraisal]. [appraisal]: https://github.com/thoughtbot/appraisal
1 parent 9028d4f commit 53ad44e

19 files changed

+135
-166
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@
33
pkg/
44
spec/dummy/tmp/
55
spec/dummy/my-app/
6+
*.gemfile.lock

.travis.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
language: ruby
2+
sudo: false
3+
cache: bundler
4+
notifications:
5+
email: false
6+
rvm:
7+
- 2.2
8+
- 2.1
9+
- jruby-9.0.3.0
10+
before_install:
11+
- echo '--colour' > ~/.rspec
12+
- 'echo ''gem: --no-document'' > ~/.gemrc'
13+
before_script: bin/setup
14+
script: bundle exec rake
15+
gemfile:
16+
- gemfiles/3.2.gemfile
17+
- gemfiles/4.1.gemfile
18+
- gemfiles/4.2.gemfile

Appraisals

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
appraise "3.2" do
2+
gem "rails", git: "https://github.com/rails/rails.git", branch: "3-2-stable"
3+
end
4+
5+
appraise "4.1" do
6+
gem "rails", "~> 4.1.1"
7+
end
8+
9+
appraise "4.2" do
10+
gem "rails", "~> 4.2.1"
11+
end

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ source "https://rubygems.org"
22

33
gemspec
44

5+
gem "appraisal"
56
gem "rails", "~> 4.2.5"
67

78
group :development, :test do
89
gem "pry"
10+
gem "ember-cli-rails", github: "thoughtbot/ember-cli-rails", branch: "remove-assets"
911
end
1012

1113
group :test do
12-
gem "ember-cli-rails", github: "thoughtbot/ember-cli-rails", branch: "remove-assets"
13-
1414
gem "poltergeist", "~> 1.8.0"
1515
gem "rspec-rails"
1616
end

Gemfile.lock

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,10 @@ GEM
5151
minitest (~> 5.1)
5252
thread_safe (~> 0.3, >= 0.3.4)
5353
tzinfo (~> 1.1)
54+
appraisal (2.1.0)
55+
bundler
56+
rake
57+
thor (>= 0.14.0)
5458
arel (6.0.3)
5559
builder (3.2.2)
5660
capybara (2.5.0)
@@ -160,6 +164,7 @@ PLATFORMS
160164
ruby
161165

162166
DEPENDENCIES
167+
appraisal
163168
ember-cli-rails!
164169
ember-cli-rails-assets!
165170
poltergeist (~> 1.8.0)

Rakefile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1+
require "rubygems"
12
begin
23
require "bundler/setup"
34
rescue LoadError
45
puts "You must `gem install bundler` and `bundle install` to run rake tasks"
56
end
7+
require "appraisal"
68

79
require "rdoc/task"
810

@@ -31,3 +33,7 @@ if defined? RSpec
3133
t.verbose = false
3234
end
3335
end
36+
37+
if !ENV["APPRAISAL_INITIALIZED"] && !ENV["TRAVIS"]
38+
task :default => :appraisal
39+
end
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
require "ember_cli/assets/lookup"
22

33
module EmberCliRailsAssetsHelper
4-
def include_ember_script_tags(name, **options)
4+
def include_ember_script_tags(name)
55
EmberCli[name].build
66

77
assets = EmberCli::Assets::Lookup.new(EmberCli[name])
88

99
assets.javascript_assets.
1010
map { |src| %{<script src="#{src}"></script>}.html_safe }.
11-
reduce(&:+)
11+
inject(&:+)
1212
end
1313

14-
def include_ember_stylesheet_tags(name, **options)
14+
def include_ember_stylesheet_tags(name)
1515
EmberCli[name].build
1616

1717
assets = EmberCli::Assets::Lookup.new(EmberCli[name])
1818

1919
assets.stylesheet_assets.
2020
map { |src| %{<link rel="stylesheet" href="#{src}">}.html_safe }.
21-
reduce(&:+)
21+
inject(&:+)
2222
end
2323
end

bin/setup

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ fi
2222
root="$(pwd)"
2323

2424
cd ${root}/spec/dummy/my-app &&
25-
npm install --save-dev ember-cli-rails-addon@rondale-sc/ember-cli-rails-addon
25+
npm install --save-dev ember-cli-rails-addon@rondale-sc/ember-cli-rails-addon &&
2626
bower install
2727

2828
cd ${root}/spec/dummy && bundle exec rake ember:install

gemfiles/3.2.gemfile

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# This file was generated by Appraisal
2+
3+
source "https://rubygems.org"
4+
5+
gem "appraisal"
6+
gem "test-unit", "~> 3.0"
7+
gem "rails", :git => "https://github.com/rails/rails.git", :branch => "3-2-stable"
8+
9+
group :development, :test do
10+
gem "pry"
11+
end
12+
13+
group :test do
14+
gem "ember-cli-rails", :github => "thoughtbot/ember-cli-rails", :branch => "1.0.0-beta"
15+
gem "poltergeist", "~> 1.8.0"
16+
gem "rspec-rails"
17+
end
18+
19+
gemspec :path => "../"

gemfiles/4.1.gemfile

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# This file was generated by Appraisal
2+
3+
source "https://rubygems.org"
4+
5+
gem "appraisal"
6+
gem "rails", "~> 4.1.1"
7+
8+
group :development, :test do
9+
gem "pry"
10+
end
11+
12+
group :test do
13+
gem "ember-cli-rails", :github => "thoughtbot/ember-cli-rails", :branch => "1.0.0-beta"
14+
gem "poltergeist", "~> 1.8.0"
15+
gem "rspec-rails"
16+
end
17+
18+
gemspec :path => "../"

gemfiles/4.2.gemfile

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# This file was generated by Appraisal
2+
3+
source "https://rubygems.org"
4+
5+
gem "appraisal"
6+
gem "rails", "~> 4.2.1"
7+
8+
group :development, :test do
9+
gem "pry"
10+
end
11+
12+
group :test do
13+
gem "ember-cli-rails", :github => "thoughtbot/ember-cli-rails", :branch => "1.0.0-beta"
14+
gem "poltergeist", "~> 1.8.0"
15+
gem "rspec-rails"
16+
end
17+
18+
gemspec :path => "../"

lib/ember_cli/assets/asset_map.rb

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@ def javascripts
1212
assert_asset_map!
1313

1414
[
15-
asset_matching(%r{vendor(.*)\.js\z}),
16-
asset_matching(%r{#{ember_app_name}(.*)\.js\z}),
15+
asset_matching(/vendor(.*)\.js\z/),
16+
asset_matching(/#{ember_app_name}(.*)\.js\z/),
1717
]
1818
end
1919

2020
def stylesheets
2121
assert_asset_map!
2222

2323
[
24-
asset_matching(%r{vendor(.*)\.css\z}),
25-
asset_matching(%r{#{ember_app_name}(.*)\.css\z}),
24+
asset_matching(/vendor(.*)\.css\z/),
25+
asset_matching(/#{ember_app_name}(.*)\.css\z/),
2626
]
2727
end
2828

@@ -58,7 +58,9 @@ def raise_missing_asset(regex)
5858

5959
def assert_asset_map!
6060
if assets.empty?
61-
raise BuildError.new("Missing `#{ember_app_name}/assets/assetMap.json`")
61+
raise BuildError.new <<-MSG
62+
Missing `#{ember_app_name}/assets/assetMap.json`
63+
MSG
6264
end
6365
end
6466
end

lib/ember_cli/assets/lookup.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,9 @@ def asset_map_hash
4040
end
4141

4242
def ember_app_name
43-
@ember_app_name ||= app.options.fetch(:name) { package_json.fetch(:name) }
43+
@ember_app_name ||= app.options.fetch(:name) do
44+
package_json.fetch(:name)
45+
end
4446
end
4547

4648
def package_json

spec/dummy/config/application.rb

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,21 @@
88

99
module Dummy
1010
class Application < Rails::Application
11+
config.cache_classes = true
12+
config.eager_load = false
13+
config.serve_static_files = true
14+
config.static_cache_control = "public, max-age=3600"
15+
16+
config.consider_all_requests_local = true
17+
config.action_controller.perform_caching = false
18+
config.action_dispatch.show_exceptions = false
19+
config.action_controller.allow_forgery_protection = false
20+
21+
config.active_support.test_order = :random
22+
23+
config.active_support.deprecation = :stderr
24+
25+
config.secret_token = "SECRET_TOKEN_IS_MIN_30_CHARS_LONG"
26+
config.secret_key_base = "SECRET_KEY_BASE"
1127
end
1228
end

spec/dummy/config/environments/development.rb

Lines changed: 0 additions & 35 deletions
This file was deleted.

spec/dummy/config/environments/production.rb

Lines changed: 0 additions & 79 deletions
This file was deleted.

0 commit comments

Comments
 (0)