Skip to content

Commit 568cdaf

Browse files
authored
Merge pull request #66 from mconf/2476-bump-gem-versions
[PRT-2476] Bump gem versions
2 parents ab98ed1 + b9993d5 commit 568cdaf

12 files changed

Lines changed: 93 additions & 180 deletions

Dockerfile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
FROM ruby:2.6.5
1+
FROM ruby:3.4.5
22

3-
ENV app /usr/src/app
3+
ENV app=/usr/src/app
44

55
# Create app directory
66
RUN mkdir -p $app
@@ -9,5 +9,9 @@ WORKDIR $app
99
# Bundle app source
1010
COPY . $app
1111

12+
# Set the app directory as safe in Git, to avoid 'detected dubious ownership in repository' errors
13+
RUN git config --global --add safe.directory ${app}
14+
1215
# Install app dependencies
16+
RUN gem install bundler -v 2.6.9
1317
RUN bundle install

Gemfile

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,8 @@ source 'http://rubygems.org'
22

33
gemspec
44

5-
group :developement do
6-
gem 'rake', '>= 0.9'
7-
gem 'rdoc', '6.1.2.1'
8-
end
9-
105
group :development, :test do
11-
gem 'rspec', '~> 2.10'
12-
gem 'cucumber-rails'
6+
gem 'rspec'
137
gem 'forgery'
14-
gem 'bbbot-ruby', :git => 'https://github.com/mconf/bbbot-ruby.git'
15-
# gem 'rails_best_practices'
8+
gem 'rake'
169
end

Gemfile.lock

Lines changed: 19 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -1,98 +1,42 @@
1-
GIT
2-
remote: https://github.com/mconf/bbbot-ruby.git
3-
revision: fcfd8c4c71371653335a46d7462ee14a9301f546
4-
specs:
5-
bbbot-ruby (0.0.1)
6-
71
PATH
82
remote: .
93
specs:
104
bigbluebutton-api-ruby (1.9.1)
11-
childprocess (>= 1.0.1)
12-
ffi (>= 1.9.24)
13-
json (>= 1.8.6)
14-
nokogiri (>= 1.10.4)
15-
rack (>= 1.6.11)
16-
rubyzip (>= 1.3.0)
5+
base64 (>= 0.1.0)
176
xml-simple (~> 1.1)
187

198
GEM
209
remote: http://rubygems.org/
2110
specs:
22-
addressable (2.2.8)
23-
builder (3.0.0)
24-
capybara (1.1.2)
25-
mime-types (>= 1.16)
26-
nokogiri (>= 1.3.3)
27-
rack (>= 1.0.0)
28-
rack-test (>= 0.5.4)
29-
selenium-webdriver (~> 2.0)
30-
xpath (~> 0.1.4)
31-
childprocess (1.0.1)
32-
rake (< 13.0)
33-
cucumber (1.1.9)
34-
builder (>= 2.1.2)
35-
diff-lcs (>= 1.1.2)
36-
gherkin (~> 2.9.0)
37-
json (>= 1.4.6)
38-
term-ansicolor (>= 1.0.6)
39-
cucumber-rails (1.3.0)
40-
capybara (>= 1.1.2)
41-
cucumber (>= 1.1.8)
42-
nokogiri (>= 1.5.0)
43-
diff-lcs (1.1.3)
44-
ffi (1.9.24)
11+
base64 (0.3.0)
12+
diff-lcs (1.6.2)
4513
forgery (0.5.0)
46-
gherkin (2.9.3)
47-
json (>= 1.4.6)
48-
json (2.6.3)
49-
libwebsocket (0.1.3)
50-
addressable
51-
mime-types (1.18)
52-
mini_portile2 (2.8.1)
53-
multi_json (1.3.4)
54-
nokogiri (1.14.3)
55-
mini_portile2 (~> 2.8.0)
56-
racc (~> 1.4)
57-
racc (1.6.2)
58-
rack (2.2.3)
59-
rack-test (0.6.1)
60-
rack (>= 1.0)
6114
rake (12.3.3)
62-
rdoc (6.1.2.1)
6315
rexml (3.2.5)
64-
rspec (2.10.0)
65-
rspec-core (~> 2.10.0)
66-
rspec-expectations (~> 2.10.0)
67-
rspec-mocks (~> 2.10.0)
68-
rspec-core (2.10.0)
69-
rspec-expectations (2.10.0)
70-
diff-lcs (~> 1.1.3)
71-
rspec-mocks (2.10.0)
72-
rubyzip (1.3.0)
73-
selenium-webdriver (2.21.2)
74-
childprocess (>= 0.2.5)
75-
ffi (~> 1.0)
76-
libwebsocket (~> 0.1.3)
77-
multi_json (~> 1.0)
78-
rubyzip
79-
term-ansicolor (1.0.7)
16+
rspec (3.13.1)
17+
rspec-core (~> 3.13.0)
18+
rspec-expectations (~> 3.13.0)
19+
rspec-mocks (~> 3.13.0)
20+
rspec-core (3.13.5)
21+
rspec-support (~> 3.13.0)
22+
rspec-expectations (3.13.5)
23+
diff-lcs (>= 1.2.0, < 2.0)
24+
rspec-support (~> 3.13.0)
25+
rspec-mocks (3.13.5)
26+
diff-lcs (>= 1.2.0, < 2.0)
27+
rspec-support (~> 3.13.0)
28+
rspec-support (3.13.5)
8029
xml-simple (1.1.9)
8130
rexml
82-
xpath (0.1.4)
83-
nokogiri (~> 1.3)
8431

8532
PLATFORMS
8633
ruby
8734

8835
DEPENDENCIES
89-
bbbot-ruby!
9036
bigbluebutton-api-ruby!
91-
cucumber-rails
9237
forgery
93-
rake (>= 0.9)
94-
rdoc (= 6.1.2.1)
95-
rspec (~> 2.10)
38+
rake
39+
rspec
9640

9741
BUNDLED WITH
98-
1.17.3
42+
2.6.9

Rakefile

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,34 +2,12 @@ require 'rubygems'
22
require 'rdoc/task'
33
require 'rubygems/package_task'
44
require 'rspec/core/rake_task'
5-
require 'cucumber/rake/task'
65

76
desc 'Default: run tests.'
8-
# task :default => [:spec, :cucumber]
97
task :default => :spec
108

119
RSpec::Core::RakeTask.new(:spec)
1210

13-
Cucumber::Rake::Task.new do |t|
14-
15-
# Disable all features that need the bot. It isn't working since BigBlueButton 0.81.
16-
prepend = "--tags ~@need-bot"
17-
18-
# in jruby the class BigBlueButtonBot doesn't work (it uses fork)
19-
if defined?(RUBY_ENGINE) and RUBY_ENGINE == 'jruby'
20-
puts "Jruby detected, ignoring features with @need-bot"
21-
prepend = "--tags ~@need-bot"
22-
end
23-
24-
# defaults to the latest version, that runs all tests
25-
# if set to 0.8 only, won't run tests for newer versions
26-
if ENV["V"] == "0.8" or ENV["VERSION"] == "0.8"
27-
t.cucumber_opts = "--format pretty --tags ~@wip --tags @version-all #{prepend}"
28-
else
29-
t.cucumber_opts = "--format pretty --tags ~@wip --tags @version-all,@version-081 #{prepend}"
30-
end
31-
end
32-
3311
RDoc::Task.new do |rdoc|
3412
rdoc.rdoc_files.include('README.md', 'LICENSE', 'LICENSE_003', 'CHANGELOG.md', 'lib/**/*.rb')
3513
rdoc.main = "README.md"

bigbluebutton-api-ruby.gemspec

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,6 @@ Gem::Specification.new do |s|
1414
s.files = `git ls-files`.split("\n")
1515
s.require_paths = ["lib"]
1616

17-
s.add_runtime_dependency('childprocess', '>= 1.0.1')
18-
s.add_runtime_dependency('ffi', '>= 1.9.24')
19-
s.add_runtime_dependency('json', '>= 1.8.6')
20-
s.add_runtime_dependency('nokogiri', '>= 1.10.4')
21-
s.add_runtime_dependency('rack', '>= 1.6.11')
22-
s.add_runtime_dependency('rubyzip', '>= 1.3.0')
2317
s.add_runtime_dependency('xml-simple', '~> 1.1')
18+
s.add_runtime_dependency('base64', '>= 0.1.0')
2419
end

features/step_definitions/check_status_steps.rb

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
When /^the method isMeetingRunning informs that the meeting is running$/ do
22
@req.response = @api.is_meeting_running?(@req.id)
3-
@req.response.should be_true
3+
@req.response.should be true
44
end
55

66
When /^the method isMeetingRunning informs that the meeting is not running$/i do
77
@req.response = @api.is_meeting_running?(@req.id)
8-
@req.response.should be_false
8+
@req.response.should be false
99
end
1010

1111
When /^calling the method get_meetings$/ do
@@ -29,8 +29,8 @@
2929
found[:attendeePW].should be_a(String)
3030
found[:attendeePW].should_not be_empty
3131
found[:moderatorPW].should == @req.mod_pass
32-
found[:hasBeenForciblyEnded].should be_false
33-
found[:running].should be_false
32+
found[:hasBeenForciblyEnded].should be false
33+
found[:running].should be false
3434
if @api.version >= "0.8"
3535
found[:meetingName].should == @req.id
3636
found[:createTime].should be_a(Numeric)
@@ -40,8 +40,8 @@
4040
When /^it shows all the information of the meeting that was created$/ do
4141
@req.response = @api.get_meeting_info(@req.id, @req.mod_pass)
4242
@req.response[:meetingID].should == @req.id
43-
@req.response[:running].should be_false
44-
@req.response[:hasBeenForciblyEnded].should be_false
43+
@req.response[:running].should be false
44+
@req.response[:hasBeenForciblyEnded].should be false
4545
@req.response[:startTime].should be_nil
4646
@req.response[:endTime].should be_nil
4747
@req.response[:participantCount].should == 0
@@ -70,7 +70,7 @@
7070

7171
@req.opts.has_key?(:record) ?
7272
(@req.response[:recording].should == @req.opts[:record]) :
73-
(@req.response[:recording].should be_false)
73+
(@req.response[:recording].should be false)
7474
@req.opts.has_key?(:maxParticipants) ?
7575
(@req.response[:maxUsers].should == @req.opts[:maxParticipants]) :
7676
(@req.response[:maxUsers].should == 20)
@@ -98,9 +98,9 @@
9898
@req.response = @api.get_meeting_info(@req.id, @req.mod_pass)
9999
participants = count.to_i
100100

101-
@req.response[:running].should be_true
101+
@req.response[:running].should be true
102102
@req.response[:moderatorCount].should > 0
103-
@req.response[:hasBeenForciblyEnded].should be_false
103+
@req.response[:hasBeenForciblyEnded].should be false
104104
@req.response[:participantCount].should == participants
105105
@req.response[:attendees].size.should == 2
106106

features/step_definitions/common_steps.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@
5757
end
5858

5959
When /^the response is successful$/ do
60-
@req.response[:returncode].should be_true
60+
@req.response[:returncode].should be true
6161
end
6262

6363
When /^the response is successful with no messages$/ do
64-
@req.response[:returncode].should be_true
64+
@req.response[:returncode].should be true
6565
@req.response[:messageKey].should == ""
6666
@req.response[:message].should == ""
6767
end
@@ -83,9 +83,9 @@
8383
end
8484

8585
When /^the response to the create method is successful and well formatted$/ do
86-
@req.response[:returncode].should be_true
86+
@req.response[:returncode].should be true
8787
@req.response[:meetingID].should == @req.id
88-
@req.response[:hasBeenForciblyEnded].should be_false
88+
@req.response[:hasBeenForciblyEnded].should be false
8989
@req.response[:messageKey].should == ""
9090
@req.response[:message].should == ""
9191

@@ -111,12 +111,12 @@
111111
end
112112

113113
When /^the response to the end method is successful and well formatted$/ do
114-
@req.response[:returncode].should be_true
114+
@req.response[:returncode].should be true
115115
@req.response[:messageKey].should == "sentEndMeetingRequest"
116116
@req.response[:message].should_not be_empty
117117
end
118118

119119
When /^the response to the get_recordings method is successful and well formatted$/ do
120-
@req.response[:returncode].should be_true
120+
@req.response[:returncode].should be true
121121
@req.response[:recordings].should == []
122122
end

features/step_definitions/end_meetings_steps.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,16 @@
2424
end
2525

2626
When /^the flag hasBeenForciblyEnded should be set$/ do
27-
@req.response[:hasBeenForciblyEnded].should be_true
27+
@req.response[:hasBeenForciblyEnded].should be true
2828
end
2929

3030
When /^the information returned by get_meeting_info is correct$/ do
3131
# check only what is different in a meeting that WAS ENDED
3232
# the rest is checked in other scenarios
3333

3434
@req.response = @api.get_meeting_info(@req.id, @req.mod_pass)
35-
@req.response[:running].should be_false
36-
@req.response[:hasBeenForciblyEnded].should be_true
35+
@req.response[:running].should be false
36+
@req.response[:hasBeenForciblyEnded].should be true
3737
@req.response[:participantCount].should == 0
3838
@req.response[:moderatorCount].should == 0
3939
@req.response[:attendees].should == []

features/step_definitions/recordings_steps.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212
When /^the meeting is set to be recorded$/ do
1313
@req.response = @api.get_meeting_info(@req.id, @req.mod_pass)
14-
@req.response[:returncode].should be_true
15-
@req.response[:recording].should be_true
14+
@req.response[:returncode].should be true
15+
@req.response[:recording].should be true
1616
end
1717

1818
When /^the user creates a meeting without the record flag$/ do
@@ -28,8 +28,8 @@
2828

2929
When /^the meeting is not set to be recorded$/i do
3030
@req.response = @api.get_meeting_info(@req.id, @req.mod_pass)
31-
@req.response[:returncode].should be_true
32-
@req.response[:recording].should be_false
31+
@req.response[:returncode].should be true
32+
@req.response[:recording].should be false
3333
end
3434

3535
When /^the user calls the get_recordings method$/ do

lib/bigbluebutton_api.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
require 'net/http'
2-
require 'cgi'
32
require 'rexml/document'
43
require 'digest/sha1'
54
require 'digest/sha2'

0 commit comments

Comments
 (0)