ngrok-tunnel 2.0.1 → 2.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c864e0a2db71b2c84350df7daba7ef501c75a2d
-  data.tar.gz: adbc7d33d04e99d3e657f53ff4c203d93a323b0e
+  metadata.gz: 9403b3ccb11df523110810244d731267ab8fa167
+  data.tar.gz: 00bb979f702a180d544b2330ad54141a992f64e0
 SHA512:
-  metadata.gz: f97a3e3eb817a84c124029ab9e40ea3d6bbd81548a576ba6c454f261564d9aa7a1150496d0b47035010d93a699b39543b7706d3e9fec113247e3a9f67dc25709
-  data.tar.gz: 96dbd1d0a73e59675ffe02e386953383d202c258b386665de17a6f4965ee40461fe274d5eab3f75e36806b1ed81d33ae804d27ed1b4b8f0720f3e8538293ab2f
+  metadata.gz: 547594a5dea6990a2382d644fbac257fc0d96d59af9d78eafc5cced6995e0b33c58be9dd73b873059b83eff7e3076a6ef63bc6ec2ddfa1a65897866c1ff2d97c
+  data.tar.gz: 48ed16dd13d5c8237dc7bb9a2f213c095e4eb19200121264acea53909608e52ee4500e8b78945111a963dbcca983f9f3c249d17e23958b5e6a2452c86603cd7e

data/README.md

@@ -2,7 +2,7 @@
 
 Ngrok-tunnel gem is a ruby wrapper for ngrok
 
-[![Gem Version](https://badge.fury.io/rb/ngrok-tunnel.svg)](http://badge.fury.io/rb/ngrok-tunnel)
+[![Gem Version](https://badge.fury.io/rb/ngrok-tunnel.svg)](http://badge.fury.io/rb/ngrok-tunnel)  [![Code Climate](https://codeclimate.com/github/bogdanovich/ngrok-tunnel/badges/gpa.svg)](https://codeclimate.com/github/bogdanovich/ngrok-tunnel)
 
 ## Installation
 

data/lib/ngrok/tunnel/version.rb

@@ -1,5 +1,5 @@
 module Ngrok
   class Tunnel
-    VERSION = "2.0.1"
+    VERSION = "2.0.16"
   end
 end

data/lib/ngrok/tunnel.rb

@@ -8,7 +8,7 @@ module Ngrok
   class Error < StandardError; end
 
   class Tunnel
-    
+
     class << self
       attr_reader :pid, :ngrok_url, :ngrok_url_https, :status
 
@@ -23,12 +23,12 @@ module Ngrok
 
         if stopped?
           @params[:log] = (@params[:log]) ? File.open(@params[:log], 'w+') : Tempfile.new('ngrok')
-          @pid = spawn("exec ngrok " + ngrok_exec_params)
-          at_exit { Ngrok::Tunnel.stop }      
+          @pid = spawn("exec ngrok http " + ngrok_exec_params)
+          at_exit { Ngrok::Tunnel.stop }
           @status = :running
           fetch_urls
         end
-        
+
         @ngrok_url
       end
 
@@ -72,7 +72,7 @@ module Ngrok
       private
 
       def ngrok_exec_params
-        exec_params = "-log=stdout " 
+        exec_params = "-log=stdout -log-level=debug "
         exec_params << "-authtoken=#{@params[:authtoken]} " if @params[:authtoken]
         exec_params << "-subdomain=#{@params[:subdomain]} " if @params[:subdomain]
         exec_params << "-config=#{@params[:config]} #{@params[:port].to_i} > #{@params[:log].path}"
@@ -81,15 +81,20 @@ module Ngrok
       def fetch_urls
         @params[:timeout].times do
           log_content = @params[:log].read
-          @ngrok_url, @ngrok_url_https = log_content.scan(/"Url":"([^"]+)"/).flatten
-          return @ngrok_url if @ngrok_url
+          result = log_content.scan(/URL:(.+)\sProto:(http|https)\s/)
+          if !result.empty?
+            result = Hash[*result.flatten].invert
+            @ngrok_url = result['http']
+            @ngrok_url_https = result['https']
+            return @ngrok_url if @ngrok_url
+          end
 
-          error = log_content.scan(/"Error":"([^"]+)"/).flatten
+          error = log_content.scan(/msg="command failed" err="([^"]+)"/).flatten
           unless error.empty?
             self.stop
             raise Ngrok::Error, error.first
           end
-          
+
           sleep 1
           @params[:log].rewind
         end

data/spec/tunnel/tunnel_spec.rb

@@ -42,21 +42,17 @@ describe Ngrok::Tunnel do
     end
 
     it "should have valid ngrok_url" do
-      expect(Ngrok::Tunnel.ngrok_url).to be =~ /http:\/\/.*ngrok.com$/
+      expect(Ngrok::Tunnel.ngrok_url).to be =~ /http:\/\/.*ngrok\.io$/
     end
 
     it "should have valid ngrok_url_https" do
-      expect(Ngrok::Tunnel.ngrok_url_https).to be =~ /https:\/\/.*ngrok.com$/
+      expect(Ngrok::Tunnel.ngrok_url_https).to be =~ /https:\/\/.*ngrok\.io$/
     end
 
     it "should have pid > 0" do
       expect(Ngrok::Tunnel.pid).to be > 0
     end
 
-    it "should present in process list" do
-      expect(Ngrok::Tunnel.pid.to_s).to eq `pidof ngrok`.strip
-    end
-
   end
 
   describe "Custom log file" do

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: ngrok-tunnel
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.16
 platform: ruby
 authors:
 - Anton Bogdanovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-24 00:00:00.000000000 Z
+date: 2015-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.10'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 description: Ngrok-tunnel gem is a ruby wrapper for ngrok
@@ -87,8 +87,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
+- .gitignore
+- .rspec
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -108,12 +108,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -125,3 +125,4 @@ summary: Ngrok-tunnel gem is a ruby wrapper for ngrok
 test_files:
 - spec/spec_helper.rb
 - spec/tunnel/tunnel_spec.rb
+has_rdoc: