Skip to content
This repository was archived by the owner on Nov 1, 2017. It is now read-only.

Commit 1393a1a

Browse files
committed
Merge pull request #10 from github/bowerify
Bowerify
2 parents 242b524 + 0387170 commit 1393a1a

File tree

10 files changed

+23
-10
lines changed

10 files changed

+23
-10
lines changed

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
Gemfile.lock
77
InstalledFiles
88
_yardoc
9+
bin/
910
coverage
1011
doc/
1112
lib/bundler/man
@@ -15,5 +16,6 @@ spec/reports
1516
test/tmp
1617
test/version_tmp
1718
tmp
18-
components
19+
bower_components
1920
node_modules
21+
vendor/gems/

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
source :rubygems
1+
source "https://rubygems.org"
22
gemspec

app/assets/javascripts/task_lists.coffee

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#= provides tasklist:change
66
#= provides tasklist:changed
77
#
8-
#= require crema/element/fire
8+
#= require crema/events/fire
99
#= require crema/events/pageupdate
1010
#
1111
# Enables Task List update behavior.

bower.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"name": "task-lists",
3+
"dependencies": {
4+
"jquery": ">= 1.9.1",
5+
"crema": "[email protected]:github/crema.git",
6+
"qunit": ">= 1.0"
7+
}
8+
}

config.ru

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ require 'sprockets'
77
Root = File.expand_path("..", __FILE__)
88

99
Assets = Sprockets::Environment.new(Root) do |env|
10-
env.append_path "components" # bower
10+
env.append_path "bower_components"
1111
env.append_path "app/assets/javascripts"
1212
env.append_path "app/assets/stylesheets"
1313
env.append_path "test"

script/bootstrap

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,4 @@ if ! npm list bower 2>&1 | grep 0.8.5 >/dev/null; then
1010
npm install git://github.com/twitter/bower.git
1111
fi
1212

13-
bower install --no-color jquery
14-
bower install --no-color https://hubot:[email protected]/github/crema.git
15-
bower install --no-color rails-behaviors
13+
bower install --no-color

script/cibuild

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@
77
cd $(dirname "$0")/..
88
export PATH="$(pwd)/bin:$(pwd)/script:$(pwd)/node_modules/.bin:/usr/share/rbenv/shims:/opt/phantomjs/bin:/usr/share/nvm/0.8.11/bin:$PATH"
99

10+
# setup Ruby version
11+
if [ -d /usr/share/rbenv/shims ]; then export PATH=/usr/share/rbenv/shims:$PATH; fi
12+
export RBENV_VERSION="1.9.3-p231-tcs-github"
13+
1014
# Write commit we're building at
1115
git log -n 1 || true
1216
echo
@@ -15,4 +19,4 @@ export DISPLAY=:99.0
1519

1620
./script/bootstrap
1721
./script/testsuite 4018
18-
rake test
22+
bundle exec rake test

task-lists.gemspec

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ Gem::Specification.new do |gem|
1818

1919
gem.add_dependency "html-pipeline"
2020

21+
gem.add_development_dependency "github-markdown"
2122
gem.add_development_dependency "rake"
2223
gem.add_development_dependency "coffee-script"
2324
gem.add_development_dependency "json"

test/units.coffee

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
#= require qunit
1+
#= require qunit/qunit/qunit
22
#= require_directory ./unit

test/units.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
/*= require qunit */
1+
/*= require qunit/qunit/qunit */

0 commit comments

Comments
 (0)