rivendell-import 0.6 → 0.7

data/Gemfile

@@ -9,5 +9,4 @@ gem 'capistrano'
 
 if RUBY_PLATFORM =~ /linux/
   gem 'libnotify'
-  gem 'rb-inotify'
 end

data/Gemfile.lock

@@ -1,17 +1,17 @@
 PATH
   remote: .
   specs:
-    rivendell-import (0.6)
+    rivendell-import (0.7)
       SyslogLogger (~> 2.0)
       activerecord (~> 3.2.8)
       activesupport (~> 3.2.8)
       daemons
       httmultiparty
       httparty (= 0.11.0)
-      listen (~> 1.2.1)
+      listen (~> 1.3.1)
       mail
       rivendell-api (~> 0.0.5)
-      rivendell-db
+      rivendell-db (~> 0.2)
       sinatra
       sqlite3
       trollop
@@ -21,20 +21,20 @@ GEM
   remote: https://rubygems.org/
   specs:
     SyslogLogger (2.0)
-    activemodel (3.2.14)
-      activesupport (= 3.2.14)
+    activemodel (3.2.16)
+      activesupport (= 3.2.16)
       builder (~> 3.0.0)
-    activerecord (3.2.14)
-      activemodel (= 3.2.14)
-      activesupport (= 3.2.14)
+    activerecord (3.2.16)
+      activemodel (= 3.2.16)
+      activesupport (= 3.2.16)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activesupport (3.2.14)
+    activesupport (3.2.16)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     addressable (2.3.5)
-    arel (3.0.2)
-    bcrypt-ruby (3.0.1)
+    arel (3.0.3)
+    bcrypt-ruby (3.1.2)
     builder (3.0.3)
     capistrano (2.14.2)
       highline
@@ -79,7 +79,7 @@ GEM
     do_mysql (0.10.13)
       data_objects (= 0.10.13)
     fastercsv (1.5.5)
-    ffi (1.9.0)
+    ffi (1.9.3)
     gherkin (2.11.2)
       json (>= 1.4.6)
     guard (1.4.0)
@@ -98,20 +98,20 @@ GEM
     httparty (0.11.0)
       multi_json (~> 1.0)
       multi_xml (>= 0.5.2)
-    i18n (0.6.5)
-    json (1.7.5)
-    json_pure (1.8.0)
-    libnotify (0.8.0)
+    i18n (0.6.9)
+    json (1.8.1)
+    json_pure (1.8.1)
+    libnotify (0.8.2)
       ffi (>= 1.0.11)
-    listen (1.2.2)
+    listen (1.3.1)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
       rb-kqueue (>= 0.2)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.25)
-    multi_json (1.7.7)
+    mime-types (1.25.1)
+    multi_json (1.8.2)
     multi_xml (0.5.5)
     multipart-post (1.2.0)
     net-scp (1.1.0)
@@ -124,19 +124,21 @@ GEM
     null_logger (0.0.1)
     polyglot (0.3.3)
     rack (1.5.2)
-    rack-protection (1.5.0)
+    rack-protection (1.5.1)
       rack
     rake (0.9.2.2)
     rb-fsevent (0.9.3)
-    rb-inotify (0.9.0)
+    rb-inotify (0.9.2)
       ffi (>= 0.5.0)
     rb-kqueue (0.2.0)
       ffi (>= 0.5.0)
+    rdoc (3.12.2)
+      json (~> 1.4)
     rivendell-api (0.0.5)
       activesupport
       httmultiparty
       null_logger
-    rivendell-db (0.0.1)
+    rivendell-db (0.2)
       dm-core
       dm-mysql-adapter
       dm-serializer
@@ -154,7 +156,7 @@ GEM
       multi_json (~> 1.0)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
-    sinatra (1.4.3)
+    sinatra (1.4.4)
       rack (~> 1.4)
       rack-protection (~> 1.4)
       tilt (~> 1.3, >= 1.3.4)
@@ -166,9 +168,9 @@ GEM
       polyglot
       polyglot (>= 0.3.1)
     trollop (2.0)
-    tzinfo (0.3.37)
+    tzinfo (0.3.38)
     uuidtools (2.1.4)
-    will_paginate (3.0.4)
+    will_paginate (3.0.5)
 
 PLATFORMS
   ruby
@@ -182,7 +184,7 @@ DEPENDENCIES
   guard-rspec
   libnotify
   rake
-  rb-inotify
+  rdoc
   rivendell-import!
   rspec
   simplecov

data/examples/config.rb

@@ -12,6 +12,8 @@ Mail.defaults do
   delivery_method :smtp, { :address => "smtp.free.fr" }
 end
 
+# Rivendell::API::Xport.debug_output $stdout
+
 Rivendell::Import::Notifier::Mail.from = "root@tryphon.eu"
 
 Rivendell::Import.config do |config|
@@ -19,6 +21,8 @@ Rivendell::Import.config do |config|
   config.rivendell.login_name = "user"
   config.rivendell.password = ""
 
+  config.rivendell.db_url = 'mysql://rduser:letmein@localhost/Rivendell'
+
   config.to_prepare do |file|
     cart.default_title = file.basename
 
@@ -27,8 +31,14 @@ Rivendell::Import.config do |config|
     end
 
     file.in("pad") do
+      name = file.basename
+      if name.match /-lundi$/
+        cart.cut.days = %w{mon}
+        name.gsub! /-lundi$/, ""
+      end
+
       cart.clear_cuts!
-      cart.find_by_title file.basename
+      cart.find_by_title name
     end
 
     cart.group ||= "TEST"

data/lib/rivendell/import.rb

@@ -40,6 +40,7 @@ require "rivendell/import/worker"
 require "rivendell/import/task"
 require "rivendell/import/tasks"
 require "rivendell/import/base"
+require "rivendell/import/database"
 require "rivendell/import/cart_finder"
 require "rivendell/import/cart"
 require "rivendell/import/context"

data/lib/rivendell/import/base.rb

@@ -22,17 +22,16 @@ module Rivendell::Import
       workers << Worker.new(self).start unless options[:dry_run]
 
       Rivendell::Import.logger.info "Listen files in #{directory}"
-
       callback = Proc.new do |modified, added, removed|
         # Rivendell::Import.logger.debug [modified, added, removed].inspect
-        begin
-          added.each do |file|
+        added.each do |file|
+          begin
             Rivendell::Import.logger.debug "Detected file '#{file}'"
             file(file, directory)
+          rescue Exception => e
+            Rivendell::Import.logger.error "Task creation failed : #{e}"
+            Rivendell::Import.logger.debug e.backtrace.join("\n")
           end
-        rescue Exception => e
-          Rivendell::Import.logger.error "Task creation failed : #{e}"
-          Rivendell::Import.logger.debug e.backtrace.join("\n")
         end
       end
 

data/lib/rivendell/import/cart.rb

@@ -4,16 +4,30 @@ module Rivendell::Import
     include ActiveModel::Serialization
     include ActiveModel::Serializers::JSON
 
+    def as_json(options = {})
+      super options.merge(:root => false)
+    end
+
     def attributes
-      %w{number group clear_cuts? title default_title}.inject({}) do |map, attribute|
+      attributes = {}
+      %w{number group clear_cuts title default_title import_options}.each do |attribute|
         value = send attribute
-        map[attribute] = value if value
-        map
+        attributes[attribute] = value if value.present?
+      end
+      if (cut_attributes = cut.attributes).present?
+        attributes["cut"] = cut_attributes
       end
+      attributes
     end
 
     def attributes=(attributes)
-      attributes.each { |k,v| send "#{k}=", v }
+      attributes.each do |k,v|
+        unless k == "cut"
+          send "#{k}=", v
+        else
+          cut.attributes = v
+        end
+      end
     end
 
     delegate :blank?, :to => :attributes
@@ -53,18 +67,31 @@ module Rivendell::Import
       @cut ||= Cut.new(self)
     end
 
+    attr_accessor :import_options
+    def import_options
+      @import_options ||= {}
+    end
+
     def import(file)
       raise "File #{file.path} not found" unless file.exists?
 
+      if clear_cuts?
+        Rivendell::Import.logger.debug "Clear cuts of Cart #{number}"
+        xport.clear_cuts number
+      end
       cut.create
-      xport.clear_cuts number if clear_cuts?
-      xport.import number, cut.number, file.path
+
+      Rivendell::Import.logger.debug "Import #{file.path} in Cut #{cut.number}"
+      xport.import number, cut.number, file.path, import_options
       cut.update
     end
 
     def find_by_title(string, options = {})
+      Rivendell::Import.logger.debug "Looking for a Cart '#{string}'"
       if remote_cart = cart_finder.find_by_title(string, options)
+        Rivendell::Import.logger.debug "Found Cart #{remote_cart.number}"
         self.number = remote_cart.number
+        self.import_options[:use_metadata] = false
       end
     end
 
@@ -75,18 +102,12 @@ module Rivendell::Import
       self.clear_cuts = true
     end
 
-    @db_url = nil
-    cattr_accessor :db_url
-
     def cart_finder
       @cart_finder ||=
-        begin
-          unless db_url
-            Rivendell::Import::CartFinder::ByApi.new xport
-          else
-            Rivendell::DB.establish_connection(db_url)
-            Rivendell::Import::CartFinder::ByDb.new
-          end
+        unless Database.enabled?
+          Rivendell::Import::CartFinder::ByApi.new xport
+        else
+          Rivendell::Import::CartFinder::ByDb.new
         end
     end
 

data/lib/rivendell/import/cart_finder_by_db.rb

@@ -1,18 +1,20 @@
 # Find Carts using a direct database access.
-# 
+#
 # Provided to workaround actual accent problems experienced with Rivendell API.
 module Rivendell::Import
   class CartFinder::ByDb < CartFinder
-  
+
     def carts(options = {})
+      Database.init
+
       query_options = { :fields => [ :number, :title ] }
-      
-      if options[:group] 
-        query_options[:group_name] = options[:group] 
+
+      if options[:group]
+        query_options[:group_name] = options[:group]
       end
 
       Rivendell::DB::Cart.all(query_options)
     end
-  
+
   end
 end

data/lib/rivendell/import/cli.rb

@@ -126,12 +126,15 @@ module Rivendell::Import
       end
 
       config_loader.load
+
       daemonize
 
       config_loader.listen_file
+      sleep 1
 
       if listen_mode?
         start_webserver
+        sleep 1
 
         listen_options = {}
         listen_options[:dry_run] = true if dry_run?

data/lib/rivendell/import/config.rb

@@ -25,6 +25,10 @@ module Rivendell::Import
         Task.default_xport_options[:password] = password
       end
 
+      def db_url=(url)
+        Database.url = url
+      end
+
     end
 
   end

data/lib/rivendell/import/cut.rb

@@ -7,13 +7,28 @@ module Rivendell::Import
     attr_reader :cart
 
     attr_accessor :number
+    attr_accessor :datetime
+    attr_accessor :daypart
+    attr_accessor :days
 
     def initialize(cart)
       @cart = cart
     end
 
+    def as_json(options = {})
+      super options.merge(:root => false)
+    end
+
     def attributes
-      {}
+      %w{datetime daypart days}.inject({}) do |map, attribute|
+        value = send attribute
+        map[attribute] = value if value
+        map
+      end
+    end
+
+    def attributes=(attributes)
+      attributes.each { |k,v| send "#{k}=", v }
     end
 
     def xport
@@ -21,12 +36,38 @@ module Rivendell::Import
     end
 
     def create
-      # xport.delete_cuts # if clean cuts is required
+      Rivendell::Import.logger.debug "Create Cut for Cart #{cart.number}"
       self.number = xport.add_cut(cart.number).number unless number
     end
 
+    def name
+      "%06d_%03d" % [cart.number, number]
+    end
+
+    def db_attributes?
+      [datetime, daypart, days].any? &:present?
+    end
+
     def update
-      # xport.edit_cut # to define attributes
+      if db_attributes?
+        Rivendell::Import.logger.debug "Save Cut db attributes #{inspect}"
+        Database.init
+
+        db_cut = Rivendell::DB::Cut.get(name)
+        if datetime
+          db_cut.start_datetime, db_cut.end_datetime = datetime.begin, datetime.end
+        end
+        if daypart
+          db_cut.start_daypart, db_cut.end_daypart = daypart.begin, daypart.end
+        end
+        if days
+          db_cut.days = days
+        end
+
+        Rivendell::Import.logger.debug "Change Cut #{number} in DB #{db_cut.inspect}"
+
+        db_cut.save
+      end
     end
 
   end

data/lib/rivendell/import/database.rb

@@ -0,0 +1,21 @@
+module Rivendell::Import
+  module Database
+
+    mattr_accessor :url
+
+    def self.enabled?
+      url.present?
+    end
+
+    @@initialized = false
+    def self.init
+      raise "Database not enabled (no config.rivendell.db_url defined)" unless enabled?
+
+      unless @@initialized
+        Rivendell::DB.establish_connection(url)
+        @@initialized = true
+      end
+    end
+
+  end
+end

data/lib/rivendell/import/tasking/cart.rb

@@ -7,7 +7,7 @@ module Rivendell::Import::Tasking
 
     def cart
       @cast ||= Rivendell::Import::Cart.new(self).tap do |cart|
-        cart.from_json raw_cart if raw_cart
+        cart.from_json(raw_cart, false) if raw_cart
       end
     end
 

data/lib/rivendell/import/version.rb

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

data/rivendell-import.gemspec

@@ -15,7 +15,8 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Rivendell::Import::VERSION
 
-  gem.add_runtime_dependency 'listen', '~> 1.2.1'
+  # 2.0 requires ruby 1.9.3
+  gem.add_runtime_dependency 'listen', '~> 1.3.1'
   gem.add_runtime_dependency 'httmultiparty'
   # 0.12.0 requires ruby 1.9.3
   gem.add_runtime_dependency 'httparty', '0.11.0'
@@ -32,7 +33,7 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency 'daemons'
 
-  gem.add_runtime_dependency 'rivendell-db'
+  gem.add_runtime_dependency 'rivendell-db', '~> 0.2'
 
   gem.add_development_dependency "simplecov"
   gem.add_development_dependency "rspec"
@@ -40,6 +41,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "guard-rspec"
   gem.add_development_dependency "guard-cucumber"
   gem.add_development_dependency "rake"
+  gem.add_development_dependency "rdoc"
   gem.add_development_dependency "cucumber"
   gem.add_development_dependency "database_cleaner"
   # gem.add_development_dependency "remarkable_activerecord"

data/spec/rivendell/import/cart_finder_spec.rb

@@ -16,7 +16,7 @@ describe Rivendell::Import::CartFinder do
     before do
       subject.stub(:carts).and_return(carts)
     end
-    
+
     it "should use carts with given options" do
       subject.should_receive(:carts).with(options).and_return(carts)
       subject.find_all_by_title("dummy", options)
@@ -53,7 +53,7 @@ describe Rivendell::Import::CartFinder do
     it "should remove accents" do
       subject.call("Ç'est évident").should == "c est evident"
     end
-    
+
   end
 
   describe "#find_by_title" do
@@ -61,7 +61,7 @@ describe Rivendell::Import::CartFinder do
     before do
       subject.stub(:carts).and_return(carts)
     end
-    
+
     it "should try an exact match" do
       subject.find_by_title(cart.title).should == cart
     end
@@ -98,7 +98,7 @@ describe Rivendell::Import::CartFinder::ByApi do
     before do
       subject.xport.stub :list_carts => carts
     end
-    
+
     it "should return Xport#list_carts result" do
       subject.carts.should == carts
     end
@@ -131,9 +131,10 @@ describe Rivendell::Import::CartFinder::ByDb do
   describe "#carts" do
 
     before do
+      Rivendell::Import::Database.stub :init
       Rivendell::DB::Cart.stub :all => carts
     end
-    
+
     it "should return Carts found in database" do
       subject.carts.should == carts
     end

data/spec/rivendell/import/cart_spec.rb

@@ -10,7 +10,7 @@ describe Rivendell::Import::Cart do
     it "should use the given task" do
       Rivendell::Import::Cart.new(task).task.should == task
     end
-    
+
   end
 
   describe "#xport" do
@@ -18,7 +18,7 @@ describe Rivendell::Import::Cart do
     before(:each) do
       task.stub :xport => mock
     end
-    
+
     it "should be task xport" do
       subject.xport.should == subject.task.xport
     end
@@ -64,7 +64,7 @@ describe Rivendell::Import::Cart do
         subject.group = nil
         lambda { subject.create }.should raise_error
       end
-                                         
+
     end
 
   end
@@ -85,14 +85,20 @@ describe Rivendell::Import::Cart do
       subject.number = 123
       subject.stub :cut => mock.as_null_object, :xport => mock.as_null_object
     end
-    
+
     it "should create Cut" do
       subject.cut.should_receive :create
       subject.import file
     end
 
     it "should import file via xport with Cart and Cut numbers" do
-      subject.xport.should_receive(:import).with(subject.number, subject.cut.number, file.path)
+      subject.xport.should_receive(:import).with(subject.number, subject.cut.number, file.path, {})
+      subject.import file
+    end
+
+    it "should use import options if specified" do
+      subject.import_options[:dummy] = true
+      subject.xport.should_receive(:import).with(subject.number, subject.cut.number, file.path, subject.import_options)
       subject.import file
     end
 
@@ -145,6 +151,11 @@ describe Rivendell::Import::Cart do
       subject.find_by_title("dummy", :group => "TEST")
     end
 
+    it "should add the import option :use_metadata => false" do
+      subject.find_by_title(cart.title)
+      subject.import_options[:use_metadata].should be_false
+    end
+
   end
 
   describe "#clear_cuts!" do
@@ -152,7 +163,7 @@ describe Rivendell::Import::Cart do
     before do
       subject.number = 123
     end
-    
+
     it "should set flag clear_cuts" do
       subject.clear_cuts!
       subject.clear_cuts.should be_true
@@ -160,4 +171,42 @@ describe Rivendell::Import::Cart do
 
   end
 
+  describe "#attributes" do
+
+    it "should include clear_cuts value" do
+      subject.clear_cuts = true
+      subject.attributes["clear_cuts"].should == subject.clear_cuts
+    end
+
+    it "should include import_options value" do
+      subject.import_options = { :use_metadata => false }
+      subject.attributes["import_options"].should == { :use_metadata => false }
+    end
+
+    it "should include cut attributes" do
+      subject.cut.days = %{mon}
+      subject.attributes["cut"].should == { "days" => %{mon} }
+    end
+
+  end
+
+  describe "#to_json" do
+
+    it "should not include root" do
+      subject.cut.days = %{mon}
+      subject.to_json.should == '{"cut":{"days":"mon"}}'
+    end
+
+  end
+
+  describe "#attributes=" do
+
+    it "should set cut attributes" do
+      subject.attributes = { "cut" => { "days" => %{mon} } }
+      subject.cut.days.should == %{mon}
+    end
+
+  end
+
+
 end

data/spec/rivendell/import/config_spec.rb

@@ -1,13 +1,13 @@
 require 'spec_helper'
 
 describe Rivendell::Import::Config do
- 
+
   let(:config) { Rivendell::Import::Config.new }
 
   describe "#to_prepare" do
 
     let(:user_block) { Proc.new {} }
-    
+
     it "should define Base.default_to_prepare with given block" do
       subject.to_prepare(&user_block)
       Rivendell::Import::Base.default_to_prepare.should == user_block
@@ -32,7 +32,17 @@ describe Rivendell::Import::Config do
     it_should_define_task_default_xport_option :host
     it_should_define_task_default_xport_option :login_name
     it_should_define_task_default_xport_option :password
-    
+
+    it "should define Database.url" do
+      subject.db_url = "dummy"
+      Rivendell::Import::Database.url.should == "dummy"
+    end
+
+    after do
+      Rivendell::Import::Database.url = nil
+    end
+
+
   end
 
 end

data/spec/rivendell/import/cut_spec.rb

@@ -0,0 +1,108 @@
+require 'spec_helper'
+
+describe Rivendell::Import::Cut do
+
+  let(:task) { mock }
+  let(:cart) { Rivendell::Import::Cart.new task }
+  subject { Rivendell::Import::Cut.new cart }
+
+  describe "initialization" do
+
+    it "should use the given cart" do
+      Rivendell::Import::Cut.new(cart).cart.should == cart
+    end
+
+  end
+
+  describe "#create" do
+
+    before(:each) do
+      subject.stub :xport => mock
+    end
+
+    it "should use Xport#add_cut with Cart number" do
+      subject.cart.number = 123
+      subject.xport.should_receive(:add_cut).with(123).and_return(mock(:number => "000123_001"))
+      subject.create
+    end
+
+    it "should use the number returned by Xport#add_cut" do
+      subject.cart.number = 123
+      subject.xport.should_receive(:add_cut).with(123).and_return(mock(:number => "000123_001"))
+      subject.create
+      subject.number.should == "000123_001"
+    end
+
+  end
+
+  describe "#update" do
+
+    before do
+      subject.number = 1
+    end
+
+    context "when DB attributes are defined" do
+
+      let(:db_cut) do
+        Struct.new(:start_datetime, :end_datetime, :start_daypart, :end_daypart, :days) do
+          def save; true; end
+        end.new
+      end
+
+      before do
+        subject.stub :db_attributes? => true
+        Rivendell::DB::Cut.stub :get => db_cut
+        Rivendell::Import::Database.stub :init
+      end
+
+      it "should retrieve the DB Cut with number" do
+        Rivendell::DB::Cut.should_receive(:get).with(subject.name).and_return(db_cut)
+        subject.update
+      end
+
+      it "should save the DB Cut" do
+        db_cut.should_receive(:save)
+        subject.update
+      end
+
+      it "should define DB Cut start_datetime and end_datetime when datetime range is defined" do
+        begin_of_december = Time.parse("1 December 2013")
+        end_of_december = Time.parse("31 December 2013")
+        subject.datetime = begin_of_december..end_of_december
+
+        subject.update
+
+        db_cut.start_datetime.should == begin_of_december
+        db_cut.end_datetime.should == end_of_december
+      end
+
+      it "should define DB Cut start_daypart and end_daypart when daypart range is defined" do
+        subject.daypart = "12:00:00".."14:00:00"
+
+        subject.update
+
+        db_cut.start_daypart.should == "12:00:00"
+        db_cut.end_daypart.should == "14:00:00"
+      end
+
+      it "should define DB Cut days when defined" do
+        subject.days = %{mon}
+        subject.update
+        db_cut.days.should == subject.days
+      end
+
+    end
+
+  end
+
+  describe "#name" do
+
+    it "should return 001015_001 for cart number 1015 and number 1" do
+      subject.number = 1
+      subject.cart.number = 1015
+      subject.name.should == "001015_001"
+    end
+
+  end
+
+end

data/spec/rivendell/import/database_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+describe Rivendell::Import::Database do
+
+  it "should be enabled when url is defined" do
+    Rivendell::Import::Database.url = "dummy"
+    Rivendell::Import::Database.should be_enabled
+  end
+
+  after do
+    Rivendell::Import::Database.url = nil
+  end
+
+end

data/tasks/rdoc.rake

@@ -1,10 +1,4 @@
-begin
-  require 'rdoc/task'
-rescue LoadError
-  require 'rdoc/rdoc'
-  require 'rake/rdoctask'
-  RDoc::Task = Rake::RDocTask
-end
+require 'rdoc/task'
 
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rivendell-import
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 0
-  - 6
-  version: "0.6"
+  - 7
+  version: "0.7"
 platform: ruby
 authors: 
 - Alban Peignier
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-10-13 00:00:00 Z
+date: 2013-12-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
@@ -22,12 +22,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 25
         segments: 
         - 1
-        - 2
+        - 3
         - 1
-        version: 1.2.1
+        version: 1.3.1
   prerelease: false
   name: listen
   type: :runtime
@@ -215,12 +215,13 @@ dependencies:
   requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 15
         segments: 
         - 0
-        version: "0"
+        - 2
+        version: "0.2"
   prerelease: false
   name: rivendell-db
   type: :runtime
@@ -320,7 +321,7 @@ dependencies:
         - 0
         version: "0"
   prerelease: false
-  name: cucumber
+  name: rdoc
   type: :development
   version_requirements: *id021
 - !ruby/object:Gem::Dependency 
@@ -334,9 +335,23 @@ dependencies:
         - 0
         version: "0"
   prerelease: false
-  name: database_cleaner
+  name: cucumber
   type: :development
   version_requirements: *id022
+- !ruby/object:Gem::Dependency 
+  requirement: &id023 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  name: database_cleaner
+  type: :development
+  version_requirements: *id023
 description: Import sound in our Rivendell system
 email: 
 - alban@tryphon.eu
@@ -379,6 +394,7 @@ files:
 - lib/rivendell/import/config_loader.rb
 - lib/rivendell/import/context.rb
 - lib/rivendell/import/cut.rb
+- lib/rivendell/import/database.rb
 - lib/rivendell/import/file.rb
 - lib/rivendell/import/notification.rb
 - lib/rivendell/import/notifier/base.rb
@@ -407,6 +423,8 @@ files:
 - spec/rivendell/import/cli_spec.rb
 - spec/rivendell/import/config_spec.rb
 - spec/rivendell/import/context_spec.rb
+- spec/rivendell/import/cut_spec.rb
+- spec/rivendell/import/database_spec.rb
 - spec/rivendell/import/file_spec.rb
 - spec/rivendell/import/notifier/base_spec.rb
 - spec/rivendell/import/notifier/mail_spec.rb
@@ -470,6 +488,8 @@ test_files:
 - spec/rivendell/import/cli_spec.rb
 - spec/rivendell/import/config_spec.rb
 - spec/rivendell/import/context_spec.rb
+- spec/rivendell/import/cut_spec.rb
+- spec/rivendell/import/database_spec.rb
 - spec/rivendell/import/file_spec.rb
 - spec/rivendell/import/notifier/base_spec.rb
 - spec/rivendell/import/notifier/mail_spec.rb