kelredd-pruview 0.2.2 → 0.2.3

data/.gitignore

@@ -0,0 +1,6 @@
+pkg/*
+.bundle
+*.gem
+*.log
+/test/output/
+/test_output

data/Gemfile

@@ -0,0 +1,6 @@
+source "http://rubygems.org"
+
+# Specify dependencies in rbht.gemspec
+gemspec
+
+gem 'rake'

data/Gemfile.lock

@@ -0,0 +1,34 @@
+PATH
+  remote: .
+  specs:
+    kelredd-pruview (0.2.3)
+      flvtool2
+      mini_magick (~> 3.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    flvtool2 (1.0.6)
+    json (1.4.6)
+    kelredd-useful (0.4.2)
+      json
+    leftright (0.9.1)
+    mini_magick (3.2)
+      subexec (~> 0.0.4)
+    rake (0.9.2)
+    shoulda (2.11.3)
+    subexec (0.0.4)
+    test-belt (1.1.2)
+      leftright (~> 0.9.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.0)
+  kelredd-pruview!
+  kelredd-useful (>= 0.4.0)
+  leftright (>= 0.0.6)
+  rake
+  shoulda (>= 2.10.0)
+  test-belt (~> 1.0)

data/Rakefile

@@ -1,45 +1,9 @@
-require 'rubygems'
-require 'rake/gempackagetask'
-require 'simple_gem/testtasks'
+include Rake::DSL
 
-require 'lib/pruview/version'
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
-task :default => :test
-
-spec = Gem::Specification.new do |s|
-  s.name             = 'kelredd-pruview'
-  s.version          = Pruview::Version.to_s
-  s.has_rdoc         = true
-  s.extra_rdoc_files = %w(README.rdoc)
-  s.rdoc_options     = %w(--main README.rdoc)
-  s.summary          = "A gem to ease generating image previews (thumbnails) of various files"
-  s.author           = 'Kelly Redding'
-  s.email            = 'kelly@kelredd.com'
-  s.homepage         = 'http://github.com/kelredd/pruview'
-  s.files            = %w(README.rdoc Rakefile) + Dir.glob("{bin,features,lib,test}/**/*")
-  # s.executables    = ['pruview']
-
-  s.add_development_dependency("shoulda", [">= 2.10.0"])
-  s.add_development_dependency("leftright", [">= 0.0.6"])
-  s.add_development_dependency("kelredd-useful", [">= 0.4.0"])
-  s.add_development_dependency("kelredd-simple-gem", [">= 0.7.0"])
-
-  s.add_dependency('mini_magick', "~>3.0")
-  s.add_dependency('flvtool2')
-end
-
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.gem_spec = spec
-end
-
-SimpleGem::TestTasks.new
-
-desc 'Generate the gemspec for this gem'
-task :gemspec do
-  file = File.dirname(__FILE__) + "/#{spec.name}.gemspec"
-  File.open(file, 'w') {|f| f << spec.to_ruby }
-  puts "Created gemspec: #{file}"
-end
-
-task :default => :gem
+require 'test_belt/rake_tasks'
+TestBelt::RakeTasks.for :test
 
+task :default => :build

data/bin/ffyml

@@ -30,40 +30,40 @@ output_file=$2
 temp_out="/tmp/ffinfo.tmp"
 
 # run ffmpeg in a known error state and capture it's file properties output from standard error
-echo "ffmpeg -i $video_file 2> $temp_out"
+echo "ffmpeg -i \"$video_file\" 2> \"$temp_out\""
 ffmpeg -i "$video_file" 2> "$temp_out"
 
 # parse temp_out for the file properties
 # format
-var_format=`cat $temp_out | grep "Input #0" | gawk -F', ' '{print $2}'`
-var_duration=`cat $temp_out | grep "Duration:" | gawk -F': ' '{print $2}' | gawk -F', ' '{print $1}'`
-var_bitrate=`cat $temp_out | grep "Duration:" | gawk -F': ' '{print $4}' | gawk -F' ' '{print $1}'`
-var_codec=`cat $temp_out | grep "Video:" | gawk -F': ' '{print $3}' | gawk -F', ' '{print $1}'`
-var_width=`cat $temp_out | grep "Video:" | gawk -F': ' '{print $3}' | gawk -F', ' '{print $3}' | gawk -F'x' '{print $1}'`
-var_height=`cat $temp_out | grep "Video:" | gawk -F': ' '{print $3}' | gawk -F', ' '{print $3}' | gawk -F'x' '{print $2}' | gawk -F' ' '{print $1}'`
-var_framerate=`cat $temp_out | grep "Video:" | gawk -F': ' '{print $3}' | gawk -F', ' '{print $5}' | gawk -F' ' '{print $1}'`
+var_format=`cat "$temp_out" | grep "Input #0" | gawk -F', ' '{print $2}'`
+var_duration=`cat "$temp_out" | grep "Duration:" | gawk -F': ' '{print $2}' | gawk -F', ' '{print $1}'`
+var_bitrate=`cat "$temp_out" | grep "Duration:" | gawk -F': ' '{print $4}' | gawk -F' ' '{print $1}'`
+var_codec=`cat "$temp_out" | grep "Video:" | gawk -F': ' '{print $3}' | gawk -F', ' '{print $1}'`
+var_width=`cat "$temp_out" | grep "Video:" | gawk -F': ' '{print $3}' | gawk -F', ' '{print $3}' | gawk -F'x' '{print $1}'`
+var_height=`cat "$temp_out" | grep "Video:" | gawk -F': ' '{print $3}' | gawk -F', ' '{print $3}' | gawk -F'x' '{print $2}' | gawk -F' ' '{print $1}'`
+var_framerate=`cat "$temp_out" | grep "Video:" | gawk -F': ' '{print $3}' | gawk -F', ' '{print $5}' | gawk -F' ' '{print $1}'`
 if [ "$var_framerate" = "" ]; then
-  var_framerate=`cat $temp_out | grep "Video:" | gawk -F': ' '{print $3}' | gawk -F', ' '{print $4}' | gawk -F' ' '{print $1}'`
+  var_framerate=`cat "$temp_out" | grep "Video:" | gawk -F': ' '{print $3}' | gawk -F', ' '{print $4}' | gawk -F' ' '{print $1}'`
 fi
-var_audio_codec=`cat $temp_out | grep "Audio:" | gawk -F': ' '{print $3}' | gawk -F', ' '{print $1}'`
-var_audio_bitrate=`cat $temp_out | grep "Audio:" | gawk -F', ' '{print $5}' | gawk -F' ' '{print $1}'`
-var_audio_sampling=`cat $temp_out | grep "Audio:" | gawk -F', ' '{print $2}' | gawk -F' ' '{print $1}'`
+var_audio_codec=`cat "$temp_out" | grep "Audio:" | gawk -F': ' '{print $3}' | gawk -F', ' '{print $1}'`
+var_audio_bitrate=`cat "$temp_out" | grep "Audio:" | gawk -F', ' '{print $5}' | gawk -F' ' '{print $1}'`
+var_audio_sampling=`cat "$temp_out" | grep "Audio:" | gawk -F', ' '{print $2}' | gawk -F' ' '{print $1}'`
 
 # write the output YAML file
-echo "# file properties" > $output_file
-echo format: $var_format >> $output_file
-echo duration: $var_duration >> $output_file
-echo bitrate: $var_bitrate >> $output_file
-echo codec: $var_codec >> $output_file
-echo width: $var_width >> $output_file
-echo height: $var_height >> $output_file
-echo framerate: $var_framerate >> $output_file
-echo audio_codec: $var_audio_codec >> $output_file
-echo audio_bitrate: $var_audio_bitrate >> $output_file
-echo audio_sampling: $var_audio_sampling >> $output_file
+echo "# file properties" > "$output_file"
+echo "format: $var_format" >> "$output_file"
+echo "duration: $var_duration" >> "$output_file"
+echo "bitrate: $var_bitrate" >> "$output_file"
+echo "codec: $var_codec" >> "$output_file"
+echo "width: $var_width" >> "$output_file"
+echo "height: $var_height" >> "$output_file"
+echo "framerate: $var_framerate" >> "$output_file"
+echo "audio_codec: $var_audio_codec" >> "$output_file"
+echo "audio_bitrate: $var_audio_bitrate" >> "$output_file"
+echo "audio_sampling: $var_audio_sampling" >> "$output_file"
 
 # cleanup
-rm $temp_out
+rm "$temp_out"
 
 echo "Done."
 

data/kelredd-pruview.gemspec

@@ -0,0 +1,27 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "pruview/version"
+
+Gem::Specification.new do |s|
+  s.name        = "kelredd-pruview"
+  s.version     = Pruview::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Kelly D. Redding"]
+  s.email       = ["kelly@kelredd.com"]
+  s.homepage    = "http://github.com/kelredd/pruview"
+  s.summary     = %q{Ease generating image previews (thumbnails) of various files}
+  s.description = %q{Ease generating image previews (thumbnails) of various files}
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+
+  s.add_development_dependency("bundler", ["~> 1.0"])
+  s.add_development_dependency("test-belt", ["~> 1.0"])
+  s.add_development_dependency(%q<shoulda>, [">= 2.10.0"])
+  s.add_development_dependency(%q<leftright>, [">= 0.0.6"])
+  s.add_development_dependency(%q<kelredd-useful>, [">= 0.4.0"])
+  s.add_dependency(%q<mini_magick>, ["~> 3.0"])
+  s.add_dependency(%q<flvtool2>, [">= 0"])
+end

data/lib/pruview/version.rb

@@ -1,13 +1,3 @@
 module Pruview
-  module Version
-
-    MAJOR = 0
-    MINOR = 2
-    TINY  = 2
-
-    def self.to_s # :nodoc:
-      [MAJOR, MINOR, TINY].join('.')
-    end
-
-  end
-end
+  VERSION = "0.2.3"
+end

data/lib/pruview/video.rb

@@ -63,10 +63,14 @@ module Pruview
     end
 
     def get_info(yml_path)
-      run("#{FFYML} #{@source} #{yml_path}", "Unable to get video info")
+      run(info_command(@source, yml_path), "Unable to get video info")
       YAML.load_file(yml_path)
     end
 
+    def info_command(source, yml_path)
+      %Q{#{FFYML} "#{source}" "#{yml_path}"}
+    end
+
     def build_command(source, target, width, height, info, scale_static)
       command = "#{FFMPEG} -i #{source}"
       command += get_scale_command(info['width'], info['height'], width, height, scale_static)

data/lib/pruview/video_image.rb

@@ -28,7 +28,7 @@ module Pruview
     end
     
     def self.build_command(source, time_str, format, target)
-      command = "#{Video::FFMPEG} -i #{source}"
+      command = %Q{#{Video::FFMPEG} -i "#{source}"}
       command += " #{time_str}"
       command += " -f #{format}" if !format.empty?
       command += " -an -y #{target}"
@@ -39,4 +39,4 @@ module Pruview
     end
   
   end
-end
+end

data/test/unit/video_image_test.rb

@@ -23,6 +23,12 @@ module Pruview
         assert_equal '.jpg', File.extname(@output)
       end
 
+      should "quote the source path in #build_command" do
+        source = 'foo bar.jpg'
+        command = Pruview::VideoImage.build_command(source, 'a', 'b', 'c')
+        assert_equal 'ffmpeg -i "foo bar.jpg" a -f b -an -y c', command
+      end
+
     end
 
   end

data/test/unit/video_test.rb

@@ -39,6 +39,11 @@ module Pruview
         assert_equal '.jpg', File.extname(@output)
       end
 
+      should "quote the source and yml_path args to the ffyml command" do
+        command = @file.send(:info_command, 'foo bar.jpg', 'foo bar.yml')
+        assert_equal %Q{#{Pruview::Video::FFYML} "foo bar.jpg" "foo bar.yml"}, command
+      end
+
     end
 
   end

metadata

@@ -1,27 +1,54 @@
 --- !ruby/object:Gem::Specification 
 name: kelredd-pruview
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
+  hash: 17
+  prerelease: 
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
-- Kelly Redding
+- Kelly D. Redding
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-10-28 00:00:00 -05:00
-default_executable: 
+date: 2011-07-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: shoulda
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
+  version_requirements: *id001
+  prerelease: false
+  name: bundler
+  type: :development
+- !ruby/object:Gem::Dependency 
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
+  version_requirements: *id002
+  prerelease: false
+  name: test-belt
+  type: :development
+- !ruby/object:Gem::Dependency 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -32,12 +59,12 @@ dependencies:
         - 10
         - 0
         version: 2.10.0
+  version_requirements: *id003
+  prerelease: false
+  name: shoulda
   type: :development
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: leftright
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -48,12 +75,12 @@ dependencies:
         - 0
         - 6
         version: 0.0.6
+  version_requirements: *id004
+  prerelease: false
+  name: leftright
   type: :development
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: kelredd-useful
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -64,28 +91,12 @@ dependencies:
         - 4
         - 0
         version: 0.4.0
-  type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: kelredd-simple-gem
+  version_requirements: *id005
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        - 7
-        - 0
-        version: 0.7.0
+  name: kelredd-useful
   type: :development
-  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: mini_magick
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -95,12 +106,12 @@ dependencies:
         - 3
         - 0
         version: "3.0"
+  version_requirements: *id006
+  prerelease: false
+  name: mini_magick
   type: :runtime
-  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: flvtool2
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -109,28 +120,35 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  version_requirements: *id007
+  prerelease: false
+  name: flvtool2
   type: :runtime
-  version_requirements: *id006
-description: 
-email: kelly@kelredd.com
-executables: []
-
+description: Ease generating image previews (thumbnails) of various files
+email: 
+- kelly@kelredd.com
+executables: 
+- ffyml
 extensions: []
 
-extra_rdoc_files: 
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
+- .gitignore
+- Gemfile
+- Gemfile.lock
 - README.rdoc
 - Rakefile
 - bin/ffyml
+- kelredd-pruview.gemspec
+- lib/pruview.rb
+- lib/pruview/USWebCoatedSWOP.icc
 - lib/pruview/document.rb
 - lib/pruview/exceptions.rb
 - lib/pruview/sRGB.icm
-- lib/pruview/USWebCoatedSWOP.icc
 - lib/pruview/version.rb
 - lib/pruview/video.rb
 - lib/pruview/video_image.rb
-- lib/pruview.rb
 - test/files/basic.jpg
 - test/files/basic.mpg
 - test/files/error.jpg
@@ -141,14 +159,12 @@ files:
 - test/unit/document_test.rb
 - test/unit/video_image_test.rb
 - test/unit/video_test.rb
-has_rdoc: true
 homepage: http://github.com/kelredd/pruview
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --main
-- README.rdoc
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -172,9 +188,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
-summary: A gem to ease generating image previews (thumbnails) of various files
-test_files: []
-
+summary: Ease generating image previews (thumbnails) of various files
+test_files: 
+- test/files/basic.jpg
+- test/files/basic.mpg
+- test/files/error.jpg
+- test/files/error.mov
+- test/files/image.tiff
+- test/files/invalid_format.poop
+- test/helper.rb
+- test/unit/document_test.rb
+- test/unit/video_image_test.rb
+- test/unit/video_test.rb