enigmamachine 0.4.3 → 0.5.0

data/Rakefile

@@ -9,14 +9,15 @@ begin
     gem.description = %Q{A RESTful video encoder which you can use as either a front-end to ffmpeg or headless on a server.}
     gem.email = "dave@caprica"
     gem.homepage = "http://github.com/futurechimp/enigmamachine"
-    gem.authors = ["Dave Hrycyszyn"]
+    gem.authors = ["Dave Hrycyszyn", "Dmitry Brazhkin"]
     gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
-    gem.add_dependency "data_mapper", "=1.0.0"
-    gem.add_dependency "eventmachine", "=0.12.10"
-    gem.add_dependency "dm-sqlite-adapter", "=1.0.0"
+    gem.add_dependency "data_mapper", ">=1.0.2"
+    gem.add_dependency "dm-sqlite-adapter", ">=1.0.2"
+    gem.add_dependency "eventmachine", ">=0.12.10"
     gem.add_dependency "rack-flash"
     gem.add_dependency "ruby-debug"
-    gem.add_dependency "sinatra", "=1.0.0"
+    gem.add_dependency "sinatra", ">=1.0.0"
+    gem.add_dependency "streamio-ffmpeg", ">=0.7.3"
     gem.add_dependency "thin"
 
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings

data/VERSION

@@ -1 +1 @@
-0.4.3
+0.5.0

data/bin/enigmamachine

@@ -2,7 +2,7 @@
 
 # Enigmamachine command line interface script.
 # Run <tt>enigmamachine -h</tt> to get more usage.
-require File.dirname(__FILE__) + '/../lib/enigmamachine'
+require 'rubygems'
 require 'thin'
 
 rackup_file = "#{File.dirname(__FILE__)}/../lib/enigmamachine/config.ru"

data/enigmamachine.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{enigmamachine}
-  s.version = "0.4.3"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Dave Hrycyszyn"]
-  s.date = %q{2010-09-15}
+  s.authors = ["Dave Hrycyszyn", "Dmitry Brazhkin"]
+  s.date = %q{2010-10-04}
   s.default_executable = %q{enigmamachine}
   s.description = %q{A RESTful video encoder which you can use as either a front-end to ffmpeg or headless on a server.}
   s.email = %q{dave@caprica}
@@ -76,48 +76,51 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/futurechimp/enigmamachine}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{A RESTful video encoder.}
   s.test_files = [
-    "test/helper.rb",
-     "test/test_enigmamachine.rb",
-     "test/support/blueprints.rb",
+    "test/support/blueprints.rb",
+     "test/helper.rb",
      "test/test_encoding_queue.rb",
+     "test/test_video.rb",
      "test/test_encoder.rb",
-     "test/test_video.rb"
+     "test/test_enigmamachine.rb"
   ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-      s.add_runtime_dependency(%q<data_mapper>, ["= 1.0.0"])
-      s.add_runtime_dependency(%q<eventmachine>, ["= 0.12.10"])
-      s.add_runtime_dependency(%q<dm-sqlite-adapter>, ["= 1.0.0"])
+      s.add_runtime_dependency(%q<data_mapper>, [">= 1.0.2"])
+      s.add_runtime_dependency(%q<dm-sqlite-adapter>, [">= 1.0.2"])
+      s.add_runtime_dependency(%q<eventmachine>, [">= 0.12.10"])
       s.add_runtime_dependency(%q<rack-flash>, [">= 0"])
       s.add_runtime_dependency(%q<ruby-debug>, [">= 0"])
-      s.add_runtime_dependency(%q<sinatra>, ["= 1.0.0"])
+      s.add_runtime_dependency(%q<sinatra>, [">= 1.0.0"])
+      s.add_runtime_dependency(%q<streamio-ffmpeg>, [">= 0.7.3"])
       s.add_runtime_dependency(%q<thin>, [">= 0"])
     else
       s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-      s.add_dependency(%q<data_mapper>, ["= 1.0.0"])
-      s.add_dependency(%q<eventmachine>, ["= 0.12.10"])
-      s.add_dependency(%q<dm-sqlite-adapter>, ["= 1.0.0"])
+      s.add_dependency(%q<data_mapper>, [">= 1.0.2"])
+      s.add_dependency(%q<dm-sqlite-adapter>, [">= 1.0.2"])
+      s.add_dependency(%q<eventmachine>, [">= 0.12.10"])
       s.add_dependency(%q<rack-flash>, [">= 0"])
       s.add_dependency(%q<ruby-debug>, [">= 0"])
-      s.add_dependency(%q<sinatra>, ["= 1.0.0"])
+      s.add_dependency(%q<sinatra>, [">= 1.0.0"])
+      s.add_dependency(%q<streamio-ffmpeg>, [">= 0.7.3"])
       s.add_dependency(%q<thin>, [">= 0"])
     end
   else
     s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-    s.add_dependency(%q<data_mapper>, ["= 1.0.0"])
-    s.add_dependency(%q<eventmachine>, ["= 0.12.10"])
-    s.add_dependency(%q<dm-sqlite-adapter>, ["= 1.0.0"])
+    s.add_dependency(%q<data_mapper>, [">= 1.0.2"])
+    s.add_dependency(%q<dm-sqlite-adapter>, [">= 1.0.2"])
+    s.add_dependency(%q<eventmachine>, [">= 0.12.10"])
     s.add_dependency(%q<rack-flash>, [">= 0"])
     s.add_dependency(%q<ruby-debug>, [">= 0"])
-    s.add_dependency(%q<sinatra>, ["= 1.0.0"])
+    s.add_dependency(%q<sinatra>, [">= 1.0.0"])
+    s.add_dependency(%q<streamio-ffmpeg>, [">= 0.7.3"])
     s.add_dependency(%q<thin>, [">= 0"])
   end
 end

data/lib/enigmamachine.rb

@@ -10,6 +10,7 @@ require 'dm-validations'
 require 'dm-migrations'
 require 'open3'
 require 'logger'
+require 'streamio-ffmpeg'
 
 # Extensions to Sinatra
 #
@@ -270,5 +271,13 @@ class EnigmaMachine < Sinatra::Base
     end
   end
 
+  # Deletes a video.
+  #
+  delete '/videos/:id' do |id|
+    @video = Video.get(id)
+    @video.destroy
+    redirect "/videos"
+  end
+
 end
 

data/lib/enigmamachine/encoding_queue.rb

@@ -6,6 +6,7 @@ class EncodingQueue
   # starts looking for unencoded videos.
   #
   def initialize
+    @threads = YAML.load_file(Dir.getwd + '/config.yml')['threads'] if @threads.nil?
     EM.add_periodic_timer(5) {
       encode_next_video
     }
@@ -15,7 +16,7 @@ class EncodingQueue
   # Gets the next unencoded Video from the database and starts encoding it.
   #
   def encode_next_video
-    if Video.unencoded.count > 0 && ::Video.encoding.count == 0
+    if Video.unencoded.count > 0 && ::Video.encoding.count < @threads
       video = Video.unencoded.first
       begin
         video.encoder.encode(video)

data/lib/enigmamachine/models/encoder.rb

@@ -33,20 +33,16 @@ class Encoder
   #
   def ffmpeg(task, video)
     current_task_index = encoding_tasks.index(task)
-    command_string = "ffmpeg -y -i #{video.file} #{task.command} #{video.file + task.output_file_suffix}"
+    movie = FFMPEG::Movie.new(video.file)
     encoding_operation = proc {
-      video.state = "encoding"
-      video.save
-      Open3.popen3 "nice -n 19 #{command_string}" do |stdin, stdout, stderr|
-        while stderr.gets()
-          puts stderr.gets
-        end
+      video.update(:state => 'encoding')
+      movie.transcode(video.file + task.output_file_suffix, task.command) do |p|
+        puts p*100
       end
     }
     completion_callback = proc {|result|
       if task == encoding_tasks.last
-        video.state = "complete"
-        video.save
+        video.update(:state => 'complete')
         video.notify_complete
       else
         next_task_index = current_task_index + 1

data/lib/enigmamachine/models/video.rb

@@ -16,8 +16,15 @@ class Video
   property :encoder_id, Integer, :required => true
   property :callback_url, String
 
+  validates_with_method :file, :method => :check_file
+  validates_uniqueness_of :file, :scope => :encoder_id,
+    :message => "Same file with same encoder already exists"
   belongs_to :encoder
 
+  before :destroy, :check_destroy
+
+  default_scope(:default).update(:order => [:created_at.asc])
+
   # Notifies a calling application that processing has completed by sending
   # a GET request to the video's callback_url.
   #
@@ -68,5 +75,29 @@ class Video
     end
   end
 
+  private
+
+  def check_file
+    return [false, "Give a file name, not nil"] if self.file.nil?
+    return [false, "Give a file name, not a blank string"] if self.file.to_s.empty?
+    return [false, "#{self.file} does not exist"] unless File.exist? self.file
+    return [false, "#{self.file} is a directory"] if File.directory? self.file
+    movie = FFMPEG::Movie.new(self.file)
+    return [false, "#{self.file} is not a media file"] unless movie.valid?
+    return true
+  end
+
+  def check_destroy
+    return true if (self.state != 'encoding')
+    encoder = Encoder.get(self.encoder_id)
+    return true if stop_encode
+    throw :halt
+  end
+
+  def stop_encode
+    return false
+    #TODO Kill the encoder process
+  end
+
 end
 

data/lib/enigmamachine/views/videos/video.erb

@@ -1,6 +1,11 @@
 <% video = videos_video %>
 <li>
   <strong><%= video.state %></strong> - <%=h video.file %> -
-  created at <%=h video.created_at.strftime("%m/%d/%Y at  %H:%M:%S")%><br/>
+  created at <%=h video.created_at.strftime("%m/%d/%Y at  %H:%M:%S")%>
+  <form action="/videos/<%= video.id %>" method="POST">
+    <input name="_method" value="DELETE" type="hidden"/>
+    <input type="submit" value="Delete"/>
+  </form>
+  <br/>
 </li>
 

data/lib/generators/config.yml

@@ -1,3 +1,3 @@
 username: admin
 password: admin
-
+threads: 1

data/test/support/blueprints.rb

@@ -3,7 +3,7 @@ require 'faker'
 require 'sham'
 
 Encoder.blueprint do
-  name {"Blah encoder"}
+  name { Faker::Name.name }
 end
 
 Video.blueprint do
@@ -21,13 +21,13 @@ end
 EncodingTask.blueprint do
   name { "320x240 flv"}
   output_file_suffix { ".foo.flv" }
-  command { "-ss 00:00:02 -t 00:00:01 -vcodec mjpeg -vframes 1 -an -f rawvideo -s 180x136 -y"}
+  command { "-ss 00:00:02 -t 00:00:01 -vcodec mjpeg -vframes 1 -an -f rawvideo -s 180x136"}
 end
 
 EncodingTask.blueprint(:with_encoder) do
   name { "320x240 flv"}
   output_file_suffix { ".foo.flv" }
-  command { "-ss 00:00:02 -t 00:00:01 -vcodec mjpeg -vframes 1 -an -f rawvideo -s 180x136 -y"}
+  command { "-ss 00:00:02 -t 00:00:01 -vcodec mjpeg -vframes 1 -an -f rawvideo -s 180x136"}
   encoder
 end
 

data/test/test_video.rb

@@ -5,12 +5,18 @@ class TestVideo <  Test::Unit::TestCase
 
   context "A Video instance" do
 
-    should "be invalid without a file path" do
+    should "be invalid with a bad file path" do
       resource = ::Video.make
       resource.file = ""
-      assert !resource.valid?
+      assert(!resource.valid?, "must not be empty")
       resource.file = nil
-      assert !resource.valid?
+      assert(!resource.valid?, "must not be nil")
+      resource.file = "/fdfdf/sfdsdfsd/fse.gfr"
+      assert(!resource.valid?, "must be exist")
+      resource.file = File.dirname(__FILE__)
+      assert(!resource.valid?, "must not be a directory")
+      resource.file = __FILE__
+      assert(!resource.valid?, "must be media file")
     end
 
     should "be valid without a callback_url" do
@@ -27,9 +33,8 @@ class TestVideo <  Test::Unit::TestCase
       assert resource.valid?
     end
 
-    should "be valid with a file path" do
+    should "be valid with a correct file path" do
       resource = ::Video.make
-      resource.file = "foo.mpg"
       assert resource.valid?
     end
 
@@ -76,6 +81,48 @@ class TestVideo <  Test::Unit::TestCase
       end
     end
 
+    context "when try to delete any kind of videos from base" do
+      setup do
+        clear_videos
+        5.times { Video.make }
+      end
+
+      should "be delete an unencoded videos" do
+        count = Video.unencoded.count
+        2.times { Video.unencoded.first.destroy }
+        assert_equal count - 2, Video.unencoded.count
+      end
+
+      should "be delete a completed videos" do
+        3.times { Video.unencoded.first.update(:state => "complete") }
+        count = Video.complete.count
+        2.times { Video.complete.first.destroy }
+        assert_equal count - 2, Video.complete.count
+      end
+
+      should "be delete a videos with errors" do
+        3.times { Video.unencoded.first.update(:state => "error") }
+        count = Video.with_errors.count
+        2.times { Video.with_errors.first.destroy  }
+        assert_equal count - 2, Video.with_errors.count
+      end
+
+      should "not be delete an encoding videos" do
+        3.times { Video.unencoded.first.update(:state => "encoding") }
+        count = Video.encoding.count
+        2.times { Video.encoding.first.destroy }
+        assert_equal count, Video.encoding.count
+      end
+
+      should "be hard delete an encoding videos" do
+        3.times { Video.unencoded.first.update(:state => "encoding") }
+        count = Video.encoding.count
+        2.times { Video.encoding.first.destroy! }
+        assert_equal count - 2, Video.encoding.count
+      end
+
+    end
+
     should "be able to grab all completed videos" do
       assert Video.respond_to? "complete"
     end
@@ -91,7 +138,7 @@ class TestVideo <  Test::Unit::TestCase
   end
 
   def clear_videos
-    Video.all.each  {|v| v.destroy }
+    Video.all.each  {|v| v.destroy! }
   end
 
 end

metadata

@@ -1,32 +1,30 @@
 --- !ruby/object:Gem::Specification 
 name: enigmamachine
 version: !ruby/object:Gem::Version 
-  hash: 9
   prerelease: false
   segments: 
   - 0
-  - 4
-  - 3
-  version: 0.4.3
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Dave Hrycyszyn
+- Dmitry Brazhkin
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-09-15 00:00:00 +01:00
+date: 2010-10-04 00:00:00 +01:00
 default_executable: enigmamachine
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thoughtbot-shoulda
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -36,59 +34,51 @@ dependencies:
   name: data_mapper
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 1
         - 0
-        - 0
-        version: 1.0.0
+        - 2
+        version: 1.0.2
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: eventmachine
+  name: dm-sqlite-adapter
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 59
         segments: 
+        - 1
         - 0
-        - 12
-        - 10
-        version: 0.12.10
+        - 2
+        version: 1.0.2
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: dm-sqlite-adapter
+  name: eventmachine
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
-        - 1
         - 0
-        - 0
-        version: 1.0.0
+        - 12
+        - 10
+        version: 0.12.10
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rack-flash
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -98,11 +88,9 @@ dependencies:
   name: ruby-debug
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -112,11 +100,9 @@ dependencies:
   name: sinatra
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 1
         - 0
@@ -125,19 +111,31 @@ dependencies:
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: thin
+  name: streamio-ffmpeg
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
-        version: "0"
+        - 7
+        - 3
+        version: 0.7.3
   type: :runtime
   version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: thin
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id009
 description: A RESTful video encoder which you can use as either a front-end to ffmpeg or headless on a server.
 email: dave@caprica
 executables: 
@@ -211,34 +209,30 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A RESTful video encoder.
 test_files: 
-- test/helper.rb
-- test/test_enigmamachine.rb
 - test/support/blueprints.rb
+- test/helper.rb
 - test/test_encoding_queue.rb
-- test/test_encoder.rb
 - test/test_video.rb
+- test/test_encoder.rb
+- test/test_enigmamachine.rb