activevlc 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7277724b68e5a47757cd221b47c6522bc74cf0c
-  data.tar.gz: 19a56e502c9d73feb2c0fdeb114dcaf98162d665
+  metadata.gz: 56e04816c9e72596198ffd78ca019173741da370
+  data.tar.gz: bcd7e86c5d4434d25424147cb6cfdf6d05aa554c
 SHA512:
-  metadata.gz: eaf8db920f751616a47ba9a46bcc252684d04120cf82703071ce66f6bf46fa9896165f26c383fa66866b453c3a27a6f0aa139ee8a542a4238dfa4084c5887014
-  data.tar.gz: 01bf1845e930f5ad7ee4cf4e0a929a869b986e1fb3ddc94f8c33547d4dff0d6ea782906ce1f84e958151cd479de2d88360e62de7ee5e5e8b2b49071dc7da2f22
+  metadata.gz: 4d927d352f1d6fe1e667eec163dd48d11a4deff7a8dbe5fd4772b5978c7e2d1c06cc2c72a9664b8a3b937b3e6cab168d54bd15779b0119cff4e2200ad91e441e
+  data.tar.gz: 2828541e9c4416d50bab649b5f7d330a6098df884bccf4b65d280eca9b431a838d4371695e038afa038e1f046c5716acf01997ee263555caef8c6fde736f3119

data/lib/activevlc/cli.rb

@@ -44,39 +44,26 @@ module ActiveVlc
     end
 
     desc 'exec path [input_file_1 [input_file_2] [...]]', 'Launch vlc executable to run the pipeline described in path file'
+    option :cmd, type: :boolean, default: false
     def exec(path, *inputs)
       if File.readable?(path)
         begin
           pipe = ActiveVlc::parse(path)
-          pipe.inputs << inputs
+          pipe.input << inputs
           fragment = pipe.fragment
         rescue
-          puts "Error while parsing pipe file"
+          puts "Error while parsing pipe file: #{$!}"
           exit 43
         end
-        Kernel.exec "cvlc -vvv --play-and-exit #{fragment}"
-      else
-        puts "Error: file [#{path}] doesn't exist or reading permission denied."
-      end
-        exit $?.exitstatus
-    end
-
-    desc 'run path [input_file_1 [input_file_2] [...]]', 'Run the path pipeline using LibVlc (usually better than exec)'
-    def run(path, *inputs)
-      if File.readable?(path)
-        begin
-          pipe = ActiveVlc::parse(path)
-          pipe.inputs << inputs
-          fragment = pipe.fragment
-        rescue
-          puts "Error while parsing pipe file"
-          exit 43
+        if options[:cmd]
+          Kernel.exec "vlc -I dummy -vvv --play-and-exit #{fragment}"
+        else
+          ActiveVlc::Runner.new(pipe).run
         end
-        ActiveVlc::Runner.new(pipe).run
       else
         puts "Error: file [#{path}] doesn't exist or reading permission denied."
       end
-      exit 0
+        exit $?.exitstatus
     end
 
     desc 'dump path', 'Dump the internal representation of the pipeline defined in the file path'

data/lib/activevlc/libvlc/event_manager.rb

@@ -44,7 +44,7 @@ module ActiveVlc::LibVlc
 
       @events_received += 1;
 
-      puts "Received event (#{@events_received}): #{EventType[event[:type]]}"
+      # puts "Received event (#{@events_received}): #{EventType[event[:type]]}"
 
       return unless @callbacks[event[:type]].is_a? Array
       @callbacks[event[:type]].each { |proc| proc.call(type) }

data/lib/activevlc/runner.rb

@@ -37,7 +37,8 @@ module ActiveVlc
       player = @api.create_player
       events = player.event_manager
 
-      sout.gsub!('\'', '').gsub!('"', '')
+      sout.gsub!('\'', '')
+      sout.gsub!('"', '')
 
       # Building the medias with the right options
       medias = @pipeline.input.inputs.map do |input|

data/lib/activevlc/version.rb

@@ -1,3 +1,4 @@
 module ActiveVlc
-  VERSION = "0.0.3"
+  CODENAME = "Reserved Words"
+  VERSION = "0.0.4"
 end

data/spec/runner_spec.rb

@@ -20,7 +20,7 @@ describe ActiveVlc::Runner do
     `rm -f #{out}`
   end
 
-  it 'can be ran in a separate process' do
+  it 'can be ran in a separate proces' do
     out = "output.ogg"
     pipe = ActiveVlc.parse('spec/pipes/no_input.rb')
     runner = ActiveVlc::Runner.new(pipe)
@@ -31,4 +31,9 @@ describe ActiveVlc::Runner do
     File.exist?(out).should be_true
     `rm -f #{out}`
   end
+
+  it 'can be ran using the cmd line' do
+    `bundle exec activevlc exec spec/pipes/basic.rb`
+    $?.exitstatus.should eq(0)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activevlc
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Julien 'Lta' BALLET
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-27 00:00:00.000000000 Z
+date: 2013-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler