sensible-cinema 0.34.0 → 0.35.3

data/.gitmodules

@@ -1,3 +1,3 @@
 [submodule "lib/jruby-swing-helpers"]
 	path = lib/jruby-swing-helpers
-	url = https://rdp@github.com/rdp/jruby-swing-helpers.git
+	url = https://github.com/rdp/jruby-swing-helpers.git

data/README.TXT

@@ -75,6 +75,21 @@ DO NOT MAKE ILLEGAL COPIES OF DVD's for your country. See also is_it_legal_to_co
 DO NOT DISTRIBUTE EDITED DVD's.
 Watching movies edited may be legal in the US via the Family Protection Act.
 
+
+== Feedback/Contributing to Development ==
+
+Feedback, including feature requests, comments, etc. all welcome:
+
+Mailing List: http://groups.google.com/group/sensible-cinema, or just mail to 
+sensible-cinema@googlegroups.com or rogerdpack@gmail.com
+
+If you're a developer and want to help out with programmming or look and feel, etc., please do!
+See notes_for_potential_developers.txt file, and also http://github.com/rdp/sensible-cinema for source, and/or
+the wiki there.
+
+If you want to donate something, please consider donating to a charity of your choice.  
+No really, feel free, go ahead.
+
 == FAQ ==
 
 Q. How do I watch these on my TV, not just on my computer?
@@ -96,9 +111,7 @@ A. Yes, just use some WMC plugin that allows you to "call out" to a 3rd party so
    Then use the "advanced" mode "create side-by-side EDL file" to create an EDL for your previously existing file.
    Then make your WMC plugin "call out" to smplayer to play those files (through whatever means it necessary), and
    it will automatically pick up and use the EDL file.
-   You could also use the same side-by-side EDL file with XBMC, which also honors them, though
-   mutes are broken currently, so it will set it to just always skip. [note: this may not be implemented all the
-   way yet ask on the mailing list if it is or not, for XBMC]
+   You could also use the same side-by-side EDL file with XBMC, which also honors them (need at least an Eden release version).
 
 Q. Is it unethical to watch edited movies?
   Well, producers have been making "airplane edited" movies forever, why should this offend them? :)
@@ -171,9 +184,9 @@ Also clearplay doesn't seem to users for example leave comments on their filters
 Also you can't tell from clearplay's list whether a DVD is absent because it's clean, or because they
 haven't done a filter for it.
 Also sometimes certain DVD's "don't work" with clearplay for some reason (rental versions?) [3]
-As a friend once said "Clearplay is a bit of a hassle to use in today's day and age.
-It should either have wireless or an ethernet port on it. I should
-enter my login credentials to the box. When I stick a move in, it
+As a friend once said "Clearplay is a bit of a hassle to use in today's day and age.
+It should either have wireless or an ethernet port on it. I should
+enter my login credentials to the box. When I stick a move in, it
 should go to the website and download the filter."
 
 So overall I wanted to build my own that overcame some of these hurdles.
@@ -226,20 +239,6 @@ the authors and maintainers of said libraries, and anybody else I forgot to ment
 Sensible Cinema is a conglomeration of the good ideas from several people who contacted me
 over time.  Thanks for your contributions.
 
-== Feedback/Contributing to Development ==
-
-Feedback, including feature requests, comments, etc. all welcome:
-
-Mailing List: http://groups.google.com/group/sensible-cinema, or just mail to 
-sensible-cinema@googlegroups.com or rogerdpack@gmail.com
-
-If you're a developer and want to help out with programmming or look and feel, etc., please do!
-See notes_for_potential_developers.txt file, and also http://github.com/rdp/sensible-cinema for source, and/or
-the wiki there.
-
-If you want to donate something, please consider donating to a charity of your choice.  
-No really, feel free, go ahead.
-
 == Competition/re-use of files ==
 
 Note that competition/use of files from sensible cinema is welcome!

data/Rakefile

@@ -1,206 +1,202 @@
 require 'rubygems'
-require 'jeweler' # gem
-require 'os' # 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"
-    s.summary = "an EDL scene-skipper/bleeper that works with DVD's and online players like hulu"
-    s.email = "rogerdpack@gmail.com"
-    s.homepage = "http://github.com/rdp"
-    s.authors = ["Roger Pack"]
-    s.add_dependency 'os', '>= 0.9.4'
-    s.add_dependency 'sane', '>= 0.25.2'
-    s.add_dependency 'rdp-win32screenshot', '= 0.0.9'
-    s.add_dependency 'mini_magick', '>= 3.1' # for ocr...
-    s.add_dependency 'whichr', '>= 0.3.6'
-    s.add_dependency 'rdp-rautomation', '> 0.6.3' # LODO use mainline with next release, though I can't remember why
-    s.add_dependency 'rdp-ruby-wmi' # for windows
-    s.add_dependency 'plist' # for mac
-    s.add_dependency 'jruby-win32ole' # jruby-complete.jar doesn't include windows specifics...
-    s.add_dependency 'ffi' # mouse, etc. needed for windows MRI, probably jruby too [windows]
-    s.files.exclude '**/*.exe', '**/*.wav', '**/images/*'
-    s.add_development_dependency 'hitimes' # now jruby compat!
-    s.add_development_dependency 'rspec', '> 2'
-    s.add_development_dependency 'jeweler'
-    s.add_development_dependency 'rake'
-    
-    # add as real dependencies for now, as gem install --development is still broken for jruby, basically installing transitive dependencies in error <sigh> (actually might be fixed now though...so we may not need this)
-
-    for gem in s.development_dependencies #['hitimes', 'rspec', 'jeweler', 'rake']
-      # bundling rake won't be too expensive, right? and this allows for easier dev setup through gem install
-      s.add_dependency gem.name, gem.requirement
-    end
-  end
-
-desc 'run all specs'
-task 'spec' do
-  failed = []
-  Dir.chdir 'spec' do
-    for file in Dir['*spec*.rb'] do
-      puts "Running " + file
-      if !system(OS.ruby_bin + " " + file)
-        failed << file
-      end
-    end
-  end
-  if failed.length == 0
-    p 'all specs passed!' 
-  else
-    p 'at least one spec failed!', failed
-  end
-    
-end
-
-def get_transitive_dependencies dependencies
-  new_dependencies = []
-  dependencies.each{|d|
-   gem d.name # make sure it's loaded so that it'll be in Gem.loaded_specs
-   begin
-     dependency_spec = Gem.loaded_specs.select{|name, spec| name == d.name}[0][1]
-   rescue
-     raise 'possibly dont have that gem are you running jruby for sure?' + d.name
-   end
-   transitive_deps = dependency_spec.runtime_dependencies
-   new_dependencies << transitive_deps
-  }
-  new_dependencies.flatten.uniq
-end
-
-desc 'clear_and_copy_vendor_cache'
-task 'clear_and_copy_vendor_cache' do
-   system("rm -rf ../cache.bak")
-   system("cp -r vendor/cache ../cache.bak") # for retrieval later
-   Dir['vendor/cache/*'].each{|f|
-    FileUtils.rm_rf f
-    raise 'unable to delete: ' + f if File.exist?(f)
-   }
-   FileUtils.mkdir_p 'vendor/cache'
-end
-
-desc 'collect binary and gem deps for distribution'
-task 'rebundle_copy_in_dependencies' => 'gemspec' do
-   spec = eval File.read('sensible-cinema.gemspec')
+require 'jeweler' # gem
+require 'os' # 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"
+    s.summary = "an EDL scene-skipper/bleeper that works with DVD's and files and online players like netflix instant"
+    s.email = "rogerdpack@gmail.com"
+    s.homepage = "http://github.com/rdp"
+    s.authors = ["Roger Pack"]
+    
+    # IF CHANGED PUBLISH NEW GEM [and delete pkg] :)
+    s.add_dependency 'os', '>= 0.9.4'
+    s.add_dependency 'sane', '>= 0.25.4'
+    s.add_dependency 'rdp-win32screenshot', '= 0.0.9'
+    s.add_dependency 'mini_magick', '>= 3.1' # for ocr...
+    s.add_dependency 'whichr', '>= 0.3.6'
+    s.add_dependency 'rdp-rautomation', '> 0.6.3' # LODO use mainline with next release, though I can't remember why
+    s.add_dependency 'rdp-ruby-wmi' # for windows
+    s.add_dependency 'plist' # for mac
+    s.add_dependency 'jruby-win32ole' # jruby-complete.jar doesn't include windows specifics...
+    s.add_dependency 'ffi' # mouse, etc. needed for windows MRI, probably jruby too [windows]
+    s.files.exclude '**/*.exe', '**/*.wav', '**/images/*'
+    s.add_development_dependency 'hitimes' # now jruby compat!
+    s.add_development_dependency 'rspec', '> 2'
+    s.add_development_dependency 'jeweler'
+    s.add_development_dependency 'rake'
+    if ENV['for_gem_release']
+      # add as real dependencies for now, as gem install --development is still broken https://github.com/rubygems/rubygems/issues/309
+      for gem in s.development_dependencies #['hitimes', 'rspec', 'jeweler', 'rake']
+        s.add_dependency gem.name, gem.requirement
+     end  
+   end
+end
+
+desc 'run all specs'
+task 'spec' do
+  failed = []
+  Dir.chdir 'spec' do
+    for file in Dir['*spec*.rb'] do
+      puts "Running " + file
+      if !system(OS.ruby_bin + " " + file)
+        failed << file
+      end
+    end
+  end
+  if failed.length == 0
+    p 'all specs passed!' 
+  else
+    p 'at least one spec failed!', failed
+  end
+    
+end
+
+def get_transitive_dependencies dependencies
+  new_dependencies = []
+  dependencies.each{|d|
+   gem d.name # make sure it's loaded so that it'll be in Gem.loaded_specs
+   begin 
+     dependency_spec = Gem.loaded_specs.select{|name, spec| name == d.name}[0][1]
+   rescue
+     raise 'possibly dont have that gem are you running jruby for sure?' + d.name +  Gem.loaded_specs.select{|name, spec| name}.inspect
+   end
+   transitive_deps = dependency_spec.runtime_dependencies
+   new_dependencies << transitive_deps
+  }
+  new_dependencies.flatten.uniq
+end
+
+desc 'clear_and_copy_vendor_cache'
+task 'clear_and_copy_vendor_cache' do
+   FileUtils.rm_rf "../cache.bak"
+   system("cp -r vendor/cache ../cache.bak") # so we can retrieve it back later
+   Dir['vendor/cache/*'].each{|f|
+    FileUtils.rm_rf f
+    raise 'unable to delete: ' + f if File.exist?(f)
+   }
+end
+
+desc 'collect binary and gem deps for distribution'
+task 'rebundle_copy_in_dependencies' => 'gemspec' do
+   spec = eval File.read('sensible-cinema.gemspec')
    dependencies = spec.runtime_dependencies
-   dependencies = (dependencies + get_transitive_dependencies(dependencies)).uniq
+   dependencies = (dependencies + get_transitive_dependencies(dependencies)).uniq
    FileUtils.mkdir_p 'vendor/cache'
-   Dir.chdir 'vendor/cache' do
-     dependencies.each{|d|
-       system("#{OS.ruby_bin} -S gem unpack #{d.name}")
-     }
-   end
-end
-
-desc 'create distro zippable dir'
-task 'create_distro_dir' => :gemspec do # depends on gemspec...
-  raise 'need rebundle deps first' unless File.directory? 'vendor/cache'
-  require 'fileutils'
-  spec = eval File.read('sensible-cinema.gemspec')
-  dir_out = spec.name + "-" + spec.version.version + '/sensible-cinema'
-  old_glob = spec.name + '-*'
-  FileUtils.rm_rf Dir[old_glob] # remove any old versions' distro files
-  raise 'unable to delete...' if Dir[old_glob].length > 0
-  
-  existing = Dir['*']
-  FileUtils.mkdir_p dir_out
-  FileUtils.cp_r(existing, dir_out) # copies files, subdirs in
-  # these belong in the parent dir, by themselves.
-  root_distro =  "#{dir_out}/.."
-  FileUtils.cp_r(dir_out + '/template_bats/mac', root_distro) # the executable bit carries through somehow..
-  FileUtils.cp_r(dir_out + '/template_bats/pc', root_distro) # the executable bit carries through somehow..
-  FileUtils.cp(dir_out + '/template_bats/RUN SENSIBLE CINEMA CLICK HERE WINDOWS.bat', root_distro)
-  FileUtils.cp('template_bats/README_DISTRO.TXT', root_distro)
-  p 'created (still need to zips it) ' + dir_out
-  FileUtils.rm_rf Dir[dir_out + '/**/{spec}'] # don't need to distribute those..save 3M!
-end
-
-def cur_ver
-  File.read('VERSION').strip
-end
-
-def delete_now_packaged_dir name
-  FileUtils.rm_rf name
-end
-
-desc 'create *.zip,tgz'
-task 'zip' do
-  name = 'sensible-cinema-' + cur_ver
-  raise 'doesnt exist yet to zip?' unless File.directory? name
+   Dir.chdir 'vendor/cache' do
+     dependencies.each{|d|
+       system("#{OS.ruby_bin} -S gem unpack #{d.name}")
+     }
+   end
+end
+
+desc 'create distro zippable dir'
+task 'create_distro_dir' => :gemspec do # depends on gemspec...
+  raise 'need rebundle deps first' unless File.directory? 'vendor/cache'
+  require 'fileutils'
+  spec = eval File.read('sensible-cinema.gemspec')
+  dir_out = spec.name + "-" + spec.version.version + '/sensible-cinema'
+  old_glob = spec.name + '-*'
+  FileUtils.rm_rf Dir[old_glob] # remove any old versions' distro files
+  raise 'unable to delete...' if Dir[old_glob].length > 0
+  
+  existing = Dir['*']
+  FileUtils.mkdir_p dir_out
+  FileUtils.cp_r(existing, dir_out) # copies files, subdirs in
+  # these belong in the parent dir, by themselves.
+  root_distro =  "#{dir_out}/.."
+  FileUtils.cp_r(dir_out + '/template_bats/mac', root_distro) # the executable bit carries through somehow..
+  FileUtils.cp_r(dir_out + '/template_bats/pc', root_distro) # the executable bit carries through somehow..
+  FileUtils.cp(dir_out + '/template_bats/RUN SENSIBLE CINEMA CLICK HERE WINDOWS.bat', root_distro)
+  FileUtils.cp('template_bats/README_DISTRO.TXT', root_distro)
+  p 'created (still need to zips it) ' + dir_out
+  FileUtils.rm_rf Dir[dir_out + '/**/{spec}'] # don't need to distribute those..save 3M!
+end
+
+def cur_ver
+  File.read('VERSION').strip
+end
+
+def delete_now_packaged_dir name
+  FileUtils.rm_rf name
+end
+
+desc 'create *.zip,tgz'
+task 'zip' do
+  name = 'sensible-cinema-' + cur_ver
+  raise 'doesnt exist yet to zip?' unless File.directory? name
   if OS.doze?
-    sys "\"c:\\Program Files\\7-Zip\\7z.exe\" a -tzip -r  #{name}.zip #{name}"
+    raise 'please distro from linux only so we can get mac distros too'
   else
-    #sys "zip -r #{name}.zip #{name}"
-    puts "NOT packaging win installer"
+    sys "zip -r #{name}.zip #{name}"
   end
-  if OS.doze?
-    puts 'NOT packaging OS X installer'
-  else
-    sys "tar -cvzf #{name}.mac-os-x.tgz #{name}"
-  end
-  delete_now_packaged_dir name
-  p 'created ' + name + '.zip,tgz and also deleted its [create from] folder'
-end
-
-
-def sys arg, failing_is_ok = false
- 3.times { |n|
-  if n > 0
-    p 'retrying ' + arg
-  end
-  if system arg
-    return
+  sys "tar -cvzf #{name}.mac-os-x.tgz #{name}"
+  delete_now_packaged_dir name
+  p 'created ' + name + '.zip,tgz and also deleted its [create from] folder'
+end
+
+def sys arg, failing_is_ok = false
+ 3.times { |n|
+  if n > 0
+    p 'retrying ' + arg
+  end
+  if system arg
+    return
   end
- }
- raise arg + ' failed 3x!' unless failing_is_ok
-end
-
-desc 'deploy to sourceforge, after zipping'
-task 'deploy' do
-  p 'creating sf shell'
-  sys "ssh rdp@ilab1.cs.byu.edu 'ssh rogerdpack,sensible-cinema@shell.sourceforge.net create'" # needed for the next command to be able to work [weird]
-  p 'creating sf dir'
-  sys "ssh rdp@ilab1.cs.byu.edu 'ssh rogerdpack,sensible-cinema@shell.sourceforge.net \"mkdir /home/frs/project/s/se/sensible-cinema/#{cur_ver}\"'", true
-  for suffix in [ '.zip', '.mac-os-x.tgz']
+ }
+ raise arg + ' failed 3x!' unless failing_is_ok
+end
+
+desc 'deploy to sourceforge, after zipping'
+task 'deploy' do
+  p 'creating sf shell'
+  sys "ssh rdp@ilab1.cs.byu.edu 'ssh rogerdpack,sensible-cinema@shell.sourceforge.net create'" # needed for the next command to be able to work [weird]
+  p 'creating sf dir'
+  sys "ssh rdp@ilab1.cs.byu.edu 'ssh rogerdpack,sensible-cinema@shell.sourceforge.net \"mkdir /home/frs/project/s/se/sensible-cinema/#{cur_ver}\"'", true
+  for suffix in [ '.zip', '.mac-os-x.tgz']
     name = 'sensible-cinema-' + cur_ver + suffix
-    if File.exist? name
-      p 'copying to ilab ' + name
-      sys "scp #{name} rdp@ilab1.cs.byu.edu:~/incoming"
-      p 'copying into sf from ilab'
+    if File.exist? name
+      p 'copying to ilab ' + name
+      sys "scp #{name} rdp@ilab1.cs.byu.edu:~/incoming"
+      p 'copying into sf from ilab ' + name
       sys "ssh rdp@ilab1.cs.byu.edu 'scp ~/incoming/#{name} rogerdpack,sensible-cinema@frs.sourceforge.net:/home/frs/project/s/se/sensible-cinema/#{cur_ver}/#{name}'"
     else
       p 'not copying:' + name
-    end
-  end
-  p 'successfully deployed to sf! ' + cur_ver
-end
-
-# task 'gem_release' do
-#   FileUtils.rm_rf 'pkg'
-#   Rake::Task["build"].execute
-#   sys("#{Gem.ruby} -S gem push pkg/sensible-cinema-#{cur_ver}.gem")
-#   FileUtils.rm_rf 'pkg'
-# end
-
-def on_wbo command
-  sys "ssh rdp@ilab1.cs.byu.edu \"ssh wilkboar@rogerdpack.t28.net '#{command}' \""
-  
-end
-
-desc 'sync website'
-task 'update wbo' do
-  on_wbo 'cd ~/sensible-cinema/source && git pull'
-end
-
-desc ' (releases with clean cache dir, which we need now)'
-task 'full_release' => [:clear_and_copy_vendor_cache, :rebundle_copy_in_dependencies, :create_distro_dir] do # this is :release
-  p 'remember to run all the specs first!'
-  raise unless system("git pull")
-  raise unless system("git push origin master")
-  #Rake::Task["gem_release"].execute
-  Rake::Task["zip"].execute
-  Rake::Task["deploy"].execute
-  Rake::Task["update wbo"].execute
-  system(c = "cp -r ../cache.bak/* vendor/cache")
-  system("rm -rf ../cache.bak")
-end
+    end
+  end
+  p 'successfully deployed to sf! ' + cur_ver
+end
+
+# task 'gem_release' do
+#   FileUtils.rm_rf 'pkg'
+#   Rake::Task["build"].execute
+#   sys("#{Gem.ruby} -S gem push pkg/sensible-cinema-#{cur_ver}.gem")
+#   FileUtils.rm_rf 'pkg'
+# end
+
+def on_wbo command
+  sys "ssh rdp@ilab1.cs.byu.edu \"ssh wilkboar@rogerdpack.t28.net '#{command}' \""
+  
+end
+
+desc 'sync wbo website'
+task 'sync_wbo_website' do
+  on_wbo 'cd ~/sensible-cinema/source && git pull'
+end
+
+desc ' (releases with clean cache dir, which we need now)'
+task 'full_release' => [:clear_and_copy_vendor_cache, :rebundle_copy_in_dependencies, :create_distro_dir] do # this is :release
+  p 'remember to run all the specs!! Have any!'
+  require 'os'
+  raise 'need jruby' unless OS.jruby?
+  raise unless system("git pull")
+  raise unless system("git push origin master")
+  #Rake::Task["gem_release"].execute
+  Rake::Task["zip"].execute
+  Rake::Task["deploy"].execute
+  Rake::Task["sync_wbo_website"].execute
+  system(c = "cp -r ../cache.bak/* vendor/cache")
+  system("rm -rf ../cache.bak")
+end