sportsflix 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a07fea841fba3e33d6b6107da4bf6a3c6e1cc62c
-  data.tar.gz: c70331e47828b00fa300f22e23111759ae30cc26
+  metadata.gz: dd7ec5c71729b4aa9385032df26998139d54e1c9
+  data.tar.gz: 3a9faa2b861c78917ef7ee66e42adb32bcc552fc
 SHA512:
-  metadata.gz: a266abb9098421fac6b0a82e92fcf302fb8dca0a4ab55a9bf5977ffc9700c39d2950a9ae63b87016b83c01f52d8fa5752a55f9ca575eb97f6ccd21d22293c8bd
-  data.tar.gz: ae6a9e451e144e970ca5dc4c56996ff1ceeb36c3eb02d917df453b7cb3af670e470fdddce4827a21229acfc9a3832ce96d7ddfe39dff1f07e5561756ea0746f6
+  metadata.gz: 2803dcdc2eee196546c1f4057223b57d90877c3a44be2af4880a7f3b6e704f6041b8a3a30247ad5f34b758b16df1297c68db0ae160e369d1c483b96fef8354b7
+  data.tar.gz: 37712bba003af41363a33bbc968276df8b673756cc164e7b4f41179fed5b0e2c08946f57af5ff1a0c3d84b272cb940fcd756f50d10154004526feed3817fb70e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sportsflix (1.0.0)
+    sportsflix (1.1.0)
       oga (~> 2.8)
       thor (~> 0.19.4)
 
@@ -15,7 +15,7 @@ GEM
     diff-lcs (1.3)
     docile (1.1.5)
     json (2.0.3)
-    oga (2.9)
+    oga (2.10)
       ast
       ruby-ll (~> 2.1)
     parser (2.3.3.1)

data/lib/sportsflix/cli.rb

@@ -22,6 +22,7 @@ module Sportsflix
     class_option('interactive', { :type => :boolean, :default => false })
     class_option('server-only', { :aliases => :s, :type => :boolean, :default => false })
     class_option('proxy-delay', { :type => :numeric, :default => DEFAULT_PROXY_DELAY })
+    class_option('server-ip', { :type => :string })
 
     desc('watch', 'watch stream in the chosen player')
     def watch

data/lib/sportsflix/players/proxies/acestream.rb

@@ -14,6 +14,7 @@ module Sportsflix
           def initialize(options)
             @verbose      = options[:verbose]
             @video_format = options['video-format']
+            @server_ip    = options['server-ip']
 
             @executor = Sportsflix::Utils::Executor.new(options)
           end
@@ -29,11 +30,15 @@ module Sportsflix
 
           def url(uri)
             stream_uuid = uri.sub(ACESTREAM_STREAM_URI_PREFIX, '')
-            machine_ip  = local_ip
+            machine_ip  = @server_ip || get_ip_from_host || local_ip
             "http://#{machine_ip}:8000/pid/#{stream_uuid}/stream.#{@video_format}"
           end
 
           private
+          def get_ip_from_host
+            ENV['DOCKER_HOST'].gsub(/tcp:\/\/(\S+?):.+/,'\1') if ENV['DOCKER_HOST']
+          end
+
           def local_ip
             # Turn off reverse DNS resolution temporarily
             orig                         = Socket.do_not_reverse_lookup

data/lib/sportsflix/version.rb

@@ -1,3 +1,3 @@
 module Sportsflix
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportsflix
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Rodrigo Fernandes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-14 00:00:00.000000000 Z
+date: 2017-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler