app/jobs/scan_repository_job.rb config/initializers/task_scheduler.rb db/migrate/20091001223040_create_delayed_jobs.rb script/delayed_job @@ -8,3 +8,9 @@ require 'rake/testtask' require 'rake/rdoctask' require 'tasks/rails' + +begin + require 'delayed/tasks' +rescue LoadError + STDERR.puts "Run `rake gems:install` to install delayed_job" +end Rakefile @@ -1,4 +1,13 @@ class Repository < ActiveRecord::Base validates_presence_of :name, :url, :identifier validates_format_of :url, :with => URI::regexp(%w(http https)) + + before_create :check_url + + private + def check_url + if !(self.url =~ /\/$/) + self.url += "/" unless self.url.nil? + end + end end app/models/repository.rb @@ -12,13 +12,13 @@ Rails::Initializer.run do |config| # -- all .rb files in that directory are automatically loaded. # Add additional load paths for your own custom dirs - # config.load_paths += %W( #{RAILS_ROOT}/extras ) + config.load_paths += %W( #{RAILS_ROOT}/app/jobs ) # Specify gems that this application depends on and have them installed with rake gems:install - # config.gem "bj" - # config.gem "hpricot", :version => '0.6', :source => "http://code.whytheluckystiff.net" - # config.gem "sqlite3-ruby", :lib => "sqlite3" config.gem "josevalim-inherited_resources", :lib => "inherited_resources", :version => '0.9.1', :source => "http://gems.github.com" + config.gem 'collectiveidea-delayed_job', :lib => 'delayed_job', :source => 'http://gems.github.com' + config.gem 'nokogiri' + config.gem 'rufus-scheduler', :lib => 'rufus/scheduler' # Only load the plugins named here, in the order given (default is alphabetical). # :all can be used as a placeholder for all plugins not explicitly named config/environment.rb @@ -9,7 +9,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20090929014906) do +ActiveRecord::Schema.define(:version => 20091001223040) do create_table "artifacts", :force => true do |t| t.string "name" @@ -24,6 +24,19 @@ ActiveRecord::Schema.define(:version => 20090929014906) do add_index "artifacts", ["repository_id"], :name => "index_artifacts_on_repository_id" + create_table "delayed_jobs", :force => true do |t| + t.integer "priority", :default => 0 + t.integer "attempts", :default => 0 + t.text "handler" + t.text "last_error" + t.datetime "run_at" + t.datetime "locked_at" + t.datetime "failed_at" + t.string "locked_by" + t.datetime "created_at" + t.datetime "updated_at" + end + create_table "dependencies", :force => true do |t| t.integer "artifact_id" t.integer "dependency_id" db/schema.rb @@ -37,7 +37,7 @@ describe RepositoriesController do post :create, :repository => { :name => "someName", :identifier => "id", :url => "http://repo.com" } assigns[:repository].name.should == "someName" assigns[:repository].identifier.should == "id" - assigns[:repository].url.should == "http://repo.com" + assigns[:repository].url.should == "http://repo.com/" end it "should redirect to index with a notice on successful update" do spec/controllers/repositories_controller_spec.rb @@ -34,4 +34,10 @@ describe Repository do @repo.url = "123.jjkljk///" @repo.should have(1).error_on(:url) end + + it "should add an extra '/' to the if it is missing" do + @repo.url = "http://maven.com" + @repo.save + @repo.url.should == "http://maven.com/" + end end spec/models/repository_spec.rb e821ddd498de6865eb53f86eeec2b28abcc8092c Julio Arias julio.arias@fresisoft.com http://github.com/jarias/mvnsearch/commit/05dc0de6023fe90a753f8535c5ac8b81ff8c516b 05dc0de6023fe90a753f8535c5ac8b81ff8c516b 2009-10-05T22:03:59-07:00 2009-10-05T22:03:59-07:00 Added dj and rufus for repository scan job Initial commit for the repository scan job Still need to review possible dependencies exceptions 10179079fc2960d46d71dd331a8cff17c03cf231 Julio Arias julio.arias@fresisoft.com