Skip to content

Commit

Permalink
Merge branch 'feature/initialize' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
nikhgupta committed Jan 11, 2014
2 parents 16cd361 + 96d8c53 commit 8f57331
Show file tree
Hide file tree
Showing 15 changed files with 586 additions and 30 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -14,3 +14,4 @@
# Ignore all logfiles and tempfiles.
/log/*.log
/tmp
coverage
1 change: 1 addition & 0 deletions .rspec
@@ -0,0 +1 @@
--color
22 changes: 22 additions & 0 deletions .travis.yml
@@ -0,0 +1,22 @@
language: ruby
rvm:
- 2.1.0
- 1.9.3
- ruby-head
matrix:
fast_finish: true
allow_failures:
- rvm: ruby-head
env:
- DB=sqlite
- DB=mysql
- DB=postgresql
before_script:
- cp config/database.travis.yml config/database.yml
- mysql -e 'create database event_line_test;'
- psql -c 'create database event_line_test;' -U postgres
script:
- export RAILS_ENV=test
- bundle exec rake db:migrate --trace
- bundle exec rake db:test:prepare
- bundle exec rake
24 changes: 24 additions & 0 deletions Gemfile
Expand Up @@ -43,3 +43,27 @@ end

# Use debugger
# gem 'debugger', group: [:development, :test]

group :development do
gem 'pry-rails'
gem 'shotgun'
end

group :test, :development do
gem 'rspec-rails'
gem 'pg'
gem 'sqlite3'
end

group :test do
gem 'launchy'
gem 'rb-fsevent'
gem 'poltergeist'
gem 'guard-rspec'
gem 'guard-cucumber'
gem 'database_cleaner'
gem 'factory_girl_rails'
gem 'terminal-notifier-guard'
gem 'coveralls', require: false
gem 'cucumber-rails', require: false
end
247 changes: 247 additions & 0 deletions Gemfile.lock
@@ -0,0 +1,247 @@
GEM
remote: https://rubygems.org/
specs:
actionmailer (4.0.1)
actionpack (= 4.0.1)
mail (~> 2.5.4)
actionpack (4.0.1)
activesupport (= 4.0.1)
builder (~> 3.1.0)
erubis (~> 2.7.0)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
activemodel (4.0.1)
activesupport (= 4.0.1)
builder (~> 3.1.0)
activerecord (4.0.1)
activemodel (= 4.0.1)
activerecord-deprecated_finders (~> 1.0.2)
activesupport (= 4.0.1)
arel (~> 4.0.0)
activerecord-deprecated_finders (1.0.3)
activesupport (4.0.1)
i18n (~> 0.6, >= 0.6.4)
minitest (~> 4.2)
multi_json (~> 1.3)
thread_safe (~> 0.1)
tzinfo (~> 0.3.37)
addressable (2.3.5)
arel (4.0.1)
atomic (1.1.14)
builder (3.1.4)
capybara (2.2.0)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
celluloid (0.15.2)
timers (~> 1.1.0)
cliver (0.3.2)
coderay (1.1.0)
coffee-rails (4.0.1)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.0)
coffee-script (2.2.0)
coffee-script-source
execjs
coffee-script-source (1.6.3)
coveralls (0.7.0)
multi_json (~> 1.3)
rest-client
simplecov (>= 0.7)
term-ansicolor
thor
cucumber (1.3.10)
builder (>= 2.1.2)
diff-lcs (>= 1.1.3)
gherkin (~> 2.12)
multi_json (>= 1.7.5, < 2.0)
multi_test (>= 0.0.2)
cucumber-rails (1.4.0)
capybara (>= 1.1.2)
cucumber (>= 1.2.0)
nokogiri (>= 1.5.0)
rails (>= 3.0.0)
database_cleaner (1.2.0)
diff-lcs (1.2.5)
docile (1.1.2)
erubis (2.7.0)
execjs (2.0.2)
factory_girl (4.3.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.3.0)
factory_girl (~> 4.3.0)
railties (>= 3.0.0)
ffi (1.9.3)
formatador (0.2.4)
gherkin (2.12.2)
multi_json (~> 1.3)
guard (2.2.5)
formatador (>= 0.2.4)
listen (~> 2.1)
lumberjack (~> 1.0)
pry (>= 0.9.12)
thor (>= 0.18.1)
guard-cucumber (1.4.0)
cucumber (>= 1.2.0)
guard (>= 1.1.0)
guard-rspec (4.0.3)
guard (>= 2.1.1)
rspec (~> 2.14)
hike (1.2.3)
i18n (0.6.5)
jbuilder (1.5.2)
activesupport (>= 3.0.0)
multi_json (>= 1.2.0)
jquery-rails (3.0.4)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.1)
launchy (2.4.2)
addressable (~> 2.3)
listen (2.4.0)
celluloid (>= 0.15.2)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
lumberjack (1.0.4)
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
method_source (0.8.2)
mime-types (1.25.1)
mini_portile (0.5.2)
minitest (4.7.5)
multi_json (1.8.2)
multi_test (0.0.3)
mysql2 (0.3.14)
nokogiri (1.6.0)
mini_portile (~> 0.5.0)
pg (0.17.0)
poltergeist (1.5.0)
capybara (~> 2.1)
cliver (~> 0.3.1)
multi_json (~> 1.0)
websocket-driver (>= 0.2.0)
polyglot (0.3.3)
pry (0.9.12.4)
coderay (~> 1.0)
method_source (~> 0.8)
slop (~> 3.4)
pry-rails (0.3.2)
pry (>= 0.9.10)
rack (1.5.2)
rack-test (0.6.2)
rack (>= 1.0)
rails (4.0.1)
actionmailer (= 4.0.1)
actionpack (= 4.0.1)
activerecord (= 4.0.1)
activesupport (= 4.0.1)
bundler (>= 1.3.0, < 2.0)
railties (= 4.0.1)
sprockets-rails (~> 2.0.0)
railties (4.0.1)
actionpack (= 4.0.1)
activesupport (= 4.0.1)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.1.0)
rb-fsevent (0.9.4)
rb-inotify (0.9.3)
ffi (>= 0.5.0)
rdoc (3.12.2)
json (~> 1.4)
rest-client (1.6.7)
mime-types (>= 1.16)
rspec (2.14.1)
rspec-core (~> 2.14.0)
rspec-expectations (~> 2.14.0)
rspec-mocks (~> 2.14.0)
rspec-core (2.14.7)
rspec-expectations (2.14.4)
diff-lcs (>= 1.1.3, < 2.0)
rspec-mocks (2.14.4)
rspec-rails (2.14.0)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
rspec-core (~> 2.14.0)
rspec-expectations (~> 2.14.0)
rspec-mocks (~> 2.14.0)
sass (3.2.12)
sass-rails (4.0.1)
railties (>= 4.0.0, < 5.0)
sass (>= 3.1.10)
sprockets-rails (~> 2.0.0)
sdoc (0.3.20)
json (>= 1.1.3)
rdoc (~> 3.10)
shotgun (0.9)
rack (>= 1.0)
simplecov (0.8.2)
docile (~> 1.1.0)
multi_json
simplecov-html (~> 0.8.0)
simplecov-html (0.8.0)
slop (3.4.7)
sprockets (2.10.1)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.0.1)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (~> 2.8)
sqlite3 (1.3.8)
term-ansicolor (1.2.2)
tins (~> 0.8)
terminal-notifier-guard (1.5.3)
thor (0.18.1)
thread_safe (0.1.3)
atomic
tilt (1.4.1)
timers (1.1.0)
tins (0.13.1)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
turbolinks (1.3.1)
coffee-rails
tzinfo (0.3.38)
uglifier (2.3.1)
execjs (>= 0.3.0)
json (>= 1.8.0)
websocket-driver (0.3.1)
xpath (2.0.0)
nokogiri (~> 1.3)

PLATFORMS
ruby

DEPENDENCIES
coffee-rails (~> 4.0.0)
coveralls
cucumber-rails
database_cleaner
factory_girl_rails
guard-cucumber
guard-rspec
jbuilder (~> 1.2)
jquery-rails
launchy
mysql2
pg
poltergeist
pry-rails
rails (= 4.0.1)
rb-fsevent
rspec-rails
sass-rails (~> 4.0.0)
sdoc
shotgun
sqlite3
terminal-notifier-guard
turbolinks
uglifier (>= 1.3.0)
32 changes: 32 additions & 0 deletions Guardfile
@@ -0,0 +1,32 @@
# A sample Guardfile
# More info at https://github.com/guard/guard#readme

notification :terminal_notifier

guard :rspec, cmd: "bundle exec rspec --color" do
watch(%r{^spec/.+_spec\.rb$})
watch(%r{^lib/(.+)\.rb$}) { |m| "spec/lib/#{m[1]}_spec.rb" }
watch('spec/spec_helper.rb') { "spec" }

# Rails example
watch(%r{^app/(.+)\.rb$}) { |m| "spec/#{m[1]}_spec.rb" }
watch(%r{^app/(.*)(\.erb|\.haml|\.slim)$}) { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
watch(%r{^app/controllers/(.+)_(controller)\.rb$}) { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
watch(%r{^spec/support/(.+)\.rb$}) { "spec" }
watch('config/routes.rb') { "spec/routing" }
watch('app/controllers/application_controller.rb') { "spec/controllers" }

# Capybara features specs
watch(%r{^app/views/(.+)/.*\.(erb|haml|slim)$}) { |m| "spec/features/#{m[1]}_spec.rb" }

# Turnip features and steps
watch(%r{^spec/acceptance/(.+)\.feature$})
watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$}) { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance' }
end


guard 'cucumber', cmd: "bundle exec cucumber --color" do
watch(%r{^features/.+\.feature$})
watch(%r{^features/support/.+$}) { 'features' }
watch(%r{^features/step_definitions/(.+)_steps\.rb$}) { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'features' }
end
33 changes: 7 additions & 26 deletions README.rdoc
@@ -1,28 +1,9 @@
== README
== EventLine

This README would normally document whatever steps are necessary to get the
application up and running.
An application to quickly generate beautiful and elegant timelines for your
life.

Things you may want to cover:

* Ruby version

* System dependencies

* Configuration

* Database creation

* Database initialization

* How to run the test suite

* Services (job queues, cache servers, search engines, etc.)

* Deployment instructions

* ...


Please feel free to use a different markup language if you do not plan to run
<tt>rake doc:app</tt>.
{<img src="https://travis-ci.org/nikhgupta/event_line.png?branch=develop" alt="Build Status" />}[https://travis-ci.org/nikhgupta/event_line]
{<img src="https://coveralls.io/repos/nikhgupta/event_line/badge.png?branch=develop" alt="Coverage Status" />}[https://coveralls.io/r/nikhgupta/event_line?branch=develop]
{<img src="https://codeclimate.com/github/nikhgupta/event_line.png" alt="Code Climate" style="max-width:100%;"/>}[https://codeclimate.com/github/nikhgupta/event_line]
{<img src="https://gemnasium.com/nikhgupta/event_line.png" alt="Dependency Status" />}[https://gemnasium.com/nikhgupta/event_line]
8 changes: 8 additions & 0 deletions config/cucumber.yml
@@ -0,0 +1,8 @@
<%
rerun = File.file?('rerun.txt') ? IO.read('rerun.txt') : ""
rerun_opts = rerun.to_s.strip.empty? ? "--format #{ENV['CUCUMBER_FORMAT'] || 'progress'} features" : "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} #{rerun}"
std_opts = "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} --strict --tags ~@wip"
%>
default: <%= std_opts %> features
wip: --tags @wip:3 --wip features
rerun: <%= rerun_opts %> --format rerun --out rerun.txt --strict --tags ~@wip

0 comments on commit 8f57331

Please sign in to comment.