rivendell-import 0.0.5 → 0.6

data/Gemfile

@@ -3,6 +3,9 @@ source "https://rubygems.org"
 gemspec
 
 # gem "rivendell-db", :path => "~/Projects/RivendellDb"
+# gem "rivendell-api", :path => "~/Projects/RivendellApi"
+
+gem 'capistrano'
 
 if RUBY_PLATFORM =~ /linux/
   gem 'libnotify'

data/Gemfile.lock

@@ -1,15 +1,16 @@
 PATH
   remote: .
   specs:
-    rivendell-import (0.0.5)
+    rivendell-import (0.6)
       SyslogLogger (~> 2.0)
       activerecord (~> 3.2.8)
       activesupport (~> 3.2.8)
       daemons
       httmultiparty
+      httparty (= 0.11.0)
       listen (~> 1.2.1)
       mail
-      rivendell-api (~> 0.0.4)
+      rivendell-api (~> 0.0.5)
       rivendell-db
       sinatra
       sqlite3
@@ -20,21 +21,27 @@ GEM
   remote: https://rubygems.org/
   specs:
     SyslogLogger (2.0)
-    activemodel (3.2.13)
-      activesupport (= 3.2.13)
+    activemodel (3.2.14)
+      activesupport (= 3.2.14)
       builder (~> 3.0.0)
-    activerecord (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
+    activerecord (3.2.14)
+      activemodel (= 3.2.14)
+      activesupport (= 3.2.14)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
+    activesupport (3.2.14)
+      i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     addressable (2.3.5)
     arel (3.0.2)
     bcrypt-ruby (3.0.1)
     builder (3.0.3)
+    capistrano (2.14.2)
+      highline
+      net-scp (>= 1.0.0)
+      net-sftp (>= 2.0.0)
+      net-ssh (>= 2.0.14)
+      net-ssh-gateway (>= 1.1.0)
     cucumber (1.2.1)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
@@ -84,13 +91,14 @@ GEM
     guard-rspec (2.0.0)
       guard (>= 1.1)
       rspec (~> 2.11)
+    highline (1.6.16)
     httmultiparty (0.3.10)
       httparty (>= 0.7.3)
       multipart-post
     httparty (0.11.0)
       multi_json (~> 1.0)
       multi_xml (>= 0.5.2)
-    i18n (0.6.1)
+    i18n (0.6.5)
     json (1.7.5)
     json_pure (1.8.0)
     libnotify (0.8.0)
@@ -102,10 +110,17 @@ GEM
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.23)
-    multi_json (1.4.0)
-    multi_xml (0.5.4)
+    mime-types (1.25)
+    multi_json (1.7.7)
+    multi_xml (0.5.5)
     multipart-post (1.2.0)
+    net-scp (1.1.0)
+      net-ssh (>= 2.6.5)
+    net-sftp (2.1.1)
+      net-ssh (>= 2.6.5)
+    net-ssh (2.6.6)
+    net-ssh-gateway (1.2.0)
+      net-ssh (>= 2.6.5)
     null_logger (0.0.1)
     polyglot (0.3.3)
     rack (1.5.2)
@@ -117,7 +132,7 @@ GEM
       ffi (>= 0.5.0)
     rb-kqueue (0.2.0)
       ffi (>= 0.5.0)
-    rivendell-api (0.0.4)
+    rivendell-api (0.0.5)
       activesupport
       httmultiparty
       null_logger
@@ -143,11 +158,11 @@ GEM
       rack (~> 1.4)
       rack-protection (~> 1.4)
       tilt (~> 1.3, >= 1.3.4)
-    sqlite3 (1.3.7)
+    sqlite3 (1.3.8)
     stringex (1.5.1)
     thor (0.16.0)
     tilt (1.4.1)
-    treetop (1.4.14)
+    treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
     trollop (2.0)
@@ -159,6 +174,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  capistrano
   cucumber
   database_cleaner
   guard

data/Guardfile

@@ -1,7 +1,7 @@
 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
 
-guard 'rspec', :version => 2 do
+guard 'rspec' do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec" }

data/examples/config.rb

@@ -20,6 +20,8 @@ Rivendell::Import.config do |config|
   config.rivendell.password = ""
 
   config.to_prepare do |file|
+    cart.default_title = file.basename
+
     file.in("music") do
       cart.group = "MUSIC"
     end

data/features/manage_file_matching.feature

@@ -2,43 +2,42 @@ Feature: Manage Cart attributes
   In order to organize dropboxes
   An user
   wants to filter files by name
-  
+
   Scenario: Select a file by Ruby regexp
-    Given a configuration with this prepare block 
+    Given a configuration with this prepare block
      """
      if file.match /dummy/
        task.tags << 'matched'
      end
-     """ 
-    When a file "dummy.wav" is imported   
+     """
+    When a file "dummy.wav" is imported
     Then the task should have tag "matched"
 
   Scenario: Select a file with helper 'with'
-    Given a configuration with this prepare block 
+    Given a configuration with this prepare block
      """
      with /dummy/ do
        task.tag 'matched'
      end
-     """ 
-    When a file "dummy.wav" is imported   
+     """
+    When a file "dummy.wav" is imported
     Then the task should have tag "matched"
 
   Scenario: Select a cast by file name
     Given a cart "123" exists with title:"A long Title"
-    And a configuration with this prepare block 
+    And a configuration with this prepare block
      """
      cart.find_by_title file.basename
-     """ 
-    When a file "a-long-title.wav" is imported   
+     """
+    When a file "a-long-title.wav" is imported
     Then the task should have destination "Cart 123"
 
   Scenario: Select a cast by file name
     Given a cart "123" exists with title:"A long Title", group:"PAD"
     And a cart "666" exists with title:"A long Title", group:"MUSIC"
-    And a configuration with this prepare block 
+    And a configuration with this prepare block
      """
      cart.find_by_title file.basename, :group => 'PAD'
-     """ 
-    When a file "a-long-title.wav" is imported   
+     """
+    When a file "a-long-title.wav" is imported
     Then the task should have destination "Cart 123"
-

data/features/step_definitions/import_steps.rb

@@ -1,6 +1,6 @@
 def import
   @import ||= Rivendell::Import::Base.new.tap do |import|
-    
+
   end
 end
 
@@ -16,7 +16,7 @@ Given /^a cart "(.*?)" exists with (.*)$/ do |number, fields|
   attributes = fields.scan(/\ *(([^:]+):"([^\"]+)",?)/).map do |part, name, value|
     [name, value]
   end.as_hash
-  
+
   cart = Rivendell::API::Cart.new(attributes.merge(:number => number))
   Rivendell::Import::Task.mock_xport.carts << cart
 end
@@ -26,6 +26,7 @@ Given /^a configuration with this prepare block$/ do |code|
 end
 
 When /^a file "([^"]*)" is imported$/ do |file|
+  FileUtils.touch file, :mtime => Time.now - 15
   import.file file
 end
 

data/lib/rivendell/import/application.rb

@@ -8,13 +8,16 @@ module Rivendell::Import
 
     set :public_folder, ::File.expand_path('static', ::File.dirname(__FILE__))
     # set :static_cache_control, [:public, :max_age => 3600]
+    set :bind, '0.0.0.0'
 
     get '/' do
       redirect "/tasks", 302
     end
 
     get '/tasks' do
-      erb :index, :locals => { :tasks => tasks.paginate(:page => params[:page], :per_page => 15) }
+      tasks = self.tasks.paginate(:page => params[:page], :per_page => (params[:per_page] or 15))
+      tasks = tasks.search(params[:search]) if params[:search]
+      erb :index, :locals => { :tasks => tasks }
     end
 
     get '/tasks.json' do
@@ -50,4 +53,3 @@ module Rivendell::Import
 
   end
 end
-

data/lib/rivendell/import/base.rb

@@ -24,9 +24,15 @@ module Rivendell::Import
       Rivendell::Import.logger.info "Listen files in #{directory}"
 
       callback = Proc.new do |modified, added, removed|
-        added.each do |file|
-          Rivendell::Import.logger.debug "Detected file '#{file}'"
-          file(file, directory)
+        # Rivendell::Import.logger.debug [modified, added, removed].inspect
+        begin
+          added.each do |file|
+            Rivendell::Import.logger.debug "Detected file '#{file}'"
+            file(file, directory)
+          end
+        rescue Exception => e
+          Rivendell::Import.logger.error "Task creation failed : #{e}"
+          Rivendell::Import.logger.debug e.backtrace.join("\n")
         end
       end
 
@@ -41,6 +47,7 @@ module Rivendell::Import
     end
 
     def file(path, base_directory = nil)
+      path = ::File.expand_path(path, base_directory)
       file = Rivendell::Import::File.new path, :base_directory => base_directory
       create_task file
     end

data/lib/rivendell/import/cart.rb

@@ -5,7 +5,7 @@ module Rivendell::Import
     include ActiveModel::Serializers::JSON
 
     def attributes
-      %w{number group clear_cuts?}.inject({}) do |map, attribute|
+      %w{number group clear_cuts? title default_title}.inject({}) do |map, attribute|
         value = send attribute
         map[attribute] = value if value
         map
@@ -18,7 +18,7 @@ module Rivendell::Import
 
     delegate :blank?, :to => :attributes
 
-    attr_accessor :number, :group
+    attr_accessor :number, :group, :title, :default_title
     attr_reader :task
 
     def initialize(task = nil)
@@ -37,9 +37,18 @@ module Rivendell::Import
     end
 
     def update
-      # xport.edit_cart # to define title, etc ...
+      update_attributes = attributes.dup
+
+      if default_title
+        current_cart = xport.list_cart(number)
+        unless current_cart.has_title?
+          update_attributes[:title] = default_title
+        end
+      end
+
+      xport.edit_cart number, update_attributes
     end
-    
+
     def cut
       @cut ||= Cut.new(self)
     end
@@ -70,9 +79,9 @@ module Rivendell::Import
     cattr_accessor :db_url
 
     def cart_finder
-      @cart_finder ||= 
+      @cart_finder ||=
         begin
-          unless db_url 
+          unless db_url
             Rivendell::Import::CartFinder::ByApi.new xport
           else
             Rivendell::DB.establish_connection(db_url)
@@ -80,7 +89,6 @@ module Rivendell::Import
           end
         end
     end
-    
+
   end
 end
-  

data/lib/rivendell/import/cli.rb

@@ -46,7 +46,7 @@ module Rivendell::Import
 
     def parser
       @parser ||= Trollop::Parser.new do
-        opt :config, "Configuration file", :type => String, :required => true
+        opt :config, "Configuration file", :type => String #, :required => true
         opt :listen, "Wait for files in given directory"
         opt :dry_run, "Just create tasks without executing them"
         opt :debug, "Enable debug messages (in stderr)"

data/lib/rivendell/import/config_loader.rb

@@ -17,6 +17,7 @@ module Rivendell::Import
       return unless auto_reload?
 
       callback = Proc.new do |modified, added, removed|
+        Rivendell::Import.logger.debug "Configuration changed ? #{[modified, added, removed].inspect}"
         if modified.include? absolute_path
           Rivendell::Import.logger.info "Configuration changed, reload it"
           load

data/lib/rivendell/import/file.rb

@@ -43,9 +43,21 @@ module Rivendell::Import
       end
     end
 
+    def ready?
+      if age = modification_age
+        age > 10
+      else
+        false
+      end
+    end
+
+    def modification_age
+      Time.now - ::File.mtime(path) if exists?
+    end
+
     def in(directory, &block)
       if match %r{^#{directory}/}
-        yield 
+        yield
       end
     end
 

data/lib/rivendell/import/static/screen.css

@@ -135,3 +135,9 @@ em { font-style: italic; }
 #content table tr.odd {
   background-color: #EAEAEA;
 }
+#content .pagination {
+  float: right;
+}
+#content form {
+  margin-bottom: 10px;
+}

data/lib/rivendell/import/task.rb

@@ -11,15 +11,23 @@ module Rivendell::Import
     include Rivendell::Import::Tasking::Cart
     include Rivendell::Import::Tasking::Status
     include Rivendell::Import::Tasking::Destination
-    
+
     def self.pending
       where :status => "pending"
     end
 
+    def self.ready
+      self.pending.select(&:ready?)
+    end
+
     def self.ran
       where :status => %w{completed failed}
     end
 
+    def self.search(text)
+      where [ "lower(file_name) like ?", "%#{text.downcase}%" ]
+    end
+
     def ran?
       status.completed? or status.failed?
     end
@@ -71,6 +79,22 @@ module Rivendell::Import
     end
     after_status_changed :notify!, :on => [:completed, :failed]
 
+    def ready?
+      status.pending? and file_ready?
+    end
+
+    def detailed_status
+      if status.pending? and not ready?
+        "waiting"
+      else
+        status
+      end
+    end
+
+    def file_ready?
+      file.ready?
+    end
+
     def destroy_file!
       file.destroy! if delete_file?
     end
@@ -94,7 +118,7 @@ module Rivendell::Import
       logger.debug e.backtrace.join("\n")
     ensure
       unless status.completed?
-        change_status! :failed 
+        change_status! :failed
       end
       save!
     end

data/lib/rivendell/import/tasks.rb

@@ -2,11 +2,15 @@ module Rivendell::Import
   class Tasks
 
     def pop
-      Task.pending.first
+      ready_tasks.first
     end
 
     def run
-      Task.pending.find_each(&:run)
+      ready_tasks.each(&:run)
+    end
+
+    def ready_tasks
+      Task.ready
     end
 
     def create(file, &block)

data/lib/rivendell/import/version.rb

@@ -1,5 +1,5 @@
 module Rivendell
   module Import
-    VERSION = "0.0.5"
+    VERSION = "0.6"
   end
 end

data/lib/rivendell/import/views/index.erb

@@ -24,6 +24,11 @@
       <div id="content">
         <%= will_paginate tasks %>
 
+        <form action=""/>
+          <input type="text" name="search" value="<%= params[:search] %>"/>
+          <input type="submit" value="Search"/>
+        </form>
+
         <table>
           <tr>
             <th>#</th>
@@ -36,7 +41,7 @@
           <% tasks.each_with_index do |task, index| %>
           <tr class="<%= 'odd' if index.odd? %>">
             <td><%= task.id %></td>
-            <td><%= task.status %></td>
+            <td><%= task.detailed_status %></td>
             <td><%= distance_of_time_in_words_from_now(task.updated_at) %></td>
             <td><%= truncate_filename(task.file, 60) %></td>
             <td><%= task.destination %></td>

data/rivendell-import.gemspec

@@ -17,7 +17,9 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency 'listen', '~> 1.2.1'
   gem.add_runtime_dependency 'httmultiparty'
-  gem.add_runtime_dependency 'rivendell-api', '~> 0.0.4'
+  # 0.12.0 requires ruby 1.9.3
+  gem.add_runtime_dependency 'httparty', '0.11.0'
+  gem.add_runtime_dependency 'rivendell-api', '~> 0.0.5'
   gem.add_runtime_dependency 'trollop'
   gem.add_runtime_dependency 'activerecord', '~> 3.2.8'
   gem.add_runtime_dependency 'activesupport', '~> 3.2.8'

data/spec/rivendell/import/base_spec.rb

@@ -5,7 +5,7 @@ describe Rivendell::Import::Base do
   describe "#prepare_task" do
 
     let(:task) { mock }
-    
+
     it "should prepare task with to_prepare block" do
       subject.to_prepare = Proc.new {}
       task.should_receive :prepare
@@ -22,13 +22,13 @@ describe Rivendell::Import::Base do
       subject.stub :default_to_prepare => block
       subject.to_prepare.should == block
     end
-                           
+
   end
 
   describe "#create_task" do
 
     let(:file) { Rivendell::Import::File.new "dummy.wav" }
-    
+
     it "should create a task with given file" do
       Rivendell::Import::Task.should_receive(:create).with({:file => file}, {})
       subject.create_task file
@@ -44,9 +44,9 @@ describe Rivendell::Import::Base do
   describe "#file" do
 
     let(:file) { Rivendell::Import::File.new("dummy.wav") }
-    
+
     it "should create a File with given path and base_directory" do
-      Rivendell::Import::File.should_receive(:new).with("path", :base_directory => "base_directory")
+      Rivendell::Import::File.should_receive(:new).with(File.expand_path("path", "base_directory"), :base_directory => "base_directory")
       subject.file "path", "base_directory"
     end
 
@@ -59,11 +59,11 @@ describe Rivendell::Import::Base do
   end
 
   describe "#directory" do
-    
+
     it "should look for files in given directory" do
-      Dir.mktmpdir do |directory| 
+      Dir.mktmpdir do |directory|
         FileUtils.mkdir "#{directory}/subdirectory"
-        
+
         file = "#{directory}/subdirectory/dummy.wav"
         FileUtils.touch file
 
@@ -73,9 +73,9 @@ describe Rivendell::Import::Base do
     end
 
   end
-  
+
   describe "#process" do
-    
+
     it "should use file method when path isn't a directory" do
       File.stub :directory? => false
       subject.should_receive(:file).with("dummy")
@@ -93,7 +93,7 @@ describe Rivendell::Import::Base do
   describe "#listen" do
 
     before(:each) do
-      Listen.stub :to => true
+      Listen.stub :to => mock(:change => mock(:start! => true))
     end
 
     let(:directory) { "directory" }
@@ -103,7 +103,7 @@ describe Rivendell::Import::Base do
       worker.stub :start => worker
       Rivendell::Import::Worker.stub :new => worker
     end
-    
+
     it "should create a Worker" do
       Rivendell::Import::Worker.should_receive(:new).with(subject).and_return(worker)
       subject.listen directory
@@ -125,12 +125,6 @@ describe Rivendell::Import::Base do
       subject.listen directory
     end
 
-    it "should invoke file with added files" do
-      Listen.stub(:to).and_yield(nil,%w{file},nil)
-      subject.should_receive(:file).with("file", directory)
-      subject.listen directory
-    end
-
   end
 
 end