Skip to content

Commit

Permalink
Merge pull request #28 from shopsmart/bump-dependencies
Browse files Browse the repository at this point in the history
Bump dependencies
  • Loading branch information
wenga86 authored Jan 17, 2020
2 parents 6b403dc + e3004ee commit 5637d5c
Show file tree
Hide file tree
Showing 17 changed files with 166 additions and 316 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,5 @@ rerun.txt

# Coverage
test_app/coverage/

vendor
4 changes: 3 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
sudo: false
language: ruby
rvm:
- 2.3.3
- 2.6
env:
global:
- CC_TEST_REPORTER_ID="83a4a2047d4dee163903b2d6495d25ecabd8087a226b040650eb435bb126a6f0"
Expand All @@ -10,6 +10,8 @@ cache:
- apt
before_script:
- cd test_app
- gem install bundler:1.17.2
- bundle
- curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
- chmod +x ./cc-test-reporter
- ./cc-test-reporter before-build
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## v0.7.0

Changes:

- Lock down gem dependencies due to API changes
- Added additional generators for editor, browser & eslint configs

## v0.6.0

Changes:
Expand Down
35 changes: 0 additions & 35 deletions Gemfile

This file was deleted.

219 changes: 0 additions & 219 deletions Gemfile.lock

This file was deleted.

21 changes: 12 additions & 9 deletions bd_lint.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,28 @@ require "bd_lint/version"
Gem::Specification.new do |s|
s.name = "bd_lint"
s.version = BdLint::VERSION
s.authors = ["Eric Agnew"]
s.email = ["eric@bradsdeals.com"]
s.authors = ["Dev Team"]
s.email = ["dev@bradsdeals.com"]
s.homepage = "https://www.bradsdeals.com"
s.summary = "Adds essentials to rails apps"
s.summary = "Adds essentials to Ruby apps"
s.description = "BdLint adds linters, and other gems"
s.license = "MIT"

s.files = Dir["{app,config,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.md"]

s.add_dependency "brakeman"
s.add_dependency "bundler-audit"
s.add_dependency "brakeman", "~> 4"
s.add_dependency "bundler-audit", "~> 0.6"
s.add_dependency "execjs"
s.add_dependency "pre-commit"
s.add_dependency "rubocop"
s.add_dependency "rubocop-rspec"
s.add_dependency "scss_lint"
s.add_dependency "pre-commit", "0.39.0"
s.add_dependency "rubocop", "0.79.0"
s.add_dependency "rubocop-rspec", "~> 1.37"
s.add_dependency "scss_lint", "0.59.0"
s.add_dependency "thor"

s.add_development_dependency "rake"
s.add_development_dependency "rails"
s.add_development_dependency "rspec-rails"
s.add_development_dependency "sprockets"

s.post_install_message = %q{
For all developers
Expand Down
2 changes: 1 addition & 1 deletion lib/bd_lint/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module BdLint
VERSION = "0.6.0".freeze
VERSION = "0.7.0".freeze
end
4 changes: 3 additions & 1 deletion lib/generators/lint_configs/lint_configs_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ class LintConfigsGenerator < Rails::Generators::Base
source_root File.expand_path('../templates', __FILE__)

def copy_lint_configs
copy_file ".eslintrc.js", ".eslintrc.js"
copy_file ".browserslistrc", ".browserslistrc"
copy_file ".editorconfig", ".editorconfig"
copy_file ".eslintrc.js", ".eslintrc.js"
copy_file ".jscsrc", ".jscsrc"
copy_file ".pre_commit.ignore", ".pre_commit.ignore"
copy_file ".rubocop.yml", ".rubocop.yml"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ def self.source_root
end

def copy_lint_configs
copy_file ".eslintrc.js", ".eslintrc.js"
copy_file ".eslintrc.js", ".eslintrc.js"
copy_file ".jscsrc", ".jscsrc"
copy_file ".pre_commit.ignore", ".pre_commit.ignore"
copy_file ".rubocop.yml", ".rubocop.yml"
Expand Down
9 changes: 9 additions & 0 deletions lib/generators/lint_configs/templates/.browserslistrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
defaults
Android >= 6
not dead
not IE 11
not IE_Mob 11
not ExplorerMobile <= 11
iOS >= 10
Safari >= 10
maintained node versions
16 changes: 16 additions & 0 deletions lib/generators/lint_configs/templates/.editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
root = true

[*]
charset = utf-8
end_of_line = lf
indent_size = 2
indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true
max_line_length = 120

[*.{js,jsx,vue}]
quote_type = single

[*.{rake,rb}]
quote_type = double
Loading

0 comments on commit 5637d5c

Please sign in to comment.