@@ -107,4 +107,3 @@ begin end rescue LoadError end - Rakefile @@ -1,4 +1,4 @@ ---- +--- major: 0 patch: 8 minor: 1 VERSION.yml @@ -4,12 +4,12 @@ # http://builder.integrityapp.com :base_uri: http://integrity.domain.tld -# This should be a complete connection string to your database. For example -# `mysql://user@localhost/integrity` (you need an `integrity` db created in +# This should be a complete connection string to your database. For example +# `mysql://user@localhost/integrity` (you need an `integrity` db created in # localhost, of course). :database_uri: sqlite3:///var/integrity.db -# This is where your project's code will be checked out to. Make sure it's +# This is where your project's code will be checked out to. Make sure it's # writable by the user that runs Integrity. :export_directory: /path/to/scm/exports @@ -20,8 +20,8 @@ # 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 +# 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 # firewall.) :use_basic_auth: false @@ -29,10 +29,10 @@ # When `use_basic_auth` is true, the admin's username for HTTP authentication. :admin_username: username -# When `use_basic_auth` is true, the admin's password. Usually saved as a +# When `use_basic_auth` is true, the admin's password. Usually saved as a # SHA1 hash. See the next option. :admin_password: a94a8fe5ccb19ba61c4c0873d391e987982fbbd3 -# If this is true, then whenever we authenticate the admin user, will hash +# If this is true, then whenever we authenticate the admin user, will hash # it using SHA1. If not, we'll assume the provided password is in plain text. :hash_admin_password: true config/config.sample.yml @@ -27,7 +27,7 @@ module Integrity def short_commit_identifier sha1?(commit_identifier) ? commit_identifier[0..6] : commit_identifier end - + def commit_metadata case data = attribute_get(:commit_metadata) when String; YAML.load(data) lib/integrity/build.rb @@ -1,7 +1,7 @@ Dir["#{File.dirname(__FILE__)}/helpers/*.rb"].each &method(:require) module Integrity - module Helpers + module Helpers include Authorization include Breadcrumbs include Forms @@ -9,8 +9,8 @@ module Integrity include Rendering include Resources include Urls - + include Rack::Utils alias :h :escape_html end -end \ No newline at end of file +end lib/integrity/helpers.rb @@ -30,4 +30,4 @@ module Integrity end end end -end \ No newline at end of file +end lib/integrity/helpers/authorization.rb @@ -25,4 +25,4 @@ module Integrity end end end -end \ No newline at end of file +end lib/integrity/helpers/forms.rb @@ -42,4 +42,4 @@ module Integrity end end end -end \ No newline at end of file +end lib/integrity/helpers/pretty_output.rb @@ -11,4 +11,4 @@ module Integrity end end end -end \ No newline at end of file +end lib/integrity/helpers/rendering.rb @@ -10,4 +10,4 @@ module Integrity end end end -end \ No newline at end of file +end lib/integrity/helpers/resources.rb @@ -44,4 +44,4 @@ module Integrity end end end -end \ No newline at end of file +end lib/integrity/helpers/urls.rb @@ -1,38 +1,38 @@ module Integrity class Notifier include DataMapper::Resource - + property :id, Serial property :name, String, :nullable => false property :config, Yaml, :nullable => false, :lazy => false - + belongs_to :project, :class_name => "Integrity::Project" - + validates_is_unique :name, :scope => :project_id validates_present :project_id - + def self.available @available ||= constants.map { |name| const_get(name) }.select { |notifier| valid_notifier?(notifier) } end - + def self.enable_notifiers(project, enabled, config={}) all(:project_id => project).destroy! list_of_enabled_notifiers(enabled).each do |name| create! :project_id => project, :name => name, :config => config[name] end - + end - + def notify_of_build(build) to_const.notify_of_build(build, config) end - + private - + def to_const self.class.module_eval(name) end - + def self.list_of_enabled_notifiers(names) [*names].reject { |n| n.nil? } end lib/integrity/notifier.rb @@ -8,22 +8,22 @@ module Integrity def self.to_haml raise NoMethodError, "you need to implement this method in your notifier" end - + attr_reader :build - + def initialize(build, config) @build = build @config = config end - + def deliver! raise NoMethodError, "you need to implement this method in your notifier" end - + def short_message "Build #{build.short_commit_identifier} #{build.successful? ? "was successful" : "failed"}" end - + def full_message <<-EOM "Build #{build.commit_identifier} #{build.successful? ? "was successful" : "failed"}" @@ -39,7 +39,7 @@ Build Output: #{stripped_build_output} EOM end - + def build_url raise if Integrity.config[:base_uri].nil? Integrity.config[:base_uri] / build.project.permalink / "builds" / build.commit_identifier lib/integrity/notifier/base.rb @@ -29,7 +29,7 @@ module Integrity format = %Q(---%n:author: %an <%ae>%n:message: >-%n %s%n:date: %ci%n) YAML.load(`cd #{working_directory} && git show -s --pretty=format:"#{format}" #{sha1}`) end - + def name self.class.name.split("::").last end @@ -41,7 +41,7 @@ module Integrity checkout unless on_branch? pull end - + def clone log "Cloning #{uri} to #{working_directory}" `git clone #{uri} #{working_directory} &>/dev/null` lib/integrity/scm/git.rb @@ -13,13 +13,13 @@ module Integrity # ssh://[user@]host.xz/path/to/repo.git/ # ssh://[user@]host.xz/~user/path/to/repo.git/ # ssh://[user@]host.xz/~/path/to/repo.git - # - # SSH is the default transport protocol over the network. You can optionally - # specify which user to log-in as, and an alternate, scp-like syntax is also + # + # SSH is the default transport protocol over the network. You can optionally + # specify which user to log-in as, and an alternate, scp-like syntax is also # supported # - # Both syntaxes support username expansion, as does the native git protocol, - # but only the former supports port specification. The following three are + # Both syntaxes support username expansion, as does the native git protocol, + # but only the former supports port specification. The following three are # identical to the last three above, respectively: # # [user@]host.xz:/path/to/repo.git/ @@ -30,13 +30,13 @@ module Integrity def initialize(uri_string) @uri = Addressable::URI.parse(uri_string) end - + def working_tree_path strip_extension(path).gsub("/", "-") end - + private - + def strip_extension(string) uri = Pathname.new(string) if uri.extname.any? @@ -46,7 +46,7 @@ module Integrity string end end - + def path path = @uri.path path.gsub(/\~[a-zA-Z0-9]*\//, "").gsub(/^\//, "") lib/integrity/scm/git/uri.rb @@ -44,4 +44,3 @@ class Test::Unit::TestCase include Integrity include TestHelper end - test/helpers.rb @@ -1,32 +1,32 @@ module GitHelper @@_git_repositories = Hash.new {|h,k| h[k] = Repo.new(k) } - + def git_repo(name) @@_git_repositories[name] end - + def destroy_all_git_repos @@_git_repositories.each {|n,r| r.destroy } @@_git_repositories.clear end - + class Repo attr_reader :path - + def initialize(name) @name = name @path = "/tmp" / @name.to_s create end - + def path @path / ".git" end - + def create destroy FileUtils.mkdir_p @path - + Dir.chdir(@path) do system 'git init &>/dev/null' system 'git config user.name "John Doe"' @@ -35,7 +35,7 @@ module GitHelper system 'git add README &>/dev/null' system 'git commit -m "First commit" &>/dev/null' end - + add_successful_commit end @@ -55,7 +55,7 @@ module GitHelper system %Q(git commit -m "#{message}" &>/dev/null) end end - + def add_failing_commit add_commit "This commit will fail" do system %Q(echo '#{build_script(false)}' > test) @@ -71,23 +71,23 @@ module GitHelper system %Q(git add test &>/dev/null) end end - + def head Dir.chdir(@path) do `git log --pretty=format:%H | head -1`.chomp end end - + def short_head head[0..6] end - + def destroy FileUtils.rm_rf @path if File.directory?(@path) end - + protected - + def build_script(successful=true) <<-script #!/bin/sh test/helpers/acceptance/git_helper.rb @@ -8,12 +8,12 @@ module Integrity %input.text#textfile_notifier_file{ :name => "notifiers[Textfile][file]", :type => "text", :value => config["file"] } haml end - + def initialize(build, config={}) super @file = @config["file"] end - + def deliver! File.open(@file, "a") do |f| f.puts "=== #{short_message} ===" @@ -23,4 +23,4 @@ module Integrity end end end -end \ No newline at end of file +end test/helpers/acceptance/textfile_notifier.rb @@ -4,20 +4,20 @@ module Matchy::Expectations @receiver = receiver @receiver.is_a?(@expected) end - + def failure_message "Expected #{@receiver.inspect} to be a #{@expected.inspect}." end - + def negative_failure_message "Expected #{@receiver.inspect} to not be a #{@expected.inspect}." end end - + module TestCaseExtensions def be_a(obj) Matchy::Expectations::BeAExpectation.new(obj, self) end alias :be_an :be_a end -end \ No newline at end of file +end test/helpers/expectations/be_a.rb @@ -10,16 +10,16 @@ module Matchy::Expectations def matches?(event_proc) raise_block_syntax_error if block_given? - + @before = evaluate_value_proc event_proc.call @after = evaluate_value_proc - + return false if @from unless @from == @before return false if @to unless @to == @after return (@before + @amount == @after) if @amount return ((@after - @before) >= @minimum) if @minimum - return ((@after - @before) <= @maximum) if @maximum + return ((@after - @before) <= @maximum) if @maximum return @before != @after end @@ -68,7 +68,7 @@ module Matchy::Expectations def by_at_most(maximum) @maximum = maximum self - end + end def to(to) @to = to @@ -87,4 +87,4 @@ module Matchy::Expectations Matchy::Expectations::ChangeExpectation.new(receiver, message, self, &block) end end -end \ No newline at end of file +end test/helpers/expectations/change.rb @@ -87,19 +87,19 @@ EOF end end - + module TestCaseExtensions def have(n) HaveExpectation.new(n, :exactly, self) end alias :have_exactly :have - + def have_at_least(n) HaveExpectation.new(n, :at_least, self) end - + def have_at_most(n) HaveExpectation.new(n, :at_most, self) end end -end \ No newline at end of file +end test/helpers/expectations/have.rb @@ -1,6 +1,6 @@ require 'hpricot' -# evil hack to duck-type CgiResponse so that nested shoulds can use +# evil hack to duck-type CgiResponse so that nested shoulds can use # +rspec_on_rails+ matchers without remembering to call to_s on it # # e.g. test/helpers/expectations/have_tag.rb @@ -5,12 +5,12 @@ module Matchy::Expectations @predicate = predicate @arguments = arguments end - + def matches?(receiver) @receiver = receiver @receiver.send("#{@predicate}?", *@arguments) end - + def failure_message message = "Expected #{@receiver.inspect} to be #{@predicate}" message << " with #{@arguments.map {|e| e.inspect }.join(", ")}" unless @arguments.empty? @@ -23,7 +23,7 @@ module Matchy::Expectations message end end - + module TestCaseExtensions def method_missing(method, *args, &block) if method.to_s =~ /^be_(.*)/ @@ -34,4 +34,4 @@ module Matchy::Expectations end end end -end \ No newline at end of file +end test/helpers/expectations/predicates.rb @@ -5,7 +5,7 @@ class BuildTest < Test::Unit::TestCase RR.reset setup_and_reset_database! end - + specify "fixture is valid and can be saved" do lambda do Build.generate.tap do |build| @@ -14,30 +14,30 @@ class BuildTest < Test::Unit::TestCase end end.should change(Build, :count).by(1) end - + describe "Properties" do before(:each) do @build = Build.generate(:commit_identifier => "658ba96cb0235e82ee720510c049883955200fa9") end - + it "captures the build's STDOUT/STDERR" do @build.output.should_not be_blank end - + it "knows if it failed or not" do @build.successful = true @build.should be_successful @build.successful = false @build.should be_failed end - + it "knows it's status" do @build.successful = true @build.status.should be(:success) @build.successful = false @build.status.should be(:failed) end - + it "has an human readable status" do Build.gen(:successful => true).human_readable_status.should == "Build Successful" Build.gen(:successful => false).human_readable_status.should == "Build Failed" @@ -51,19 +51,19 @@ class BuildTest < Test::Unit::TestCase @build.short_commit_identifier.should == "658ba96" Build.gen(:commit_identifier => "402").short_commit_identifier.should == "402" end - + it "has a commit author" do build = Build.gen(:commit_metadata => { :author => "Nicolás Sanguinetti <contacto@nicolassanguinetti.info>" }) build.commit_author.name.should == "Nicolás Sanguinetti" build.commit_author.email.should == "contacto@nicolassanguinetti.info" build.commit_author.full.should == "Nicolás Sanguinetti <contacto@nicolassanguinetti.info>" end - + it "has a commit message" do build = Build.gen(:commit_metadata => { :message => "This commit rocks" }) build.commit_message.should == "This commit rocks" end - + it "has a commit date" do build = Build.gen(:commit_metadata => { :date => Time.utc(2008, 10, 12, 14, 18, 20) }) build.commited_at.to_s.should == "Sun Oct 12 14:18:20 UTC 2008" test/unit/build_test.rb @@ -1,7 +1,7 @@ require File.dirname(__FILE__) + "/../helpers" class NotifierTest < Test::Unit::TestCase - before(:each) do + before(:each) do setup_and_reset_database! end @@ -59,7 +59,7 @@ class NotifierTest < Test::Unit::TestCase it "requires an unique name in project scope" do project = Project.generate irc = Notifier.gen(:irc, :project => project) - + project.tap { |project| project.notifiers << irc }.save lambda do @@ -117,7 +117,7 @@ class NotifierTest < Test::Unit::TestCase end.should_not change(project.notifiers, :count) end end - + it "requires notifier classes to implement Notifier.to_haml and Notifier#deliver!" do class Blah < Notifier::Base; end lambda { Blah.to_haml }.should raise_error(NoMethodError) test/unit/notifier_test.rb @@ -143,19 +143,19 @@ class ProjectTest < Test::Unit::TestCase end.should_not change(Project, :count) end end - + describe "Finding public or private projects" do before(:each) do @public_project = Project.gen(:public => true) @private_project = Project.gen(:public => false) end - + it "finds only public projects if the condition passed is false" do projects = Project.only_public_unless(false) projects.should_not include(@private_project) projects.should include(@public_project) end - + it "finds both private and public projects if the condition passed is true" do projects = Project.only_public_unless(true) projects.should include(@private_project) @@ -274,7 +274,7 @@ class ProjectTest < Test::Unit::TestCase mock.proxy(Integrity::Notifier::IRC).notify_of_build(@project.last_build, :uri => "irc://irc.freenode.net/integrity") mock.proxy(Integrity::Notifier::Twitter).notify_of_build(@project.last_build, :email => "foo@example.org", :pass => "secret") - + @project.build end test/unit/project_test.rb @@ -46,4 +46,3 @@ class SCMTest < Test::Unit::TestCase end end end - test/unit/scm_test.rb @@ -213,7 +213,7 @@ a :family = !nice_fonts dd :line-height 1.4 - + .backtrace :margin 1em 0 :overflow scroll @@ -254,8 +254,8 @@ a :color = !success_color &.failed .meta :color = !failed_color - - + + #previous_builds li a @@ -288,7 +288,7 @@ a :color = !failed_bg - #444 &:hover :background-color = !failed_bg + #222 - + #build, #last_build h1, blockquote views/integrity.sass @@ -7,17 +7,17 @@ %label{ :for => "project_name" }< &== Name #{errors_on @project, :name} %input.text#project_name{ :name => "project_data[name]", :type => "text", :value => h(@project.name) } - + %p.required{ :class => error_class(@project, :uri) } %label{ :for => "project_repository" }< &== Git repository #{errors_on @project, :uri} %input.text#project_repository{ :name => "project_data[uri]", :type => "text", :value => h(@project.uri) } - + %p.normal{ :class => error_class(@project, :branch) } %label{ :for => "project_branch" }< &== Branch to track #{errors_on @project, :branch} %input.text#project_branch{ :name => "project_data[branch]", :type => "text", :value => "master", :value => h(@project.branch) } - + %p.normal{ :class => error_class(@project, :command) } %label{ :for => "project_build_script" } &== Build script #{errors_on @project, :command} @@ -28,7 +28,7 @@ %label{ :for => "project_public" } Public project %input.hidden{ :name => "project_data[public]", :value => "0", :type => "hidden" } %input.checkbox#project_public{ checkbox("project_data[public]", @project.public?) } - + - Notifier.available.each do |notifier| = notifier_form(notifier) views/new.haml c019c7a5747c1594039b4564505a5a5120464ccf Simon Rozet simon@rozet.name http://github.com/edavis10/integrity/commit/3d1ba4b8cde7241dacd641eb40e9f26c49fbea35 3d1ba4b8cde7241dacd641eb40e9f26c49fbea35 2009-02-13T11:25:05-08:00 2009-02-13T11:25:05-08:00 Fix whitespace errors across all source files and tests I can't stand this shit anymore. -- RMT in 60d5006 ed72c6a50ec67834471d837ef7c0d0c83cbf77b0 Simon Rozet simon@rozet.name