kelredd-pruview 0.2.3 → 0.2.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kelredd-pruview (0.2.3)
+    kelredd-pruview (0.2.4)
       flvtool2
       mini_magick (~> 3.0)
 
@@ -9,16 +9,12 @@ 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)
+    test-belt (2.0.0)
       leftright (~> 0.9.0)
 
 PLATFORMS
@@ -27,8 +23,5 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.0)
   kelredd-pruview!
-  kelredd-useful (>= 0.4.0)
-  leftright (>= 0.0.6)
   rake
-  shoulda (>= 2.10.0)
-  test-belt (~> 1.0)
+  test-belt (~> 2.0)

data/bin/ffyml

@@ -35,19 +35,19 @@ 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 -m 1 "Input #0" | gawk -F', ' '{print $2}'`
+var_duration=`cat "$temp_out" | grep -m 1 "Duration:" | gawk -F': ' '{print $2}' | gawk -F', ' '{print $1}'`
+var_bitrate=`cat "$temp_out" | grep -m 1 "Duration:" | gawk -F': ' '{print $4}' | gawk -F' ' '{print $1}'`
+var_codec=`cat "$temp_out" | grep -m 1 "Video:" | gawk -F': ' '{print $3}' | gawk -F', ' '{print $1}'`
+var_width=`cat "$temp_out" | grep -m 1 "Video:" | gawk -F': ' '{print $3}' | gawk -F', ' '{print $3}' | gawk -F'x' '{print $1}'`
+var_height=`cat "$temp_out" | grep -m 1 "Video:" | gawk -F': ' '{print $3}' | gawk -F', ' '{print $3}' | gawk -F'x' '{print $2}' | gawk -F' ' '{print $1}'`
+var_framerate=`cat "$temp_out" | grep -m 1 "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 -m 1 "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 -m 1 "Audio:" | gawk -F': ' '{print $3}' | gawk -F', ' '{print $1}'`
+var_audio_bitrate=`cat "$temp_out" | grep -m 1 "Audio:" | gawk -F', ' '{print $5}' | gawk -F' ' '{print $1}'`
+var_audio_sampling=`cat "$temp_out" | grep -m 1 "Audio:" | gawk -F', ' '{print $2}' | gawk -F' ' '{print $1}'`
 
 # write the output YAML file
 echo "# file properties" > "$output_file"

data/kelredd-pruview.gemspec

@@ -18,10 +18,7 @@ Gem::Specification.new do |s|
   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_development_dependency("test-belt", ["~> 2.0"])
   s.add_dependency(%q<mini_magick>, ["~> 3.0"])
   s.add_dependency(%q<flvtool2>, [">= 0"])
 end

data/lib/pruview/version.rb

@@ -1,3 +1,3 @@
 module Pruview
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/test/helper.rb

@@ -1,8 +1,4 @@
-require 'rubygems'
-require 'test/unit'
-require 'shoulda'
-require 'useful/shoulda_macros/test_unit'
-require 'leftright'
+require 'test_belt'
 
 # Add test and lib paths to the $LOAD_PATH
 [ File.dirname(__FILE__),
@@ -42,4 +38,4 @@ def should_complain_about(should_statement, message_match, &block)
       assert_match message_match, err.message
     end
   end
-end
+end

data/test/unit/document_test.rb

@@ -1,43 +1,48 @@
 require 'test/helper'
 
 module Pruview
+
   class DocumentTest < Test::Unit::TestCase
+    include TestBelt
 
-    context "A Pruview::Document" do
-      setup { @file = Pruview::Document.new(FILES['basic image'], OUTPUT_PATH) }
-      subject { @file }
+    context "A Pruview::Document"
+    setup { @file = Pruview::Document.new(FILES['basic image'], OUTPUT_PATH) }
+    subject { @file }
 
-      should_have_instance_methods :to_jpg
+    should have_instance_methods :to_jpg
 
-      should_complain_about("converting invalid images", /^Invalid source file/) do
-        Pruview::Document.new(FILES['invalid image'], OUTPUT_PATH)
-      end
-      should_complain_about("converting invalid image formats", /not supported - file extension: .poop/) do
-        Pruview::Document.new(FILES['invalid format'], OUTPUT_PATH)
-      end
-      should_complain_about("converting with invalid output paths", /^Invalid target directory/) do
-        Pruview::Document.new(FILES['basic image'], INVALID_OUTPUT_PATH)
-      end
+    should_complain_about("converting invalid images", /^Invalid source file/) do
+      Pruview::Document.new(FILES['invalid image'], OUTPUT_PATH)
+    end
 
-      should "create a jpg version of itself" do
-        @output = @file.to_jpg('basic_image', 50, 50)
-        assert File.exists?(@output)
-        assert_equal '.jpg', File.extname(@output)
-      end
+    should_complain_about("converting invalid image formats", /not supported - file extension: .poop/) do
+      Pruview::Document.new(FILES['invalid format'], OUTPUT_PATH)
+    end
 
-      context "of a TIFF file" do
-        setup { @file = Pruview::Document.new(FILES['tiff'], OUTPUT_PATH) }
-        subject { @file }
+    should_complain_about("converting with invalid output paths", /^Invalid target directory/) do
+      Pruview::Document.new(FILES['basic image'], INVALID_OUTPUT_PATH)
+    end
 
-        should "create a jpg version of itself" do
-          @output = @file.to_jpg('tiff', 50, 50)
-          assert File.exists?(@output)
-          assert_equal '.jpg', File.extname(@output)
-        end
+    should "create a jpg version of itself" do
+      @output = @file.to_jpg('basic_image', 50, 50)
+      assert File.exists?(@output)
+      assert_equal '.jpg', File.extname(@output)
+    end
 
-      end
+  end
+
+  class TiffTest < DocumentTest
 
+    context "of a TIFF file"
+    setup { @file = Pruview::Document.new(FILES['tiff'], OUTPUT_PATH) }
+    subject { @file }
+
+    should "create a jpg version of itself" do
+      @output = @file.to_jpg('tiff', 50, 50)
+      assert File.exists?(@output)
+      assert_equal '.jpg', File.extname(@output)
     end
 
   end
+
 end

data/test/unit/video_image_test.rb

@@ -1,35 +1,38 @@
 require 'test/helper'
 
 module Pruview
+
   class VideoImageTest < Test::Unit::TestCase
+    include TestBelt
+    context "A Pruview::VideoImage"
+    subject { Pruview::VideoImage }
 
-    context "A Pruview::VideoImage" do
+    should have_instance_method :to_jpg
 
-      should_have_class_methods :to_jpg
+    should_complain_about("converting invalid video", /^Invalid source file/) do
+      Pruview::VideoImage.to_jpg(FILES['invalid video'], OUTPUT_PATH, 'file')
+    end
 
-      should_complain_about("converting invalid video", /^Invalid source file/) do
-        Pruview::VideoImage.to_jpg(FILES['invalid video'], OUTPUT_PATH, 'file')
-      end
-      should_complain_about("converting invalid video formats", /not supported - file extension: .poop/) do
-        Pruview::VideoImage.to_jpg(FILES['invalid format'], OUTPUT_PATH, 'file')
-      end
-      should_complain_about("converting with invalid output paths", /^Invalid target directory/) do
-        Pruview::VideoImage.to_jpg(FILES['basic video'], INVALID_OUTPUT_PATH, 'file')
-      end
+    should_complain_about("converting invalid video formats", /not supported - file extension: .poop/) do
+      Pruview::VideoImage.to_jpg(FILES['invalid format'], OUTPUT_PATH, 'file')
+    end
 
-      should "create a jpg version of itself" do
-        @output = Pruview::VideoImage.to_jpg(FILES['basic video'], OUTPUT_PATH, 'file')
-        assert File.exists?(@output)
-        assert_equal '.jpg', File.extname(@output)
-      end
+    should_complain_about("converting with invalid output paths", /^Invalid target directory/) do
+      Pruview::VideoImage.to_jpg(FILES['basic video'], INVALID_OUTPUT_PATH, 'file')
+    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
+    should "create a jpg version of itself" do
+      @output = Pruview::VideoImage.to_jpg(FILES['basic video'], OUTPUT_PATH, 'file')
+      assert File.exists?(@output)
+      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

@@ -1,50 +1,53 @@
 require 'test/helper'
 
 module Pruview
+
   class VideoTest < Test::Unit::TestCase
+    include TestBelt
+
+    context "A Pruview::Video"
+    setup { @file = Pruview::Video.new(FILES['basic video'], OUTPUT_PATH) }
+    subject { @file }
 
-    context "A Pruview::Video" do
-      setup { @file = Pruview::Video.new(FILES['basic video'], OUTPUT_PATH) }
-      subject { @file }
-
-      should_have_instance_methods :to_flv, :to_mov, :to_jpg, :info
-
-      should_complain_about("converting invalid video", /^Invalid source file/) do
-        Pruview::Video.new(FILES['invalid video'], OUTPUT_PATH)
-      end
-      should_complain_about("converting invalid video formats", /not supported - file extension: .poop/) do
-        Pruview::Video.new(FILES['invalid format'], OUTPUT_PATH)
-      end
-      should_complain_about("converting with invalid output paths", /^Invalid target directory/) do
-        Pruview::Video.new(FILES['basic video'], INVALID_OUTPUT_PATH)
-      end
-
-      should "create a mov version of itself" do
-        @output = @file.to_mov('file', 50, 50)
-        assert File.exists?(@output)
-        assert_equal '.mov', File.extname(@output)
-      end
-
-      # too unstable to test right now
-      # the above test validates the plumbing and command building
-      #should "create an flv version of itself" do
-      #  @output = @file.to_flv('file', 50, 50)
-      #  assert File.exists?(@output)
-      #  assert_equal '.flv', File.extname(@output)
-      #end
-
-      should "create a jpg version of itself" do
-        @output = @file.to_jpg('file')
-        assert File.exists?(@output)
-        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
+    should have_instance_methods :to_flv, :to_mov, :to_jpg, :info
+
+    should_complain_about("converting invalid video", /^Invalid source file/) do
+      Pruview::Video.new(FILES['invalid video'], OUTPUT_PATH)
+    end
 
+    should_complain_about("converting invalid video formats", /not supported - file extension: .poop/) do
+      Pruview::Video.new(FILES['invalid format'], OUTPUT_PATH)
+    end
+
+    should_complain_about("converting with invalid output paths", /^Invalid target directory/) do
+      Pruview::Video.new(FILES['basic video'], INVALID_OUTPUT_PATH)
+    end
+
+    should "create a mov version of itself" do
+      @output = @file.to_mov('file', 50, 50)
+      assert File.exists?(@output)
+      assert_equal '.mov', File.extname(@output)
+    end
+
+    # too unstable to test right now
+    # the above test validates the plumbing and command building
+    #should "create an flv version of itself" do
+    #  @output = @file.to_flv('file', 50, 50)
+    #  assert File.exists?(@output)
+    #  assert_equal '.flv', File.extname(@output)
+    #end
+
+    should "create a jpg version of itself" do
+      @output = @file.to_jpg('file')
+      assert File.exists?(@output)
+      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,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kelredd-pruview
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Kelly D. Redding
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-20 00:00:00 Z
+date: 2011-08-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
@@ -38,65 +38,17 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 3
         segments: 
-        - 1
+        - 2
         - 0
-        version: "1.0"
+        version: "2.0"
   version_requirements: *id002
   prerelease: false
   name: test-belt
   type: :development
 - !ruby/object:Gem::Dependency 
   requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 39
-        segments: 
-        - 2
-        - 10
-        - 0
-        version: 2.10.0
-  version_requirements: *id003
-  prerelease: false
-  name: shoulda
-  type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 0
-        - 0
-        - 6
-        version: 0.0.6
-  version_requirements: *id004
-  prerelease: false
-  name: leftright
-  type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 0
-        - 4
-        - 0
-        version: 0.4.0
-  version_requirements: *id005
-  prerelease: false
-  name: kelredd-useful
-  type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -106,12 +58,12 @@ dependencies:
         - 3
         - 0
         version: "3.0"
-  version_requirements: *id006
+  version_requirements: *id003
   prerelease: false
   name: mini_magick
   type: :runtime
 - !ruby/object:Gem::Dependency 
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -120,7 +72,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id007
+  version_requirements: *id004
   prerelease: false
   name: flvtool2
   type: :runtime