diff --git a/Gemfile b/Gemfile index e642a0f..ab4d32b 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" # Allow the rails version to come from an ENV setting so Travis can test multiple versions. # See http://www.schneems.com/post/50991826838/testing-against-multiple-rails-versions/ -rails_version = ENV['RAILS_VERSION'] || '5.1.1' +rails_version = ENV['RAILS_VERSION'] || '5.1.2' gem 'rails', "#{rails_version}" @@ -15,6 +15,7 @@ end gem 'sqlite3' +gem 'rswag-specs', path: './rswag-specs' gem 'rswag-api', path: './rswag-api' gem 'rswag-ui', path: './rswag-ui' @@ -27,10 +28,9 @@ group :test do gem 'generator_spec' gem 'capybara' gem 'capybara-webkit' - gem 'rswag-specs', path: './rswag-specs' -end - -group :assets do - gem 'uglifier' - gem 'therubyracer' end +# +#group :assets do +# gem 'uglifier' +# gem 'therubyracer' +#end diff --git a/Gemfile.lock b/Gemfile.lock index 132eeed..23039f2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,90 +2,89 @@ PATH remote: rswag-api specs: rswag-api (1.3.0) - rails (>= 3.1, < 5.2) + railties (>= 3.1) PATH remote: rswag-specs specs: rswag-specs (1.3.0) - json (~> 1.8) + activesupport (>= 3.1) json-schema (~> 2.2) - rails (>= 3.1, < 5.2) - rspec-rails (>= 2.14, < 4) + railties (>= 3.1) PATH remote: rswag-ui specs: rswag-ui (1.3.0) - rails (>= 3.1, < 5.2) + actionpack (>= 3.1) + railties (>= 3.1) GEM remote: https://rubygems.org/ specs: - actioncable (5.1.1) - actionpack (= 5.1.1) + actioncable (5.1.2) + actionpack (= 5.1.2) nio4r (~> 2.0) websocket-driver (~> 0.6.1) - actionmailer (5.1.1) - actionpack (= 5.1.1) - actionview (= 5.1.1) - activejob (= 5.1.1) + actionmailer (5.1.2) + actionpack (= 5.1.2) + actionview (= 5.1.2) + activejob (= 5.1.2) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.1.1) - actionview (= 5.1.1) - activesupport (= 5.1.1) + actionpack (5.1.2) + actionview (= 5.1.2) + activesupport (= 5.1.2) rack (~> 2.0) rack-test (~> 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.1.1) - activesupport (= 5.1.1) + actionview (5.1.2) + activesupport (= 5.1.2) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.1.1) - activesupport (= 5.1.1) + activejob (5.1.2) + activesupport (= 5.1.2) globalid (>= 0.3.6) - activemodel (5.1.1) - activesupport (= 5.1.1) - activerecord (5.1.1) - activemodel (= 5.1.1) - activesupport (= 5.1.1) + activemodel (5.1.2) + activesupport (= 5.1.2) + activerecord (5.1.2) + activemodel (= 5.1.2) + activesupport (= 5.1.2) arel (~> 8.0) - activesupport (5.1.1) + activesupport (5.1.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (~> 0.7) minitest (~> 5.1) tzinfo (~> 1.1) - addressable (2.4.0) + addressable (2.5.1) + public_suffix (~> 2.0, >= 2.0.2) arel (8.0.0) builder (3.2.3) - capybara (2.10.1) + capybara (2.13.0) addressable mime-types (>= 1.16) nokogiri (>= 1.3.3) rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) - capybara-webkit (1.1.0) - capybara (~> 2.0, >= 2.0.2) + capybara-webkit (1.14.0) + capybara (>= 2.3.0, < 2.14.0) json concurrent-ruby (1.0.5) - diff-lcs (1.2.5) - erubi (1.6.0) - execjs (2.7.0) - generator_spec (0.9.3) + diff-lcs (1.3) + erubi (1.6.1) + generator_spec (0.9.4) activesupport (>= 3.0.0) railties (>= 3.0.0) globalid (0.4.0) activesupport (>= 4.2.0) i18n (0.8.4) - json (1.8.6) + json (2.1.0) json-schema (2.8.0) addressable (>= 2.4) - libv8 (3.16.14.15) loofah (2.0.3) nokogiri (>= 1.5.9) mail (2.6.6) @@ -99,55 +98,55 @@ GEM nio4r (2.1.0) nokogiri (1.8.0) mini_portile2 (~> 2.2.0) - power_assert (0.3.1) + power_assert (1.0.2) + public_suffix (2.0.5) rack (2.0.3) rack-test (0.6.3) rack (>= 1.0) - rails (5.1.1) - actioncable (= 5.1.1) - actionmailer (= 5.1.1) - actionpack (= 5.1.1) - actionview (= 5.1.1) - activejob (= 5.1.1) - activemodel (= 5.1.1) - activerecord (= 5.1.1) - activesupport (= 5.1.1) + rails (5.1.2) + actioncable (= 5.1.2) + actionmailer (= 5.1.2) + actionpack (= 5.1.2) + actionview (= 5.1.2) + activejob (= 5.1.2) + activemodel (= 5.1.2) + activerecord (= 5.1.2) + activesupport (= 5.1.2) bundler (>= 1.3.0, < 2.0) - railties (= 5.1.1) + railties (= 5.1.2) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) rails-html-sanitizer (1.0.3) loofah (~> 2.0) - railties (5.1.1) - actionpack (= 5.1.1) - activesupport (= 5.1.1) + railties (5.1.2) + actionpack (= 5.1.2) + activesupport (= 5.1.2) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (12.0.0) - ref (2.0.0) responders (2.4.0) actionpack (>= 4.2.0, < 5.3) railties (>= 4.2.0, < 5.3) - rspec-core (3.5.4) - rspec-support (~> 3.5.0) - rspec-expectations (3.5.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) sprockets (3.7.1) concurrent-ruby (~> 1.0) rack (> 1, < 3) @@ -155,22 +154,17 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - sqlite3 (1.3.12) - test-unit (3.2.1) + sqlite3 (1.3.13) + test-unit (3.2.5) power_assert - therubyracer (0.12.2) - libv8 (~> 3.16.14.0) - ref thor (0.19.4) thread_safe (0.3.6) tzinfo (1.2.3) thread_safe (~> 0.1) - uglifier (3.0.2) - execjs (>= 0.3.0, < 3) websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.2) - xpath (2.0.0) + xpath (2.1.0) nokogiri (~> 1.3) PLATFORMS @@ -180,7 +174,7 @@ DEPENDENCIES capybara capybara-webkit generator_spec - rails (= 5.1.1) + rails (= 5.1.2) responders rspec-rails rswag-api! @@ -188,8 +182,6 @@ DEPENDENCIES rswag-ui! sqlite3 test-unit - therubyracer - uglifier BUNDLED WITH 1.14.6 diff --git a/rswag-api/rswag-api.gemspec b/rswag-api/rswag-api.gemspec index 19ba7f0..80ec270 100644 --- a/rswag-api/rswag-api.gemspec +++ b/rswag-api/rswag-api.gemspec @@ -16,5 +16,5 @@ Gem::Specification.new do |s| s.files = Dir["{lib}/**/*"] + ["MIT-LICENSE", "Rakefile"] - s.add_dependency "rails", ">= 3.1", "< 5.2" + s.add_dependency 'railties', '>= 3.1' end diff --git a/rswag-specs/rswag-specs.gemspec b/rswag-specs/rswag-specs.gemspec index 17daaab..7c21c7f 100644 --- a/rswag-specs/rswag-specs.gemspec +++ b/rswag-specs/rswag-specs.gemspec @@ -16,8 +16,7 @@ Gem::Specification.new do |s| s.files = Dir["{lib}/**/*"] + ["MIT-LICENSE", "Rakefile" ] - s.add_dependency "rails", ">= 3.1", "< 5.2" - s.add_dependency 'json', '~> 1.8' + s.add_dependency 'activesupport', '>= 3.1' + s.add_dependency 'railties', '>= 3.1' s.add_dependency 'json-schema', '~> 2.2' - s.add_dependency 'rspec-rails', '>= 2.14', '< 4' end diff --git a/rswag-ui/rswag-ui.gemspec b/rswag-ui/rswag-ui.gemspec index edbbf82..95f9bc2 100644 --- a/rswag-ui/rswag-ui.gemspec +++ b/rswag-ui/rswag-ui.gemspec @@ -16,5 +16,6 @@ Gem::Specification.new do |s| s.files = Dir["{app,config,lib,vendor}/**/*"] + ["MIT-LICENSE", "Rakefile" ] - s.add_dependency "rails", ">= 3.1", "< 5.2" + s.add_dependency 'actionpack', '>=3.1' + s.add_dependency 'railties', '>= 3.1' end