foca-integrity 0.1.4 → 0.1.6

data/README.markdown

@@ -1,93 +1,15 @@
 Integrity
 =========
 
-Integrity is your friendly automated Continuous Integration server.
+[Integrity][website] is your friendly automated Continuous Integration server.
 
-It's fully usable from within its web interface (backed by [Sinatra][]),
-allowing you to add a project, set preferences for it (where's the code
-repository, is it completely private or public, etc), and run the build command
-from there.
-
-It has been designed with ruby projects in mind, but any project that can be
-tested in an unix-y fashion (with a command line tool that returns 0 on success
-and non-zero on failure) works with it.
-
-Getting Started
-===============
-
-Install the `integrity` gem from GitHub:
-
-    gem sources add http://gems.github.com
-    sudo gem install foca-integrity
-
-In order to setup Integrity, run the following command:
-
-    integrity install /path/to/my/app
-
-Then browse to /path/to/my/app and edit the config files at your convenience.
-The default configuration should be "good enough" in most cases, so you should
-be pretty much ready to rock.
-
-For deployment, we recommend [Thin][]. Provided with Integrity comes a thin.yml
-file, so all you need to do after running `integrity install` should be
-
-    thin -C /path/to/my/app/thin.yml -R /path/to/my/app/config.ru start
-
-And you should be up and running.
-
-If you want automatic commit processing, you currently need to be using
-[GitHub][]. Click the edit link on your GitHub project, and add an integrity
-link that looks like the following to the `Post-Receive URL` field:
-
-    http://integrity.domain.tld/projectname/push
-
-Receiving Notifications
-=======================
-
-If you want to be notified after each build, you need to install our notifiers.
-For example, in order to receive an email after each build, install:
-
-    sudo gem install foca-integrity-email
-
-And then edit `/path/to/my/app/config.ru` and add:
-
-    require "notifier/email"
-
-After all the `require` lines.
-
-Available notifiers
--------------------
-
-* [Mail](http://github.com/foca/integrity-email)
-* [Jabber](http://github.com/ph/integrity-jabber)
-* [Campfire](http://github.com/defunkt/integrity-campfire)
-
-Resources
-========
-
-We have a [Lighthouse account][lighthouse] where you can submit patches or
-feature requests. Also, someone is usually around [#integrity][irc-channel] on
-Freenode, so don't hesitate to stop by for ideas, help, patches or something.
-
-Future plans
-============
-
-* [Twitter][]/[IRC][]/etc bots
-* A sample generic post-receive-hook so you can run this from any git repo
-* Better integration with GitHub
-
-Development
-===========
-
-The code is stored in [GitHub][repo]. Feel free to fork, play with it, and send
-a pull request afterwards. 
-
-In order to run the test suite you'll need a few more gems: [rspec][], [rcov][]
-and [hpricot][]. With that installed running `rake` will run the specs and
-ensure the code coverage stays high.
+* See our [website][] for documentation and a [live demo][demo]
+* Report bugs and submit features request on our [Lighthouse account][lighthouse]
+* Join us on [#integrity][irc-channel] for ideas, help, patches or something
+* Get the code on [GitHub][repo]
 
 Thanks
-======
+------
 
 Thanks to the fellowing people for their feedbacks, ideas and patches :
 
@@ -99,16 +21,8 @@ Thanks to the fellowing people for their feedbacks, ideas and patches :
 * [Simon Rozet][sr]
 * [Scott Taylor][scott]
 
-[james]: http://github.com/lazyatom
-[ec]: http://github.com/elliotcabble
-[atmos]: http://github.com/atmos
-[kyle]: http://github.com/pd
-[ph]: http://github.com/ph
-[sr]: http://purl.org/net/sr/
-[scott]: http://github.com/smtlaissezfaire
-
 License
-=======
+-------
 
 (The MIT License)
 
@@ -133,21 +47,20 @@ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-[Sinatra]: http://sinatrarb.com
-[git]: http://git.or.cz
-[svn]: http://subversion.tigris.org
-[Twitter]: http://twitter.com
-[IRC]: http://wikipedia.org/wiki/IRC
-[entp]: http://entp.com
-[GitHub]: http://github.com
-[Thin]: http://code.macournoyer.com/thin/
-
-[rspec]: http://rspec.info
-[rcov]: http://eigenclass.org/hiki.rb?rcov
-[hpricot]: http://code.whytheluckystiff.net/hpricot
-
+[website]: http://integrityapp.com
+[demo]: http://builder.integrityapp.com
 [repo]: http://github.com/foca/integrity
 [lighthouse]: http://integrity.lighthouseapp.com/projects/14308-integrity
 [irc-channel]: irc://irc.freenode.net/integrity
 
 [foca]: http://nicolassanguinetti.info/
+[entp]: http://entp.com
+
+[james]: http://github.com/lazyatom
+[ec]: http://github.com/elliotcabble
+[atmos]: http://github.com/atmos
+[kyle]: http://github.com/pd
+[ph]: http://github.com/ph
+[sr]: http://purl.org/net/sr/
+[scott]: http://github.com/smtlaissezfaire
+

data/Rakefile

@@ -1,30 +1,58 @@
 require File.dirname(__FILE__) + "/lib/integrity"
-require 'spec/rake/spectask'
-require 'spec/rake/verify_rcov'
+require "rake/testtask"
+require "rcov/rcovtask"
 
-task :default => ["spec:coverage", "spec:coverage:verify"]
+desc "Run all tests and check test coverage"
+task :default => "test:coverage:verify"
 
-Spec::Rake::SpecTask.new(:spec) do |t|
-  t.spec_opts = ["--color", "--format", "progress"]
-  t.spec_files = Dir['spec/**/*_spec.rb'].sort
-  t.libs = ['lib']
-  t.rcov = false
-end
+desc "Run tests"
+task :test => %w(test:units test:acceptance)
+
+namespace :test do
+  Rake::TestTask.new(:units) do |t|
+    t.test_files = FileList["test/unit/*_test.rb"]
+  end
 
-namespace :spec do
-  Spec::Rake::SpecTask.new(:coverage) do |t|
-    t.spec_opts = ["--color", "--format", "progress"]
-    t.spec_files = Dir['spec/**/*_spec.rb'].sort
-    t.libs = ['lib']
-    t.rcov = true
-    t.rcov_opts = ['--exclude-only', '".*"', '--include-file', '^lib']
+  Rake::TestTask.new(:acceptance) do |t|
+    t.test_files = FileList["test/acceptance/*_test.rb"]
   end
 
+  desc "Measure test coverage"
+  task :coverage => %w(test:coverage:units test:coverage:acceptance)
+
   namespace :coverage do
-    RCov::VerifyTask.new(:verify) do |t|
-      t.threshold = 100
-      t.index_html = "coverage" / 'index.html'
+    desc "Measure test coverage of unit tests"
+    Rcov::RcovTask.new(:units) do |rcov|
+      rcov.pattern   = "test/unit/*_test.rb"
+      rcov.rcov_opts = %w(--html --aggregate .aggregated_coverage_report)
+      rcov.rcov_opts << ENV["RCOV_OPTS"] if ENV["RCOV_OPTS"]
+    end
+
+    desc "Measure test coverage of acceptance tests"
+    Rcov::RcovTask.new(:acceptance) do |rcov|
+      rcov.pattern   = "test/acceptance/*_test.rb"
+      rcov.rcov_opts = %w(--html --aggregate .aggregated_coverage_report)
+      rcov.rcov_opts << ENV["RCOV_OPTS"] if ENV["RCOV_OPTS"]
     end
+
+    desc "Verify test coverage"
+    task :verify => "test:coverage" do
+      File.read("coverage/index.html") =~ /<tt class='coverage_total'>\s*(\d+\.\d+)%\s*<\/tt>/
+      coverage = $1.to_f
+
+      puts
+      if coverage == 100
+        puts "\e[32m100% coverage! Awesome!\e[0m"
+      else
+        puts "\e[31mOnly #{coverage}% code coverage. You can do better ;)\e[0m"
+      end
+    end
+  end
+
+  desc "Install all gems on which the tests depend on"
+  task :install_dependencies do
+    system 'gem install redgreen rr mocha ruby-debug dm-sweatshop webrat'
+    system 'gem install -s http://gems.github.com jeremymcanally-context jeremymcanally-matchy jeremymcanally-pending foca-storyteller'
   end
 end
 
@@ -48,8 +76,7 @@ end
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |s|
-    files  = `git ls-files`.split("\n").reject {|f| f =~ %r(^spec) || f =~ %r(^vendor/rspec) || f =~ /^\.git/ } 
-    files += %w(spec/spec_helper.rb spec/form_field_matchers.rb)
+    files  = `git ls-files`.split("\n").reject {|f| f =~ %r(^test/acceptance) || f =~ %r(^test/unit) || f =~ /^\.git/ }
 
     s.name                 = 'integrity'
     s.summary              = 'The easy and fun Continuous Integration server'
@@ -62,20 +89,21 @@ begin
     s.executables          = ['integrity']
     s.post_install_message = 'Run `integrity help` for information on how to setup Integrity.'
 
-    s.add_dependency 'sinatra', ['>= 0.3.2']
+    s.add_dependency 'sinatra', ['>= 0.9.0.3']
     s.add_dependency 'haml' # ah, you evil monkey you
     s.add_dependency 'dm-core', ['>= 0.9.5']
     s.add_dependency 'dm-validations', ['>= 0.9.5']
     s.add_dependency 'dm-types', ['>= 0.9.5']
     s.add_dependency 'dm-timestamps', ['>= 0.9.5']
     s.add_dependency 'dm-aggregates', ['>= 0.9.5']
+    s.add_dependency 'dm-migrations', ['>= 0.9.5']
     s.add_dependency 'data_objects', ['>= 0.9.5']
-    s.add_dependency 'do_sqlite3', ['>= 0.9.5']        
+    s.add_dependency 'do_sqlite3', ['>= 0.9.5']
     s.add_dependency 'json'
     s.add_dependency 'foca-sinatra-diddies', ['>= 0.0.2']
-    s.add_dependency 'rspec_hpricot_matchers'
     s.add_dependency 'thor'
-    s.add_dependency 'bcrypt-ruby'
+    s.add_dependency 'uuidtools' # required by dm-types
+    s.add_dependency 'bcrypt-ruby' # required by dm-types
   end
 rescue LoadError
 end

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 major: 0
-patch: 4
+patch: 6
 minor: 1

data/app.rb

@@ -1,7 +1,6 @@
-require File.dirname(__FILE__) + '/lib/integrity'
-require 'sinatra'
-require 'diddies'
-require 'hacks'
+require File.dirname(__FILE__) + "/lib/integrity"
+require "sinatra"
+require "helpers"
 
 set :root,   Integrity.root
 set :public, Integrity.root / "public"
@@ -39,14 +38,14 @@ before do
 end
 
 get "/" do
-  @projects = Project.all(authorized? ? {} : { :public => true })
+  @projects = Project.only_public_unless(authorized?)
   show :home, :title => "projects"
 end
 
 get "/login" do
   login_required
   session[:user] = current_user
-  redirect "/"
+  redirect root_url
 end
 
 get "/new" do
@@ -58,7 +57,7 @@ end
 
 post "/" do
   login_required
-  
+
   @project = Project.new(params[:project_data])
   if @project.save
     @project.enable_notifiers(params["enabled_notifiers[]"], params["notifiers"])
@@ -70,14 +69,20 @@ end
 
 get "/:project" do
   login_required unless current_project.public?
-  show :project, :title => ["projects", current_project.permalink]
+  show :project, :title => ["projects", current_project.name]
+end
+
+get "/:project.atom" do
+  login_required unless current_project.public?
+  response["Content-Type"] = "application/rss+xml; charset=utf-8"
+  builder :project
 end
 
 put "/:project" do
   login_required
-  
+
   if current_project.update_attributes(params[:project_data])
-    current_project.enable_notifiers(params["enabled_notifiers[]"], params["notifiers"])
+    current_project.enable_notifiers(params["enabled_notifiers"], params["notifiers"])
     redirect project_url(current_project)
   else
     show :new, :title => ["projects", current_project.permalink, "edit"]
@@ -88,7 +93,7 @@ delete "/:project" do
   login_required
 
   current_project.destroy
-  redirect "/"
+  redirect root_url
 end
 
 get "/:project/edit" do
@@ -99,23 +104,14 @@ end
 
 post "/:project/push" do
   login_required
-  
-  content_type 'text/plain'
-
-  begin
-    payload = JSON.parse(params[:payload] || "")
 
-    if Integrity.config[:build_all_commits]
-      payload['commits'].sort_by { |commit| Time.parse(commit['timestamp']) }.each do |commit|
-        current_project.build(commit['id']) if payload['ref'] =~ /#{current_project.branch}/
-      end
-    else
-      current_project.build(payload['after']) if payload['ref'] =~ /#{current_project.branch}/
-    end
+  content_type "text/plain"
 
-    'Thanks, build started.'
+  begin
+    current_project.push(params[:payload])
+    "Thanks, build started."
   rescue JSON::ParserError => exception
-    invalid_payload!(exception.to_s)
+    throw :halt, [422, exception.to_s]
   end
 end
 
@@ -126,141 +122,16 @@ post "/:project/builds" do
   redirect project_url(@project)
 end
 
-get '/:project/builds/:build' do
+get "/:project/builds/:build" do
   login_required unless current_project.public?
   show :build, :title => ["projects", current_project.permalink, current_build.short_commit_identifier]
 end
 
 get "/integrity.css" do
-  header "Content-Type" => "text/css; charset=utf-8"
+  response["Content-Type"] = "text/css; charset=utf-8"
   sass :integrity
 end
 
 helpers do
-  include Rack::Utils
-  include Sinatra::Authorization
-  alias_method :h, :escape_html
-
-  def authorization_realm
-    "Integrity"
-  end
-
-  def authorized?
-    return true unless Integrity.config[:use_basic_auth]
-    !!request.env['REMOTE_USER']
-  end
-
-  def authorize(user, password)
-    if Integrity.config[:hash_admin_password]
-      password = Digest::SHA1.hexdigest(password)
-    end
-
-    !Integrity.config[:use_basic_auth] ||
-    (Integrity.config[:admin_username] == user &&
-      Integrity.config[:admin_password] == password)
-  end
-
-  def unauthorized!(realm=authorization_realm)
-    header 'WWW-Authenticate' => %(Basic realm="#{realm}")
-    throw :halt, [401, show(:unauthorized, :title => "incorrect credentials")]
-  end
-
-  def invalid_payload!(msg=nil)
-    throw :halt, [422, msg || 'No payload given']
-  end
-
-  def current_project
-    @project ||= Project.first(:permalink => params[:project]) or raise Sinatra::NotFound
-  end
-
-  def current_build
-    @build ||= current_project.builds.first(:commit_identifier => params[:build]) or raise Sinatra::NotFound
-  end
-
-  def show(view, options={})
-    @title = breadcrumbs(*options[:title])
-    haml view
-  end
-
-  def pages
-    @pages ||= [["projects", "/"], ["new project", "/new"]]
-  end
-
-  def breadcrumbs(*crumbs)
-    crumbs[0..-2].map do |crumb|
-      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>)
-      end
-    end + [crumbs.last]
-  end
-
-  def cycle(*values)
-    @cycles ||= {}
-    @cycles[values] ||= -1 # first value returned is 0
-    next_value = @cycles[values] = (@cycles[values] + 1) % values.size
-    values[next_value]
-  end
-
-  def project_url(project, *path)
-    "/" << [project.permalink, *path].join("/")
-  end
-
-  def push_url_for(project)
-    Addressable::URI.parse(Integrity.config[:base_uri]).join("#{project_url(project)}/push").to_s
-  end
-
-  def build_url(build)
-    "/#{build.project.permalink}/builds/#{build.commit_identifier}"
-  end
-
-  def filter_attributes_of(model)
-    valid = model.properties.collect {|p| p.name.to_s }
-    Hash[*params.dup.select {|k,_| valid.include?(k) }.flatten]
-  end
-
-  def errors_on(object, field)
-    return "" unless errors = object.errors.on(field)
-    errors.map {|e| e.gsub(/#{field} /i, "") }.join(", ")
-  end
-
-  def error_class(object, field)
-    object.errors.on(field).nil? ? "" : "with_errors"
-  end
-  
-  def checkbox(name, condition, extras={})
-    attrs = { :name => name, :type => "checkbox" }.merge(condition ? { :checked => "checked" } : {})
-    attrs.merge(extras)
-  end
-
-  def bash_color_codes(string)
-    string.gsub("\e[0m", '</span>').
-      gsub("\e[31m", '<span class="color31">').
-      gsub("\e[32m", '<span class="color32">').
-      gsub("\e[33m", '<span class="color33">').
-      gsub("\e[34m", '<span class="color34">').
-      gsub("\e[35m", '<span class="color35">').
-      gsub("\e[36m", '<span class="color36">').
-      gsub("\e[37m", '<span class="color37">')
-  end
-
-  def pretty_date(date_time)
-    today = Date.today
-    if date_time.day == today.day && date_time.month == today.month && date_time.year == today.year
-      "today"
-    elsif date_time.day == today.day - 1 && date_time.month == today.month && date_time.year == today.year
-      "yesterday"
-    else
-      date_time.strftime("on %b %d%o")
-    end
-  end
-  
-  def notifier_form(notifier)
-    haml(notifier.to_haml, :layout => :notifier, :locals => { 
-      :config => current_project.config_for(notifier), 
-      :notifier => "#{notifier.to_s.split(/::/).last}", 
-      :enabled => current_project.notifies?(notifier) 
-    })
-  end
+  include Helpers
 end

data/bin/integrity

@@ -1,82 +1,4 @@
 #!/usr/bin/env ruby
-require "rubygems"
-require "thor"
+require File.dirname(__FILE__) + "/../lib/integrity/installer"
 
-require File.dirname(__FILE__) + "/../lib/integrity"
-
-class WithIntegrity < Thor
-  include FileUtils
-
-  desc "install [PATH]",
-       "Copy template files to PATH. Next, go there and edit them."
-  def install(path)
-    @root = File.expand_path(path)
-
-    create_dir_structure
-    copy_template_files
-    edit_template_files
-    create_db(root / "config.yml")
-    after_setup_message
-  end
-
-  desc "create_db [CONFIG]",
-       "Checks the `database_uri` in CONFIG and creates and bootstraps a database for integrity"
-  def create_db(config)
-    Integrity.new(config)
-    DataMapper.auto_migrate!
-  end
-
-  private
-    attr_reader :root
-
-    def create_dir_structure
-      mkdir_p root
-      mkdir_p root / "builds"
-      mkdir_p root / "log"
-    end
-
-    def copy_template_files
-      cp Integrity.root / "config" / "config.sample.ru",  root / "config.ru"
-      cp Integrity.root / "config" / "config.sample.yml", root / "config.yml"
-      cp Integrity.root / "config" / "thin.sample.yml",   root / "thin.yml"
-    end
-
-    def edit_template_files
-      edit_integrity_configuration
-      edit_thin_configuration
-    end
-
-    def edit_integrity_configuration
-      config = File.read(root / "config.yml")
-      config.gsub! %r(sqlite3:///var/integrity.db), "sqlite3://#{root}/integrity.db"
-      config.gsub! %r(/path/to/scm/exports),        "#{root}/builds"
-      config.gsub! %r(/var/log),                    "#{root}/log"
-      File.open(root / "config.yml", "w") { |f| f.puts config }
-    end
-
-    def edit_thin_configuration
-      config = File.read(root / "thin.yml")
-      config.gsub! %r(/apps/integrity), root
-      File.open(root / "thin.yml", 'w') { |f| f.puts config }
-    end
-
-    def after_setup_message
-      puts
-      puts %Q(Awesome! Integrity was installed successfully!)
-      puts
-      puts %Q(If you want to enable notifiers, install the gems and then require them)
-      puts %Q(in #{root}/config.ru)
-      puts
-      puts %Q(For example:)
-      puts
-      puts %Q(  sudo gem install -s http://gems.github.com foca-integrity-email)
-      puts
-      puts %Q(And then in #{root}/config.ru add:)
-      puts
-      puts %Q(  require "notifier/email")
-      puts
-      puts %Q(Don't forget to tweak #{root / "config.yml"} to your needs.)
-    end
-end
-
-WithIntegrity.start
+Integrity::Installer.start

data/config/config.sample.ru

@@ -27,4 +27,5 @@ set     :port,    8910
 set     :env,     :production
 disable :run,     :reload
 
-run Sinatra.application
+use Rack::CommonLogger, Integrity.logger if Integrity.config[:log_debug_info]
+run Sinatra::Application

data/config/config.sample.yml

@@ -16,6 +16,10 @@
 # Path to the integrity log file
 :log: /var/log/integrity.log
 
+# Enable/Disable debug logging. Turning this on will log queries made to the
+# database and web requests (if using the provided rackup file)
+:log_debug_info: false
+
 # Enable or disable HTTP authentication for the app. BE AWARE that if you 
 # disable this anyone can delete and alter projects, so do it only if your 
 # app is running in a controlled environment (ie, behind your company's