[ontoportal-bot] Gemfile.lock update

Gemfile

@@ -16,6 +16,7 @@ gem 'sinatra-contrib', '~> 1.0'
 gem 'request_store'
 gem 'parallel'
 gem 'json-ld'
+gem 'addressable', '~> 2.8'
 
 
 # Rack middleware
@@ -41,10 +42,6 @@ gem 'newrelic_rpm'
 # HTTP server
 gem 'unicorn'
 gem 'unicorn-worker-killer'
-gem "puma", "~> 6.4"
-gem "faye-websocket", "~> 0.11.3"
-
-
 
 # Templating
 gem 'haml', '~> 5.2.2' # pin see https://github.com/ncbo/ontologies_api/pull/107
@@ -68,7 +65,7 @@ group :development do
   gem 'capistrano-rbenv', require: false
   gem 'ed25519', '>= 1.2', '< 2.0', require: false
   gem 'pry'
-  gem "listen", "~> 3.9"
+  gem 'shotgun', github: 'palexander/shotgun', branch: 'ncbo'
 end
 
 

Gemfile.lock

@@ -93,6 +93,14 @@ GIT
     rack-post-body-to-params (0.1.8)
       activesupport (>= 2.3)
 
+GIT
+  remote: https://github.com/palexander/shotgun.git
+  revision: db198224aaab2e4cb9b049adccb30e387d88bc3b
+  branch: ncbo
+  specs:
+    shotgun (0.9)
+      rack (>= 1.0)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -103,7 +111,7 @@ GEM
       public_suffix (>= 2.0.2, < 6.0)
     airbrussh (1.5.1)
       sshkit (>= 1.6.1, != 1.7.0)
-    backports (3.25.0)
+    backports (3.24.1)
     base64 (0.2.0)
     bcrypt (3.1.20)
     bcrypt_pbkdf (1.1.0)
@@ -133,7 +141,6 @@ GEM
     docile (1.4.0)
     domain_name (0.6.20240107)
     ed25519 (1.3.0)
-    eventmachine (1.2.7)
     faraday (1.10.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
@@ -157,9 +164,6 @@ GEM
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
     faraday-retry (1.0.3)
-    faye-websocket (0.11.3)
-      eventmachine (>= 0.12.0)
-      websocket-driver (>= 0.5.1)
     ffi (1.16.3)
     gapic-common (0.21.1)
       faraday (>= 1.9, < 3.a)
@@ -187,13 +191,12 @@ GEM
       representable (~> 3.0)
       retriable (>= 2.0, < 4.a)
       rexml
-    google-cloud-core (1.7.0)
+    google-cloud-core (1.6.1)
       google-cloud-env (>= 1.0, < 3.a)
       google-cloud-errors (~> 1.0)
     google-cloud-env (2.1.1)
       faraday (>= 1.0, < 3.a)
     google-cloud-errors (1.4.0)
-    google-protobuf (3.25.3-x86_64-darwin)
     google-protobuf (3.25.3-x86_64-linux)
     googleapis-common-protos (1.5.0)
       google-protobuf (~> 3.18)
@@ -234,9 +237,6 @@ GEM
     kgio (2.11.4)
     libxml-ruby (5.0.3)
     link_header (0.0.8)
-    listen (3.9.0)
-      rb-fsevent (~> 0.10, >= 0.10.3)
-      rb-inotify (~> 0.9, >= 0.9.10)
     logger (1.6.0)
     macaddr (1.7.2)
       systemu (~> 2.6.5)
@@ -248,7 +248,7 @@ GEM
     method_source (1.0.0)
     mime-types (3.5.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2024.0305)
+    mime-types-data (3.2024.0206)
     mini_mime (1.1.5)
     minitest (4.7.5)
     minitest-stub_any_instance (1.0.3)
@@ -279,16 +279,13 @@ GEM
     omni_logger (0.1.4)
       logger
     os (1.1.4)
-    parallel (1.24.0)
     parseconfig (1.1.2)
     pony (1.13.1)
       mail (>= 2.0)
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (5.0.4)
-    puma (6.4.2)
-      nio4r (~> 2.0)
     rack (1.6.13)
     rack-accept (0.4.5)
       rack (>= 0.4)
@@ -307,9 +304,6 @@ GEM
     rack-timeout (0.6.3)
     raindrops (0.20.1)
     rake (10.5.0)
-    rb-fsevent (0.11.2)
-    rb-inotify (0.10.1)
-      ffi (~> 1.0)
     rdf (3.2.11)
       link_header (~> 0.0, >= 0.0.8)
     rdf-raptor (3.2.0)
@@ -408,16 +402,12 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    websocket-driver (0.7.6)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.5)
 
 PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
   activesupport (~> 3.2)
-  addressable (~> 2.8)
   bcrypt_pbkdf (>= 1.0, < 2.0)
   bigdecimal (= 1.4.2)
   capistrano (~> 3)
@@ -427,13 +417,11 @@ DEPENDENCIES
   cube-ruby
   ed25519 (>= 1.2, < 2.0)
   faraday (~> 1.9)
-  faye-websocket (~> 0.11.3)
   ffi
   goo!
   haml (~> 5.2.2)
   json-ld
   json-schema (~> 2.0)
-  listen (~> 3.9)
   minitest (~> 4.0)
   minitest-stub_any_instance
   multi_json (~> 1.0)
@@ -443,10 +431,8 @@ DEPENDENCIES
   newrelic_rpm
   oj (~> 2.0)
   ontologies_linked_data!
-  parallel
   parseconfig
   pry
-  puma (~> 6.4)
   rack
   rack-accept (~> 0.4)
   rack-attack (~> 6.6.1)
@@ -463,6 +449,7 @@ DEPENDENCIES
   redis-rack-cache (~> 2.0)
   redis-store (= 1.9.1)
   request_store
+  shotgun!
   simplecov
   simplecov-cobertura
   sinatra (~> 1.0)

app.rb

@@ -187,16 +187,3 @@
   Pry.start binding, :quiet => true
   exit
 end
-
-
-require_relative 'lib/websockets/websockets_server'
-
-configure do
-  set :websocket_server, WebSocketServer.new(lambda { |env|
-    [200, { 'Content-Type' => 'text/plain' }, ['Hello World']]
-  })
-end
-
-Faye::WebSocket.load_adapter('puma')
-
-

bin/ontoportal

@@ -177,8 +177,7 @@ run_command() {
 dev() {
   echo "Starting OntoPortal API development server..."
 
-  local custom_command="ENVIRONMENT=development bundle exec puma -C config/puma.rb"
-  #local custom_command="ENVIRONMENT=development bundle exec rackup -p 9393 --host 0.0.0.0"
+  local custom_command="bundle exec shotgun --host 0.0.0.0  --env=development --port 9393"
   run_command "$custom_command" "$@"
 }