Skip to content

Commit

Permalink
Merge pull request #954 from transitland/service-clean-up
Browse files Browse the repository at this point in the history
Service clean up
  • Loading branch information
drewda committed Feb 8, 2017
2 parents e240c46 + f82263e commit 02e8682
Show file tree
Hide file tree
Showing 6 changed files with 2 additions and 36 deletions.
2 changes: 0 additions & 2 deletions .hound.yml

This file was deleted.

8 changes: 0 additions & 8 deletions .rubocop.yml

This file was deleted.

2 changes: 0 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,6 @@ gem 'pry-byebug', group: [:development, :test]
gem 'pry-rails', group: [:development, :test]
gem 'pry-rescue', group: [:development, :test]
gem 'pry-stack_explorer', group: [:development, :test]
gem 'rubocop', require: false, group: [:development, :test]
gem 'rubocop-rspec', require: false, group: [:development, :test]
gem 'active_record_doctor', group: :development

# code coverage and documentation
Expand Down
16 changes: 0 additions & 16 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ GEM
activerecord (>= 3.2, < 6.0)
rake (>= 10.4, < 12.0)
arel (6.0.3)
ast (2.3.0)
aws-sdk (2.6.32)
aws-sdk-resources (= 2.6.32)
aws-sdk-core (2.6.32)
Expand Down Expand Up @@ -212,14 +211,11 @@ GEM
oj (2.18.0)
oj_mimic_json (1.0.1)
orm_adapter (0.5.0)
parser (2.3.3.1)
ast (~> 2.2)
pg (0.19.0)
pghero (1.6.2)
activerecord
polyamorous (1.1.0)
activerecord (>= 3.0)
powerpack (0.1.1)
pry (0.10.4)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
Expand Down Expand Up @@ -270,7 +266,6 @@ GEM
activesupport (= 4.2.7.1)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rainbow (2.1.0)
raindrops (0.17.0)
rake (11.3.0)
rcsv (0.3.1)
Expand Down Expand Up @@ -331,14 +326,6 @@ GEM
rspec_junit_formatter (0.2.2)
builder (< 4)
rspec-core (>= 2, < 4, != 2.12.0)
rubocop (0.46.0)
parser (>= 2.3.1.1, < 3.0)
powerpack (~> 0.1)
rainbow (>= 1.99.1, < 3.0)
ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.0, >= 1.0.1)
rubocop-rspec (1.8.0)
rubocop (>= 0.42.0)
ruby-graphviz (1.2.2)
ruby-progressbar (1.8.1)
rubyzip (1.2.0)
Expand Down Expand Up @@ -388,7 +375,6 @@ GEM
unf (0.1.4)
unf_ext
unf_ext (0.0.7.2)
unicode-display_width (1.1.1)
unicorn (5.2.0)
kgio (~> 2.6)
raindrops (~> 0.7)
Expand Down Expand Up @@ -454,8 +440,6 @@ DEPENDENCIES
rspec-rails
rspec-sidekiq
rspec_junit_formatter (= 0.2.2)
rubocop
rubocop-rspec
ruby-progressbar
sentry-raven
sidekiq (< 5)
Expand Down
2 changes: 1 addition & 1 deletion config/initializers/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module TransitlandDatastore
class Application
VERSION = "4.9.8"
VERSION = "4.9.21"
end
end
8 changes: 1 addition & 7 deletions doc/development-practices.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,9 @@

We loosely (but not religiously) follow the [bbatsov/ruby-style-guide](https://github.com/bbatsov/ruby-style-guide).

**style checking on pull requests** When you open a pull request against the Datastore repository on GitHub, [HoundCI](https://houndci.com/) will check your code edits against the style guide. It will automatically add comments to the pull request with suggestions for improvements. Take these as advice, not orders.

**style checking locally** If you want to check your style before you push to GitHub and open a pull request, you can use [the RuboCop gem](https://github.com/bbatsov/rubocop) locally. (This is what HoundCI is running on a server.) We've tweaked the RuboCop config slightly in [./.rubocop.yml](../rubocop.yml). To run Rubocop locally: `bundle exec rubocop`

**style checking in editor** If you're using Atom for your text editing, [the linter-rubocop package](https://atom.io/packages/linter-rubocop) will check style as you type.

### Change Log

We're testing out an automatic way of generating [CHANGELOG.md](../CHANGELOG.md) using [the github-changelog-generator gem](https://skywinder.github.io/github-changelog-generator/). To regenerate the change log:
We use an automatic way of generating [CHANGELOG.md](../CHANGELOG.md) using [the github-changelog-generator gem](https://skywinder.github.io/github-changelog-generator/). To regenerate the change log:

1. [Generate a personal access token on GitHub](https://github.com/settings/tokens). You'll need this because the changelog generator makes so many requests to the GitHub API.
2. `gem install github_changelog_generator`
Expand Down

0 comments on commit 02e8682

Please sign in to comment.