sensible-cinema 0.21.10 → 0.22.0

data/Rakefile

@@ -1,7 +1,7 @@
 require 'jeweler'
 require 'os'
 
-ENV['PATH'] = "C:\\Program Files (x86)\\Git\\cmd;" + ENV['PATH'] # for jeweler's git gem
+ENV['PATH'] = "C:\\Program Files (x86)\\Git\\cmd;" + ENV['PATH'] # for jeweler's git gem hackaround...
 
 Jeweler::Tasks.new do |s|
     s.name = "sensible-cinema"
@@ -13,6 +13,7 @@ Jeweler::Tasks.new do |s|
     s.add_dependency 'rdp-win32screenshot', '>= 0.0.7.3' # was 0.8.0 ?
     s.add_dependency 'mini_magick', '>= 3.1' # for ocr...
     s.add_dependency 'whichr', '>= 0.3.6'
+    s.add_dependency 'jruby-win32ole'
     s.add_dependency 'rdp-ruby-wmi' # windows
     s.add_dependency 'plist' # mac
     s.add_dependency 'ffi' # mouse, etc. needed at least for MRI
@@ -65,7 +66,7 @@ def get_transitive_dependencies dependencies
 end
 
 desc 'collect binary and gem deps for distribution'
-task 'bundle_dependencies' => 'gemspec' do
+task 'rebundle_dependencies' => 'gemspec' do
    require 'whichr'
    require 'fileutils'
    require 'net/http'
@@ -82,32 +83,29 @@ task 'bundle_dependencies' => 'gemspec' do
    FileUtils.mkdir_p 'vendor/cache'
    Dir.chdir 'vendor/cache' do
      dependencies.each{|d|
-       system("#{Gem.ruby} -S gem unpack #{d.name}")
+       system("#{OS.ruby_bin} -S gem unpack #{d.name}")
      }
-    
-     # create a shunt win32ole file, so that require 'win32ole' will just work.
-     # XXXX may no longer need this...
-     Dir.mkdir 'lib'
-     File.write('lib/win32ole.rb', 'require "jruby-win32ole"')
    end
   
+  
 end
 
 desc 'create distro zippable dir'
 task 'create_distro_dir' => :gemspec do # depends on gemspec...
-  raise 'need  bundle_dependencies first' unless File.directory? 'vendor/cache'
+  raise 'need  rebundle_dependencies first' unless File.directory? 'vendor/cache'
   require 'fileutils'
   spec = eval File.read('sensible-cinema.gemspec')
   dir_out = spec.name + "-" + spec.version.version + '/sensible-cinema'
   FileUtils.rm_rf Dir['sensible-cinema-*'] # remove old versions
-  raise 'unable to delete zip' if Dir[spec.name + '-*'].length > 0
+  raise 'unable to delete...' if Dir[spec.name + '-*'].length > 0
   
   existing = Dir['*']
   FileUtils.mkdir_p dir_out
-  FileUtils.cp_r(existing, dir_out)
+  FileUtils.cp_r(existing, dir_out) # copies files, subdirs in
   # these belong in the parent dir, by themselves.
   FileUtils.cp(Dir["#{dir_out}/template_bats/*"], "#{dir_out}/..")
   p 'created (still need to zip it) ' + dir_out
+  FileUtils.rm_rf Dir[dir_out + '/**/{spec}'] # don't need to distribute those..save 3M!
 end
 
 def cur_ver
@@ -138,14 +136,12 @@ end
 task 'gem_release' do
   FileUtils.rm_rf 'pkg'
   Rake::Task["build"].execute
-  gems = Dir['pkg/*.gem']
-  gems[0..-2].each{|f| File.delete f} # kill old versions...
-  raise unless system("#{Gem.ruby} -S gem push #{gems[-1]}")
+  raise unless system("#{Gem.ruby} -S gem push pkg/sensible-cinema-#{cur_ver}.gem")
   FileUtils.rm_rf 'pkg'
 end
 
-desc 'j -S rake bundle_dependencies create_distro_dir ... (releases with clean cache dir, which we need now)'
-task 'full_release' => [:bundle_dependencies, :create_distro_dir] do # this is :release
+desc 'j -S rake rebundle_dependencies create_distro_dir ... (releases with clean cache dir, which we need now)'
+task 'full_release' => [:rebundle_dependencies, :create_distro_dir] do # this is :release
   raise unless system("git pull")
   raise unless system("git push origin master")
   Rake::Task["gem_release"].execute

data/TODO

@@ -1,9 +1,10 @@
 == roadmap [for just tasks, see below though] ==
 
   release: cheap inventionzy, and medium inventionzy
-  release: C EDL+specific portion player
+  release: C EDL/specific portion [A,B] player
+  pull ripping/make mine take a file
   ?? ordering/looseness below ??
-  pull realtime players from mine/update todo/make mine take a file
+  pull realtime players from mine [?], update todo
   build library phase, 20 dvd's
   create web site/api
   propagate wikipedia with list of realtimers etc.
@@ -32,7 +33,7 @@
     "you could get timestamps from playing it back with VLC and watching the time, though VLC [or any GUI] is always slightly off."
   @mulder: dvdnav crashes
   check with blu-ray...does it match timing-wise? sub-title wise?
-  donate tsmuxer, makemkv
+  donate tsmuxer, makemkv, ffmpeg windows
   google "scripted dvd playback" adobe, one other, avisynth dvd [?]
   check cp p.'s
   instructions: reference the sintel DVD :) (download it from my site here)

data/VERSION

@@ -1 +1 @@
-0.21.10
+0.22.0

data/bin/sensible-cinema

@@ -22,9 +22,8 @@ require File.expand_path(File.dirname(__FILE__) + "/../lib/add_any_bundled_gems_
 begin
   require 'sane' # failure here means you haven't bundled your dependencies... [$ jruby -S rake bundle_dependencies after doing jruby -S gem install sensible-cinema ]
 rescue LoadError
-  p 'warning, loading full rubygems for your developers convenient LODO and'
-  require 'rubygems'
-  require 'sane'
+  p 'warning, didnt find bundled gems, loading full rubygems for developer convenience [run rake bundle_dependencies]'
+  raise
 end
 
 raise 'need jruby' unless OS.java?
@@ -42,10 +41,12 @@ require_relative '../lib/drive_info'
 require 'whichr'
 require 'ruby-wmi'
 
-# must put mencoder first, as it has a working mplayer.exe in it...
-vendor = File.expand_path(File.dirname(__FILE__)) + '/../vendor'
-# XX do we need to_filename though?
-ENV['PATH'] = ENV['PATH'] + ';' + (vendor + '/cache/mencoder').to_filename + ';' + (vendor + '/cache').to_filename
+vendor_cache = File.expand_path(File.dirname(__FILE__)) + '/../vendor/cache'
+
+for name in ['.', 'mencoder', 'ffmpeg']
+  # put them all before the old path
+  ENV['PATH'] = (vendor_cache + '/' + name).to_filename + ';' + ENV['PATH']
+end
 
 installed_smplayer_folders = Dir['{c,d,e}:/program files*/SMPlayer']
 
@@ -298,7 +299,7 @@ module SensibleSwing
         out.close
         $?.exitstatus == 0 # 0 means success
       else
-        system_original command
+        raise command + ' failed' unless system_original command
       end
     end
     
@@ -386,7 +387,7 @@ module SensibleSwing
         p 'license exited early...exiting'
         System.exit 1
       end
-      p 'confirmed license'
+      p 'confirmed license noted: ' + license_name
       throw unless returned == 0
       old.each{|name, old_setting| UIManager.put(name, old_setting)}
     end
@@ -395,33 +396,41 @@ module SensibleSwing
       Kernel.print *args # avoid bin\sensible-cinema.rb:83:in `system_blocking': cannot convert instance of class org.jruby.RubyString to class java.awt.Graphics (TypeError)
     end
     
+    def download_7zip
+      Dir.mkdir('./vendor/cache') unless File.directory? 'vendor/cache' # development may not have it created yet... [?]
+      unless File.exist? 'vendor/cache/7za.exe'
+        Dir.chdir('vendor/cache') do
+          print 'downloading unzipper...'
+          download("http://downloads.sourceforge.net/project/sevenzip/7-Zip/9.20/7za920.zip", "7za920.zip")
+          system_blocking("../unzip.exe -o 7za920.zip") # -o means "overwrite" without prompting
+        end
+      end
+    end
+    
+    def download_zip_to english_name, url, to_this
+        download_7zip
+        Dir.chdir('vendor/cache') do
+          file_name = url.split('/')[-1]
+          print "downloading #{english_name} ..."
+          download(url, file_name)
+          system_blocking("7za e #{file_name} -y -o#{to_this}")
+          puts 'done ' + english_name
+          # creates vendor/cache/mencoder/mencoder.exe...
+        end
+    end
+    
     def check_for_dependencies
-      ffmpeg = RubyWhich.new.which('ffmpeg')
-      if ffmpeg.length == 0
-        show_blocking_message_dialog("It appears that you need to install a dependency: imagemagick.\n
-        Click ok to be directed to its download website.\nYou'll probably want to download and run the \"windows-dll.exe\" http package.\n
-        Then restart Sensible-Cinema/console window.", "Lacking dependency", JOptionPane::ERROR_MESSAGE)
-        system_non_blocking("start http://www.imagemagick.org/script/binary-releases.php#windows")
-        java.lang.System.exit(1)
+      #ffmpeg = RubyWhich.new.which('ffmpeg')
+      ffmpeg_exe_loc = File.expand_path('vendor/cache/ffmpeg/ffmpeg.exe')
+      if !File.exist?(ffmpeg_exe_loc)
+        show_blocking_license_accept_dialog 'ffmpeg', 'gplv2', 'http://www.gnu.org/licenses/gpl-2.0.html', "Appears that you need to install a dependency: ffmpeg."
+        download_zip_to "ffmpeg (5MB)", "http://ffmpeg.zeranoe.com/builds/win32/shared/ffmpeg-git-1929807-win32-shared.7z", "ffmpeg"
       end
+      raise unless File.exist?(ffmpeg_exe_loc)
       
-      mencoder = RubyWhich.new.which('mencoder')
-      if mencoder.length == 0
+      if !File.exist?('vendor/cache/mencoder/mencoder.exe')
         show_blocking_license_accept_dialog 'mplayer', 'gplv2', 'http://www.gnu.org/licenses/gpl-2.0.html', "Appears that you need to install a dependency: mplayer with mencoder."
-        vendor_cache = File.expand_path(File.dirname(__FILE__)) + "/../vendor/cache/"
-        ENV['PATH'] = ENV['PATH'] + ';' + vendor_cache + '\\..;' + vendor_cache
-        Dir.mkdir(vendor_cache) unless File.directory? vendor_cache # development may not have it created yet...
-        Dir.chdir(vendor_cache) do
-          print 'downloading unzipper...'
-          download("http://downloads.sourceforge.net/project/sevenzip/7-Zip/9.20/7za920.zip", "7za920.zip")
-          system_blocking("unzip -o 7za920.zip") # -o means "overwrite" without prompting
-          # now we have 7za.exe
-          print 'downloading mencoder.7z (6MB) ...'
-#          download("http://downloads.sourceforge.net/project/mplayer-win32/MPlayer%20and%20MEncoder/revision%2032492/MPlayer-rtm-svn-32492.7z", "mencoder.7z")
-          download("http://downloads.sourceforge.net/project/mplayer-win32/MPlayer%20and%20MEncoder/revision%2033216/MPlayer-rtm-svn-33216.7z", "mencoder.7z")
-          system_blocking("7za e mencoder.7z -y -omencoder")
-          puts 'done'
-        end
+        download_zip_to "Mplayer/mencoder (6MB)", "http://downloads.sourceforge.net/project/mplayer-win32/MPlayer%20and%20MEncoder/revision%2033216/MPlayer-rtm-svn-33216.7z", "mencoder"
       end
       
       if ARGV.index('--create-mode')
@@ -430,7 +439,7 @@ module SensibleSwing
         if(path.length == 0)
           # this one has its own license...
           show_blocking_message_dialog("It appears that you need to install a dependency: SMPlayer.\n
-          Click ok to be directed to its download website, where you can download and install it, then restart sensible cinema.", 
+          Click ok to be directed to its download website, where you can download and install it (recommend webdl download), then restart sensible cinema.", 
           "Lacking dependency", JOptionPane::ERROR_MESSAGE)
           system_non_blocking("start http://smplayer.sourceforge.net/downloads.php")
           System.exit(1)

data/change_log_with_feature_list.txt

@@ -1,3 +1,8 @@
+== 0.22.0 ==
+
+Full release. No real changes, just made it able to be distributed again
+[+ bundles its own ffmpeg instead of requiring an imagemagick installation]
+
 == 0.21.10 == [gem only release]
 
 The (offline) subtitle parser now generates descriptions better (to look for false positives),

data/lib/ocr.rb

@@ -23,8 +23,8 @@ require 'whichr' # gem
 # ENV['PATH'] = im_path.gsub('/', "\\") + ';' + ENV['PATH']
 
 if RubyWhich.new.which('identify').length == 0 || RubyWhich.new.which('convert').length == 0
- puts 'appears you do not have imagemagick installed (or not in your path) -- please install it first! http://www.imagemagick.org/script/binary-releases.php'
- sleep 100
+ puts 'appears you do not have imagemagick installed (or not in your path) -- please download and install it first! http://www.imagemagick.org/script/binary-releases.php'
+ raise
 end
 
 # helper for OCR'ing single digits that were screen captured

data/sensible-cinema.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sensible-cinema}
-  s.version = "0.21.10"
+  s.version = "0.22.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Roger Pack"]
-  s.date = %q{2011-06-08}
+  s.date = %q{2011-06-09}
   s.email = %q{rogerdpack@gmail.com}
   s.executables = ["sensible-cinema", "sensible-cinema-cli"]
   s.extra_rdoc_files = [
@@ -97,6 +97,7 @@ Gem::Specification.new do |s|
     "todo.inventionzy.txt",
     "todo.open_edl_list_org.txt",
     "todo.subtitle",
+    "vendor/jruby-complete-1.6.2.jar",
     "vendor/monkey.png",
     "vendor/readme.txt",
     "www/index.html",
@@ -153,6 +154,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<rdp-win32screenshot>, [">= 0.0.7.3"])
       s.add_runtime_dependency(%q<mini_magick>, [">= 3.1"])
       s.add_runtime_dependency(%q<whichr>, [">= 0.3.6"])
+      s.add_runtime_dependency(%q<jruby-win32ole>, [">= 0"])
       s.add_runtime_dependency(%q<rdp-ruby-wmi>, [">= 0"])
       s.add_runtime_dependency(%q<plist>, [">= 0"])
       s.add_runtime_dependency(%q<ffi>, [">= 0"])
@@ -169,6 +171,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rdp-win32screenshot>, [">= 0.0.7.3"])
       s.add_dependency(%q<mini_magick>, [">= 3.1"])
       s.add_dependency(%q<whichr>, [">= 0.3.6"])
+      s.add_dependency(%q<jruby-win32ole>, [">= 0"])
       s.add_dependency(%q<rdp-ruby-wmi>, [">= 0"])
       s.add_dependency(%q<plist>, [">= 0"])
       s.add_dependency(%q<ffi>, [">= 0"])
@@ -186,6 +189,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rdp-win32screenshot>, [">= 0.0.7.3"])
     s.add_dependency(%q<mini_magick>, [">= 3.1"])
     s.add_dependency(%q<whichr>, [">= 0.3.6"])
+    s.add_dependency(%q<jruby-win32ole>, [">= 0"])
     s.add_dependency(%q<rdp-ruby-wmi>, [">= 0"])
     s.add_dependency(%q<plist>, [">= 0"])
     s.add_dependency(%q<ffi>, [">= 0"])

data/template_bats/RUN SENSIBLE CINEMA CLICK HERE.bat

@@ -1,5 +1,5 @@
 @echo Welcome to Sensible Cinema...
-@IF NOT EXIST sensible-cinema\VENDOR\CACHE GOTO NOWINDIR
+@IF NOT EXIST sensible-cinema\VENDOR\CACHE GOTO NOVENDORDIR
 @echo This window will display lots of debug output (you can just ignore this window)
 @setlocal
 @rem disable any local rubyopt settings, just in case...
@@ -8,21 +8,17 @@
 @java -version > NUL 2>&1 || echo need to install java JRE first please install it from java.com && pause && GOTO DONE
 
 @cd sensible-cinema
-@IF EXIST .\\vendor\\cache\\jruby-complete-1.6.1.jar GOTO RUN
-@echo 'downloading jruby [11MB]...'
-wget http://rogerdpack.t28.net/sensible-cinema/releases/jruby-complete-1.6.1.jar -O ./vendor/cache/jruby-complete-1.6.1.jar
-@rem fall through
+@java -cp "./vendor/jruby-complete-1.6.2.jar" org.jruby.Main bin\sensible-cinema %* || echo ERROR. Please look for error message, above, and report back the error you see, or fix it && pause
 
-:RUN
-@java -cp "./vendor/cache/jruby-complete-1.5.5.jar" org.jruby.Main bin\sensible-cinema %* || echo ERROR. Please look for error message, above, and report back the error you see, or fix it && pause
-@rem taskkill /f /im mencoder.exe
+@rem taskkill /f /im mencoder.exe ???
 
 GOTO DONE
 
-:NOWINDIR
-@echo "it appears you downloaded sensible cinema straight from github--please download it instead from http://rogerdpack.t28.net/sensible-cinema/"
+:NOVENDORDIR
+@echo "it appears you downloaded sensible cinema straight from github--please download it instead from http://rogerdpack.t28.net/sensible-cinema/ for it to work properly"
 @pause
 @start http://rogerdpack.t28.net/sensible-cinema
-GOTO DONE
+
+@rem fall through
 
 :DONE

metadata

@@ -2,7 +2,7 @@
 name: sensible-cinema
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.21.10
+  version: 0.22.0
 platform: ruby
 authors: 
   - Roger Pack
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-08 00:00:00 -06:00
+date: 2011-06-09 00:00:00 -06:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -58,7 +58,7 @@ dependencies:
     type: :runtime
     version_requirements: *id004
   - !ruby/object:Gem::Dependency 
-    name: rdp-ruby-wmi
+    name: jruby-win32ole
     prerelease: false
     requirement: &id005 !ruby/object:Gem::Requirement 
       none: false
@@ -69,7 +69,7 @@ dependencies:
     type: :runtime
     version_requirements: *id005
   - !ruby/object:Gem::Dependency 
-    name: plist
+    name: rdp-ruby-wmi
     prerelease: false
     requirement: &id006 !ruby/object:Gem::Requirement 
       none: false
@@ -80,7 +80,7 @@ dependencies:
     type: :runtime
     version_requirements: *id006
   - !ruby/object:Gem::Dependency 
-    name: ffi
+    name: plist
     prerelease: false
     requirement: &id007 !ruby/object:Gem::Requirement 
       none: false
@@ -91,7 +91,7 @@ dependencies:
     type: :runtime
     version_requirements: *id007
   - !ruby/object:Gem::Dependency 
-    name: hitimes
+    name: ffi
     prerelease: false
     requirement: &id008 !ruby/object:Gem::Requirement 
       none: false
@@ -99,32 +99,32 @@ dependencies:
         - - ">="
           - !ruby/object:Gem::Version 
             version: "0"
-    type: :development
+    type: :runtime
     version_requirements: *id008
   - !ruby/object:Gem::Dependency 
-    name: rspec
+    name: hitimes
     prerelease: false
     requirement: &id009 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
-        - - ">"
+        - - ">="
           - !ruby/object:Gem::Version 
-            version: "2"
+            version: "0"
     type: :development
     version_requirements: *id009
   - !ruby/object:Gem::Dependency 
-    name: jeweler
+    name: rspec
     prerelease: false
     requirement: &id010 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
-        - - ">="
+        - - ">"
           - !ruby/object:Gem::Version 
-            version: "0"
+            version: "2"
     type: :development
     version_requirements: *id010
   - !ruby/object:Gem::Dependency 
-    name: rake
+    name: jeweler
     prerelease: false
     requirement: &id011 !ruby/object:Gem::Requirement 
       none: false
@@ -135,7 +135,7 @@ dependencies:
     type: :development
     version_requirements: *id011
   - !ruby/object:Gem::Dependency 
-    name: hitimes
+    name: rake
     prerelease: false
     requirement: &id012 !ruby/object:Gem::Requirement 
       none: false
@@ -143,10 +143,10 @@ dependencies:
         - - ">="
           - !ruby/object:Gem::Version 
             version: "0"
-    type: :runtime
+    type: :development
     version_requirements: *id012
   - !ruby/object:Gem::Dependency 
-    name: rspec
+    name: hitimes
     prerelease: false
     requirement: &id013 !ruby/object:Gem::Requirement 
       none: false
@@ -157,7 +157,7 @@ dependencies:
     type: :runtime
     version_requirements: *id013
   - !ruby/object:Gem::Dependency 
-    name: jeweler
+    name: rspec
     prerelease: false
     requirement: &id014 !ruby/object:Gem::Requirement 
       none: false
@@ -168,7 +168,7 @@ dependencies:
     type: :runtime
     version_requirements: *id014
   - !ruby/object:Gem::Dependency 
-    name: rake
+    name: jeweler
     prerelease: false
     requirement: &id015 !ruby/object:Gem::Requirement 
       none: false
@@ -178,6 +178,17 @@ dependencies:
             version: "0"
     type: :runtime
     version_requirements: *id015
+  - !ruby/object:Gem::Dependency 
+    name: rake
+    prerelease: false
+    requirement: &id016 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    type: :runtime
+    version_requirements: *id016
 description: 
 email: rogerdpack@gmail.com
 executables: 
@@ -269,6 +280,7 @@ files:
   - todo.inventionzy.txt
   - todo.open_edl_list_org.txt
   - todo.subtitle
+  - vendor/jruby-complete-1.6.2.jar
   - vendor/monkey.png
   - vendor/readme.txt
   - www/index.html