nocebo/diaspora_federation
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #92 from SuperTux88/update-gems

Browse source 
Update gems
This commit is contained in:
Benjamin Neff 2018-01-19 02:10:07 +01:00
commit f735edadc3
No known key found for this signature in database
GPG key ID: 971464C3F1A90194
15 changed files with 150 additions and 125 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.rubocop.yml
View file

@ -190,6 +190,16 @@ Layout/EmptyLineBetweenDefs:
Style/NumericPredicate:
EnforcedStyle: comparison
# disable this for now, needs to be rechecked later
Style/DateTime:
Exclude:
- "lib/diaspora_federation/discovery/xrd_document.rb"
- "spec/lib/diaspora_federation/discovery/xrd_document_spec.rb"
# broken in 0.52.1
Layout/EmptyLinesAroundArguments:
Enabled: false
### backward compatibility
# only with ruby >= 2.3

7
.travis.yml
View file

@ -1,9 +1,10 @@
language: ruby
rvm:
- 2.4.1
- 2.3.4
- 2.2.7
- 2.5.0
- 2.4.3
- 2.3.6
- 2.2.9
- 2.1
gemfile:
- Gemfile

8
Gemfile
View file

@ -19,7 +19,7 @@ group :development do
# code style
gem "pronto", "0.9.5", require: false
gem "pronto-rubocop", "0.9.0", require: false
gem "rubocop", "0.50.0", require: false
gem "rubocop", "0.52.1", require: false
# automatic test runs
gem "guard-rspec", require: false
@ -40,7 +40,7 @@ end
group :test do
# rspec formatter
gem "fuubar", "2.2.0", require: false
gem "fuubar", "2.3.1", require: false
gem "nyan-cat-formatter", require: false
# test coverage
@ -58,6 +58,6 @@ group :development, :test do
gem "rake"
# unit tests
gem "rspec", "~> 3.6.0"
gem "rspec-rails", "~> 3.6.0"
gem "rspec", "~> 3.7.0"
gem "rspec-rails", "~> 3.7.0"
end

103
Gemfile.lock
View file

@ -46,28 +46,29 @@ GEM
concurrent-ruby (1.0.5)
crack (0.4.3)
safe_yaml (~> 1.0.0)
crass (1.0.3)
diff-lcs (1.3)
docile (1.1.5)
erubi (1.6.1)
ethon (0.10.1)
erubi (1.7.0)
ethon (0.11.0)
ffi (>= 1.3.0)
fabrication (2.16.3)
fabrication (2.19.0)
faraday (0.13.1)
multipart-post (>= 1.2, < 3)
faraday_middleware (0.12.2)
faraday (>= 0.7.4, < 1.0)
ffi (1.9.18)
formatador (0.2.5)
fuubar (2.2.0)
fuubar (2.3.1)
rspec-core (~> 3.0)
ruby-progressbar (~> 1.4)
gitlab (4.2.0)
gitlab (4.3.0)
httparty
terminal-table
guard (2.14.1)
guard (2.14.2)
formatador (>= 0.2.4)
listen (>= 2.7, < 4.0)
lumberjack (~> 1.0)
lumberjack (>= 1.0.12, < 2.0)
nenv (~> 0.1)
notiffany (~> 0.0)
pry (>= 0.9.12)
@ -81,10 +82,11 @@ GEM
guard-rubocop (1.3.0)
guard (~> 2.0)
rubocop (~> 0.20)
hashdiff (0.3.6)
hashdiff (0.3.7)
httparty (0.15.6)
multi_xml (>= 0.5.2)
i18n (0.8.6)
i18n (0.9.1)
concurrent-ruby (~> 1.0)
json (2.1.0)
json-schema (2.8.0)
addressable (>= 2.4)
@ -95,14 +97,15 @@ GEM
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
loofah (2.0.3)
loofah (2.1.1)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
lumberjack (1.0.12)
macaddr (1.7.1)
systemu (~> 2.6.2)
method_source (0.8.2)
method_source (0.9.0)
mini_portile2 (2.3.0)
minitest (5.10.3)
minitest (5.11.1)
multi_xml (0.6.0)
multipart-post (2.0.0)
nenv (0.3.0)
@ -113,11 +116,11 @@ GEM
shellany (~> 0.0)
nyan-cat-formatter (0.12.0)
rspec (>= 2.99, >= 2.14.2, < 4)
octokit (4.7.0)
octokit (4.8.0)
sawyer (~> 0.8.0, >= 0.5.3)
parallel (1.12.0)
parser (2.4.0.0)
ast (~> 2.2)
parallel (1.12.1)
parser (2.4.0.2)
ast (~> 2.3)
powerpack (0.1.1)
pronto (0.9.5)
gitlab (~> 4.0, >= 4.0.0)
@ -129,15 +132,15 @@ GEM
pronto-rubocop (0.9.0)
pronto (~> 0.9.0)
rubocop (~> 0.38, >= 0.35.0)
pry (0.11.0)
pry (0.11.3)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
pry-byebug (3.5.0)
method_source (~> 0.9.0)
pry-byebug (3.5.1)
byebug (~> 9.1)
pry (~> 0.10)
public_suffix (3.0.0)
public_suffix (3.0.1)
rack (2.0.3)
rack-test (0.7.0)
rack-test (0.8.2)
rack (>= 1.0, < 3)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
@ -152,42 +155,42 @@ GEM
thor (>= 0.18.1, < 2.0)
rainbow (2.2.2)
rake
rake (12.1.0)
rake (12.3.0)
rb-fsevent (0.10.2)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
rspec (3.6.0)
rspec-core (~> 3.6.0)
rspec-expectations (~> 3.6.0)
rspec-mocks (~> 3.6.0)
rspec (3.7.0)
rspec-core (~> 3.7.0)
rspec-expectations (~> 3.7.0)
rspec-mocks (~> 3.7.0)
rspec-collection_matchers (1.1.3)
rspec-expectations (>= 2.99.0.beta1)
rspec-core (3.6.0)
rspec-support (~> 3.6.0)
rspec-expectations (3.6.0)
rspec-core (3.7.1)
rspec-support (~> 3.7.0)
rspec-expectations (3.7.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.6.0)
rspec-support (~> 3.7.0)
rspec-json_expectations (2.1.0)
rspec-mocks (3.6.0)
rspec-mocks (3.7.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.6.0)
rspec-rails (3.6.1)
rspec-support (~> 3.7.0)
rspec-rails (3.7.2)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.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)
rubocop (0.50.0)
rspec-core (~> 3.7.0)
rspec-expectations (~> 3.7.0)
rspec-mocks (~> 3.7.0)
rspec-support (~> 3.7.0)
rspec-support (3.7.0)
rubocop (0.52.1)
parallel (~> 1.10)
parser (>= 2.3.3.1, < 3.0)
parser (>= 2.4.0.2, < 3.0)
powerpack (~> 0.1)
rainbow (>= 2.2.2, < 3.0)
rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.0, >= 1.0.1)
ruby-progressbar (1.8.3)
ruby-progressbar (1.9.0)
ruby_dep (1.5.0)
rugged (0.26.0)
safe_yaml (1.0.4)
@ -216,17 +219,17 @@ GEM
thread_safe (0.3.6)
typhoeus (1.3.0)
ethon (>= 0.9.0)
tzinfo (1.2.3)
tzinfo (1.2.4)
thread_safe (~> 0.1)
unicode-display_width (1.3.0)
uuid (2.3.8)
macaddr (~> 1.0)
valid (1.2.0)
webmock (3.0.1)
webmock (3.2.1)
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff
yard (0.9.9)
yard (0.9.12)
PLATFORMS
ruby
@ -236,7 +239,7 @@ DEPENDENCIES
diaspora_federation-json_schema!
diaspora_federation-rails!
diaspora_federation-test!
fuubar (= 2.2.0)
fuubar (= 2.3.1)
guard-rspec
guard-rubocop
json-schema-rspec (= 0.0.4)
@ -246,11 +249,11 @@ DEPENDENCIES
pry
pry-byebug
rake
rspec (~> 3.6.0)
rspec (~> 3.7.0)
rspec-collection_matchers (~> 1.1.2)
rspec-json_expectations (~> 2.1)
rspec-rails (~> 3.6.0)
rubocop (= 0.50.0)
rspec-rails (~> 3.7.0)
rubocop (= 0.52.1)
simplecov (= 0.15.1)
simplecov-rcov (= 0.2.3)
spring
@ -260,4 +263,4 @@ DEPENDENCIES
yard
BUNDLED WITH
1.15.4
1.16.1

2
diaspora_federation.gemspec
View file

@ -24,9 +24,9 @@ Gem::Specification.new do |s|
s.required_ruby_version = "~> 2.1"
s.add_dependency "nokogiri", "~> 1.6", ">= 1.6.8"
s.add_dependency "faraday", ">= 0.9.0", "< 0.14.0"
s.add_dependency "faraday_middleware", ">= 0.10.0", "< 0.13.0"
s.add_dependency "nokogiri", "~> 1.6", ">= 1.6.8"
s.add_dependency "typhoeus", "~> 1.0"
s.add_dependency "valid", "~> 1.0"
end

6
lib/diaspora_federation/discovery/discovery.rb
View file

@ -26,7 +26,7 @@ module DiasporaFederation
person
rescue DiscoveryError
raise # simply re-raise DiscoveryError
rescue => e # rubocop:disable Lint/RescueWithoutErrorClass
rescue => e # rubocop:disable Style/RescueStandardError
raise DiscoveryError, "Failed discovery for #{diaspora_id}: #{e.class}: #{e.message}"
end
@ -48,7 +48,7 @@ module DiasporaFederation
response = HttpClient.get(url)
raise "Failed to fetch #{url}: #{response.status}" unless response.success?
response.body
rescue => e # rubocop:disable Lint/RescueWithoutErrorClass
rescue => e # rubocop:disable Style/RescueStandardError
unless http_fallback && url.start_with?("https://")
raise DiscoveryError, "Failed to fetch #{url} for #{diaspora_id}: #{e.class}: #{e.message}"
end
@ -78,7 +78,7 @@ module DiasporaFederation
# This tries the WebFinger URL with https first, then falls back to http if webfinger_http_fallback is enabled.
@webfinger = WebFinger.from_json(get(webfinger_url, DiasporaFederation.webfinger_http_fallback))
rescue => e # rubocop:disable Lint/RescueWithoutErrorClass
rescue => e # rubocop:disable Style/RescueStandardError
logger.warn "WebFinger failed, retrying with legacy WebFinger for #{diaspora_id}: #{e.class}: #{e.message}"
@webfinger = WebFinger.from_xml(get(legacy_webfinger_url_from_host_meta))
end

2
lib/diaspora_federation/federation/diaspora_url_parser.rb
View file

@ -26,7 +26,7 @@ module DiasporaFederation
class_name = Entity.entity_class(type).to_s.rpartition("::").last
return if DiasporaFederation.callbacks.trigger(:fetch_related_entity, class_name, guid)
Fetcher.fetch_public(author, type, guid)
rescue => e # rubocop:disable Lint/RescueWithoutErrorClass
rescue => e # rubocop:disable Style/RescueStandardError
logger.error "Failed to fetch linked entity #{type}:#{guid}: #{e.class}: #{e.message}"
end
end

2
lib/diaspora_federation/federation/fetcher.rb
View file

@ -11,7 +11,7 @@ module DiasporaFederation
type = entity_name(entity_type).to_s
raise "Already fetching ..." if fetching[type].include?(guid)
fetch_from_url(author, type, guid)
rescue => e # rubocop:disable Lint/RescueWithoutErrorClass
rescue => e # rubocop:disable Style/RescueStandardError
raise NotFetchable, "Failed to fetch #{entity_type}:#{guid} from #{author}: #{e.class}: #{e.message}"
end

4
lib/diaspora_federation/federation/receiver.rb
View file

@ -15,7 +15,7 @@ module DiasporaFederation
Salmon::MagicEnvelope.unenvelop(magic_env_xml)
end
Public.new(magic_env).receive
rescue => e # rubocop:disable Lint/RescueWithoutErrorClass
rescue => e # rubocop:disable Style/RescueStandardError
logger.error "failed to receive public message: #{e.class}: #{e.message}"
logger.debug "received data:\n#{data}"
raise e
@ -36,7 +36,7 @@ module DiasporaFederation
Salmon::MagicEnvelope.unenvelop(magic_env_xml)
end
Private.new(magic_env, recipient_id).receive
rescue => e # rubocop:disable Lint/RescueWithoutErrorClass
rescue => e # rubocop:disable Style/RescueStandardError
logger.error "failed to receive private message for #{recipient_id}: #{e.class}: #{e.message}"
logger.debug "received data:\n#{data}"
raise e

2
lib/diaspora_federation/federation/receiver/abstract_receiver.rb
View file

@ -17,7 +17,7 @@ module DiasporaFederation
# Validates and receives the entity
def receive
validate_and_receive
rescue => e # rubocop:disable Lint/RescueWithoutErrorClass
rescue => e # rubocop:disable Style/RescueStandardError
logger.error "failed to receive #{entity}"
raise e
end

1
lib/tasks/gemfiles.rake
View file

@ -8,6 +8,7 @@ namespace :gemfiles do
original_gemfile.sub!(/(gemspec name:.*)/) { "#{Regexp.last_match[1]}, path: \"../../\"" }
original_gemfile.sub!(/(gemspec\(name:.*)\)/) { "#{Regexp.last_match[1]}, path: \"../../\")" }
original_gemfile.sub!(/^group :development do$.*?^end$\n\n/m, "")
original_gemfile << "\n gem \"fabrication\", \"< 2.17.0\"\n" # new versions are not compatible with ruby 2.1
rails4_version = "4.2.8"
rails4_gemfile = "#{original_gemfile}\ngem \"actionpack\", \"#{rails4_version}\"\n"

6
test/gemfiles/no-rails.Gemfile
View file

@ -17,7 +17,7 @@ end
group :test do
# rspec formatter
gem "fuubar", "2.2.0", require: false
gem "fuubar", "2.3.1", require: false
gem "nyan-cat-formatter", require: false
# test coverage
@ -35,5 +35,7 @@ group :development, :test do
gem "rake"
# unit tests
gem "rspec", "~> 3.6.0"
gem "rspec", "~> 3.7.0"
end
gem "fabrication", "< 2.17.0"

43
test/gemfiles/no-rails.Gemfile.lock
View file

@ -22,7 +22,7 @@ GEM
safe_yaml (~> 1.0.0)
diff-lcs (1.3)
docile (1.1.5)
ethon (0.10.1)
ethon (0.11.0)
ffi (>= 1.3.0)
fabrication (2.16.3)
faraday (0.13.1)
@ -30,10 +30,10 @@ GEM
faraday_middleware (0.12.2)
faraday (>= 0.7.4, < 1.0)
ffi (1.9.18)
fuubar (2.2.0)
fuubar (2.3.1)
rspec-core (~> 3.0)
ruby-progressbar (~> 1.4)
hashdiff (0.3.6)
hashdiff (0.3.7)
json (2.1.0)
json-schema (2.8.0)
addressable (>= 2.4)
@ -48,25 +48,25 @@ GEM
mini_portile2 (~> 2.3.0)
nyan-cat-formatter (0.12.0)
rspec (>= 2.99, >= 2.14.2, < 4)
public_suffix (3.0.0)
rake (12.1.0)
rspec (3.6.0)
rspec-core (~> 3.6.0)
rspec-expectations (~> 3.6.0)
rspec-mocks (~> 3.6.0)
public_suffix (3.0.1)
rake (12.3.0)
rspec (3.7.0)
rspec-core (~> 3.7.0)
rspec-expectations (~> 3.7.0)
rspec-mocks (~> 3.7.0)
rspec-collection_matchers (1.1.3)
rspec-expectations (>= 2.99.0.beta1)
rspec-core (3.6.0)
rspec-support (~> 3.6.0)
rspec-expectations (3.6.0)
rspec-core (3.7.1)
rspec-support (~> 3.7.0)
rspec-expectations (3.7.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.6.0)
rspec-support (~> 3.7.0)
rspec-json_expectations (2.1.0)
rspec-mocks (3.6.0)
rspec-mocks (3.7.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.6.0)
rspec-support (3.6.0)
ruby-progressbar (1.8.3)
rspec-support (~> 3.7.0)
rspec-support (3.7.0)
ruby-progressbar (1.9.0)
safe_yaml (1.0.4)
simplecov (0.15.1)
docile (~> 1.1.0)
@ -81,7 +81,7 @@ GEM
uuid (2.3.8)
macaddr (~> 1.0)
valid (1.2.0)
webmock (3.0.1)
webmock (3.2.1)
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff
@ -93,11 +93,12 @@ DEPENDENCIES
diaspora_federation!
diaspora_federation-json_schema!
diaspora_federation-test!
fuubar (= 2.2.0)
fabrication (< 2.17.0)
fuubar (= 2.3.1)
json-schema-rspec (= 0.0.4)
nyan-cat-formatter
rake
rspec (~> 3.6.0)
rspec (~> 3.7.0)
rspec-collection_matchers (~> 1.1.2)
rspec-json_expectations (~> 2.1)
simplecov (= 0.15.1)
@ -105,4 +106,4 @@ DEPENDENCIES
webmock (~> 3.0)
BUNDLED WITH
1.15.4
1.16.1

8
test/gemfiles/rails4.Gemfile
View file

@ -17,7 +17,7 @@ end
group :test do
# rspec formatter
gem "fuubar", "2.2.0", require: false
gem "fuubar", "2.3.1", require: false
gem "nyan-cat-formatter", require: false
# test coverage
@ -35,8 +35,10 @@ group :development, :test do
gem "rake"
# unit tests
gem "rspec", "~> 3.6.0"
gem "rspec-rails", "~> 3.6.0"
gem "rspec", "~> 3.7.0"
gem "rspec-rails", "~> 3.7.0"
end
gem "fabrication", "< 2.17.0"
gem "actionpack", "4.2.8"

71
test/gemfiles/rails4.Gemfile.lock
View file

@ -40,12 +40,14 @@ GEM
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
builder (3.2.3)
concurrent-ruby (1.0.5)
crack (0.4.3)
safe_yaml (~> 1.0.0)
crass (1.0.3)
diff-lcs (1.3)
docile (1.1.5)
erubis (2.7.0)
ethon (0.10.1)
ethon (0.11.0)
ffi (>= 1.3.0)
fabrication (2.16.3)
faraday (0.13.1)
@ -53,36 +55,38 @@ GEM
faraday_middleware (0.12.2)
faraday (>= 0.7.4, < 1.0)
ffi (1.9.18)
fuubar (2.2.0)
fuubar (2.3.1)
rspec-core (~> 3.0)
ruby-progressbar (~> 1.4)
hashdiff (0.3.6)
i18n (0.8.6)
hashdiff (0.3.7)
i18n (0.9.1)
concurrent-ruby (~> 1.0)
json (2.1.0)
json-schema (2.8.0)
addressable (>= 2.4)
json-schema-rspec (0.0.4)
json-schema (~> 2.5)
rspec
loofah (2.0.3)
loofah (2.1.1)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
macaddr (1.7.1)
systemu (~> 2.6.2)
mini_portile2 (2.3.0)
minitest (5.10.3)
minitest (5.11.1)
multipart-post (2.0.0)
nokogiri (1.8.1)
mini_portile2 (~> 2.3.0)
nyan-cat-formatter (0.12.0)
rspec (>= 2.99, >= 2.14.2, < 4)
public_suffix (3.0.0)
public_suffix (3.0.1)
rack (1.6.8)
rack-test (0.6.3)
rack (>= 1.0)
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.8)
activesupport (>= 4.2.0.beta, < 5.0)
rails-dom-testing (1.0.9)
activesupport (>= 4.2.0, < 5.0)
nokogiri (~> 1.6)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.3)
@ -92,32 +96,32 @@ GEM
activesupport (= 4.2.8)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (12.1.0)
rspec (3.6.0)
rspec-core (~> 3.6.0)
rspec-expectations (~> 3.6.0)
rspec-mocks (~> 3.6.0)
rake (12.3.0)
rspec (3.7.0)
rspec-core (~> 3.7.0)
rspec-expectations (~> 3.7.0)
rspec-mocks (~> 3.7.0)
rspec-collection_matchers (1.1.3)
rspec-expectations (>= 2.99.0.beta1)
rspec-core (3.6.0)
rspec-support (~> 3.6.0)
rspec-expectations (3.6.0)
rspec-core (3.7.1)
rspec-support (~> 3.7.0)
rspec-expectations (3.7.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.6.0)
rspec-support (~> 3.7.0)
rspec-json_expectations (2.1.0)
rspec-mocks (3.6.0)
rspec-mocks (3.7.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.6.0)
rspec-rails (3.6.1)
rspec-support (~> 3.7.0)
rspec-rails (3.7.2)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.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)
ruby-progressbar (1.8.3)
rspec-core (~> 3.7.0)
rspec-expectations (~> 3.7.0)
rspec-mocks (~> 3.7.0)
rspec-support (~> 3.7.0)
rspec-support (3.7.0)
ruby-progressbar (1.9.0)
safe_yaml (1.0.4)
simplecov (0.15.1)
docile (~> 1.1.0)
@ -131,12 +135,12 @@ GEM
thread_safe (0.3.6)
typhoeus (1.3.0)
ethon (>= 0.9.0)
tzinfo (1.2.3)
tzinfo (1.2.4)
thread_safe (~> 0.1)
uuid (2.3.8)
macaddr (~> 1.0)
valid (1.2.0)
webmock (3.0.1)
webmock (3.2.1)
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff
@ -150,17 +154,18 @@ DEPENDENCIES
diaspora_federation-json_schema!
diaspora_federation-rails!
diaspora_federation-test!
fuubar (= 2.2.0)
fabrication (< 2.17.0)
fuubar (= 2.3.1)
json-schema-rspec (= 0.0.4)
nyan-cat-formatter
rake
rspec (~> 3.6.0)
rspec (~> 3.7.0)
rspec-collection_matchers (~> 1.1.2)
rspec-json_expectations (~> 2.1)
rspec-rails (~> 3.6.0)
rspec-rails (~> 3.7.0)
simplecov (= 0.15.1)
simplecov-rcov (= 0.2.3)
webmock (~> 3.0)
BUNDLED WITH
1.15.4
1.16.1