ngrok-wrapper 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 270d9efa417c5821721519760816d3febbf085d183680ad0268a244eaec4a753
-  data.tar.gz: dd477aa0effed04807720dd6e22a3f607b79f88b343318c7d1674c18e573b056
+  metadata.gz: 73d4023376c99fae6a7c7c0e5461e1fb2fe91d83531bc77e35252e42e87a9795
+  data.tar.gz: 61eecae9040ebbe584b02cacea0c0a41a84d928dd6ebe7964c20f4b391e155e4
 SHA512:
-  metadata.gz: e8d752ee9ee727a5e54705e1c7d361b6babd13415a68173325df4cf4a2c7158fa37cc60920b8023e9b57b45c1ce1450325bcc17949885045ff1f1d3b9bebcb7a
-  data.tar.gz: 7f3e3c5404e138e6f4a01ed06c77d13f746bc977057b91494a26f98f80fa59fa2c55b992cf6bf015142e6bc38ff4fc1fcd73e5537e77018801a8b945e9b33623
+  metadata.gz: e20e1589b5b0e375acbbd59b0c6e7b472906a1f54534e6695492926fdad36b1aeec2a25fef568fb7527d9416c7a4cae78296473733ccb4166b8c6bbaec95ead4
+  data.tar.gz: 237102d6642b6f58f5be5e9b35dfe9782863f93662df84c6a9864728df9103c67e4bf12badc87fa481e80b7156b636caab7ecd7058dfb44467e4420968dc191d

data/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## [v0.2.0](https://github.com/texpert/ngrok-wrapper/tree/v0.2.0) (2022-02-19)
+
+### Making Ngrok process survive server stop on Linux
+
+It was working OK on Mac OS on the 0.1.0 release, but not on Linux.
+
+It came out that `Process.setsid` should be applied to the spawned process to establish this process as a new session 
+and process group leader. This is completely detaching it from the parent process, so it won't be killed when the 
+parent will go down.
+
+[Full Changelog](https://github.com/texpert/ngrok-wrapper/compare/v0.1.0...v0.2.0)
+
+**Merged pull requests:**
+
+- Add config.hosts example for Rails \>= 6.0.0 [\#18](https://github.com/texpert/ngrok-wrapper/pull/18) ([texpert](https://github.com/texpert))
+- Ngrok.start should try to return first @ngrok\_url\_https or then @ngrok\_url [\#17](https://github.com/texpert/ngrok-wrapper/pull/17) ([texpert](https://github.com/texpert))
+- Use fork, Process.setsid and spawn instead of just spawn, to change the owner of ngrok process [\#16](https://github.com/texpert/ngrok-wrapper/pull/16) ([texpert](https://github.com/texpert))
+
 ## [v0.1.0](https://github.com/texpert/ngrok-wrapper/tree/v0.1.0) (2022-01-09)
 
 [Full Changelog](https://github.com/texpert/ngrok-wrapper/compare/3e032fa019c91ee7338a7ad3a3335e6c5597b394...v0.1.0)

data/README.md

@@ -140,6 +140,7 @@ end
 
 ```ruby
 config.force_ssl = true if NGROK_ENABLED
+config.hosts << '.ngrok.io' if NGROK_ENABLED # for Rails >= 6.0.0
 
 config.action_mailer.default_url_options = {
   host: NGROK_ENABLED ? NGROK_URL.delete_prefix('https://') : 'myapp.local',

data/lib/ngrok/wrapper/version.rb

@@ -2,6 +2,6 @@
 
 module Ngrok
   class Wrapper
-    VERSION = '0.1.0'
+    VERSION = '0.2.0'
   end
 end

data/lib/ngrok/wrapper.rb

@@ -38,7 +38,7 @@ module Ngrok
           File.write(@persistence_file, { pid: @pid, ngrok_url: @ngrok_url, ngrok_url_https: @ngrok_url_https }.to_json)
         end
 
-        @ngrok_url
+        @ngrok_url_https || @ngrok_url
       end
 
       def stop
@@ -104,7 +104,7 @@ module Ngrok
       def ngrok_process_status_lines(refetch: false)
         return @ngrok_process_status_lines if defined?(@ngrok_process_status_lines) && !refetch
 
-        @ngrok_process_status_lines = (`ps ax | grep "ngrok http"`).split("\n")
+        @ngrok_process_status_lines = (`ps ax | grep "ngrok http"`).split("\n").map(&:strip)
       end
 
       def try_params_from_running_ngrok
@@ -134,7 +134,13 @@ module Ngrok
         # Prepare the log file into which ngrok output will be redirected in `ngrok_exec_params`
         @params[:log] = @params[:log] ? File.open(@params[:log], 'w+') : Tempfile.new('ngrok')
         if persistent_ngrok
-          Process.spawn("exec nohup ngrok http #{ngrok_exec_params} &")
+          fork do
+            Process.setsid
+            system("exec nohup ngrok http #{ngrok_exec_params} &")
+          end
+
+          sleep 0.5
+
           @pid = ngrok_process_status_lines(refetch: true)
                  .find { |line| line.include?('ngrok http -log') && line.end_with?(addr.to_s) }.split[0]
         else

data/spec/ngrok/wrapper_spec.rb

@@ -260,12 +260,13 @@ RSpec.describe 'Ngrok::Wrapper' do
               it 'set Ngrok::Wrapper pid and status attributes' do
                 expect(Ngrok::Wrapper).not_to receive(:spawn_new_ngrok)
 
-                Ngrok::Wrapper.start(persistence: true)
+                result = Ngrok::Wrapper.start(persistence: true)
 
                 expect(Ngrok::Wrapper.pid).to eql('795')
                 expect(Ngrok::Wrapper.status).to eql(:running)
                 expect(Ngrok::Wrapper.ngrok_url).to eql('http://b1cd-109-185-141-9.ngrok.io')
                 expect(Ngrok::Wrapper.ngrok_url_https).to eql('https://b1cd-109-185-141-9.ngrok.io')
+                expect(result).to eql('https://b1cd-109-185-141-9.ngrok.io')
               end
             end
 
@@ -306,13 +307,14 @@ RSpec.describe 'Ngrok::Wrapper' do
 
               it 'sets Ngrok::Wrapper pid and status attributes' do
                 allow(Ngrok::Wrapper).to receive(:spawn_new_ngrok).with(persistent_ngrok: true).and_call_original
+                allow(Ngrok::Wrapper).to receive(:fork).and_call_original
                 allow(Ngrok::Wrapper)
                   .to receive(:ngrok_process_status_lines).with(refetch: true).and_return(new_ngrok_ps_lines)
                 allow(Ngrok::Wrapper).to receive(:fetch_urls)
 
                 expect(Ngrok::Wrapper).to receive(:spawn_new_ngrok).with(persistent_ngrok: true)
-                expect(Ngrok::Wrapper)
-                  .to receive(:ngrok_process_status_lines).with(refetch: true)
+                expect(Ngrok::Wrapper).to receive(:fork)
+                expect(Ngrok::Wrapper).to receive(:ngrok_process_status_lines).with(refetch: true)
                 allow(Ngrok::Wrapper).to receive(:fetch_urls)
 
                 Ngrok::Wrapper.start(persistence: true)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ngrok-wrapper
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Anton Bogdanovich
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-09 00:00:00.000000000 Z
+date: 2022-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: github_changelog_generator