integrity 0.1.9.1 → 0.1.9.2

data/.gitignore

@@ -0,0 +1,12 @@
+log/*.log
+config/thin.yml
+config/deploy.rb
+config/config.yml
+dist
+coverage
+integrity.db
+exports
+*.gem
+*.swp
+.aggregated_coverage_report
+tmp/

data/CHANGES

@@ -0,0 +1,28 @@
+0.1.9.2 / unreleased
+====================
+
+* Add development dependencies to gemspec
+* Fix and improve deprecation (Josh Nichols)
+* Fix a typo in post install message (Josh Nichols)
+* Fix URLs issues (hopefully)
+  * Calculate URLs using base_uri option instead of the request.url
+  * Fix and use the URLs generation helpers in views. (Will Leinweber)
+* Depend on sinatra-authorization (which has no dependency) instead
+  of sinatra-ditties.
+* Use [mg](http://github.com/sr/mg) to manage release
+* Various tweaks to the bootstraping Rake tasks. I am not happy
+  with them, though.
+  <http://integrity.lighthouseapp.com/projects/14308/tickets/126>
+
+0.1.9.1 / 2009-03-16
+====================
+
+* Add the Integrity::Notifier::Test mixin, aimed at helping
+  writing test for notifiers.
+    NOTE: The API is not fixed yet. See the following ticket
+    <http://integrity.lighthouseapp.com/projects/14308-integrity/tickets/130>
+* Add support for Heroku as a deployment option
+* Fix the installer to work with the current Thor gem
+
+
+**There is no changelog for previous release :-)**

data/README.markdown

@@ -15,6 +15,12 @@ Try it!
     $ rake launch
     # Navigate to <http://0.0.0.0:4567>
 
+Run the test suite
+------------------
+
+Install the test dependencies with `rake test:setup` and
+run the test suite with `rake test`.
+
 Thanks
 ------
 

data/Rakefile

@@ -1,34 +1,28 @@
 require "rake/testtask"
 require "rake/clean"
-require "rcov/rcovtask"
 
-begin
-  require "metric_fu"
-rescue LoadError
+def spec
+  @spec ||= begin
+    require "rubygems/specification"
+    eval(File.read("integrity.gemspec"))
+  end
 end
 
 desc "Default: run all tests"
 task :default => :test
 
-desc "Special task for running tests on <http://builder.integrityapp.com>"
-task :ci do
-  sh "git submodule update --init"
-
-  Rake::Task["test"].invoke
-
-  metrics = %w(flay flog:all reek roodi saikuro)
-  metrics.each { |m| Rake::Task["metrics:#{m}"].invoke }
+desc "Install Integrity dependencies"
+task :setup do
+  puts "NOTE: assuming you have gems.github.com in your gem sources"
 
-  rm_rf "/var/www/integrity-metrics"
-  mv "tmp/metric_fu", "/var/www/integrity-metrics"
+  system "gem install " +
+    spec.dependencies.select { |dep| dep.type == :runtime }.
+      collect(&:name).join(" ")
+end
 
-  File.open("/var/www/integrity-metrics/index.html", "w") { |f|
-    f << "<ul>"
-    metrics.map { |m| m.split(":").first }.each { |m|
-      f << %Q(<li><a href="/#{m}">#{m}</a></li>)
-    }
-    f << "</ul>"
-  }
+desc "Launch Integrity real quick"
+task :launch do
+  ruby "bin/integrity launch"
 end
 
 desc "Run tests"
@@ -42,77 +36,44 @@ namespace :test do
     t.test_files = FileList["test/acceptance/*_test.rb"]
   end
 
-  desc "Install all gems on which the tests depend on"
-  task :install_dependencies do
-    system "gem install rr mocha dm-sweatshop ZenTest"
-    system "gem install -s http://gems.github.com jeremymcanally-context \
-jeremymcanally-matchy jeremymcanally-pending foca-storyteller"
-    system "git submodule update --init"
-  end
-end
+  desc "Install tests dependencies"
+  task :setup do
+    puts "NOTE: assuming you have gems.github.com in your gem sources"
 
-desc "Launch Integrity real quick"
-task :launch do
-  ruby "bin/integrity launch"
-end
-
-directory "dist/"
-CLOBBER.include("dist")
-
-# Load the gemspec using the same limitations as github
-def spec
-  @spec ||=
-    begin
-      require "rubygems/specification"
-      data = File.read("integrity.gemspec")
-      spec = nil
-      Thread.new { spec = eval("$SAFE = 3\n#{data}") }.join
-      spec
-    end
+    system "gem install " +
+      spec.dependencies.select { |dep| dep.type  == :development }.
+        collect(&:name).join(" ")
+  end
 end
 
-def package(ext="")
-  "dist/integrity-#{spec.version}" + ext
+begin
+  require "mg"
+  MG.new("integrity.gemspec")
+rescue LoadError
 end
 
-desc "Build and install as local gem"
-task :install => package('.gem') do
-  sh "gem install #{package('.gem')}"
+begin
+  require "metric_fu"
+rescue LoadError
 end
 
-desc "Publish the current release on Rubyforge"
-task :rubyforge => ["rubyforge:gem", "rubyforge:tarball", "rubyforge:git"]
-
-namespace :rubyforge do
-  desc "Publish gem and tarball to rubyforge"
-  task :gem => package(".gem") do
-    sh "rubyforge add_release integrity integrity #{spec.version} #{package('.gem')}"
-  end
+desc "Special task for running tests on <http://builder.integrityapp.com>"
+task :ci do
+  sh "git submodule update --init"
 
-  task :tarball => package(".tar.gz") do
-    sh "rubyforge add_file integrity integrity #{spec.version} #{package('.tar.gz')}"
-  end
+  Rake::Task["test"].invoke
 
-  desc "Push to gitosis@rubyforge.org:integrity.git"
-  task :git do
-    sh "git push gitosis@rubyforge.org:integrity.git master"
-  end
-end
+  metrics = %w(flay flog:all reek roodi saikuro)
+  metrics.each { |m| Rake::Task["metrics:#{m}"].invoke }
 
-desc "Build gem tarball into dist/"
-task :package => %w(.gem .tar.gz).map { |ext| package(ext) }
-namespace :package do
-  file package(".tar.gz") => "dist/" do |f|
-    sh <<-SH
-      git archive \
-        --prefix=integrity-#{spec.version}/ \
-        --format=tar \
-        HEAD | gzip > #{f.name}
-    SH
-  end
+  rm_rf "/var/www/integrity-metrics"
+  mv "tmp/metric_fu", "/var/www/integrity-metrics"
 
-  file package(".gem") => "dist/" do |f|
-    sh "gem build integrity.gemspec"
-    mv File.basename(f.name), f.name
-  end
+  File.open("/var/www/integrity-metrics/index.html", "w") { |f|
+    f << "<ul>"
+    metrics.map { |m| m.split(":").first }.each { |m|
+      f << %Q(<li><a href="/#{m}">#{m}</a></li>)
+    }
+    f << "</ul>"
+  }
 end

data/config/heroku/.gems

@@ -1,4 +1 @@
-mailfactory --version '>= 1.4.0'
-tlsmail
-foca-sinatra-ditties --version 0.0.3 --source http://gems.github.com
 integrity --version 0.1.9.0

data/config/heroku/integrity-config.rb

@@ -5,7 +5,10 @@ require "integrity"
 Integrity.config = {
   :database_uri     => ENV["DATABASE_URL"],
   :export_directory => File.dirname(__FILE__) + "/tmp",
-  :log              => File.dirname(__FILE__) + "/log/integrity.log"
+  :log              => File.dirname(__FILE__) + "/log/integrity.log",
+  # Uncomment to setup a password
+  # :admin_usenrame   => "admin",
+  # :admin_password   => "foobar"
 }
 
 Integrity.new

data/integrity.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name    = "integrity"
-  s.version = "0.1.9.1"
+  s.version = "0.1.9.2"
   s.date    = "2009-03-16"
 
   s.description = "Your Friendly Continuous Integration server. Easy, fun and painless!"
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.rubygems_version  = "1.3.1"
 
   s.add_dependency "sinatra", [">= 0.9.1.1"]
+  s.add_dependency "sinatra-authorization"
   s.add_dependency "haml",    [">= 2.0.0"]
   s.add_dependency "data_mapper", [">= 0.9.10"]
   s.add_dependency "uuidtools"   # required by dm-types
@@ -26,7 +27,21 @@ Gem::Specification.new do |s|
   s.add_dependency "json"
   s.add_dependency "thor"
 
+  if s.respond_to?(:add_development_dependency)
+    s.add_development_dependency "rr"
+    s.add_development_dependency "mocha"
+    s.add_development_dependency "webrat"
+    s.add_development_dependency "do_sqlite3"
+    s.add_development_dependency "dm-sweatshop"
+    s.add_development_dependency "ParseTree" # required by dm-sweatshop
+    s.add_development_dependency "jeremymcanally-context"
+    s.add_development_dependency "jeremymcanally-pending"
+    s.add_development_dependency "foca-storyteller"
+  end
+
   s.files = %w[
+.gitignore
+CHANGES
 README.markdown
 Rakefile
 bin/integrity
@@ -75,12 +90,13 @@ test/acceptance/create_project_test.rb
 test/acceptance/delete_project_test.rb
 test/acceptance/edit_project_test.rb
 test/acceptance/error_page_test.rb
-test/acceptance/helpers.rb
 test/acceptance/installer_test.rb
 test/acceptance/manual_build_project_test.rb
+test/acceptance/not_found_page_test.rb
 test/acceptance/notifier_test.rb
 test/acceptance/project_syndication_test.rb
 test/acceptance/stylesheet_test.rb
+test/acceptance/unauthorized_page_test.rb
 test/helpers.rb
 test/helpers/acceptance.rb
 test/helpers/acceptance/email_notifier.rb
@@ -103,10 +119,6 @@ test/unit/notifier_test.rb
 test/unit/project_builder_test.rb
 test/unit/project_test.rb
 test/unit/scm_test.rb
-vendor/sinatra-ditties/README.rdoc
-vendor/sinatra-ditties/lib/sinatra/ditties.rb
-vendor/sinatra-ditties/lib/sinatra/ditties/authorization.rb
-vendor/sinatra-ditties/lib/sinatra/ditties/mailer.rb
 views/_commit_info.haml
 views/build.haml
 views/error.haml

data/lib/integrity.rb

@@ -1,5 +1,4 @@
-$:.unshift File.expand_path(File.dirname(__FILE__)),
-  File.expand_path(File.dirname(__FILE__) + "/../vendor/sinatra-ditties/lib")
+$:.unshift File.expand_path(File.dirname(__FILE__))
 
 require "json"
 require "haml"
@@ -31,9 +30,14 @@ require "integrity/helpers"
 require "integrity/app"
 
 module Integrity
-  def self.new(config_file = nil)
-    self.config = YAML.load_file(config_file) unless config_file.nil?
-    DataMapper.setup(:default, config[:database_uri])
+  def self.new(config=nil)
+    if config.is_a?(String) && File.file?(config)
+      self.config = YAML.load_file(config)
+    elsif config.is_a?(Hash)
+      self.config = config
+    end
+
+    DataMapper.setup(:default, self.config[:database_uri])
   end
 
   def self.default_configuration

data/lib/integrity/app.rb

@@ -31,7 +31,7 @@ module Integrity
       sass :integrity
     end
 
-    get "/" do
+    get "/?" do
       @projects = Project.only_public_unless(authorized?)
       show :home, :title => "projects"
     end
@@ -40,7 +40,7 @@ module Integrity
       login_required
 
       session[:user] = current_user
-      redirect root_url
+      redirect root_url.to_s
     end
 
     get "/new" do
@@ -50,14 +50,14 @@ module Integrity
       show :new, :title => ["projects", "new project"]
     end
 
-    post "/" do
+    post "/?" do
       login_required
 
       @project = Project.new(params[:project_data])
 
       if @project.save
         update_notifiers_of(@project)
-        redirect project_url(@project)
+        redirect project_url(@project).to_s
       else
         show :new, :title => ["projects", "new project"]
       end
@@ -79,7 +79,7 @@ module Integrity
 
       if current_project.update_attributes(params[:project_data])
         update_notifiers_of(current_project)
-        redirect project_url(current_project)
+        redirect project_url(current_project).to_s
       else
         show :new, :title => ["projects", current_project.permalink, "edit"]
       end
@@ -89,7 +89,7 @@ module Integrity
       login_required
 
       current_project.destroy
-      redirect root_url
+      redirect root_url.to_s
     end
 
     get "/:project/edit" do
@@ -115,7 +115,7 @@ module Integrity
       login_required
 
       current_project.build
-      redirect project_url(current_project)
+      redirect project_url(current_project).to_s
     end
 
     get "/:project/commits/:commit" do
@@ -132,7 +132,7 @@ module Integrity
       login_required
 
       current_project.build(params[:commit])
-      redirect commit_url(current_commit)
+      redirect commit_url(current_commit).to_s
     end
   end
 end

data/lib/integrity/build.rb

@@ -45,37 +45,37 @@ module Integrity
     # Deprecated methods
     #
     def short_commit_identifier
-      warn "Build#short_commit_identifier is deprecated, use Commit#short_identifier"
+      warn "Build#short_commit_identifier is deprecated, use Commit#short_identifier (#{caller[0]})"
       commit.short_identifier
     end
 
     def commit_identifier
-      warn "Build#commit_identifier is deprecated, use Commit#identifier"
+      warn "Build#commit_identifier is deprecated, use Commit#identifier (#{caller[0]})"
       commit.identifier
     end
 
     def commit_author
-      warn "Build#commit_author is deprecated, use Commit#author"
+      warn "Build#commit_author is deprecated, use Commit#author (#{caller[0]})"
       commit.author
     end
 
     def commit_message
-      warn "Build#commit_message is deprecated, use Commit#message"
+      warn "Build#commit_message is deprecated, use Commit#message (#{caller[0]})"
       commit.message
     end
 
     def commited_at
-      warn "Build#commited_at is deprecated, use Commit#committed_at"
+      warn "Build#commited_at is deprecated, use Commit#committed_at (#{caller[0]})"
       commit.committed_at
     end
 
     def project_id
-      warn "Build#project_id is deprecated, use Commit#project_id"
+      warn "Build#project_id is deprecated, use Commit#project_id (#{caller[0]})"
       commit.project_id
     end
 
     def commit_metadata
-      warn "Build#commit_metadata is deprecated, use the different methods in Commit instead"
+      warn "Build#commit_metadata is deprecated, use the different methods in Commit instead (#{caller[0]})"
       { :message => commit.message,
         :author  => commit.author,
         :date    => commit.committed_at }

data/lib/integrity/helpers/authorization.rb

@@ -1,4 +1,4 @@
-require "sinatra/ditties"
+require "sinatra/authorization"
 
 module Integrity
   module Helpers

data/lib/integrity/helpers/breadcrumbs.rb

@@ -2,7 +2,7 @@ module Integrity
   module Helpers
     module Breadcrumbs
       def pages
-        @pages ||= [["projects", "/"], ["new project", "/new"]]
+        @pages ||= [["projects", root_path], ["new project", root_path("/new")]]
       end
 
       def breadcrumbs(*crumbs)