From 8568a3efbda4991742f5445154d6763904d255c2 Mon Sep 17 00:00:00 2001 From: Chris Beer Date: Wed, 12 Jul 2017 13:53:52 -0700 Subject: [PATCH 1/3] Remove about_page gem, which isn't compatible with Rails 5.1 --- Gemfile | 1 - config/initializers/about_page.rb | 17 ----------------- config/routes.rb | 1 - spec/integration/about_page_spec.rb | 15 --------------- 4 files changed, 34 deletions(-) delete mode 100644 config/initializers/about_page.rb delete mode 100644 spec/integration/about_page_spec.rb diff --git a/Gemfile b/Gemfile index 730fa863e..def096427 100644 --- a/Gemfile +++ b/Gemfile @@ -78,7 +78,6 @@ gem 'ruby-prof' gem 'whenever', require: false # Stanford/Hydra related gems -gem 'about_page' gem 'active-fedora', '~> 8.2' gem 'blacklight', '~> 6.0' gem 'blacklight-hierarchy' diff --git a/config/initializers/about_page.rb b/config/initializers/about_page.rb deleted file mode 100644 index 3599b05ec..000000000 --- a/config/initializers/about_page.rb +++ /dev/null @@ -1,17 +0,0 @@ -AboutPage.configure do |config| - config.app = { :name => 'Argo', :version => Argo.version } - - config.dependencies = AboutPage::Dependencies.new - - config.environment = AboutPage::Environment.new({ - 'Ruby' => /^(RUBY|GEM_|rvm)/ - }) - - config.request = AboutPage::RequestEnvironment.new({ - 'HTTP Server' => /^(SERVER_|POW_)/, - 'WebAuth' => /^WEBAUTH_/ - }) - - config.fedora = AboutPage::Fedora.new(ActiveFedora::Base.connection_for_pid(0)) - config.solr = AboutPage::Solr.new(Dor::SearchService.solr, :expects => { :numDocs => 0 }) -end diff --git a/config/routes.rb b/config/routes.rb index 11e77a56c..d9e39df04 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -43,7 +43,6 @@ match 'catalog', :via => [:get, :post], :to => redirect { |params, req| req.fullpath.sub(%r{^/catalog}, '/view') }, as: 'search_catalog_redirect' match 'catalog/*all', :via => [:get, :post], :to => redirect { |params, req| req.fullpath.sub(%r{^/catalog}, '/view') }, as: 'catalog_redirect' - mount AboutPage::Engine => '/about(.:format)' match 'report', :to => 'report#index', :via => [:get, :post], :as => 'report' match 'report/data', :to => 'report#data', :via => [:get, :post], :as => 'report_data' match 'report/download', :to => 'report#download', :via => [:get, :post], :as => 'report_download' diff --git a/spec/integration/about_page_spec.rb b/spec/integration/about_page_spec.rb deleted file mode 100644 index 542a680be..000000000 --- a/spec/integration/about_page_spec.rb +++ /dev/null @@ -1,15 +0,0 @@ -require 'spec_helper' - -describe 'about_page', :type => :request do - before :each do - @current_user = mock_user(is_admin?: true) - allow_any_instance_of(ApplicationController).to receive(:current_user).and_return(@current_user) - end - - context 'about page tests' do - it 'should display the about page' do - visit '/about' - expect(page).to have_content('Dependencies') - end - end -end From aca6cd93275008526a22575079965a05244fcebf Mon Sep 17 00:00:00 2001 From: Chris Beer Date: Wed, 12 Jul 2017 13:56:44 -0700 Subject: [PATCH 2/3] Update dependencies --- Gemfile | 9 +- Gemfile.lock | 294 ++++++++++++++++++++++++++------------------------- db/schema.rb | 90 ++++++++-------- 3 files changed, 198 insertions(+), 195 deletions(-) diff --git a/Gemfile b/Gemfile index def096427..002de07f7 100644 --- a/Gemfile +++ b/Gemfile @@ -1,9 +1,9 @@ source 'https://rubygems.org' #Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '~> 5.0.0', '>= 5.0.0.1' +gem 'rails', '~> 5.1.0' # Use Puma as the app server -gem 'puma', '~> 3.0' +gem 'puma', '~> 3.7' # Use SCSS for stylesheets gem 'sass-rails', '~> 5.0' # Use Uglifier as compressor for JavaScript assets @@ -35,7 +35,7 @@ end group :development do # Access an IRB console on exception pages or by using <%= console %> anywhere in the code. gem 'web-console' - gem 'listen', '~> 3.0.5' + gem 'listen', '>= 3.0.5', '< 3.2' # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring gem 'spring' gem 'spring-watcher-listen', '~> 2.0.0' @@ -54,7 +54,7 @@ gem 'delayed_job_active_record' gem 'equivalent-xml', '>= 0.6.0' # For ignoring_attr_values() with arguments gem 'faraday' gem 'eye' # NOTE: if eye is upgraded, see the note in the 'bin/eye' script about checking to see whether that script needs upgrading (which won't happen automatically). -gem 'honeybadger', '~> 2.0' +gem 'honeybadger', '~> 3.0' gem 'jqgrid-jquery-rails' gem 'jquery-ui-rails', '~> 5.0' gem 'jquery-validation-rails' @@ -72,6 +72,7 @@ gem 'ebnf', '1.0.0' # 1.0 requires rdf 2.x; bundler bug stops it from resolving gem 'rdf-reasoner', '~> 0.3.0' # 0.4 requires rdf 2.x; bundler bug stops it from resolving correctly gem 'rdf-tabular', '~> 0.3.0' # 0.4 requires rdf 2.x; bundler bug stops it from resolving correctly gem 'rdf-microdata', '2.0.2' # 2.0.3 requires rdf 2.x; bundler bug stops it from resolving correctly +gem 'erubis' # implicit dependency required by rdf-rdfa/haml, no longer provided by default in Rails 5.1 gem 'retries' gem 'ruby-graphviz' gem 'ruby-prof' diff --git a/Gemfile.lock b/Gemfile.lock index c9f5e7412..043700a07 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,33 +8,30 @@ GIT GEM remote: https://rubygems.org/ specs: - about_page (0.3.1) - grit - rails (>= 3.2) - actioncable (5.0.2) - actionpack (= 5.0.2) - nio4r (>= 1.2, < 3.0) + actioncable (5.1.2) + actionpack (= 5.1.2) + nio4r (~> 2.0) websocket-driver (~> 0.6.1) - actionmailer (5.0.2) - actionpack (= 5.0.2) - actionview (= 5.0.2) - activejob (= 5.0.2) + 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.0.2) - actionview (= 5.0.2) - activesupport (= 5.0.2) + 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.0.2) - activesupport (= 5.0.2) + actionview (5.1.2) + activesupport (= 5.1.2) builder (~> 3.1) - erubis (~> 2.7.0) + erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - active-fedora (8.4.0) + active-fedora (8.4.1) active-triples (~> 0.4.0) activesupport (>= 3.0.0) deprecation @@ -49,27 +46,27 @@ GEM deprecation (~> 0.1) linkeddata (~> 1.1) rdf (~> 1.1) - activejob (5.0.2) - activesupport (= 5.0.2) + activejob (5.1.2) + activesupport (= 5.1.2) globalid (>= 0.3.6) - activemodel (5.0.2) - activesupport (= 5.0.2) - activerecord (5.0.2) - activemodel (= 5.0.2) - activesupport (= 5.0.2) - arel (~> 7.0) - activesupport (5.0.2) + 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.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (~> 0.7) minitest (~> 5.1) tzinfo (~> 1.1) - addressable (2.5.0) + addressable (2.5.1) public_suffix (~> 2.0, >= 2.0.2) - airbrussh (1.1.2) + airbrussh (1.3.0) sshkit (>= 1.6.1, != 1.7.0) - arel (7.1.4) + arel (8.0.0) ast (2.3.0) - autoprefixer-rails (6.7.7.1) + autoprefixer-rails (7.1.2.2) execjs bagit (0.4.0) docopt (~> 0.5.0) @@ -77,7 +74,8 @@ GEM barby (0.6.5) bcp47 (0.3.3) i18n - blacklight (6.8.0) + bindex (0.5.0) + blacklight (6.10.1) bootstrap-sass (~> 3.2) deprecation globalid @@ -98,8 +96,8 @@ GEM bundler (~> 1.2) thor (~> 0.18) byebug (9.0.6) - cancancan (1.16.0) - capistrano (3.8.0) + cancancan (2.0.0) + capistrano (3.8.2) airbrussh (>= 1.0.0) i18n rake (>= 10.0.0) @@ -114,14 +112,14 @@ GEM capistrano (~> 3.0) capistrano-passenger (0.2.0) capistrano (~> 3.0) - capistrano-rails (1.2.3) + capistrano-rails (1.3.0) capistrano (~> 3.1) capistrano-bundler (~> 1.1) - capistrano-shared_configs (0.1.2) + capistrano-shared_configs (0.2.2) capistrano3-delayed-job (1.7.3) capistrano (~> 3.0, >= 3.0.0) daemons (~> 1.2.4) - capybara (2.13.0) + capybara (2.14.4) addressable mime-types (>= 1.16) nokogiri (>= 1.3.3) @@ -151,16 +149,16 @@ GEM timers (>= 4.1.1) celluloid-supervision (0.20.6) timers (>= 4.1.1) - childprocess (0.6.2) + childprocess (0.7.1) ffi (~> 1.0, >= 1.0.11) chronic (0.10.2) cliver (0.3.2) codeclimate-test-reporter (1.0.8) simplecov (<= 0.13) coderay (1.1.1) - coffee-rails (4.2.1) + coffee-rails (4.2.2) coffee-script (>= 2.2.0) - railties (>= 4.0.0, < 5.2.x) + railties (>= 4.0.0) coffee-script (2.4.1) coffee-script-source execjs @@ -179,15 +177,14 @@ GEM crack (0.4.3) safe_yaml (~> 1.0.0) daemons (1.2.4) - database_cleaner (1.5.3) - debug_inspector (0.0.2) + database_cleaner (1.6.1) deep_merge (1.1.1) - delayed_job (4.1.2) - activesupport (>= 3.0, < 5.1) - delayed_job_active_record (4.1.1) - activerecord (>= 3.0, < 5.1) + delayed_job (4.1.3) + activesupport (>= 3.0, < 5.2) + delayed_job_active_record (4.1.2) + activerecord (>= 3.0, < 5.2) delayed_job (>= 3.0, < 5) - deprecation (0.2.2) + deprecation (0.99.0) activesupport diff-lcs (1.3) dlss-capistrano (3.4.1) @@ -197,11 +194,11 @@ GEM capistrano-shared_configs docile (1.1.5) docopt (0.5.0) - domain_name (0.5.20170223) + domain_name (0.5.20170404) unf (>= 0.0.5, < 1.0.0) dor-rights-auth (1.3.0) nokogiri - dor-services (5.22.2) + dor-services (5.24.1) active-fedora (>= 6.0, < 9.a) activesupport (>= 3.2.18) confstruct (~> 0.2.7) @@ -240,9 +237,10 @@ GEM sxp (~> 0.1, >= 0.1.3) equivalent-xml (0.6.0) nokogiri (>= 1.4.3) + erubi (1.6.1) erubis (2.7.0) execjs (2.7.0) - eye (0.9.1) + eye (0.9.2) celluloid (~> 0.17.3) celluloid-io (~> 0.17.0) sigar (~> 0.7.3) @@ -253,31 +251,27 @@ GEM factory_girl_rails (4.8.0) factory_girl (~> 4.8.0) railties (>= 3.0.0) - faraday (0.12.0.1) + faraday (0.12.1) multipart-post (>= 1.2, < 3) ffi (1.9.18) - globalid (0.3.7) - activesupport (>= 4.1.0) - grit (2.5.0) - diff-lcs (~> 1.1) - mime-types (~> 1.15) - posix-spawn (~> 0.3.6) + globalid (0.4.0) + activesupport (>= 4.2.0) haml (4.0.7) tilt - hashdiff (0.3.2) - hitimes (1.2.4) - honeybadger (2.7.2) + hashdiff (0.3.4) + hitimes (1.2.5) + honeybadger (3.1.2) hooks (0.4.1) uber (~> 0.0.14) htmlentities (4.3.4) http-cookie (1.0.3) domain_name (~> 0.5) http_logger (0.5.1) - i18n (0.8.1) + i18n (0.8.6) iso-639 (0.2.8) - jbuilder (2.6.3) - activesupport (>= 3.0.0, < 5.2) - multi_json (~> 1.2) + jbuilder (2.7.0) + activesupport (>= 4.2.0) + multi_json (>= 1.2) jettywrapper (2.0.4) activesupport (>= 3.0.0) childprocess @@ -334,9 +328,10 @@ GEM rdf-xsd (~> 1.1, >= 1.1.5) sparql (~> 1.99) sparql-client (~> 1.99) - listen (3.0.8) + listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) logger (1.2.8) loofah (2.0.3) nokogiri (>= 1.5.9) @@ -345,12 +340,14 @@ GEM nokogiri (>= 1.4.3.1) systemu (>= 1.2.0) validatable - mail (2.6.4) + mail (2.6.6) mime-types (>= 1.16, < 4) method_source (0.8.2) - mime-types (1.25.1) - mini_portile2 (2.1.0) - minitest (5.10.1) + mime-types (3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0521) + mini_portile2 (2.2.0) + minitest (5.10.2) moab-versioning (2.0.0) confstruct json @@ -364,14 +361,14 @@ GEM mods_display (0.4.1) i18n stanford-mods (~> 2.1) - modsulator (1.0.4) + modsulator (1.0.5) activesupport equivalent-xml (>= 0.6.0) nokogiri - roo (>= 1.1) + roo (= 2.5.1) multi_json (1.12.1) multipart-post (2.0.0) - mysql2 (0.4.5) + mysql2 (0.4.8) net-http-persistent (2.9.4) net-scp (1.2.1) net-ssh (>= 2.6.5) @@ -379,30 +376,30 @@ GEM net-ssh (>= 2.6.5) net-ssh (4.1.0) netrc (0.11.0) - newrelic_rpm (4.0.0.332) - nio4r (2.0.0) - nokogiri (1.7.1) - mini_portile2 (~> 2.1.0) + newrelic_rpm (4.2.0.334) + nio4r (2.1.0) + nokogiri (1.8.0) + mini_portile2 (~> 2.2.0) nokogiri-happymapper (0.5.9) nokogiri (~> 1.5) nom-xml (0.6.0) activesupport (>= 3.2.18) i18n nokogiri - okcomputer (1.14.1) + okcomputer (1.16.0) om (3.1.1) activemodel activesupport nokogiri (>= 1.4.2) solrizer (~> 3.3) + parallel (1.11.2) parser (2.4.0.0) ast (~> 2.2) pdf-core (0.4.0) - poltergeist (1.14.0) + poltergeist (1.15.0) capybara (~> 2.1) cliver (~> 0.3.1) websocket-driver (>= 0.2.0) - posix-spawn (0.3.13) powerpack (0.1.1) prawn (1.3.0) pdf-core (~> 0.4.0) @@ -419,50 +416,51 @@ GEM pry-doc (0.10.0) pry (~> 0.9) yard (~> 0.9) - pry-rails (0.3.5) - pry (>= 0.9.10) + pry-rails (0.3.6) + pry (>= 0.10.4) pry-remote (0.1.8) pry (~> 0.9) slop (~> 3.0) public_suffix (2.0.5) - puma (3.8.2) - rack (2.0.1) - rack-mini-profiler (0.10.2) + puma (3.9.1) + rack (2.0.3) + rack-mini-profiler (0.10.5) rack (>= 1.2.0) rack-test (0.6.3) rack (>= 1.0) - rails (5.0.2) - actioncable (= 5.0.2) - actionmailer (= 5.0.2) - actionpack (= 5.0.2) - actionview (= 5.0.2) - activejob (= 5.0.2) - activemodel (= 5.0.2) - activerecord (= 5.0.2) - activesupport (= 5.0.2) + 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.0.2) + railties (= 5.1.2) sprockets-rails (>= 2.0.0) - rails-controller-testing (1.0.1) - actionpack (~> 5.x) - actionview (~> 5.x) + rails-controller-testing (1.0.2) + actionpack (~> 5.x, >= 5.0.1) + actionview (~> 5.x, >= 5.0.1) activesupport (~> 5.x) - rails-dom-testing (2.0.2) - activesupport (>= 4.2.0, < 6.0) - nokogiri (~> 1.6) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) rails-html-sanitizer (1.0.3) loofah (~> 2.0) - railties (5.0.2) - actionpack (= 5.0.2) - activesupport (= 5.0.2) + railties (5.1.2) + actionpack (= 5.1.2) + activesupport (= 5.1.2) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rainbow (2.2.1) + rainbow (2.2.2) + rake rake (12.0.0) - rb-fsevent (0.9.8) - rb-inotify (0.9.8) - ffi (>= 0.5.0) + rb-fsevent (0.10.2) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) rdf (1.99.1) link_header (~> 0.0, >= 0.0.8) rdf-aggregate-repo (1.99.0) @@ -515,36 +513,39 @@ GEM rdf-xsd (1.99.0) rdf (~> 1.99) ref (2.0.0) - responders (2.3.0) - railties (>= 4.2.0, < 5.1) - rest-client (2.0.1) + responders (2.4.0) + actionpack (>= 4.2.0, < 5.3) + railties (>= 4.2.0, < 5.3) + rest-client (2.0.2) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) retries (0.0.5) - roo (2.7.1) + roo (2.5.1) nokogiri (~> 1) rubyzip (~> 1.1, < 2.0.0) - rsolr (1.1.2) + rsolr (2.0.2) builder (>= 2.1.2) - rspec-core (3.5.4) - rspec-support (~> 3.5.0) - rspec-expectations (3.5.0) + faraday + 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) - rubocop (0.47.1) + 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.49.1) + parallel (~> 1.10) parser (>= 2.3.3.1, < 3.0) powerpack (~> 0.1) rainbow (>= 1.99.1, < 3.0) @@ -554,6 +555,7 @@ GEM ruby-graphviz (1.2.3) ruby-prof (0.16.2) ruby-progressbar (1.8.1) + ruby_dep (1.5.0) rubydora (1.9.1) activemodel activesupport @@ -565,7 +567,7 @@ GEM rest-client rubyzip (1.2.1) safe_yaml (1.0.4) - sass (3.4.23) + sass (3.4.25) sass-rails (5.0.6) railties (>= 4.0.0, < 6) sass (~> 3.1) @@ -577,7 +579,7 @@ GEM docile (~> 1.1.0) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) - simplecov-html (0.10.0) + simplecov-html (0.10.1) slop (3.6.0) solrizer (3.4.1) activesupport @@ -598,7 +600,7 @@ GEM net-http-persistent (~> 2.9) rdf (>= 1.99, < 3) tins (= 1.6.0) - spring (2.0.1) + spring (2.0.2) activesupport (>= 4.2) spring-watcher-listen (2.0.1) listen (>= 2.7, < 4.0) @@ -611,19 +613,19 @@ GEM activesupport (>= 4.0) sprockets (>= 3.0.0) sqlite3 (1.3.13) - sshkit (1.13.1) + sshkit (1.14.0) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) stanford-mods (2.4.0) activesupport mods (~> 2.0, >= 2.0.2) - state_machines (0.4.0) - stomp (1.4.3) + state_machines (0.5.0) + stomp (1.4.4) sul_styles (0.6.1) rails (>= 4.1, < 6) sxp (0.1.5) systemu (2.6.5) - term-ansicolor (1.4.0) + term-ansicolor (1.6.0) tins (~> 1.0) therubyracer (0.12.3) libv8 (~> 3.16.14.15) @@ -637,28 +639,28 @@ GEM ttfunk (1.4.0) turbolinks (5.0.1) turbolinks-source (~> 5) - turbolinks-source (5.0.0) + turbolinks-source (5.0.3) twitter-typeahead-rails (0.11.1.pre.corejavascript) actionpack (>= 3.1) jquery-rails railties (>= 3.1) - tzinfo (1.2.2) + tzinfo (1.2.3) thread_safe (~> 0.1) uber (0.0.15) - uglifier (3.1.9) + uglifier (3.2.0) execjs (>= 0.3.0, < 3) unf (0.1.4) unf_ext - unf_ext (0.0.7.2) - unicode-display_width (1.1.3) + unf_ext (0.0.7.4) + unicode-display_width (1.3.0) uuidtools (2.1.5) validatable (1.6.7) - web-console (3.4.0) + web-console (3.5.1) actionview (>= 5.0) activemodel (>= 5.0) - debug_inspector + bindex (>= 0.4.0) railties (>= 5.0) - webmock (2.3.2) + webmock (3.0.1) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff @@ -670,15 +672,14 @@ GEM whenever (0.9.7) chronic (>= 0.6.3) xml-simple (1.1.5) - xpath (2.0.0) + xpath (2.1.0) nokogiri (~> 1.3) - yard (0.9.8) + yard (0.9.9) PLATFORMS ruby DEPENDENCIES - about_page active-fedora (~> 8.2) barby blacklight (~> 6.0) @@ -705,10 +706,11 @@ DEPENDENCIES dor-services (>= 5.22.2, < 6) ebnf (= 1.0.0) equivalent-xml (>= 0.6.0) + erubis eye factory_girl_rails faraday - honeybadger (~> 2.0) + honeybadger (~> 3.0) http_logger jbuilder (~> 2.5) jettywrapper @@ -717,7 +719,7 @@ DEPENDENCIES jquery-ui-rails (~> 5.0) jquery-validation-rails linkeddata (~> 1.99) - listen (~> 3.0.5) + listen (>= 3.0.5, < 3.2) moab-versioning mods_display mysql2 (~> 0.4.5) @@ -732,10 +734,10 @@ DEPENDENCIES pry-doc pry-rails pry-remote - puma (~> 3.0) + puma (~> 3.7) rack-mini-profiler rack-webauth! - rails (~> 5.0.0, >= 5.0.0.1) + rails (~> 5.1.0) rails-controller-testing rake rdf (~> 1.99) diff --git a/db/schema.rb b/db/schema.rb index 1f263ea99..7bcd17729 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -13,87 +13,87 @@ ActiveRecord::Schema.define(version: 20160318203331) do create_table "bookmarks", force: :cascade do |t| - t.integer "user_id", null: false - t.string "document_id" - t.string "title" + t.integer "user_id", null: false + t.string "document_id" + t.string "title" t.datetime "created_at" t.datetime "updated_at" - t.string "user_type" - t.string "document_type" + t.string "user_type" + t.string "document_type" t.index ["user_id"], name: "index_bookmarks_on_user_id" end create_table "bulk_actions", force: :cascade do |t| - t.string "action_type" - t.string "status" - t.string "log_name" - t.string "description" - t.integer "druid_count_total", default: 0 - t.integer "druid_count_success", default: 0 - t.integer "druid_count_fail", default: 0 - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.integer "user_id" + t.string "action_type" + t.string "status" + t.string "log_name" + t.string "description" + t.integer "druid_count_total", default: 0 + t.integer "druid_count_success", default: 0 + t.integer "druid_count_fail", default: 0 + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.integer "user_id" t.index ["user_id"], name: "index_bulk_actions_on_user_id" end create_table "delayed_jobs", force: :cascade do |t| - t.integer "priority", default: 0, null: false - t.integer "attempts", default: 0, null: false - t.text "handler", limit: 4294967295, null: false - t.text "last_error" + t.integer "priority", default: 0, null: false + t.integer "attempts", default: 0, null: false + t.text "handler", limit: 4294967295, null: false + t.text "last_error" t.datetime "run_at" t.datetime "locked_at" t.datetime "failed_at" - t.string "locked_by" - t.string "queue" + t.string "locked_by" + t.string "queue" t.datetime "created_at" t.datetime "updated_at" t.index ["priority", "run_at"], name: "delayed_jobs_priority" end create_table "indexing_exceptions", force: :cascade do |t| - t.string "pid" - t.text "solr_document" - t.string "dor_services_version" - t.text "exception" + t.string "pid" + t.text "solr_document" + t.string "dor_services_version" + t.text "exception" t.datetime "created_at" t.datetime "updated_at" t.index ["pid"], name: "index_indexing_exceptions_on_pid" end create_table "searches", force: :cascade do |t| - t.text "query_params" - t.integer "user_id" + t.text "query_params" + t.integer "user_id" t.datetime "created_at" t.datetime "updated_at" - t.string "user_type" + t.string "user_type" t.index ["user_id"], name: "index_searches_on_user_id" end create_table "users", force: :cascade do |t| - t.string "sunetid" + t.string "sunetid" t.datetime "created_at" t.datetime "updated_at" end create_table "wfs_rails_workflows", force: :cascade do |t| - t.string "druid", null: false - t.string "datastream", null: false - t.string "process", null: false - t.string "status" - t.text "error_msg" - t.binary "error_txt" - t.integer "attempts", default: 0, null: false - t.string "lifecycle" - t.decimal "elapsed", precision: 9, scale: 3 - t.string "repository" - t.integer "version", default: 1 - t.text "note" - t.integer "priority", default: 0 - t.string "lane_id", default: "default", null: false - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.string "druid", null: false + t.string "datastream", null: false + t.string "process", null: false + t.string "status" + t.text "error_msg" + t.binary "error_txt" + t.integer "attempts", default: 0, null: false + t.string "lifecycle" + t.decimal "elapsed", precision: 9, scale: 3 + t.string "repository" + t.integer "version", default: 1 + t.text "note" + t.integer "priority", default: 0 + t.string "lane_id", default: "default", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false end end From 0c55b6ef0f19ac46fb91f569dfb8c61c4d15b4cb Mon Sep 17 00:00:00 2001 From: Johnathan Martin Date: Wed, 5 Jul 2017 17:36:44 -0700 Subject: [PATCH 3/3] update the local copy of the bin/eye control script, since the dependency updates include an eye version update. mostly as a formality, seems pretty much the same as before. --- bin/eye | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/bin/eye b/bin/eye index 4f44180cc..406daec3c 100755 --- a/bin/eye +++ b/bin/eye @@ -1,11 +1,13 @@ -#!/usr/bin/env ruby_executable_hooks - -#NOTE: this script is a copy of the script included in a system-wide installation of eye v0.8. +#!/usr/bin/env ruby +# +## +#NOTE: this script is a copy of the script included in a system-wide installation of eye v0.9.2. # it is reproduced here so that eye can be run on deployment of argo to machines that lack a system-wide # installation of eye (which is the setup as of this comment's writing). if you upgrade the version of eye # that argo uses, check to see whether this needs to be upgraded. - -# (text from the original installation) +# +# (original script reproduced unchanged, except for this comment) +## # This file was generated by RubyGems. # # The application 'eye' is installed as part of a gem, and @@ -14,7 +16,7 @@ require 'rubygems' -version = ">= 0" +version = ">= 0.a" if ARGV.first str = ARGV.first @@ -25,6 +27,4 @@ if ARGV.first end end -gem 'eye', version load Gem.bin_path('eye', 'eye', version) -