integrity 0.1.10 → 0.1.11

data/AUTHORS

@@ -2,34 +2,40 @@ Integrity is maintained by Nicolás Sanguinetti and Simon Rozet.
 
 Thanks to the following people for their feedbacks, ideas and patches :
 
-* Bodaniel Jeanes
-* James Golick
-* Wilson Bilkovich
-* Mislav Marohnić
-* Miles Z. Sterrett
-* Kyle Hargraves
-* Josh Nichols
-* Jeremy Hinegardner
-* Chris Wanstrath
-* Will Leinweber
-* Pier-Hugues Pellerin
-* Justin Knowlden
-* Elliott Cable
-* dbr
-* Scott Taylor
-* Jeff Whitmire
-* Diego Algorta
-* Eric Mill
-* Pat Nakajima
-* Nick Quaranto
-* Levent Ali
-* Jeff Schoolcraft
-* James Adam
-* Harry Vangberg
-* Guilherme Chapiewski
-* David Dollar
-* Corey Donohoe
-* Christopher Redinger
-* Alexander Lang
+Alexander Lang
+atmos
+bdotdub
+Bodaniel Jeanes
+Christopher Redinger
+Chris Wanstrath
+Corey Donohoe
+David Dollar
+dbr
+Chris Wanstrath
+Diego Algorta
+Douglas F Shearer
+elliottcable
+Guilherme Chapiewski
+Harry Vangberg
+James Adam
+James Golick
+Jeff Schoolcraft
+Jeff Whitmire
+Jeremy Hinegardner
+Josh Nichols
+Justin Knowlden
+klondike
+Kyle Hargraves
+Levent Ali
+Miles Z. Sterrett
+Mislav Marohnić
+Nick Quaranto
+Nicolás Sanguinetti
+Pat Nakajima
+Pier-Hugues Pellerin
+Scott Taylor
+Simon Rozet
+Will Leinweber
+Wilson Bilkovich
 
 NOTE: Please let us know if your name is missing

data/CHANGES

@@ -1,6 +1,36 @@
+0.1.11 / 2009-07-26
+===================
+
+* This release depends on Sinatra 0.9.4 and hence, Rack 1.0 (finally!)
+
+* The `integrity launch` command was removed. Please use a rackup
+  file and whatever server you want instead
+
+* The Heroku install was removed as it currently doesn't work.
+  A template-type repo ready to be pushed onto Heroku might be provided
+  in the future
+
+* Fix an error occuring when a notifier times out [#166 / Benny Wong]
+
+* Fix pretty_date helpers showing a leading zero for days < 10
+  [Douglas F Shearer]
+
+* Add a missing backstick to the post install message [Douglas F Shearer]
+
+* Fix a missing dependency on builder [#177]
+
+* Fix the Content-Type of the Atom feed
+
+* Get rid of all mention of foca-integrity from generated files
+
+* Fix all Sass deprecation warnings
+
+
 0.1.10 / 2009-05-14
 ====================
 
+* Projects are now sorted by name (Nick Quaranto)
+
 * Bundle the NULL commit author/message fix as a migration
 
 * Fix issue with stale notifier. See 693c95e for details

data/README.md

@@ -8,13 +8,6 @@ Integrity
 * Join us on [#integrity][irc-channel] for ideas, help, patches or something
 * Get the code on [GitHub][repo]
 
-Try it!
--------
-
-    $ git clone git://github.com/integrity/integrity.git
-    $ rake launch
-    $ open http://0.0.0.0:4567/
-
 Run the test suite
 ------------------
 

data/Rakefile

@@ -1,20 +1,8 @@
 require "rake/testtask"
 
-def spec
-  @spec ||= begin
-    require "rubygems/specification"
-    eval(File.read("integrity.gemspec"))
-  end
-end
-
 desc "Default: run all tests"
 task :default => :test
 
-desc "Launch Integrity real quick"
-task :launch do
-  ruby "bin/integrity launch"
-end
-
 desc "Run tests"
 task :test => %w(test:units test:acceptance)
 namespace :test do

data/config/config.sample.ru

@@ -2,20 +2,5 @@
 require "rubygems"
 require "integrity"
 
-# If you want to add any notifiers, install the gems and then require them here
-# For example, to enable the Email notifier: install the gem (from github:
-#
-#   sudo gem install -s http://gems.github.com foca-integrity-email
-#
-# And then uncomment the following line:
-#
-# require "notifier/email"
-
-# Load configuration and initialize Integrity
 Integrity.new(File.dirname(__FILE__) + "/config.yml")
-
-# You probably don't want to edit anything below
-Integrity::App.set :environment, ENV["RACK_ENV"] || :production
-Integrity::App.set :port,        8910
-
 run Integrity::App

data/integrity.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name    = "integrity"
-  s.version = "0.1.10"
-  s.date    = "2009-04-06"
+  s.version = "0.1.11"
+  s.date    = "2009-07-26"
 
   s.description = "Your Friendly Continuous Integration server. Easy, fun and painless!"
   s.summary     = "The easy and fun Continuous Integration server"
@@ -18,9 +18,10 @@ Gem::Specification.new do |s|
   s.has_rdoc          = false
   s.rubygems_version  = "1.3.1"
 
-  s.add_dependency "sinatra", ["= 0.9.1.1"]
+  s.add_dependency "sinatra"
   s.add_dependency "sinatra-authorization"
   s.add_dependency "haml",    [">= 2.0.0"]
+  s.add_dependency "builder"
   s.add_dependency "data_mapper", ["= 0.9.11"]
   s.add_dependency "uuidtools"   # required by dm-types
   s.add_dependency "bcrypt-ruby" # required by dm-types
@@ -50,10 +51,6 @@ Rakefile
 bin/integrity
 config/config.sample.ru
 config/config.sample.yml
-config/heroku/.gems
-config/heroku/Rakefile
-config/heroku/config.ru
-config/heroku/integrity-config.rb
 config/thin.sample.yml
 integrity.gemspec
 lib/integrity.rb

data/lib/integrity/app.rb

@@ -65,7 +65,7 @@ module Integrity
 
     get "/:project.atom" do
       login_required unless current_project.public?
-      response["Content-Type"] = "application/rss+xml; charset=utf-8"
+      response["Content-Type"] = "application/atom+xml; charset=utf-8"
       builder :project
     end
 

data/lib/integrity/build.rb

@@ -2,15 +2,15 @@ module Integrity
   class Build
     include DataMapper::Resource
 
-    property :id,           Integer,  :serial => true
+    property :id,           Serial
     property :output,       Text,     :default => "", :lazy => false
     property :successful,   Boolean,  :default => false
     property :commit_id,    Integer,  :nullable => false
-    property :created_at,   DateTime
-    property :updated_at,   DateTime
     property :started_at,   DateTime
     property :completed_at, DateTime
 
+    timestamps :at
+
     belongs_to :commit, :class_name => "Integrity::Commit",
                         :child_key => [:commit_id]
 

data/lib/integrity/commit.rb

@@ -2,13 +2,13 @@ module Integrity
   class Commit
     include DataMapper::Resource
 
-    property :id,           Integer,  :serial => true
+    property :id,           Serial
     property :identifier,   String,   :nullable => false
     property :message,      String,   :length => 255
     property :author,       Author,   :length => 255
     property :committed_at, DateTime
-    property :created_at,   DateTime
-    property :updated_at,   DateTime
+
+    timestamps :at
 
     has 1,     :build,   :class_name => "Integrity::Build",
                          :order => [:created_at.desc]

data/lib/integrity/helpers/breadcrumbs.rb

@@ -10,7 +10,7 @@ module Integrity
           if page_data = pages.detect {|c| c.first == crumb }
             %Q(<a href="#{page_data.last}">#{page_data.first}</a>)
           elsif @project && @project.permalink == crumb
-            %Q(<a href="#{project_url(@project)}">#{@project.permalink}</a>)
+            %Q(<a href="#{project_path(@project)}">#{@project.permalink}</a>)
           end
         end + [crumbs.last]
       end

data/lib/integrity/helpers/pretty_output.rb

@@ -26,7 +26,7 @@ module Integrity
         elsif days_away == 1
           "yesterday"
         else
-          strftime_with_ordinal(date_time, "on %b %d%o")
+          strftime_with_ordinal(date_time, "on %b %o")
         end
       end
 
@@ -38,7 +38,7 @@ module Integrity
           else                "th"
         end
 
-        date_time.strftime(format_string.gsub("%o", ordinal))
+        date_time.strftime(format_string.gsub("%o", date_time.day.to_s + ordinal))
       end
     end
   end

data/lib/integrity/installer.rb

@@ -14,20 +14,14 @@ module Integrity
        "Copy template files to PATH for desired deployement strategy
        (either Thin, Passenger or Heroku). Next, go there and edit them."
     method_options :passenger => :boolean,
-                   :thin      => :boolean,
-                   :heroku    => :boolean
+                   :thin      => :boolean
     def install(path)
       @root = Pathname(path).expand_path
 
-      if options[:heroku]
-        cp_r Pathname(__FILE__).join("../../../config/heroku"), root
-        puts post_heroku_install_message
-      else
-        create_dir_structure
-        copy_template_files
-        edit_template_files
-        puts post_install_message
-      end
+      create_dir_structure
+      copy_template_files
+      edit_template_files
+      puts post_install_message
     end
 
     desc "migrate_db [CONFIG]",
@@ -40,28 +34,6 @@ module Integrity
       Integrity.migrate_db
     end
 
-    desc "launch [CONFIG]",
-         "Launch Integrity real quick. Database is saved in #{database_path}."
-    method_options :config => :optional, :port => :optional
-    def launch
-      require "thin"
-      require "do_sqlite3"
-
-      port = options[:port] || 4567
-
-      config = { :database_uri => "sqlite3://#{ENV["HOME"]}/.integrity.db",
-                 :base_uri     => "http://0.0.0.0:#{options[:port]}",
-                 :export_directory => "/tmp/integrity-exports"             }
-      config.merge!(YAML.load_file(options[:config])) if options[:config]
-
-      migrate_db(config)
-
-      Thin::Server.start("0.0.0.0", port, Integrity::App)
-    rescue LoadError => boom
-      $stderr << "Make sure thin and do_sqlite3 are insatalled\n\n"
-      raise
-    end
-
     private
       attr_reader :root
 
@@ -102,39 +74,16 @@ module Integrity
         File.open(root / "thin.yml", 'w') { |f| f.puts config }
       end
 
-      def post_heroku_install_message
-        <<EOF
-Your Integrity install is ready to be deployed onto Heroku. Next steps:
-
-  1. git init && git add . && git commit -am "Initial import"
-  2. heroku create
-  3. Add heroku-given domain as :base_uri in integrity-config.rb
-  4. git push heroku master
-  5. heroku rake db:migrate
-EOF
-      end
-
       def post_install_message
         <<EOF
 Awesome! Integrity was installed successfully!
 
 To complete the installation, please configure the `database_uri` in
 #{root.join("config.yml")} and install the matching DataMapper adapter if
-necessary. Then, run `integrity migrate_db #{root.join("config.yml")}
-
-== Notifiers
-If you want to enable notifiers, install the gems and then require them
-in #{root}/config.ru
-
-For example:
-
-    sudo gem install -s http://gems.github.com foca-integrity-email
-
-And then in #{root}/config.ru add:
-
-    require "notifier/email"
+necessary. Then, run `integrity migrate_db #{root.join("config.yml")}`
 
-Don't forget to tweak #{root / "config.yml"} to your needs.
+Please go to <http://integrityapp.com/#notifiers> for notifiers setup
+instructions.
 EOF
       end
 

data/lib/integrity/notifier/base.rb

@@ -5,7 +5,7 @@ module Integrity
         Integrity.log "Notifying of build #{build.commit.short_identifier} using the #{to_s} notifier"
         Timeout.timeout(8) { new(build.commit, config).deliver! }
       rescue Timeout::Error
-        Integrity.log "#{notifier.name} notifier timed out"
+        Integrity.log "#{to_s} notifier timed out"
         false
       end
 

data/lib/integrity/project.rb

@@ -6,7 +6,7 @@ module Integrity
     include DataMapper::Resource
     include Notifiers, Push
 
-    property :id,         Integer,  :serial => true
+    property :id,         Serial
     property :name,       String,   :nullable => false
     property :permalink,  String
     property :uri,        URI,      :nullable => false, :length => 255
@@ -14,8 +14,8 @@ module Integrity
     property :command,    String,   :nullable => false, :length => 255, :default => "rake"
     property :public,     Boolean,  :default => true
     property :building,   Boolean,  :default => false
-    property :created_at, DateTime
-    property :updated_at, DateTime
+
+    timestamps :at
 
     default_scope(:default).update(:order => [:name.asc])
 

data/test/acceptance/installer_test.rb

@@ -34,10 +34,6 @@ class InstallerTest < Test::Unit::AcceptanceTestCase
     assert ! root.join("public").directory?
     assert ! root.join("tmp").directory?
 
-    assert ! root.join("Rakefile").file?
-    assert ! root.join("integrity.rb").file?
-    assert ! root.join(".gems").file?
-
     assert ! root.join("thin.yml").file?
     assert root.join("config.ru").file?
 
@@ -66,16 +62,4 @@ class InstallerTest < Test::Unit::AcceptanceTestCase
     config["rackup"].should == root.join("config.ru").to_s
     config["log"].should    == root.join("log/thin.log").to_s
   end
-
-  scenario "Installing Integrity for Heroku" do
-    message = install("--heroku")
-
-    assert_equal "integrity --version 0.1.9.3", root.join(".gems").read.chomp
-
-    assert root.join("Rakefile").file?
-    assert root.join("integrity-config.rb").file?
-    assert root.join("config.ru").file?
-
-    assert message.include?("ready to be deployed onto Heroku")
-  end
 end

data/test/acceptance/project_syndication_test.rb

@@ -7,6 +7,10 @@ class ProjectSyndicationTest < Test::Unit::AcceptanceTestCase
     So I can know the status of my favorite projects while having my morning coffee
   EOS
 
+  def content_type
+    webrat_session.send(:response).headers["Content-Type"]
+  end
+
   scenario "a public project's page includes an autodiscovery link tag for the feed" do
     Project.gen(:integrity, :public => true)
     visit "/integrity"
@@ -20,7 +24,7 @@ class ProjectSyndicationTest < Test::Unit::AcceptanceTestCase
 
     visit "/integrity.atom"
 
-    # TODO: check for content-type
+    assert_equal "application/atom+xml; charset=utf-8", content_type
 
     assert_have_tag("feed title", :content => "Build history for Integrity")
     assert_have_tag("feed entry", :count => 11)

data/test/acceptance/stylesheet_test.rb

@@ -14,7 +14,7 @@ class IntegrityStylesheetTest < Test::Unit::AcceptanceTestCase
 
     assert_contain("body {")
     # TODO: Check that it actually returns a 302
-    assert_equal %Q{"2465c472aacf302259dde5146a841e45"},
+    assert_equal %Q{"96f809c4dec9e7cfdd20542dfdeefaf2"},
       webrat_session.send(:response).headers["ETag"]
 
     visit "/reset.css"

data/test/unit/helpers_test.rb

@@ -9,14 +9,14 @@ class BrowsePublicProjectsTest < Test::Unit::TestCase
     @h.pretty_date(Time.now).should == "today"
     @h.pretty_date(Time.new - 86400).should == "yesterday"
 
-    @h.pretty_date(Time.mktime(1995, 12, 01)).should == "on Dec 01st"
+    @h.pretty_date(Time.mktime(1995, 12, 01)).should == "on Dec 1st"
     @h.pretty_date(Time.mktime(1995, 12, 21)).should == "on Dec 21st"
     @h.pretty_date(Time.mktime(1995, 12, 31)).should == "on Dec 31st"
 
     @h.pretty_date(Time.mktime(1995, 12, 22)).should == "on Dec 22nd"
     @h.pretty_date(Time.mktime(1995, 12, 22)).should == "on Dec 22nd"
 
-    @h.pretty_date(Time.mktime(1995, 12, 03)).should == "on Dec 03rd"
+    @h.pretty_date(Time.mktime(1995, 12, 03)).should == "on Dec 3rd"
     @h.pretty_date(Time.mktime(1995, 12, 23)).should == "on Dec 23rd"
 
     @h.pretty_date(Time.mktime(1995, 12, 15)).should == "on Dec 15th"

data/test/unit/notifier_test.rb

@@ -93,4 +93,16 @@ class NotifierTest < Test::Unit::TestCase
 
     irc.notify_of_build(build)
   end
+
+  it "handles notifier timeouts" do
+    irc   = Notifier.gen(:irc)
+    Notifier.register(Integrity::Notifier::IRC)
+    build = Build.gen
+
+    stub.instance_of(Notifier::IRC).deliver! { raise Timeout::Error }
+    mock(Integrity).log(anything)
+    mock(Integrity).log("Integrity::Notifier::IRC notifier timed out") { nil }
+
+    irc.notify_of_build(build)
+  end
 end

data/views/integrity.sass

@@ -79,7 +79,7 @@ a
     :margin-bottom .75em
     :padding .25em 0
     :line-height 1.2
-    :border-bottom = 1px solid !rule_color
+    :border-bottom = 1px "solid" !rule_color
   h2
     :font-weight bold
     :font-size 1.5em
@@ -95,8 +95,8 @@ a
   code, pre, textarea, input
     :font-family = !monospace_fonts
   pre
-    margin .5em :0
-    padding .5em
+    :margin .5em
+    :padding .5em
 
   form
     p
@@ -160,7 +160,7 @@ a
     fieldset
       :padding-bottom 1em
       :margin-left 1.35em
-      :border-bottom = 1px solid !rule_color
+      :border-bottom = 1px "solid" !rule_color
       :margin-bottom 1em
       h3
         :margin-top 1em
@@ -228,17 +228,17 @@ a
 
     .backtrace
       :margin 1em 0
-      :overflow scroll
+      :overflow "scroll"
       :height 30em
-      :border = 1px solid !rule_color
+      :border = 1px "solid" !rule_color
       :line-height 1.6
 
   #projects
     :margin 1em 0 2em
-    :border-top = 1px solid !rule_color
+    :border-top = 1px "solid" !rule_color
     li
       :position relative
-      :border-bottom = 1px solid !rule_color
+      :border-bottom = 1px "solid" !rule_color
       &.odd
         :background = !content_bg - #080808
       &.building

data/views/new.haml

@@ -39,7 +39,7 @@
   %p
     You can use this Push URL with your GitHub project to enable automated continuous integration.
   %p
-    %code#push_url= push_url_for(@project)
+    %code#push_url= h(push_url_for(@project))
 
   %form{ :method => "post", :action => project_path(@project) }
     .hidden

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: integrity
 version: !ruby/object:Gem::Version 
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors: 
 - "Nicol\xC3\xA1s Sanguinetti"
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-06 00:00:00 +02:00
+date: 2009-07-26 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -19,9 +19,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.1.1
+        version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
   name: sinatra-authorization
@@ -43,6 +43,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.0.0
     version: 
+- !ruby/object:Gem::Dependency 
+  name: builder
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: data_mapper
   type: :runtime
@@ -211,10 +221,6 @@ files:
 - bin/integrity
 - config/config.sample.ru
 - config/config.sample.yml
-- config/heroku/.gems
-- config/heroku/Rakefile
-- config/heroku/config.ru
-- config/heroku/integrity-config.rb
 - config/thin.sample.yml
 - integrity.gemspec
 - lib/integrity.rb
@@ -296,8 +302,10 @@ files:
 - views/project.builder
 - views/project.haml
 - views/unauthorized.haml
-has_rdoc: false
+has_rdoc: true
 homepage: http://integrityapp.com
+licenses: []
+
 post_install_message: Run `integrity help` for information on how to setup Integrity.
 rdoc_options: []
 
@@ -318,9 +326,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: integrity
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: The easy and fun Continuous Integration server
 test_files: []
 

data/config/heroku/.gems

@@ -1 +0,0 @@
-integrity --version 0.1.9.3

data/config/heroku/Rakefile

@@ -1,6 +0,0 @@
-desc "Create the Integrity database"
-task "db:migrate" do
-  require File.dirname(__FILE__) + "/integrity-config"
-
-  DataMapper.auto_migrate!
-end

data/config/heroku/config.ru

@@ -1,7 +0,0 @@
-#!/usr/bin/env ruby
-require File.dirname(__FILE__) + "/integrity-config"
-
-Integrity::App.set(:environment, ENV["RACK_ENV"] || :production)
-Integrity::App.disable(:run, :reload)
-run Integrity::App
-

data/config/heroku/integrity-config.rb

@@ -1,15 +0,0 @@
-require "rubygems"
-gem "integrity"
-require "integrity"
-
-Integrity.config = {
-  :base_uri         => nil, # Edit this! Like :base_uri => 'http://awesome-subdomain-13.heroku.com'
-  :database_uri     => ENV["DATABASE_URL"],
-  :export_directory => File.dirname(__FILE__) + "/tmp",
-  :log              => File.dirname(__FILE__) + "/log/integrity.log",
-  # Uncomment to setup a password
-  # :admin_usenrame   => "admin",
-  # :admin_password   => "foobar"
-}
-
-Integrity.new