From 19329ee8fab2273981b24b0e7ea4836e95d6d435 Mon Sep 17 00:00:00 2001 From: John Hawthorn Date: Wed, 30 Mar 2016 10:57:50 -0700 Subject: [PATCH 1/3] Remove guard I don't believe guard is so widely used anymore. It is an unnecessary dependency. --- Guardfile | 70 --------------------------------------- solidus_braintree.gemspec | 2 -- 2 files changed, 72 deletions(-) delete mode 100644 Guardfile diff --git a/Guardfile b/Guardfile deleted file mode 100644 index deea540d..00000000 --- a/Guardfile +++ /dev/null @@ -1,70 +0,0 @@ -# A sample Guardfile -# More info at https://github.com/guard/guard#readme - -## Uncomment and set this to only include directories you want to watch -# directories %w(app lib config test spec features) \ -# .select{|d| Dir.exists?(d) ? d : UI.warning("Directory #{d} does not exist")} - -## Note: if you are using the `directories` clause above and you are not -## watching the project directory ('.'), then you will want to move -## the Guardfile to a watched dir and symlink it back, e.g. -# -# $ mkdir config -# $ mv Guardfile config/ -# $ ln -s config/Guardfile . -# -# and, you'll have to watch "config/Guardfile" instead of "Guardfile" - -# Note: The cmd option is now required due to the increasing number of ways -# rspec may be run, below are examples of the most common uses. -# * bundler: 'bundle exec rspec' -# * bundler binstubs: 'bin/rspec' -# * spring: 'bin/rspec' (This will use spring if running and you have -# installed the spring binstubs per the docs) -# * zeus: 'zeus rspec' (requires the server to be started separately) -# * 'just' rspec: 'rspec' - -guard :rspec, cmd: "bundle exec rspec" do - require "guard/rspec/dsl" - dsl = Guard::RSpec::Dsl.new(self) - - # Feel free to open issues for suggestions and improvements - - # RSpec files - rspec = dsl.rspec - watch(rspec.spec_helper) { rspec.spec_dir } - watch(rspec.spec_support) { rspec.spec_dir } - watch(rspec.spec_files) - - # Ruby files - ruby = dsl.ruby - dsl.watch_spec_files_for(ruby.lib_files) - - # Rails files - rails = dsl.rails(view_extensions: %w(erb haml slim)) - dsl.watch_spec_files_for(rails.app_files) - dsl.watch_spec_files_for(rails.views) - - watch(rails.controllers) do |m| - [ - rspec.spec.("routing/#{m[1]}_routing"), - rspec.spec.("controllers/#{m[1]}_controller"), - rspec.spec.("acceptance/#{m[1]}") - ] - end - - # Rails config changes - watch(rails.spec_helper) { rspec.spec_dir } - watch(rails.routes) { "#{rspec.spec_dir}/routing" } - watch(rails.app_controller) { "#{rspec.spec_dir}/controllers" } - - # Capybara features specs - watch(rails.view_dirs) { |m| rspec.spec.("features/#{m[1]}") } - watch(rails.layouts) { |m| rspec.spec.("features/#{m[1]}") } - - # Turnip features and steps - watch(%r{^spec/acceptance/(.+)\.feature$}) - watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$}) do |m| - Dir[File.join("**/#{m[1]}.feature")][0] || "spec/acceptance" - end -end diff --git a/solidus_braintree.gemspec b/solidus_braintree.gemspec index 2b7e5f61..ffc67ca2 100644 --- a/solidus_braintree.gemspec +++ b/solidus_braintree.gemspec @@ -28,8 +28,6 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'rspec-rails' spec.add_development_dependency 'ffaker' spec.add_development_dependency "rspec" - spec.add_development_dependency "guard" - spec.add_development_dependency "guard-rspec" spec.add_development_dependency "pry" spec.add_development_dependency "pry-byebug" spec.add_development_dependency 'sqlite3' From f972b8eb7d71074ed9f86b842cfceeb4cdc799cb Mon Sep 17 00:00:00 2001 From: John Hawthorn Date: Wed, 30 Mar 2016 11:18:58 -0700 Subject: [PATCH 2/3] Require pry and byebug but not pry-byebug --- solidus_braintree.gemspec | 2 +- spec/spec_helper.rb | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/solidus_braintree.gemspec b/solidus_braintree.gemspec index ffc67ca2..b06fe26f 100644 --- a/solidus_braintree.gemspec +++ b/solidus_braintree.gemspec @@ -29,7 +29,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'ffaker' spec.add_development_dependency "rspec" spec.add_development_dependency "pry" - spec.add_development_dependency "pry-byebug" + spec.add_development_dependency "byebug" spec.add_development_dependency 'sqlite3' spec.add_development_dependency 'database_cleaner', '~> 1.2.0' spec.add_development_dependency "vcr" diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 9b931662..b46ca91c 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -9,7 +9,8 @@ require 'ffaker' require 'vcr' require 'webmock' -require 'pry-byebug' +require 'pry' +require 'byebug' Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f} From 5c61e1499a2fa82f82d83d27a2f76fd70fb6a05c Mon Sep 17 00:00:00 2001 From: John Hawthorn Date: Wed, 30 Mar 2016 11:19:43 -0700 Subject: [PATCH 3/3] Losen dependency on database_cleaner --- solidus_braintree.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solidus_braintree.gemspec b/solidus_braintree.gemspec index b06fe26f..e0bcea97 100644 --- a/solidus_braintree.gemspec +++ b/solidus_braintree.gemspec @@ -31,7 +31,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency "pry" spec.add_development_dependency "byebug" spec.add_development_dependency 'sqlite3' - spec.add_development_dependency 'database_cleaner', '~> 1.2.0' + spec.add_development_dependency 'database_cleaner', '~> 1.2' spec.add_development_dependency "vcr" spec.add_development_dependency "webmock" end