Commit Gemfile.lock for reproducible tests
Addressed a syntax error in the thrift.gemspec, and committed
Gemfile.lock files for both the gem and tests. Gems source switched
to https://rubygems.org.
This is a strongly recommended approach according to the Bundler team:
> As a result, you SHOULD check your Gemfile.lock into version control,
> in both applications and gems. If you do not, every machine that
> checks out your repository (including your production server) will
> resolve all dependencies again, which will result in different
> versions of third-party code being used if any of the gems in the
> Gemfile(5) or any of their dependencies have been updated.
https://bundler.io/man/bundle-install.1.html#THE-GEMFILE-LOCK
Also helps with Dependabot, which will be able to bump the lock file,
while we can relax version requirements in the gemspec.
diff --git a/.gitignore b/.gitignore
index b264b4b..9fc033f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -254,7 +254,6 @@
/lib/perl/pm_to_blib
/lib/py/build
/lib/py/thrift.egg-info/
-/lib/rb/Gemfile.lock
/lib/rb/debug_proto_test
/lib/rb/.config
/lib/rb/ext/conftest.dSYM/
@@ -373,7 +372,6 @@
/test/hs/TestServer
/test/php/php_ext_dir/
/test/py.twisted/_trial_temp/
-/test/rb/Gemfile.lock
/test/netstd/**/bin
/test/netstd/**/obj
/test/netstd/**/launchSettings.json
diff --git a/lib/rb/Gemfile b/lib/rb/Gemfile
index 1c86af9..b4e2a20 100644
--- a/lib/rb/Gemfile
+++ b/lib/rb/Gemfile
@@ -1,4 +1,3 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
gemspec
-
diff --git a/lib/rb/Gemfile.lock b/lib/rb/Gemfile.lock
new file mode 100644
index 0000000..796f299
--- /dev/null
+++ b/lib/rb/Gemfile.lock
@@ -0,0 +1,72 @@
+PATH
+ remote: .
+ specs:
+ thrift (0.23.0)
+
+GEM
+ remote: https://rubygems.org/
+ specs:
+ binding_of_caller (1.0.1)
+ debug_inspector (>= 1.2.0)
+ byebug (11.1.3)
+ coderay (1.1.3)
+ daemons (1.4.1)
+ debug_inspector (1.2.0)
+ diff-lcs (1.6.2)
+ eventmachine (1.2.7)
+ method_source (0.9.2)
+ pry (0.11.3)
+ coderay (~> 1.1.0)
+ method_source (~> 0.9.0)
+ pry-byebug (3.8.0)
+ byebug (~> 11.0)
+ pry (~> 0.10)
+ pry-stack_explorer (0.4.9.3)
+ binding_of_caller (>= 0.7)
+ pry (>= 0.9.11)
+ rack (2.2.21)
+ rack-test (0.8.3)
+ rack (>= 1.0, < 3)
+ rake (12.3.3)
+ rspec (3.13.2)
+ rspec-core (~> 3.13.0)
+ rspec-expectations (~> 3.13.0)
+ rspec-mocks (~> 3.13.0)
+ rspec-core (3.13.6)
+ rspec-support (~> 3.13.0)
+ rspec-expectations (3.13.5)
+ diff-lcs (>= 1.2.0, < 2.0)
+ rspec-support (~> 3.13.0)
+ rspec-mocks (3.13.7)
+ diff-lcs (>= 1.2.0, < 2.0)
+ rspec-support (~> 3.13.0)
+ rspec-support (3.13.6)
+ srv (1.0.0)
+ rack (>= 1.3.0)
+ thin (1.8.2)
+ daemons (~> 1.0, >= 1.0.9)
+ eventmachine (~> 1.0, >= 1.0.4)
+ rack (>= 1, < 3)
+
+PLATFORMS
+ arm64-darwin
+ arm64-linux
+ ruby
+ x86_64-darwin
+ x86_64-linux
+
+DEPENDENCIES
+ bundler (~> 2.2.34)
+ pry (~> 0.11.3)
+ pry-byebug (~> 3.6)
+ pry-stack_explorer (~> 0.4.9.2)
+ rack (>= 2.2.20)
+ rack-test (~> 0.8.3)
+ rake (~> 12.3)
+ rspec (~> 3.7)
+ srv (~> 1.0)
+ thin (~> 1.7)
+ thrift!
+
+BUNDLED WITH
+ 2.2.34
diff --git a/lib/rb/thrift.gemspec b/lib/rb/thrift.gemspec
index 744d078..288cc11 100644
--- a/lib/rb/thrift.gemspec
+++ b/lib/rb/thrift.gemspec
@@ -26,7 +26,7 @@
s.require_paths = %w[lib ext]
- s.add_development_dependency 'bundler', '~> 2.2.33"
+ s.add_development_dependency 'bundler', '~> 2.2.34'
s.add_development_dependency 'pry', '~> 0.11.3'
s.add_development_dependency 'pry-byebug', '~> 3.6'
s.add_development_dependency 'pry-stack_explorer', '~> 0.4.9.2'
@@ -37,4 +37,3 @@
s.add_development_dependency 'srv', '~> 1.0'
s.add_development_dependency 'thin', '~> 1.7'
end
-
diff --git a/test/rb/Gemfile b/test/rb/Gemfile
index 4ff0539..c75f7a0 100644
--- a/test/rb/Gemfile
+++ b/test/rb/Gemfile
@@ -1,6 +1,4 @@
-source "http://rubygems.org"
-
-require "rubygems"
+source "https://rubygems.org"
gem 'rack', '~> 2.0', '>= 2.0.4'
gem 'thin', '~> 1.7', '>= 1.7.2'
diff --git a/test/rb/Gemfile.lock b/test/rb/Gemfile.lock
new file mode 100644
index 0000000..8e64418
--- /dev/null
+++ b/test/rb/Gemfile.lock
@@ -0,0 +1,28 @@
+GEM
+ remote: https://rubygems.org/
+ specs:
+ daemons (1.4.1)
+ eventmachine (1.2.7)
+ power_assert (3.0.1)
+ rack (2.2.21)
+ test-unit (3.7.3)
+ power_assert
+ thin (1.8.2)
+ daemons (~> 1.0, >= 1.0.9)
+ eventmachine (~> 1.0, >= 1.0.4)
+ rack (>= 1, < 3)
+
+PLATFORMS
+ arm64-darwin
+ arm64-linux
+ ruby
+ x86_64-darwin
+ x86_64-linux
+
+DEPENDENCIES
+ rack (~> 2.0, >= 2.0.4)
+ test-unit (~> 3.2, >= 3.2.7)
+ thin (~> 1.7, >= 1.7.2)
+
+BUNDLED WITH
+ 2.2.34