vcs_ruby 1.1.8 → 1.1.9

data/lib/defaults.yml

@@ -1,39 +1,39 @@
-main:
-  rows: 4
-  columns: 4
-  interval: ~
-  padding: 2
-  quality: 95
-filter:
-  timestamp: true
-  polaroid: false
-  softshadow: true
-style:
-  header:
-    font: DejaVuSans.ttf
-    size: 14
-    color: Black
-    background: "#afcd7a"
-  title:
-    font: DejaVuSans.ttf
-    size: 33
-    color: Black
-    background: White
-  highlight:
-    background: LightGoldenRod
-  contact:
-    background: White
-  timestamp:
-    font: DejaVuSans.ttf
-    size: 14
-    color: White
-    background: "#000000aa"
-  signature:
-    font: DejaVuSans.ttf
-    size: 10
-    color: Black
-    background: SlateGray
-lowlevel:
-  blank_evasion: true
-  blank_threshold: 0.08
-  blank_alternatives: [ -2, 2, -5, 5, -10, 10, -15, 15, -30, 30, 0]
+main:
+  rows: 4
+  columns: 4
+  interval: ~
+  padding: 2
+  quality: 95
+filter:
+  timestamp: true
+  polaroid: false
+  softshadow: true
+style:
+  header:
+    font: DejaVuSans.ttf
+    size: 14
+    color: Black
+    background: "#afcd7a"
+  title:
+    font: DejaVuSans.ttf
+    size: 33
+    color: Black
+    background: White
+  highlight:
+    background: LightGoldenRod
+  contact:
+    background: White
+  timestamp:
+    font: DejaVuSans.ttf
+    size: 14
+    color: White
+    background: "#000000aa"
+  signature:
+    font: DejaVuSans.ttf
+    size: 10
+    color: Black
+    background: SlateGray
+lowlevel:
+  blank_evasion: true
+  blank_threshold: 0.08
+  blank_alternatives: [ -2, 2, -5, 5, -10, 10, -15, 15, -30, 30, 0]

data/lib/font.rb

@@ -1,81 +1,81 @@
-#
-# Font helper
-#
-
-require 'mini_magick'
-require 'pp'
-
-module VCSRuby
-  IMFont = Struct.new(:name, :family, :style, :stretch, :weight, :glyphs)
-
-  class Font
-    attr_reader :name, :path, :size
-
-    @@fonts = {}
-
-    def initialize name, size
-      @name = name
-      @path = find_path
-      @size = size
-    end
-
-    def exists?
-      load_font_cache if @@fonts.length == 0
-
-      !!font_by_name(@name)
-    end
-
-    def find_path
-      load_font_cache if @@fonts.length == 0
-
-      if exists?
-        font_by_name(@name).glyphs
-      else
-        nil
-      end
-    end
-
-    def font_by_name name
-      if name =~ /\./
-        key, font = @@fonts.select{ |key, f| f.glyphs =~ /#{name}\z/ }.first
-        return font
-      else
-        @@fonts[name]
-      end
-    end
-
-    def load_font_cache
-
-      fonts = MiniMagick::Tool::Identify.new(whiny: false) do |identify|
-        identify.list 'font'
-      end
-
-      parse_fonts(fonts)
-    end
-
-    def parse_fonts(fonts)
-      font = nil
-      fonts.lines.each do |line|
-        key, value = line.strip.split(':', 2).map(&:strip)
-
-        next if [nil, 'Path'].include? key
-
-        if key == 'Font'
-          @@fonts[value] = font = IMFont.new(value)
-        else
-          font.send("#{key}=", value)
-        end
-      end
-    end
-
-    def line_height
-      MiniMagick::Tool::Convert.new do |convert|
-        convert.font path if exists?
-        convert.pointsize size
-        convert << 'label:F'
-        convert.format '%h'
-        convert << 'info:'
-      end.to_i
-    end
-  end
-end
+#
+# Font helper
+#
+
+require 'mini_magick'
+require 'pp'
+
+module VCSRuby
+  IMFont = Struct.new(:name, :family, :style, :stretch, :weight, :glyphs)
+
+  class Font
+    attr_reader :name, :path, :size
+
+    @@fonts = {}
+
+    def initialize name, size
+      @name = name
+      @path = find_path
+      @size = size
+    end
+
+    def exists?
+      load_font_cache if @@fonts.length == 0
+
+      !!font_by_name(@name)
+    end
+
+    def find_path
+      load_font_cache if @@fonts.length == 0
+
+      if exists?
+        font_by_name(@name).glyphs
+      else
+        nil
+      end
+    end
+
+    def font_by_name name
+      if name =~ /\./
+        key, font = @@fonts.select{ |key, f| f.glyphs =~ /#{name}\z/ }.first
+        return font
+      else
+        @@fonts[name]
+      end
+    end
+
+    def load_font_cache
+
+      fonts = MiniMagick::Tool::Identify.new(whiny: false) do |identify|
+        identify.list 'font'
+      end
+
+      parse_fonts(fonts)
+    end
+
+    def parse_fonts(fonts)
+      font = nil
+      fonts.lines.each do |line|
+        key, value = line.strip.split(':', 2).map(&:strip)
+
+        next if [nil, 'Path'].include? key
+
+        if key == 'Font'
+          @@fonts[value] = font = IMFont.new(value)
+        else
+          font.send("#{key}=", value)
+        end
+      end
+    end
+
+    def line_height
+      MiniMagick::Tool::Convert.new do |convert|
+        convert.font path if exists?
+        convert.pointsize size
+        convert << 'label:F'
+        convert.format '%h'
+        convert << 'info:'
+      end.to_i
+    end
+  end
+end

data/lib/frame.rb

@@ -1,161 +1,161 @@
-#
-# Frame from video
-#
-
-require 'mini_magick'
-
-module VCSRuby
-  class Frame
-    attr_accessor :width, :height, :aspect
-    attr_reader :filters, :time
-
-    def initialize video, capturer, time
-      @video = video
-      @capturer = capturer
-      @time = time
-      @filters = []
-    end
-
-    def filename= file_path
-      @out_path = File.dirname(file_path)
-      @out_filename = File.basename(file_path,'.*')
-    end
-
-    def filename
-      File.join(@out_path, "#{@out_filename}.#{@capturer.format_extension}")
-    end
-
-    def format= fmt
-      @capturer.format = fmt
-    end
-
-    def format
-      @capturer.format
-    end
-
-    def capture
-      @capturer.grab @time, filename
-    end
-
-    def capture_and_evade interval = nil
-      times = [TimeIndex.new] + Configuration.instance.blank_alternatives
-      if interval
-        times.select! { |t| (t < interval / 2) and (t > interval / -2) }
-      end
-      times.map! { |t| @time + t }
-
-      times.each do |time|
-        @time = time
-        capture
-        break unless blank?
-        puts "Blank frame detected. => #{@time}" unless Configuration.instance.quiet?
-        puts "Giving up!" if time == times.last && !Configuration.instance.quiet?
-      end
-    end
-
-    def blank?
-      image = MiniMagick::Image.open filename
-      image.colorspace 'Gray'
-      mean = image['%[fx:image.mean]'].to_f
-      return mean < Configuration.instance.blank_threshold
-    end
-
-    def apply_filters
-      MiniMagick::Tool::Convert.new do |convert|
-        convert.background 'Transparent'
-        convert.fill 'Transparent'
-        convert << filename
-
-        sorted_filters.each do |filter|
-          call_filter filter, convert
-        end
-
-        convert << filename
-      end
-    end
-
-private
-    def call_filter filter, convert
-      if respond_to?(filter, true)
-        method(filter).call(convert)
-      else
-        raise "Filter '#{filter}' does not exist"
-      end
-    end
-
-    def sorted_filters
-      [:resize_filter, :timestamp_filter, :photoframe_filter, :polaroid_filter, :random_rotation_filter, :softshadow_filter].select{ |filter| @filters.include?(filter) }
-    end
-
-    def resize_filter convert
-      convert.resize "#{width}x#{height}!"
-    end
-
-    def timestamp_filter convert
-      convert.stack do |box|
-        box.box Configuration.instance.timestamp_background
-        box.fill Configuration.instance.timestamp_color
-        box.pointsize Configuration.instance.timestamp_font.size
-        box.gravity 'SouthEast'
-        if Configuration.instance.timestamp_font.exists?
-          box.font Configuration.instance.timestamp_font.path
-        end
-        box.annotate('+10+10', " #{@time.to_timestamp} ")
-      end
-      convert.flatten
-      convert.gravity 'None'
-    end
-
-    def softshadow_filter convert
-      convert.stack do |box|
-        box.background 'Black'
-        box.clone.+
-        box.shadow '50x2+4+4'
-        box.background 'None'
-      end
-      convert.swap.+
-      convert.flatten
-      convert.trim
-      convert.repage.+
-    end
-
-    def photoframe_filter convert
-      convert.bordercolor 'White'
-      convert.border 3
-      convert.bordercolor 'Grey60'
-      convert.border 1
-    end
-
-    def polaroid_filter convert
-      border = 8
-      convert.stack do |a|
-        a.fill 'White'
-        a.background 'White'
-        a.bordercolor 'White'
-        if Tools.magick_version.major > 6
-          a.alpha_color 'White'
-        else
-          a.mattecolor 'White'
-        end
-        a.frame "#{border}x#{border}"
-        a.stack do |b|
-          b.flip
-          b.splice "0x#{border*5}"
-        end
-        a.flip
-        a.bordercolor 'Grey60'
-        a.border 1
-      end
-      convert.repage.+
-    end
-
-    def random_rotation_filter convert
-      angle = Random::rand(-18..18)
-      convert.background 'None'
-      convert.rotate angle
-    end
-
-    def film_filter
-    end
-  end
-end
+#
+# Frame from video
+#
+
+require 'mini_magick'
+
+module VCSRuby
+  class Frame
+    attr_accessor :width, :height, :aspect
+    attr_reader :filters, :time
+
+    def initialize video, capturer, time
+      @video = video
+      @capturer = capturer
+      @time = time
+      @filters = []
+    end
+
+    def filename= file_path
+      @out_path = File.dirname(file_path)
+      @out_filename = File.basename(file_path,'.*')
+    end
+
+    def filename
+      File.join(@out_path, "#{@out_filename}.#{@capturer.format_extension}")
+    end
+
+    def format= fmt
+      @capturer.format = fmt
+    end
+
+    def format
+      @capturer.format
+    end
+
+    def capture
+      @capturer.grab @time, filename
+    end
+
+    def capture_and_evade interval = nil
+      times = [TimeIndex.new] + Configuration.instance.blank_alternatives
+      if interval
+        times.select! { |t| (t < interval / 2) and (t > interval / -2) }
+      end
+      times.map! { |t| @time + t }
+
+      times.each do |time|
+        @time = time
+        capture
+        break unless blank?
+        puts "Blank frame detected. => #{@time}" unless Configuration.instance.quiet?
+        puts "Giving up!" if time == times.last && !Configuration.instance.quiet?
+      end
+    end
+
+    def blank?
+      image = MiniMagick::Image.open filename
+      image.colorspace 'Gray'
+      mean = image['%[fx:image.mean]'].to_f
+      return mean < Configuration.instance.blank_threshold
+    end
+
+    def apply_filters
+      MiniMagick::Tool::Convert.new do |convert|
+        convert.background 'Transparent'
+        convert.fill 'Transparent'
+        convert << filename
+
+        sorted_filters.each do |filter|
+          call_filter filter, convert
+        end
+
+        convert << filename
+      end
+    end
+
+private
+    def call_filter filter, convert
+      if respond_to?(filter, true)
+        method(filter).call(convert)
+      else
+        raise "Filter '#{filter}' does not exist"
+      end
+    end
+
+    def sorted_filters
+      [:resize_filter, :timestamp_filter, :photoframe_filter, :polaroid_filter, :random_rotation_filter, :softshadow_filter].select{ |filter| @filters.include?(filter) }
+    end
+
+    def resize_filter convert
+      convert.resize "#{width}x#{height}!"
+    end
+
+    def timestamp_filter convert
+      convert.stack do |box|
+        box.box Configuration.instance.timestamp_background
+        box.fill Configuration.instance.timestamp_color
+        box.pointsize Configuration.instance.timestamp_font.size
+        box.gravity 'SouthEast'
+        if Configuration.instance.timestamp_font.exists?
+          box.font Configuration.instance.timestamp_font.path
+        end
+        box.annotate('+10+10', " #{@time.to_timestamp} ")
+      end
+      convert.flatten
+      convert.gravity 'None'
+    end
+
+    def softshadow_filter convert
+      convert.stack do |box|
+        box.background 'Black'
+        box.clone.+
+        box.shadow '50x2+4+4'
+        box.background 'None'
+      end
+      convert.swap.+
+      convert.flatten
+      convert.trim
+      convert.repage.+
+    end
+
+    def photoframe_filter convert
+      convert.bordercolor 'White'
+      convert.border 3
+      convert.bordercolor 'Grey60'
+      convert.border 1
+    end
+
+    def polaroid_filter convert
+      border = 8
+      convert.stack do |a|
+        a.fill 'White'
+        a.background 'White'
+        a.bordercolor 'White'
+        if Tools.magick_version.major > 6
+          a.alpha_color 'White'
+        else
+          a.mattecolor 'White'
+        end
+        a.frame "#{border}x#{border}"
+        a.stack do |b|
+          b.flip
+          b.splice "0x#{border*5}"
+        end
+        a.flip
+        a.bordercolor 'Grey60'
+        a.border 1
+      end
+      convert.repage.+
+    end
+
+    def random_rotation_filter convert
+      angle = Random::rand(-18..18)
+      convert.background 'None'
+      convert.rotate angle
+    end
+
+    def film_filter
+    end
+  end
+end