vcs_ruby 1.1.8 → 1.1.9

data/lib/capturer.rb

@@ -1,69 +1,69 @@
-#
-# Capturer Baseclass
-#
-
-require 'vcs'
-
-module VCSRuby
-  class Capturer
-    $formats = { :png => 'png', :bmp => 'bmp', :tiff => 'tif', :mjpeg => 'jpg', :jpeg => 'jpg', :jpg => 'jpg' }
-
-    def available?
-      false
-    end
-
-    def self.initialize_capturers video
-      capturers = []
-
-      puts "Available capturers: #{available_capturers.map{ |c| c.to_s }.join(', ')}" if Tools.verbose?
-    end
-
-    def self.create
-      capturers = []
-
-      capturers << LibAV.new(video)
-      capturers << MPlayer.new(video)
-      capturers << FFmpeg.new(video)
-
-      return capturers.first
-    end
-
-    def format
-      @format || available_formats.first
-    end
-
-    def format_extension
-      $formats[format]
-    end
-
-    def format= format
-      if available_formats.include? format
-        @format = format
-      else
-        raise "Capturer '#{name}' does not support format: '#{format}'"
-      end
-    end
-
-  private
-    def probe_meta_information
-      check_cache
-      return parse_meta_info
-    rescue Exception => e
-      puts e
-      return false
-    end
-
-    def parse_meta_info
-      parse_format && parse_audio_streams && parse_video_streams
-    end
-
-    def get_hash defines
-      result = {}
-      defines.lines.each do |line|
-        kv = line.split("=")
-        result[kv[0].strip] = kv[1].strip if kv.count == 2
-      end
-      result
-    end
-  end
-end
+#
+# Capturer Baseclass
+#
+
+require 'vcs'
+
+module VCSRuby
+  class Capturer
+    $formats = { :png => 'png', :bmp => 'bmp', :tiff => 'tif', :mjpeg => 'jpg', :jpeg => 'jpg', :jpg => 'jpg' }
+
+    def available?
+      false
+    end
+
+    def self.initialize_capturers video
+      capturers = []
+
+      puts "Available capturers: #{available_capturers.map{ |c| c.to_s }.join(', ')}" if Tools.verbose?
+    end
+
+    def self.create
+      capturers = []
+
+      capturers << LibAV.new(video)
+      capturers << MPlayer.new(video)
+      capturers << FFmpeg.new(video)
+
+      return capturers.first
+    end
+
+    def format
+      @format || available_formats.first
+    end
+
+    def format_extension
+      $formats[format]
+    end
+
+    def format= format
+      if available_formats.include? format
+        @format = format
+      else
+        raise "Capturer '#{name}' does not support format: '#{format}'"
+      end
+    end
+
+  private
+    def probe_meta_information
+      check_cache
+      return parse_meta_info
+    rescue Exception => e
+      puts e
+      return false
+    end
+
+    def parse_meta_info
+      parse_format && parse_audio_streams && parse_video_streams
+    end
+
+    def get_hash defines
+      result = {}
+      defines.lines.each do |line|
+        kv = line.split("=")
+        result[kv[0].strip] = kv[1].strip if kv.count == 2
+      end
+      result
+    end
+  end
+end

data/lib/command.rb

@@ -1,51 +1,51 @@
-#
-# Command
-#
-
-module VCSRuby
-  class Command
-    attr_reader :name
-    def initialize name, command
-      @name = name
-      @command = which(command)
-      @available = !!@command
-    end
-
-    def available?
-      @available
-    end
-
-    def execute parameter, streams = 0, no_error = false
-      raise "Command '#{name}' not available" unless available?
-      puts "#{@command} #{parameter}" if Configuration.instance.verbose?
-      result = nil
-      if Tools::windows?
-        streams = '2> nul' if streams === 0
-
-        result = `cmd /C #{@command} #{parameter} #{streams}`
-      else
-        streams = "2> /dev/null" if streams === 0
-
-        result =`#{@command} #{parameter} #{streams}`
-      end
-
-      raise "#{@command} failed with return value '#{$?}'" unless $?.to_i == 0 || no_error
-      return result
-    end
-
-private
-    # http://stackoverflow.com/questions/2108727/which-in-ruby-checking-if-program-exists-in-path-from-ruby
-    def which cmd
-      exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
-      ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
-        exts.each do |ext|
-          exe = File.join(path, "#{cmd}#{ext}")
-          if File.executable?(exe) && !File.directory?(exe)
-            return exe
-          end
-        end
-      end
-      return nil
-    end
-  end
- end
+#
+# Command
+#
+
+module VCSRuby
+  class Command
+    attr_reader :name
+    def initialize name, command
+      @name = name
+      @command = which(command)
+      @available = !!@command
+    end
+
+    def available?
+      @available
+    end
+
+    def execute parameter, streams = 0, no_error = false
+      raise "Command '#{name}' not available" unless available?
+      puts "#{@command} #{parameter}" if Configuration.instance.verbose?
+      result = nil
+      if Tools::windows?
+        streams = '2> nul' if streams === 0
+
+        result = `cmd /S /C ""#{@command}" #{parameter} #{streams}"`
+      else
+        streams = "2> /dev/null" if streams === 0
+
+        result =`"#{@command} #{parameter}" #{streams}`
+      end
+
+      raise "#{@command} failed with return value '#{$?}'" unless $?.to_i == 0 || no_error
+      return result
+    end
+
+private
+    # http://stackoverflow.com/questions/2108727/which-in-ruby-checking-if-program-exists-in-path-from-ruby
+    def which cmd
+      exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
+      ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+        exts.each do |ext|
+          exe = File.join(path, "#{cmd}#{ext}")
+          if File.executable?(exe) && !File.directory?(exe)
+            return exe
+          end
+        end
+      end
+      return nil
+    end
+  end
+ end

data/lib/configuration.rb

@@ -1,150 +1,150 @@
-#
-# Configuration
-#
-
-require 'font'
-require 'singleton'
-
-class ::Hash
-    def deep_merge(second)
-        merger = proc { |key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : v2 }
-        self.merge(second, &merger)
-    end
-end
-
-module VCSRuby
-  class Configuration
-    include Singleton
-
-    attr_reader :header_font, :title_font, :timestamp_font, :signature_font
-    attr_writer :verbose, :quiet, :capturer
-
-    def initialize
-      default_config_file = File.expand_path("defaults.yml", File.dirname(__FILE__))
-      @config = ::YAML::load_file(default_config_file)
-
-      local_config_files = ['~/.vcs.rb.yml']
-      local_config_files.select{ |f| File.exists?(f) }.each do |local_config_file|
-        local_config = YAML::load_file(local_config_file)
-        @config = @config.deep_merge(local_config)
-      end
-
-      @header_font    = Font.new @config['style']['header']['font'],    @config['style']['header']['size']
-      @title_font     = Font.new @config['style']['title']['font'],     @config['style']['title']['size']
-      @timestamp_font = Font.new @config['style']['timestamp']['font'], @config['style']['timestamp']['size']
-      @signature_font = Font.new @config['style']['signature']['font'], @config['style']['signature']['size']
-    end
-
-    def load_profile profile
-      profiles = [File.expand_path("#{profile}.yml", File.dirname(__FILE__)), "~/#{profile}.yml"]
-
-      found = false
-      profiles.each do |profile|
-        if File.exists?(profile)
-          puts "Profile loaded: #{profile}" if verbose?
-          config = YAML::load_file(profile)
-          @config = @config.deep_merge(config)
-          found = true
-        end
-      end
-
-      raise "No profile '#{profile}' found" unless found
-    end
-
-    def verbose?
-      @verbose
-    end
-
-    def quiet?
-      @quiet
-    end
-
-    def capturer
-      @capturer || :any
-    end
-
-    def rows
-      @config['main']['rows'] ? @config['main']['rows'].to_i : nil
-    end
-
-    def columns
-      @config['main']['columns'] ? @config['main']['columns'].to_i : nil
-    end
-
-    def interval
-      @config['main']['interval'] ? TimeIndex.new(@config['main']['interval']) : nil
-    end
-
-    def padding
-      @config['main']['padding'] ? @config['main']['padding'].to_i : 2
-    end
-
-    def quality
-      @config['main']['quality'] ? @config['main']['quality'].to_i : 90
-    end
-
-    def header_background
-      @config['style']['header']['background']
-    end
-
-    def header_color
-      @config['style']['header']['color']
-    end
-
-    def title_background
-      @config['style']['title']['background']
-    end
-
-    def title_color
-      @config['style']['title']['color']
-    end
-
-    def highlight_background
-      @config['style']['highlight']['background']
-    end
-
-    def contact_background
-      @config['style']['contact']['background']
-    end
-
-    def timestamp_background
-      @config['style']['timestamp']['background']
-    end
-
-    def timestamp_color
-      @config['style']['timestamp']['color']
-    end
-
-    def signature_background
-      @config['style']['signature']['background']
-    end
-
-    def signature_color
-      @config['style']['signature']['color']
-    end
-
-    def blank_threshold
-      @config['lowlevel']['blank_threshold'].to_f
-    end
-
-    def blank_evasion?
-      @config['lowlevel']['blank_evasion']
-    end
-
-    def blank_alternatives
-      @config['lowlevel']['blank_alternatives'].map{ |e| TimeIndex.new e.to_i }
-    end
-
-    def timestamp
-      !!@config['filter']['timestamp']
-    end
-
-    def polaroid
-      !!@config['filter']['polaroid']
-    end
-
-    def softshadow
-      !!@config['filter']['softshadow']
-    end
-  end
- end
+#
+# Configuration
+#
+
+require 'font'
+require 'singleton'
+
+class ::Hash
+    def deep_merge(second)
+        merger = proc { |key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : v2 }
+        self.merge(second, &merger)
+    end
+end
+
+module VCSRuby
+  class Configuration
+    include Singleton
+
+    attr_reader :header_font, :title_font, :timestamp_font, :signature_font
+    attr_writer :verbose, :quiet, :capturer
+
+    def initialize
+      default_config_file = File.expand_path("defaults.yml", File.dirname(__FILE__))
+      @config = ::YAML::load_file(default_config_file)
+
+      local_config_files = ['~/.vcs.rb.yml']
+      local_config_files.select{ |f| File.exists?(f) }.each do |local_config_file|
+        local_config = YAML::load_file(local_config_file)
+        @config = @config.deep_merge(local_config)
+      end
+
+      @header_font    = Font.new @config['style']['header']['font'],    @config['style']['header']['size']
+      @title_font     = Font.new @config['style']['title']['font'],     @config['style']['title']['size']
+      @timestamp_font = Font.new @config['style']['timestamp']['font'], @config['style']['timestamp']['size']
+      @signature_font = Font.new @config['style']['signature']['font'], @config['style']['signature']['size']
+    end
+
+    def load_profile profile
+      profiles = [File.expand_path("#{profile}.yml", File.dirname(__FILE__)), "~/#{profile}.yml"]
+
+      found = false
+      profiles.each do |profile|
+        if File.exists?(profile)
+          puts "Profile loaded: #{profile}" if verbose?
+          config = YAML::load_file(profile)
+          @config = @config.deep_merge(config)
+          found = true
+        end
+      end
+
+      raise "No profile '#{profile}' found" unless found
+    end
+
+    def verbose?
+      @verbose
+    end
+
+    def quiet?
+      @quiet
+    end
+
+    def capturer
+      @capturer || :any
+    end
+
+    def rows
+      @config['main']['rows'] ? @config['main']['rows'].to_i : nil
+    end
+
+    def columns
+      @config['main']['columns'] ? @config['main']['columns'].to_i : nil
+    end
+
+    def interval
+      @config['main']['interval'] ? TimeIndex.new(@config['main']['interval']) : nil
+    end
+
+    def padding
+      @config['main']['padding'] ? @config['main']['padding'].to_i : 2
+    end
+
+    def quality
+      @config['main']['quality'] ? @config['main']['quality'].to_i : 90
+    end
+
+    def header_background
+      @config['style']['header']['background']
+    end
+
+    def header_color
+      @config['style']['header']['color']
+    end
+
+    def title_background
+      @config['style']['title']['background']
+    end
+
+    def title_color
+      @config['style']['title']['color']
+    end
+
+    def highlight_background
+      @config['style']['highlight']['background']
+    end
+
+    def contact_background
+      @config['style']['contact']['background']
+    end
+
+    def timestamp_background
+      @config['style']['timestamp']['background']
+    end
+
+    def timestamp_color
+      @config['style']['timestamp']['color']
+    end
+
+    def signature_background
+      @config['style']['signature']['background']
+    end
+
+    def signature_color
+      @config['style']['signature']['color']
+    end
+
+    def blank_threshold
+      @config['lowlevel']['blank_threshold'].to_f
+    end
+
+    def blank_evasion?
+      @config['lowlevel']['blank_evasion']
+    end
+
+    def blank_alternatives
+      @config['lowlevel']['blank_alternatives'].map{ |e| TimeIndex.new e.to_i }
+    end
+
+    def timestamp
+      !!@config['filter']['timestamp']
+    end
+
+    def polaroid
+      !!@config['filter']['polaroid']
+    end
+
+    def softshadow
+      !!@config['filter']['softshadow']
+    end
+  end
+ end