Add vendored gitlab-shell to rspec

5 files changed, 45 insertions, 2 deletions

diff --git a/Makefile b/Makefile
index a19054faa..5e79ab055 100644
--- a/Makefile
+++ b/Makefile
@@ -47,6 +47,10 @@ test: prepare-build
 rspec: prepare-build
 	cd $(BUILD_DIR) && $(MAKE) $@
 
+.PHONY: rspec-gitlab-shell
+rspec-gitlab-shell: prepare-build
+	cd $(BUILD_DIR) && $(MAKE) $@
+
 .PHONY: verify
 verify: prepare-build
 	cd $(BUILD_DIR) && $(MAKE) $@
diff --git a/_support/makegen.go b/_support/makegen.go
index 3bd410f81..e8e7de6ba 100644
--- a/_support/makegen.go
+++ b/_support/makegen.go
@@ -310,7 +310,7 @@ binaries: assemble
 prepare-tests: {{ .TestRepo }} {{ .GitTestRepo }} ../.ruby-bundle
 
 .PHONY: test
-test: test-go rspec
+test: test-go rspec rspec-gitlab-shell
 
 .PHONY: test-go
 test-go: prepare-tests
@@ -324,6 +324,14 @@ race-go: prepare-tests
 rspec: assemble-go prepare-tests
 	cd  {{ .GitalyRubyDir }} && bundle exec rspec
 
+.PHONY: rspec-gitlab-shell
+rspec-gitlab-shell: {{ .GitlabShellDir }}/config.yml assemble-go prepare-tests
+	# rspec in {{ .GitlabShellRelDir }}
+	@cd  {{ .GitalyRubyDir }} && bundle exec bin/ruby-cd {{ .GitlabShellDir }} rspec
+
+{{ .GitlabShellDir }}/config.yml: {{ .GitlabShellDir }}/config.yml.example
+	cp $< $@
+
 .PHONY: verify
 verify: lint check-formatting staticcheck govendor-status notice-up-to-date govendor-tagged rubocop
 
diff --git a/ruby/.gitignore b/ruby/.gitignore
new file mode 100644
index 000000000..3b6ee585f
--- /dev/null
+++ b/ruby/.gitignore
@@ -0,0 +1 @@
+/coverage
diff --git a/ruby/Gemfile b/ruby/Gemfile
index e17ac114a..690195249 100644
--- a/ruby/Gemfile
+++ b/ruby/Gemfile
@@ -27,4 +27,10 @@ group :development, :test do
   gem 'rspec-parameterized', require: false
   gem 'timecop', require: false
   gem 'factory_bot', require: false
+
+  # gitlab-shell spec gems
+  gem 'listen', '~> 0.5.0'
+  gem 'simplecov', '~> 0.9.0', require: false
+  gem 'vcr', '~> 4.0.0'
+  gem 'webmock', '~> 3.4.0'
 end
diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock
index 7418309d7..4132df771 100644
--- a/ruby/Gemfile.lock
+++ b/ruby/Gemfile.lock
@@ -10,6 +10,8 @@ GEM
     adamantium (0.2.0)
       ice_nine (~> 0.11.0)
       memoizable (~> 0.4.0)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
     ast (2.4.0)
     binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
@@ -19,9 +21,12 @@ GEM
       adamantium (~> 0.2.0)
       equalizer (~> 0.0.9)
     concurrent-ruby (1.1.3)
+    crack (0.4.3)
+      safe_yaml (~> 1.0.0)
     crass (1.0.4)
     debug_inspector (0.0.3)
     diff-lcs (1.3)
+    docile (1.1.5)
     equalizer (0.0.11)
     escape_utils (1.2.1)
     factory_bot (4.11.1)
@@ -63,12 +68,14 @@ GEM
     grpc (1.15.0)
       google-protobuf (~> 3.1)
       googleapis-common-protos-types (~> 1.0.0)
+    hashdiff (0.3.8)
     i18n (1.1.1)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     json (2.1.0)
     licensee (8.9.2)
       rugged (~> 0.24)
+    listen (0.5.3)
     memoizable (0.4.2)
       thread_safe (~> 0.3, >= 0.3.1)
     mime-types (3.2.2)
@@ -76,6 +83,7 @@ GEM
     mime-types-data (3.2018.0812)
     mini_portile2 (2.3.0)
     minitest (5.11.3)
+    multi_json (1.13.1)
     multipart-post (2.0.0)
     nokogiri (1.8.5)
       mini_portile2 (~> 2.3.0)
@@ -91,6 +99,7 @@ GEM
       parser
       unparser
     procto (0.0.3)
+    public_suffix (3.0.3)
     rainbow (3.0.0)
     rdoc (4.3.0)
     rouge (3.3.0)
@@ -122,12 +131,18 @@ GEM
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.10.0)
     rugged (0.27.5)
+    safe_yaml (1.0.4)
     sanitize (4.6.6)
       crass (~> 1.0.2)
       nokogiri (>= 1.4.4)
       nokogumbo (~> 1.4)
     sentry-raven (2.7.4)
       faraday (>= 0.7.6, < 1.0)
+    simplecov (0.9.2)
+      docile (~> 1.1.0)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.9.0)
+    simplecov-html (0.9.0)
     stringex (2.8.4)
     thread_safe (0.3.6)
     timecop (0.9.1)
@@ -142,6 +157,11 @@ GEM
       equalizer (~> 0.0.9)
       parser (>= 2.3.1.2, < 2.6)
       procto (~> 0.0.2)
+    vcr (4.0.0)
+    webmock (3.4.2)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+      hashdiff
 
 PLATFORMS
   ruby
@@ -159,13 +179,17 @@ DEPENDENCIES
   google-protobuf (~> 3.6)
   grpc (~> 1.15.0)
   licensee (~> 8.9.0)
+  listen (~> 0.5.0)
   rdoc (~> 4.2)
   rspec
   rspec-parameterized
   rubocop (~> 0.50)
   rugged (~> 0.27)
   sentry-raven (~> 2.7.2)
+  simplecov (~> 0.9.0)
   timecop
+  vcr (~> 4.0.0)
+  webmock (~> 3.4.0)
 
 BUNDLED WITH
-   1.17.1
+   1.17.2