Squashed 'buildres/csl/csl-locales/' changes from 79c4dba80a..bd8d2dbc85

bd8d2dbc85 Update spec_helper for pull-request testing (#220) ed3fc7c9be Update to Ruby 3.0.0 (#218) git-subtree-dir: buildres/csl/csl-locales git-subtree-split: bd8d2dbc85713b192d426fb02749475df30f0d2c
JabRef · May 1, 2021 · caa215b · caa215b
1 parent bf7344c
commit caa215b
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 26 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,4 +1,4 @@
-ruby '2.7.1'
+ruby '3.0.0'
 source 'https://rubygems.org'
 
 gem 'rake'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,56 +1,85 @@
 GIT
   remote: https://github.com/citation-style-language/Sheldon.git
-  revision: 1962fad73610a3e0b1610e0c24c16669d584196b
+  revision: 38b6de75ac4dd86d6b3b47c172431e6e44f53ca0
   specs:
-    sheldon (1.0.2)
+    sheldon (1.0.30)
       citeproc-ruby
       csl-styles
       diffy
       dotenv
+      erubis (~> 2.7)
+      faraday
+      faraday_middleware
+      git_diff
+      hashdiff (= 0.3.7)
       nokogiri
+      octokit (~> 4.0)
       ostruct
       reverse_markdown
 
 GEM
   remote: https://rubygems.org/
   specs:
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     citeproc (1.0.10)
       namae (~> 1.0)
-    citeproc-ruby (1.1.12)
+    citeproc-ruby (1.1.13)
       citeproc (~> 1.0, >= 1.0.9)
       csl (~> 1.5)
-    csl (1.5.1)
+    csl (1.5.2)
       namae (~> 1.0)
     csl-styles (1.0.1.10)
       csl (~> 1.0)
     diff-lcs (1.4.4)
     diffy (3.4.0)
     dotenv (2.7.6)
-    fuubar (2.5.0)
+    erubis (2.7.0)
+    faraday (1.3.0)
+      faraday-net_http (~> 1.0)
+      multipart-post (>= 1.2, < 3)
+      ruby2_keywords
+    faraday-net_http (1.0.1)
+    faraday_middleware (1.0.0)
+      faraday (~> 1.0)
+    fuubar (2.5.1)
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
-    mini_portile2 (2.4.0)
-    namae (1.0.1)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
-    ostruct (0.2.0)
-    rake (13.0.1)
+    git_diff (0.4.3)
+    hashdiff (0.3.7)
+    mini_portile2 (2.5.0)
+    multipart-post (2.1.1)
+    namae (1.0.2)
+    nokogiri (1.11.1)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
+    octokit (4.20.0)
+      faraday (>= 0.9)
+      sawyer (~> 0.8.0, >= 0.5.3)
+    ostruct (0.3.3)
+    public_suffix (4.0.6)
+    racc (1.5.2)
+    rake (13.0.3)
     reverse_markdown (2.0.0)
       nokogiri
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.2)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
-    ruby-progressbar (1.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    ruby-progressbar (1.11.0)
+    ruby2_keywords (0.0.4)
+    sawyer (0.8.2)
+      addressable (>= 2.3.5)
+      faraday (> 0.8, < 2.0)
 
 PLATFORMS
   ruby
@@ -64,7 +93,7 @@ DEPENDENCIES
   sheldon!
 
 RUBY VERSION
-   ruby 2.7.1
+   ruby 3.0.0p0
 
 BUNDLED WITH
-   2.1.4
+   2.2.3
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -2,6 +2,8 @@
 require 'json'
 
 LOCALE_ROOT = File.expand_path('../..', __FILE__)
+PULL_REQUEST = File.join(LOCALE_ROOT, 'pull-request')
+LOCALE_ROOT = PULL_REQUEST if File.directory?(PULL_REQUEST)
 
 NO_REGIONS = %w{
   eu ar la