Skip to content

Commit

Permalink
Merge branch 'feature/travis_ci' into 'master'
Browse files Browse the repository at this point in the history
Feature/travis ci

See merge request !44
  • Loading branch information
蒼時弦也 committed Sep 5, 2017
2 parents d016426 + c77a677 commit 40a7b4c
Show file tree
Hide file tree
Showing 5 changed files with 71 additions and 16 deletions.
1 change: 1 addition & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ AllCops:
- node_modules/**/*
- db/*
- vendor/ruby/**/*
- vendor/bundle/**/*
- config/initializers/simple_form_bootstrap.rb
Rails:
Enabled: true
Expand Down
22 changes: 22 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
language: ruby
rvm:
- 2.4.1
services:
- postgres
cache:
bundler: true
directories:
- node_modules
before_install:
- nvm install 8.1.0
- npm install -g yarn
before_script:
- yarn install
- bundle exec rake db:create
- bundle exec rake db:schema:load
script:
- yarn eslint
- bundle exec scss-lint app/assets/stylesheets/
- bundle exec rubocop
- bundle exec rspec

2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ group :development, :test do
gem 'faker'

gem 'dotenv-rails'
gem 'rubocop', require: false
gem 'rubocop', '0.49.1', require: false
gem 'scss_lint', require: false
gem 'timecop'
end
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ DEPENDENCIES
rails-i18n
rspec
rspec-rails
rubocop
rubocop (= 0.49.1)
sassc-rails
scss_lint
selenium-webdriver
Expand All @@ -411,4 +411,4 @@ DEPENDENCIES
webpacker

BUNDLED WITH
1.15.1
1.15.3
58 changes: 45 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,24 +1,56 @@
# README
Tamashii Clock-in [![Build Status](https://travis-ci.org/tamashii-io/tamashii-clockin.svg?branch=master)](https://travis-ci.org/tamashii-io/tamashii-clockin)
===

This README would normally document whatever steps are necessary to get the
application up and running.
## Requirements

Things you may want to cover:
* Ruby 2.4.0
* PostgreSQL 9.5+
* Redis
* Node.js
* Yarn

* Ruby version
## Usage

* System dependencies
### Install Dependency

* Configuration
```
$ bundle install
```

* Database creation
### Prepare Database

* Database initialization
If you didn't have database.

* How to run the test suite
```
$ rake db:create
```

* Services (job queues, cache servers, search engines, etc.)
And run migration to create tables.

* Deployment instructions
```
$ rake db:migrate
```

* ...
### Rails

Start Rails server

```
$ rails s
```

### Webpack

Make sure running `webpack-dev-server` to building javascript.

Above require `binstub` setup for your system.

```
$ webpack-dev-server
```

or

```
$ ./bin/webpack-dev-server
```

0 comments on commit 40a7b4c

Please sign in to comment.