1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
|
From: Lucas Kanashiro <kanashiro@ubuntu.com>
Date: Wed, 21 Feb 2024 19:05:52 -0300
Subject: Fix FTBFS with Ruby 3.2
Call File.exist? instead of File.exists?
Forwarded: no
---
lib/stomp_server.rb | 2 +-
lib/stomp_server/queue.rb | 2 +-
lib/stomp_server/queue/activerecord_queue.rb | 2 +-
lib/stomp_server/queue/dbm_queue.rb | 8 ++++----
lib/stomp_server/stomp_auth.rb | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/lib/stomp_server.rb b/lib/stomp_server.rb
index 4f5b03f..8dfb40b 100644
--- a/lib/stomp_server.rb
+++ b/lib/stomp_server.rb
@@ -57,7 +57,7 @@ module StompServer
end
puts copts.parse(ARGV)
- if File.exists?(@defaults[:configfile])
+ if File.exist?(@defaults[:configfile])
opts = @defaults.merge(YAML.load_file(@defaults[:configfile]))
else
opts = @defaults
diff --git a/lib/stomp_server/queue.rb b/lib/stomp_server/queue.rb
index 0ec1011..200f3d9 100644
--- a/lib/stomp_server/queue.rb
+++ b/lib/stomp_server/queue.rb
@@ -7,7 +7,7 @@ class Queue
@delete_empty = delete_empty
@directory = directory
Dir.mkdir(@directory) unless File.directory?(@directory)
- if File.exists?("#{@directory}/qinfo")
+ if File.exist?("#{@directory}/qinfo")
qinfo = Hash.new
File.open("#{@directory}/qinfo", "rb") { |f| qinfo = Marshal.load(f.read)}
@queues = qinfo[:queues]
diff --git a/lib/stomp_server/queue/activerecord_queue.rb b/lib/stomp_server/queue/activerecord_queue.rb
index b3fc3d2..1013e6b 100644
--- a/lib/stomp_server/queue/activerecord_queue.rb
+++ b/lib/stomp_server/queue/activerecord_queue.rb
@@ -20,7 +20,7 @@ class ActiveRecordQueue
# Load DB configuration
db_config = "#{configdir}/database.yml"
puts "reading from #{db_config}"
- if File.exists? db_config
+ if File.exist? db_config
db_params.merge! YAML::load(File.open(db_config))
end
diff --git a/lib/stomp_server/queue/dbm_queue.rb b/lib/stomp_server/queue/dbm_queue.rb
index 6fb1bc9..c875e96 100644
--- a/lib/stomp_server/queue/dbm_queue.rb
+++ b/lib/stomp_server/queue/dbm_queue.rb
@@ -49,10 +49,10 @@ class DBMQueue < Queue
def _close_queue(dest)
@db[dest][:dbh].close
dbname = @db[dest][:dbname]
- File.delete(dbname) if File.exists?(dbname)
- File.delete("#{dbname}.db") if File.exists?("#{dbname}.db")
- File.delete("#{dbname}.pag") if File.exists?("#{dbname}.pag")
- File.delete("#{dbname}.dir") if File.exists?("#{dbname}.dir")
+ File.delete(dbname) if File.exist?(dbname)
+ File.delete("#{dbname}.db") if File.exist?("#{dbname}.db")
+ File.delete("#{dbname}.pag") if File.exist?("#{dbname}.pag")
+ File.delete("#{dbname}.dir") if File.exist?("#{dbname}.dir")
end
def _writeframe(dest,frame,msgid)
diff --git a/lib/stomp_server/stomp_auth.rb b/lib/stomp_server/stomp_auth.rb
index 82567d8..0393012 100644
--- a/lib/stomp_server/stomp_auth.rb
+++ b/lib/stomp_server/stomp_auth.rb
@@ -6,7 +6,7 @@ attr_accessor :authorized
def initialize(passfile='.passwd')
@passfile = passfile
@authorized = Hash.new
- if File.exists?(@passfile)
+ if File.exist?(@passfile)
file = File.read(@passfile)
file.split(/\n/).each do |data|
next if data =~/^\s*#/
|
