hyrax 2.3.0 → 2.3.1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 0df96c169892214d2f731b444c3035513aff1695
4
- data.tar.gz: 929e779d5ef621a5beae5765230ff1428833dd8a
3
+ metadata.gz: 77aab9ff04dd457969eb0262e7da89891fbd112d
4
+ data.tar.gz: 7f8c954f813b3195d68cbe5e4ef917dbda19bc60
5
5
  SHA512:
6
- metadata.gz: deeaf9148d5313e84849d68e129600deb7ea9d84098c504d30f8125793cfaf971e07c6284f5efea1cfbd4425e723a75d46100a2abf9ddc13d61b46f3b5c76786
7
- data.tar.gz: ecab45fc775aff812ceef8377a9d3f57bf76029b115b648a0ac99dacd02cf304f47351680601e0f113ddcd76cce97823ae9cdd3e6856aaea8eb5c098956b75a4
6
+ metadata.gz: '0968813adc8ee7ad3fd0048d271090b46fd0a5cf87cc8c4341d8ee0c446347f7b8c542011ebde50c82b64b4d400c7ca7e318c993be2599d1d2715d962d9fab02'
7
+ data.tar.gz: 7677d6c7657b5517e392d1df9fc6d2cfcf42d7b24b80fc312f1d41bfc9add536eb7307a990a9457fcc8d4c55a39f1d030d2ae87e79a3045b3b80d1e203b74b68
data/.circleci/config.yml CHANGED
@@ -8,17 +8,12 @@ jobs:
8
8
  docker:
9
9
  # legacy needed for phantomjs
10
10
  - image: circleci/ruby:2.5.1-node-browsers-legacy
11
- environment:
12
- RAILS_ENV: test
13
- RACK_ENV: test
14
- BUNDLE_JOBS: 4
15
- BUNDLE_RETRY: 3
16
- NOKOGIRI_USE_SYSTEM_LIBRARIES: true
17
- ENGINE_CART_RAILS_OPTIONS: --skip-git --skip-bundle --skip-listen --skip-spring --skip-yarn --skip-keeps --skip-action-cable --skip-coffee --skip-puma --skip-test
18
- SPEC_OPTS: --format progress --format RspecJunitFormatter --out /tmp/test-results/rspec.xml --format progress
19
11
  - image: circleci/redis:4
20
- # - image: yinlinchen/fcrepo4-docker:4.7.5
21
- # - image: solr:7
12
+ - image: ualbertalib/docker-fcrepo4:4.7
13
+ environment:
14
+ CATALINA_OPTS: "-Djava.awt.headless=true -Dfile.encoding=UTF-8 -server -Xms512m -Xmx1024m -XX:NewSize=256m -XX:MaxNewSize=256m -XX:PermSize=256m -XX:MaxPermSize=256m -XX:+DisableExplicitGC"
15
+ - image: solr:7
16
+ command: bin/solr -cloud -noprompt -f -p 8985
22
17
 
23
18
  # Specify service dependencies here if necessary
24
19
  # CircleCI maintains a library of pre-built images
@@ -26,33 +21,73 @@ jobs:
26
21
  # - image: circleci/postgres:9.4
27
22
 
28
23
  working_directory: ~/repo
24
+ parallelism: 2
25
+
26
+ environment:
27
+ RAILS_ENV: test
28
+ RACK_ENV: test
29
+ FCREPO_TEST_PORT: 8080/fcrepo
30
+ BUNDLE_JOBS: 4
31
+ BUNDLE_RETRY: 3
32
+ NOKOGIRI_USE_SYSTEM_LIBRARIES: true
33
+ ENGINE_CART_RAILS_OPTIONS: --skip-git --skip-bundle --skip-listen --skip-spring --skip-yarn --skip-keeps --skip-action-cable --skip-coffee --skip-puma --skip-test
34
+ SPEC_OPTS: --profile 10 --format RspecJunitFormatter --out /tmp/test-results/rspec.xml --format progress
35
+ COVERALLS_PARALLEL: true
29
36
 
30
37
  steps:
38
+ - restore_cache:
39
+ keys:
40
+ - source-v1-{{ .Branch }}-{{ .Revision }}
41
+ - source-v1-{{ .Branch }}-
42
+ - source-v1-
43
+
44
+ - checkout
45
+
46
+ - save_cache:
47
+ key: source-v1-{{ .Branch }}-{{ .Revision }}
48
+ paths:
49
+ - ".git"
50
+
51
+ # BUNDLE_PATH is unset to allow for `bundle config path` to take precedence.
31
52
  - run:
32
- name: Setup Interpolated ENV Variables
53
+ name: Extra environment setup
33
54
  command: |
34
- echo 'export BUNDLE_PATH="$CIRCLE_WORKING_DIRECTORY/vendor/bundle"' >> $BASH_ENV
55
+ echo 'unset BUNDLE_PATH' >> $BASH_ENV
35
56
 
36
- - checkout
57
+ - restore_cache:
58
+ keys:
59
+ - v1-internal-test-app-{{ .Branch }}
60
+ - v1-internal-test-app-
37
61
 
38
62
  # Download and cache dependencies
39
63
  - restore_cache:
40
64
  keys:
65
+ - v1-dependencies-{{ .Branch }}-{{ checksum "./.internal_test_app/.generated_engine_cart" }}
66
+ - v1-dependencies-{{ .Branch }}
41
67
  - v1-dependencies-
42
68
 
43
69
  - run:
44
- name: install dependencies
70
+ name: Install dependencies
45
71
  command: |
46
72
  gem update --system
73
+ gem update bundler
74
+ bundle config path $CIRCLE_WORKING_DIRECTORY/vendor/bundle
47
75
  bundle install
76
+
77
+ - run:
78
+ name: Call Rubocop
79
+ command: bundle exec rubocop
80
+
81
+ - run:
82
+ name: Generate test app, ensure top-level Gemfile.lock is valid
83
+ command: |
48
84
  bundle exec rake engine_cart:generate
85
+ bundle install
49
86
 
50
87
  - save_cache:
51
88
  paths:
52
- - ./Gemfile.lock
53
- - ./vendor/bundle
54
89
  - ./.internal_test_app
55
- key: v1-dependencies-{{ checksum "./.internal_test_app/.generated_engine_cart" }}
90
+ key: v1-internal-test-app-{{ .Branch }}-{{ checksum "./.internal_test_app/.generated_engine_cart" }}
56
91
 
57
92
  - run:
58
93
  name: Start headless Chrome
@@ -60,12 +95,27 @@ jobs:
60
95
  background: true
61
96
 
62
97
  - run:
63
- name: Run tests
98
+ name: Load config into SolrCloud
99
+ command: |
100
+ cd .internal_test_app/solr/config
101
+ zip -1 -r solr_hyrax_config.zip ./*
102
+ curl -H "Content-type:application/octet-stream" --data-binary @solr_hyrax_config.zip "http://localhost:8985/solr/admin/configs?action=UPLOAD&name=hyrax"
103
+ curl -H 'Content-type: application/json' http://localhost:8985/api/collections/ -d '{create: {name: hydra-test, config: hyrax, numShards: 1}}'
104
+
105
+ - run:
106
+ name: Run rspec in parallel
64
107
  command: |
65
108
  mkdir /tmp/test-results
66
- TEST_FILES="$(circleci tests glob "spec/**/*_spec.rb" | circleci tests split --split-by=timings)"
109
+ bundle exec rspec $(circleci tests glob "spec/**/*_spec.rb" | circleci tests split --split-by=timings)
110
+
111
+ - run:
112
+ name: Clean dependencies
113
+ command: bundle clean
67
114
 
68
- bundle exec rake ci
115
+ - save_cache:
116
+ paths:
117
+ - ./vendor/bundle
118
+ key: v1-dependencies-{{ .Branch }}-{{ checksum "./.internal_test_app/.generated_engine_cart" }}
69
119
 
70
120
  # collect reports
71
121
  - store_test_results:
@@ -0,0 +1,36 @@
1
+ The Samvera community is dedicated to providing a welcoming and
2
+ positive experience for all its members, whether they are at a formal
3
+ gathering, in a social setting, or taking part in activities online.
4
+ The Samvera community welcomes participation from people all over the
5
+ world and these members bring with them a wide variety of
6
+ professional, personal and social backgrounds; whatever these may be,
7
+ we treat colleagues with dignity and respect.
8
+
9
+ Community members communicate primarily in English, though for many of
10
+ them this is not their native language. We therefore strive to express
11
+ ourselves simply and clearly remembering that unnecessary use of
12
+ jargon and slang will be a barrier to understanding for many of our
13
+ colleagues. We are sensitive to the fact that the international
14
+ nature of the community means that we span many different social norms
15
+ around language and behaviour and we strive to conduct ourselves,
16
+ online and in person, in ways that are unlikely to cause offence.
17
+
18
+ Samvera conversations are often information-rich and intended to
19
+ generate discussion and debate. We discuss ideas from a standpoint of
20
+ mutual respect and reasoned argument.
21
+
22
+ Community members work together to promote a respectful and safe
23
+ community. In the event that someone’s conduct is causing offence or
24
+ distress, Samvera has a detailed
25
+ [Anti-Harassment Policy and Protocol](https://wiki.duraspace.org/display/samvera/Anti-Harassment+Policy)
26
+ which can be applied to address the problem. The first step in dealing
27
+ with any serious misconduct is to contact a local meeting organizer,
28
+ the
29
+ [Samvera community helpers](https://wiki.duraspace.org/display/samvera/Samvera+Community+Helpers)
30
+ ([email](mailto:helpers@samvera.org)), a community member you
31
+ trust, or the
32
+ [Samvera Steering Group](https://wiki.duraspace.org/display/samvera/Samvera+Steering+Group+membership)
33
+ immediately; at Samvera events, these people can be identified by
34
+ distinctive name badges. The
35
+ [Policy and Protocol](https://wiki.duraspace.org/display/samvera/Anti-Harassment+Policy)
36
+ should be consulted for fuller details.
data/README.md CHANGED
@@ -2,6 +2,7 @@
2
2
 
3
3
  Code: [![Version](https://badge.fury.io/rb/hyrax.png)](http://badge.fury.io/rb/hyrax)
4
4
  [![Build Status](https://travis-ci.org/samvera/hyrax.png?branch=master)](https://travis-ci.org/samvera/hyrax)
5
+ [![CircleCI](https://circleci.com/gh/samvera/hyrax.svg?style=svg)](https://circleci.com/gh/samvera/hyrax)
5
6
  [![Coverage Status](https://coveralls.io/repos/github/samvera/hyrax/badge.svg?branch=master)](https://coveralls.io/github/samvera/hyrax?branch=master)
6
7
  [![Code Climate](https://codeclimate.com/github/samvera/hyrax/badges/gpa.svg)](https://codeclimate.com/github/samvera/hyrax)
7
8
  [![Dependency Maintenance Status](https://dependencyci.com/github/samvera/hyrax/badge)](https://dependencyci.com/github/samvera/hyrax)
@@ -63,7 +64,7 @@ The Samvera community is here to help. Please see our [support guide](./.github/
63
64
  # Getting started
64
65
 
65
66
  This document contains instructions specific to setting up an app with __Hyrax
66
- v2.3.0__. If you are looking for instructions on installing a different
67
+ v2.3.1__. If you are looking for instructions on installing a different
67
68
  version, be sure to select the appropriate branch or tag from the drop-down
68
69
  menu above.
69
70
 
@@ -162,7 +163,7 @@ NOTE: The steps need to be done in order to create a new Hyrax based app.
162
163
  Generate a new Rails application using the template.
163
164
 
164
165
  ```
165
- rails _5.1.6_ new my_app -m https://raw.githubusercontent.com/samvera/hyrax/v2.3.0/template.rb
166
+ rails _5.1.6_ new my_app -m https://raw.githubusercontent.com/samvera/hyrax/v2.3.1/template.rb
166
167
  ```
167
168
 
168
169
  Generating a new Rails application using Hyrax's template above takes cares of a number of steps for you, including:
@@ -1,6 +1,5 @@
1
1
  require 'active_fedora/base'
2
2
  require 'active_fedora/version'
3
- raise "Verify this override is still needed for non 11.5.2 versions" unless ActiveFedora::VERSION == '11.5.2'
4
3
 
5
4
  module Hyrax
6
5
  module RepositoryReindexer
data/lib/hyrax/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Hyrax
2
- VERSION = '2.3.0'.freeze
2
+ VERSION = '2.3.1'.freeze
3
3
  end
data/template.rb CHANGED
@@ -1,4 +1,4 @@
1
- gem 'hyrax', '2.3.0'
1
+ gem 'hyrax', '2.3.1'
2
2
  run 'bundle install'
3
3
  generate 'hyrax:install', '-f'
4
4
  rails_command 'db:migrate'
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: hyrax
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.3.0
4
+ version: 2.3.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Justin Coyne
@@ -14,7 +14,7 @@ authors:
14
14
  autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
- date: 2018-09-19 00:00:00.000000000 Z
17
+ date: 2018-09-25 00:00:00.000000000 Z
18
18
  dependencies:
19
19
  - !ruby/object:Gem::Dependency
20
20
  name: rails
@@ -1086,6 +1086,7 @@ files:
1086
1086
  - ".rubocop_fixme.yml"
1087
1087
  - ".scss-lint.yml"
1088
1088
  - ".travis.yml"
1089
+ - CODE_OF_CONDUCT.md
1089
1090
  - Gemfile
1090
1091
  - LICENSE
1091
1092
  - README.md