airstream 0.3.2 → 0.3.4

data/bin/airstream

@@ -70,23 +70,24 @@ begin
     exit 68
   end
 
+  io = Airstream::Io.new
+  io.quiet = options[:quiet]
+  io.verbose = options[:verbose]
   server = Airstream::Server.new(options[:reciever])
 
   puts "=> Ctrl-C to exit airstream"
   ARGV.each do |file|
 
     server.allow_local_httpd = options[:use_local_httpd]
-    puts "sending video file #{file}" if options[:verbose]
+    io.info "sending video file #{file}"
     server.video = file
 
-    print "loading " unless options[:quiet]
-    "|/-\\".chars.cycle.each do |c|
-      print c unless options[:quiet]
-      sleep(0.2)
-      print "\b" unless options[:quiet]
-      break unless server.loading?
+    io.print "loading"
+    while server.loading?
+      io.print "."
+      sleep(0.7)
     end
-    puts "done" unless options[:quiet]
+    io.puts " done"
 
     video_title = File.basename(file, '.mp4')
     pbar_options = {
@@ -94,14 +95,20 @@ begin
       total: server.video_duration,
       format: '%t |%b%i| %p%%'
     }
+
+    io.hide_input
     pbar = ProgressBar.create(pbar_options)
     while (elapsed_time=server.video_position) < server.video_duration
+      io.catch_input
+      break if io.quit? || io.skip?
       pbar.progress = elapsed_time
       formatted_time = Time.at(elapsed_time).gmtime.strftime('%R:%S')
       pbar.title = "#{video_title} #{formatted_time}"
-      sleep 1.0
+      sleep 0.5
     end
+    io.show_input
     pbar.finish
+    break if io.quit?
   end
 
 rescue Airplay::Protocol::InvalidMediaError

data/lib/airstream.rb

@@ -11,6 +11,7 @@ module Airstream
 end
 
 require 'airstream/version.rb'
+require 'airstream/io.rb'
 require 'airstream/network.rb'
 require 'airstream/node.rb'
 require 'airstream/video.rb'

data/lib/airstream/io.rb

@@ -0,0 +1,46 @@
+
+require 'io/wait'
+
+module Airstream
+  class Io
+    attr_writer :quiet, :verbose
+    attr_reader :key
+
+    def print(msg)
+      STDOUT.print msg unless @quiet
+    end
+
+    def puts(msg)
+      STDOUT.puts msg unless @quiet
+    end
+
+    def info(msg)
+      STDOUT.puts msg if @verbose
+    end
+
+    def hide_input
+      `stty raw -echo`
+    end
+
+    def show_input
+      `stty -raw echo`
+    end
+
+    def catch_input
+      @key = nil
+      if STDIN.ready?
+        @key = STDIN.getc
+      end
+    rescue
+      show_input
+    end
+
+    def quit?
+      @key == "q"
+    end
+
+    def skip?
+      @key == "s"
+    end
+  end
+end

data/lib/airstream/version.rb

@@ -1,4 +1,4 @@
 
 module Airstream
-  VERSION = '0.3.2'
+  VERSION = '0.3.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: airstream
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-07 00:00:00.000000000 Z
+date: 2012-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: airplay
@@ -43,6 +43,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: webrick
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -72,6 +104,7 @@ files:
 - bin/airimg
 - lib/airstream.rb
 - lib/airstream/version.rb
+- lib/airstream/io.rb
 - lib/airstream/network.rb
 - lib/airstream/node.rb
 - lib/airstream/video.rb