vlc-client 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e93182279e83b89bc91c7fd08478ad97dda296da
-  data.tar.gz: 5ad6b5688d2babebc662003918331874878405e8
+  metadata.gz: ae9ecda809fe61433d61d38c263715eebc2d99f3
+  data.tar.gz: 46c6ef80d8507cb05d6a32f0f274e7eaf629cfbb
 SHA512:
-  metadata.gz: 06f1446c87b4cf6939bbc84a470881246803091f4af8f658c3f73a865828759caee8a988d43e1e3e159d603f052b08074dc63f1e3abe54eb6a88348a719c5bcf
-  data.tar.gz: 8f80b8fb1b534516441df59b3f10c3a502eafa0bc7c40377a1db6e721bdda04ffb2f49aa18067dae0605a6e9d0db30f2b967f656730181a054948265df7eddee
+  metadata.gz: e6f404e88f192deca0dd42e1acef2d4808bb70675b5a2a370cb293e9056e905fe1346f8ca56fc42b0780bb279ae47b5a9eb5df73fbe73cafd838ad95b0169cf2
+  data.tar.gz: 41e9cda0d0b842f7a7e4e25917a7ae5cbc3c4bfd7623465a99e5dda5a7675342eb9e6640ac01abfdacc394e20849cc3cd67af996ef1b0d99d9d0b5f61d38143c

data/.travis.yml

@@ -1,3 +1,8 @@
+before_install:
+  #This is a temporary workaround a rubygems bug! Remove later
+  #see: https://github.com/bundler/bundler/issues/2784 & https://github.com/rubygems/rubygems/pull/763
+  - gem update --system 2.1.11
+  - gem --version
 language: ruby
 script: bundle exec rake --verbose --trace
 bundler_args: --without development
@@ -10,4 +15,4 @@ rvm:
   - 1.9.2
   - 1.9.3
   - 2.0.0
-  - ruby-head
+  - ruby-head

data/README.md

@@ -90,7 +90,7 @@ vlc.connect
 
 ## Notice
 
-vlc-client has been tested on linux but it should work on any VLC installation as long and the command line is responsive for `vlc` and `cvlc` calls. On Mac OSX these are not available by default. They can be created with:
+vlc-client has been tested on linux but it should work on any VLC installation as long as the command line is responsive for `vlc` and `cvlc` calls. On Mac OSX these are not available by default. They can be created with:
 
 ```
 ln -s /Applications/VLC.app/Contents/MacOS/VLC /usr/local/bin/vlc

data/lib/vlc-client.rb

@@ -24,6 +24,7 @@ module VLC
     include VLC::Client::VideoControls
     include VLC::Client::ConnectionManagement
 
+    attr_reader   :connection
     attr_accessor :host,
                   :port,
                   :server
@@ -69,8 +70,6 @@ module VLC
       bind_server(server, options) unless server.nil?
     end
 
-    attr_reader :connection
-
    private
     def bind_server(server, options = {})
       @connection.host = server.host

data/lib/vlc-client/server.rb

@@ -45,9 +45,21 @@ module VLC
     #
     def start(detached = false)
       return @pid if running?
-      rd, wr = IO.pipe
-
       detached ? @deamon = true : setup_traps
+
+      if RUBY_VERSION >= '1.9'
+        @pid = Process.spawn(headless? ? 'cvlc' : 'vlc',
+                             '--extraintf', 'rc', '--rc-host', "#{@host}:#{@port}",
+                             :pgroup => detached,
+                             :in => '/dev/null',
+                             :out => '/dev/null',
+                             :err => '/dev/null')
+
+        return @pid
+      end
+
+      # for Ruby 1.8 and below
+      rd, wr = IO.pipe
       if Process.fork      #parent
         wr.close
         @pid = rd.read.to_i
@@ -104,9 +116,20 @@ module VLC
 
   private
     def setup_traps
-      trap("EXIT") { stop }
-      trap("INT")  { stop }
-      trap("CLD")  { @pid = NullObject.new; @deamon = false }
+      trap("EXIT") do
+        stop
+        exit
+      end
+
+      trap("INT") do
+        stop
+        exit
+      end
+
+      trap("CLD") do
+        @pid = NullObject.new
+        @deamon = false
+      end
     end
 
     def detach
@@ -119,4 +142,4 @@ module VLC
       end
     end
   end
-end
+end

data/lib/vlc-client/version.rb

@@ -1,3 +1,3 @@
 module VLC
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/helper.rb

@@ -30,39 +30,21 @@ module Mocks
   end
 
   def mock_system_calls(opts = {})
-    if opts.fetch(:daemonized, false)
-      Process.should_receive(:fork).once.ordered.and_return(false)
-
-      if RUBY_VERSION < "1.9"
-        Process.should_receive(:setsid).once.ordered
-        Process.should_receive(:fork).once.ordered.and_return(false)
-        Dir.should_receive(:chdir).once.with("/")
-      else
-        Process.should_receive(:daemon).once
-      end
-      Process.should_receive(:pid).once.and_return(99)
-
-      rd = double('rd', :close => true)
-      wd = double('wd', :write => true, :close => true)
-      IO.stub(:pipe).and_return([rd, wd])
-
-      [STDIN, STDOUT, STDERR].each { |std| std.stub(:reopen) }
-
+    if RUBY_VERSION < "1.9"
+      # ruby 1.8.x system call stubs
+      rd = double('rd', :read => 99, :close => true)
+      wr = double('wr', :close => true)
+      IO.stub(:pipe).and_return([rd, wr])
+      Process.stub(:fork).twice.and_return(true)
+      Process.stub(:pid).once.and_return(99)
       Kernel.stub(:exec)
+      [STDIN, STDOUT, STDERR].each { |std| std.stub(:reopen) }
     else
-      Process.stub(:fork).and_return(true)
-
-      rd = double('rd', :read => 99, :close => true)
-      wd = double('wd', :close => true)
-      IO.stub(:pipe).and_return([rd, wd])
-
-      Process.should_receive(:kill).once.with('INT', 99) if opts.fetch(:kill, true)
+      # ruby 1.9+ process spwan mock
+      Process.should_receive(:spawn).once.and_return(99)
     end
-  end
 
-  def mock_sub_systems
-    mock_system_calls
-    mock_tcp_server
+    Process.should_receive(:kill).once.with('INT', 99) if opts.fetch(:kill, true)
   end
 
   def mock_file(filename)
@@ -76,4 +58,4 @@ end
 
 RSpec.configure do |cfg|
   cfg.include(Mocks)
-end
+end

data/spec/system_spec.rb

@@ -18,7 +18,6 @@ describe VLC::System do
   end
 
   it 'handles server lifecycle management to client code' do
-    mock_system_calls(:kill => false)
     mock_tcp_server(:close => false)
 
     vlc = VLC::System.new('127.0.0.1', 9999, :auto_start => false)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vlc-client
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Miguel Guinada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-15 00:00:00.000000000 Z
+date: 2014-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: retryable