From 92c0fdba94a1546a80dc2dfaee76f8af226dbd66 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 22 May 2017 14:13:36 +0300 Subject: [PATCH 1/2] Remove guard gems as unused --- .rubocop-guard.yml | 10 --------- Gemfile | 4 ---- Gemfile.lock | 39 ---------------------------------- Guardfile | 52 ---------------------------------------------- 4 files changed, 105 deletions(-) delete mode 100644 .rubocop-guard.yml delete mode 100644 Guardfile diff --git a/.rubocop-guard.yml b/.rubocop-guard.yml deleted file mode 100644 index 0ee03be6b..000000000 --- a/.rubocop-guard.yml +++ /dev/null @@ -1,10 +0,0 @@ -inherit_from: .rubocop.yml - -# -# Turn off during guard runs -# - -# turn off comment intention check during development -# because NerdCommenter honors commented code intentions -Style/CommentIndentation: - Enabled: false diff --git a/Gemfile b/Gemfile index 0f9ba3511..9798d5743 100644 --- a/Gemfile +++ b/Gemfile @@ -114,12 +114,8 @@ gem 'jquery-ui-rails', '5.0.5' group :development do - gem 'guard', '2.12.9' # run tests automatically gem 'spring', '1.3.6' gem 'spring-commands-rspec', '1.0.4' - gem 'guard-rails', '0.7.1' # run EPP server automatically - gem 'guard-rspec', '4.5.2' - gem 'guard-rubocop', '1.2.0' gem 'rubocop', '0.48.1' # deploy diff --git a/Gemfile.lock b/Gemfile.lock index 3495e9eea..239fd2994 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -204,7 +204,6 @@ GEM path_expander (~> 1.0) ruby_parser (~> 3.1, > 3.1.0) sexp_processor (~> 4.8) - formatador (0.2.5) globalid (0.3.7) activesupport (>= 4.1.0) grape (0.12.0) @@ -217,26 +216,6 @@ GEM rack-accept rack-mount virtus (>= 1.0.0) - guard (2.12.9) - formatador (>= 0.2.4) - listen (>= 2.7, <= 4.0) - lumberjack (~> 1.0) - nenv (~> 0.1) - notiffany (~> 0.0) - pry (>= 0.9.12) - shellany (~> 0.0) - thor (>= 0.18.1) - guard-compat (1.2.1) - guard-rails (0.7.1) - guard (~> 2.11) - guard-compat (~> 1.0) - guard-rspec (4.5.2) - guard (~> 2.1) - guard-compat (~> 1.1) - rspec (>= 2.99.0, < 4.0) - guard-rubocop (1.2.0) - guard (~> 2.0) - rubocop (~> 0.20) gyoku (1.3.1) builder (>= 2.1.2) haml (4.0.7) @@ -290,13 +269,8 @@ GEM libv8 (3.16.14.19) libxml-ruby (3.0.0) liquid (3.0.6) - listen (3.1.5) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - ruby_dep (~> 1.2) loofah (2.0.3) nokogiri (>= 1.5.9) - lumberjack (1.0.11) mail (2.6.4) mime-types (>= 1.16, < 4) method_source (0.8.2) @@ -320,14 +294,10 @@ GEM railties (>= 3.0) multi_json (1.12.1) multi_xml (0.6.0) - nenv (0.3.0) netrc (0.11.0) nokogiri (1.7.1) mini_portile2 (~> 2.1.0) nori (2.6.0) - notiffany (0.1.1) - nenv (~> 0.1) - shellany (~> 0.0) nprogress-rails (0.1.6.7) open4 (1.3.4) orm_adapter (0.5.0) @@ -401,9 +371,6 @@ GEM activesupport (>= 3.0) i18n polyamorous (~> 1.1) - rb-fsevent (0.9.8) - rb-inotify (0.9.8) - ffi (>= 0.5.0) rdoc (4.3.0) reek (4.6.1) codeclimate-engine-rb (~> 0.4.0) @@ -445,7 +412,6 @@ GEM ruby-progressbar (~> 1.7) unicode-display_width (~> 1.0, >= 1.0.1) ruby-progressbar (1.8.1) - ruby_dep (1.5.0) ruby_parser (3.8.4) sexp_processor (~> 4.1) rubycritic (3.2.0) @@ -480,7 +446,6 @@ GEM thor (~> 0.14) selectize-rails (0.12.1) sexp_processor (4.8.0) - shellany (0.0.1) simplecov (0.10.0) docile (~> 1.1.0) json (~> 1.8) @@ -581,10 +546,6 @@ DEPENDENCIES factory_girl_rails figaro (= 1.1.1) grape (= 0.12.0) - guard (= 2.12.9) - guard-rails (= 0.7.1) - guard-rspec (= 4.5.2) - guard-rubocop (= 1.2.0) haml-rails (= 0.9.0) hashie-forbidden_attributes (= 0.1.1) html2haml (= 2.1.0) diff --git a/Guardfile b/Guardfile deleted file mode 100644 index ab7619ed7..000000000 --- a/Guardfile +++ /dev/null @@ -1,52 +0,0 @@ -group :red_green_refactor, halt_on_fail: true do - # start test EPP server automatically on port 8989, - # be sure you have apache2 configured to - # accept EPP request on port 701, what proxy to 8989. - # port and environment is just for correct notification, all is overwritten by CLI - # guard :rails, port: 8989, environment: 'test' do - # # guard :rails, port: 8989, environment: 'test', CLI: 'RAILS_ENV=test unicorn -p 8989' do - # watch('Gemfile.lock') - # watch(%r{^(config|lib)/.*}) - # end - - # guard :rspec, cmd: 'spring rspec --fail-fast', notification: false do - guard :rspec, cmd: 'spring rspec', notification: false 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{^app/controllers/epp/(.+)_(controller)\.rb$}) { |m| ["spec/epp/#{m[1].sub(/s$/,'')}_spec.rb"] } - watch(%r{^app/models/epp/(.+)\.rb$}) { |m| "spec/epp/#{m[1]}_spec.rb" } - watch(%r{^spec/support/(.+)\.rb$}) { "spec" } - watch('config/routes.rb') { "spec/routing" } - watch('app/controllers/application_controller.rb') { "spec/controllers" } - watch('spec/rails_helper.rb') { "spec" } - - # epp tests - watch('app/helpers/epp/contacts_helper.rb') { 'spec/epp/contact_spec.rb' } - watch('app/helpers/epp/domains_helper.rb') { 'spec/epp/domain_spec.rb' } - # 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 - - # Martin does not want rubocop - unless Socket.gethostname == 'martin' - guard :rubocop, - all_on_start: false, - cli: '--display-cop-names -c .rubocop-guard.yml -f fuubar', - notification: false do - - watch(%r{.+\.rb$}) - watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0]) } - watch(%r{(?:.+/)?\.rubocop-guard\.yml$}) { |m| File.dirname(m[0]) } - end - end -end From e76ee8baabdbb907a772a36bf53a57e43a79f8e8 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 22 May 2017 14:39:20 +0300 Subject: [PATCH 2/2] Update rspec gem to 3.6.0 --- Gemfile | 2 +- Gemfile.lock | 38 +++++++++++++++++++------------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Gemfile b/Gemfile index 9798d5743..e75da11b3 100644 --- a/Gemfile +++ b/Gemfile @@ -125,7 +125,7 @@ end group :development, :test do gem 'capybara' - gem 'rspec-rails', '~> 3.5' + gem 'rspec-rails', '~> 3.6' gem 'fabrication', '2.13.2' # Replacement for fixtures gem 'phantomjs-binaries' gem 'phantomjs' diff --git a/Gemfile.lock b/Gemfile.lock index 239fd2994..0305e57d5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -281,7 +281,7 @@ GEM open4 (~> 1.3.4) rake mini_portile2 (2.1.0) - minitest (5.10.1) + minitest (5.10.2) monetize (1.6.0) money (~> 6.8) money (6.8.3) @@ -327,7 +327,7 @@ GEM erubis que (~> 0.8) sinatra - rack (1.6.5) + rack (1.6.8) rack-accept (0.4.5) rack (>= 0.4) rack-mount (0.8.3) @@ -384,27 +384,27 @@ GEM http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rspec (3.5.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) - rspec-core (3.5.4) - rspec-support (~> 3.5.0) - rspec-expectations (3.5.0) + rspec (3.6.0) + rspec-core (~> 3.6.0) + rspec-expectations (~> 3.6.0) + rspec-mocks (~> 3.6.0) + rspec-core (3.6.0) + rspec-support (~> 3.6.0) + rspec-expectations (3.6.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-mocks (3.5.0) + rspec-support (~> 3.6.0) + rspec-mocks (3.6.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-rails (3.5.2) + rspec-support (~> 3.6.0) + rspec-rails (3.6.0) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) - rspec-support (~> 3.5.0) - rspec-support (3.5.0) + rspec-core (~> 3.6.0) + rspec-expectations (~> 3.6.0) + rspec-mocks (~> 3.6.0) + rspec-support (~> 3.6.0) + rspec-support (3.6.0) rubocop (0.48.1) parser (>= 2.3.3.1, < 3.0) powerpack (~> 0.1) @@ -579,7 +579,7 @@ DEPENDENCIES rails-settings-cached (= 0.4.1) ransack (= 1.5.1) rest-client - rspec-rails (~> 3.5) + rspec-rails (~> 3.6) rubocop (= 0.48.1) rubycritic (= 3.2.0) sass-rails (= 5.0.6)