build/execscript.erb findlibs/ev/ftools.rb findlibs/main.rb findlibs/require2lib.rb @@ -146,6 +146,11 @@ Pallet.new('yikes', "0.1") do |p| # load_os("pallet_deb") end +desc "Create a bundle folder that has all dependencies included" +task :bundle do + ENV["REQUIRE2LIB_LIBDIR"] = "#{RootDir}/bundle" + sh "#{RootDir}/findlibs/main.rb #{RootDir}/lib/main.rb" +end ####################### ## Gettext section @@ -172,7 +177,10 @@ end desc "Miscellaneous post-build tasks" task :postbuild => [:expandify] do + # FIXME: There's a Rake'y way to do this... sh "cp #{RootDir}/build/config.rb #{RootDir}/lib" + sh "mkdir -p #{RootDir}/bin && mv #{RootDir}/build/execscript #{RootDir}/bin/yikes" + sh "chmod +x #{RootDir}/bin/yikes" end # Default Actions Rakefile @@ -1,21 +1,21 @@ Done: * Get one-shot "just do it" functionality * Use external ffmpeg + * Fix exec script + * FFmpeg/libfaac/whatever from source, statically compiled 0.1: * Linux package - - Fix exec script 0.2: * Investigate what other encoders (Handbrake et al.) are doing * Daemon mode (frontend/backend separation) - * Qt4 GUI + * Rails daemon running video podcasts to local machine, advertise using Zeroconf * OSX disk image * Use Taglib to write tag information - * FFmpeg/libfaac/whatever from source, statically compiled 0.5: - * Rails daemon running video podcasts to local machine, advertise using Zeroconf + * Qt4 GUI 0.8: * Works in Win32 @@ -23,3 +23,9 @@ Done: * Windows installer Future: + * Simple queue of files to encode + * Monitoring FFmpeg output (without confusing rb!) + * Daemon control interface, script to kick off encoder run + * Dir change notifications on Linux, OSX + * Running daemon instant on-demand + TODO @@ -55,11 +55,15 @@ def load_os(file) end end -def ruby_path +def ruby_exec_path return ENV["RUBY_BIN"] if ENV["RUBY_BIN"] # FIXME: We need to include Ruby on Win32 return nil if os() == :win32 - ret = `where ruby` - return ($? != 0 ? ret : nil) + ret = `which ruby` + return nil unless ret # FIXME: How can I use $? here? + + # Filter out the newline at the end + m = /^(.*?)\s*$/.match(ret) + return m[1] end build/platform.rake @@ -74,7 +74,13 @@ module ExternalTranscoder def transcode(input, output) cmd = get_command(input, output) puts "Running #{cmd}" + + # FIXME: Dumb hack code! + system(cmd) + return + IO.popen cmd do |i,o,e| + break o.readlines.each do |line| p line end lib/engine.rb @@ -153,7 +153,7 @@ class Yikes < Logger::Application end end -return unless __FILE__ == $0 - -$the_app = Yikes.instance -$the_app.run +if __FILE__ == $0 + $the_app = Yikes.instance + $the_app.run +end lib/main.rb @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: yikes 0.1\n" -"POT-Creation-Date: 2008-03-01 11:04-0800\n" +"POT-Creation-Date: 2008-03-03 12:35-0800\n" "PO-Revision-Date: 2008-01-20 20:45-0800\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" po/yikes.pot @@ -1,7 +1,7 @@ Usage: Yikes [options] Specific options: - -l, --library /path/to/videos Directory to recursively scan for videos + -l, --dslibrary /path/to/videos Directory to recursively scan for videos -t, --target dir Directory to put files in -g, --gui Run the GUI version of this application stories/steps/help_output @@ -35,6 +35,17 @@ class TestFFMpegTranscoder < Test::Unit::TestCase @fft = FFMpegTranscoder.new end + def test_basic_transcode + input = File.join(TestDir, 'test_files', 'MH_egyptian_pan_L2R.avi') + output = File.join(TestDir, 'tmp.avi') + @fft.transcode(input, output) + + # Let's see if the file exists + opn = Pathname.new(output) + assert opn.exist? + opn.delete + end + def test_get_command input = "foo" output = 'bar' test/test_engine.rb 8281de746ca25b2e3e17ed5fc2bd9e76fd8bdab8 Paul Betts paul@paulbetts.org http://github.com/xpaulbettsx/yikes/commit/05160691e731bcf8fa0173d19a5d5a8bb86dc9ab 05160691e731bcf8fa0173d19a5d5a8bb86dc9ab 2008-03-08T16:52:12-08:00 2008-03-08T16:52:12-08:00 Add code from rubyscript2exe to build "bundles" - extract out all files require'd by Yikes to a folder 9a766e856afed84c7aab0fb5b9dbbac9a7f2ddbf Paul Betts paul@paulbetts.org