integrity 0.1.8 → 0.1.9.0

data/views/new.haml

@@ -7,29 +7,29 @@
     %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}
-    %textarea#project_build_script{ :name => "project_data[command]", :cols => 40, :rows => 1 }
+    %textarea#project_build_script{ :name => "project_data[command]", :cols => 40, :rows => 2 }
       &== #{@project.command.to_s}
 
   %p.normal.checkbox
     %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|
+
+  - Integrity::Notifier.available.each do |notifier|
     = notifier_form(notifier)
 
   %p.submit

data/views/project.builder

@@ -2,20 +2,20 @@ xml.instruct!
 xml.feed :xmlns => "http://www.w3.org/2005/Atom" do
   xml.title     "Build history for #{@project.name}"
   xml.subtitle  @project.uri
-  xml.updated   @project.builds.first.created_at
+  xml.updated   @project.last_commit.updated_at
   xml.link      :href => "#{project_url(@project)}.atom", :rel => "self"
   xml.id        "#{project_url(@project)}.atom"
 
-  @project.builds.each do |build|
+  @project.commits.each do |commit|
     xml.entry do
-      xml.id        build_url(build)
-      xml.link      :href => build_url(build), :rel => "alternate", :type => "text/html"
-      xml.updated   build.created_at
-      xml.published build.created_at
+      xml.id        commit_url(commit)
+      xml.link      :href => commit_url(commit), :rel => "alternate", :type => "text/html"
+      xml.updated   commit.created_at
+      xml.published commit.created_at
 
-      xml.title "Built #{build.short_commit_identifier} #{build.successful? ? "successfully" : "and failed"}"
-      xml.author { xml.name(build.commit_author.name) }
-      xml.content("<div>#{partial(:build_info, :build => build)}</div>", :type => "html")
+      xml.title commit.human_readable_status
+      xml.author { xml.name(commit.author.name) }
+      xml.content("<div>#{partial(:commit_info, :commit => commit)}</div>", :type => "html")
    end
   end
 end

data/views/project.haml

@@ -1,28 +1,30 @@
 #administrative
   %a{ :href => project_path(@project, :edit) } Edit Project
 
-- if @project.builds.empty?
+- if @project.commits.empty?
   %form.blank_slate{ :action => project_path(@project, :builds), :method => :post }
     %p No builds for this project, buddy
     %h1
       You can request a
       %button{ :type => :submit } manual build
 - else
-  - @build = @project.last_build
-  #last_build{ :class => @build.status }
-    = partial(:build_info, :build => @build)
+  - @commit = @project.last_commit
+  #last_build{ :class => @commit.status }
+    = partial(:commit_info, :commit => @commit)
 
   %form{ :action => project_path(@project, :builds), :method => :post }
-    %p.submit
-      %button{ :type => :submit } Request Manual Build
+    %p.submit.manual-build
+      %button{ :type => :submit, :title => "Fetch the last commit and build it" }<
+        Build the last commit
+      in the repository (or rebuild the latest)
 
-  - unless @project.previous_builds.empty?
+  - unless @project.previous_commits.empty?
     %h2 Previous builds
     %ul#previous_builds
-      - @project.previous_builds.each do |build|
-        %li{ :class => build.status }
-          %a{ :href => build_path(build) }
+      - @project.previous_commits.each do |commit|
+        %li{ :class => commit.status }
+          %a{ :href => commit_path(commit) }
             %strong.build<
-              &== Build #{build.short_commit_identifier}
+              &== Build #{commit.short_identifier}
             %span.attribution<
-              == by #{build.commit_author.name}, #{pretty_date build.commited_at}
+              == by #{commit.author.name}, #{pretty_date commit.committed_at}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: integrity
 version: !ruby/object:Gem::Version 
-  version: 0.1.8
+  version: 0.1.9.0
 platform: ruby
 authors: 
 - "Nicol\xC3\xA1s Sanguinetti"
@@ -10,8 +10,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-12 00:00:00 +01:00
-default_executable: integrity
+date: 2009-03-13 00:00:00 +01:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sinatra
@@ -21,7 +21,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.0.3
+        version: 0.9.1.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: haml
@@ -34,84 +34,34 @@ dependencies:
         version: 2.0.0
     version: 
 - !ruby/object:Gem::Dependency 
-  name: dm-core
+  name: data_mapper
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.5
+        version: 0.9.10
     version: 
 - !ruby/object:Gem::Dependency 
-  name: dm-validations
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.9.5
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: dm-types
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.9.5
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: dm-timestamps
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.9.5
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: dm-aggregates
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.9.5
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: dm-migrations
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.9.5
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: data_objects
+  name: uuidtools
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.5
+        version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: do_sqlite3
+  name: bcrypt-ruby
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.5
+        version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
   name: json
@@ -124,14 +74,14 @@ dependencies:
         version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: foca-sinatra-diddies
+  name: foca-sinatra-ditties
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.0.2
+        version: 0.0.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: thor
@@ -143,28 +93,8 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-- !ruby/object:Gem::Dependency 
-  name: uuidtools
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: bcrypt-ruby
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
 description: Your Friendly Continuous Integration server. Easy, fun and painless!
-email: contacto@nicolassanguinetti.info
+email: info@integrityapp.com
 executables: 
 - integrity
 extensions: []
@@ -172,62 +102,99 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- README.markdown
 - Rakefile
-- VERSION.yml
-- app.rb
+- README.markdown
 - bin/integrity
-- config/config.sample.ru
-- config/config.sample.yml
-- config/thin.sample.yml
-- integrity.gemspec
-- lib/integrity.rb
-- lib/integrity/build.rb
+- lib/integrity
+- lib/integrity/project_builder.rb
+- lib/integrity/core_ext
 - lib/integrity/core_ext/object.rb
-- lib/integrity/core_ext/string.rb
+- lib/integrity/notifier.rb
 - lib/integrity/helpers.rb
+- lib/integrity/installer.rb
+- lib/integrity/app.rb
+- lib/integrity/build.rb
+- lib/integrity/scm
+- lib/integrity/scm/git.rb
+- lib/integrity/scm/git
+- lib/integrity/scm/git/uri.rb
+- lib/integrity/author.rb
+- lib/integrity/project.rb
+- lib/integrity/migrations.rb
+- lib/integrity/scm.rb
+- lib/integrity/helpers
+- lib/integrity/helpers/rendering.rb
 - lib/integrity/helpers/authorization.rb
-- lib/integrity/helpers/breadcrumbs.rb
 - lib/integrity/helpers/forms.rb
-- lib/integrity/helpers/pretty_output.rb
-- lib/integrity/helpers/rendering.rb
 - lib/integrity/helpers/resources.rb
+- lib/integrity/helpers/breadcrumbs.rb
+- lib/integrity/helpers/pretty_output.rb
 - lib/integrity/helpers/urls.rb
-- lib/integrity/installer.rb
-- lib/integrity/migrations.rb
-- lib/integrity/notifier.rb
+- lib/integrity/notifier
 - lib/integrity/notifier/base.rb
-- lib/integrity/project.rb
-- lib/integrity/project_builder.rb
-- lib/integrity/scm.rb
-- lib/integrity/scm/git.rb
-- lib/integrity/scm/git/uri.rb
+- lib/integrity/notifier/test_helpers.rb
+- lib/integrity/commit.rb
+- lib/integrity.rb
+- views/not_found.haml
+- views/notifier.haml
+- views/new.haml
+- views/error.haml
+- views/unauthorized.haml
+- views/layout.haml
+- views/project.builder
+- views/_commit_info.haml
+- views/project.haml
+- views/build.haml
+- views/home.haml
+- views/integrity.sass
 - public/buttons.css
-- public/reset.css
 - public/spinner.gif
+- public/reset.css
+- config/config.ru
+- config/thin.sample.yml
+- config/config.sample.ru
+- config/config.yml
+- config/config.sample.yml
 - test/helpers.rb
+- test/acceptance
+- test/acceptance/build_notifications_test.rb
+- test/acceptance/notifier_test.rb
+- test/acceptance/manual_build_project_test.rb
+- test/acceptance/helpers.rb
+- test/acceptance/stylesheet_test.rb
+- test/acceptance/api_test.rb
+- test/acceptance/project_syndication_test.rb
+- test/acceptance/error_page_test.rb
+- test/acceptance/browse_project_test.rb
+- test/acceptance/edit_project_test.rb
+- test/acceptance/delete_project_test.rb
+- test/acceptance/create_project_test.rb
+- test/acceptance/installer_test.rb
+- test/acceptance/browse_project_builds_test.rb
+- test/unit
+- test/unit/helpers_test.rb
+- test/unit/migrations_test.rb
+- test/unit/notifier_test.rb
+- test/unit/project_builder_test.rb
+- test/unit/build_test.rb
+- test/unit/project_test.rb
+- test/unit/commit_test.rb
+- test/unit/scm_test.rb
+- test/unit/integrity_test.rb
+- test/helpers
+- test/helpers/expectations.rb
 - test/helpers/acceptance.rb
-- test/helpers/acceptance/git_helper.rb
+- test/helpers/acceptance
+- test/helpers/acceptance/email_notifier.rb
 - test/helpers/acceptance/textfile_notifier.rb
-- test/helpers/expectations.rb
-- test/helpers/expectations/be_a.rb
-- test/helpers/expectations/change.rb
+- test/helpers/acceptance/git_helper.rb
+- test/helpers/expectations
 - test/helpers/expectations/have.rb
-- test/helpers/expectations/have_tag.rb
+- test/helpers/expectations/be_a.rb
 - test/helpers/expectations/predicates.rb
+- test/helpers/expectations/change.rb
 - test/helpers/fixtures.rb
-- views/_build_info.haml
-- views/build.haml
-- views/error.haml
-- views/home.haml
-- views/integrity.sass
-- views/layout.haml
-- views/new.haml
-- views/not_found.haml
-- views/notifier.haml
-- views/project.builder
-- views/project.haml
-- views/unauthorized.haml
+- test/helpers/initial_migration_fixture.sql
 has_rdoc: false
 homepage: http://integrityapp.com
 post_install_message: Run `integrity help` for information on how to setup Integrity.

data/VERSION.yml

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

data/app.rb

@@ -1,138 +0,0 @@
-require "sinatra"
-
-require File.dirname(__FILE__) + "/lib/integrity"
-require "integrity/helpers"
-
-set :root,   Integrity.root
-set :public, Integrity.root / "public"
-set :views,  Integrity.root / "views"
-
-enable :sessions
-
-include Integrity
-
-configure :development do
-  config = Integrity.root / "config" / "config.yml"
-  Integrity.config = config if File.exists? config
-end
-
-configure do
-  Integrity.new
-end
-
-not_found do
-  status 404
-  show :not_found, :title => "lost, are we?"
-end
-
-error do
-  @error = request.env['sinatra.error']
-  status 500
-  show :error, :title => "something has gone terribly wrong"
-end
-
-before do
-  # The browser only sends http auth data for requests that are explicitly
-  # required to do so. This way we get the real values of +#logged_in?+ and
-  # +#current_user+
-  login_required if session[:user]
-end
-
-get "/" do
-  @projects = Project.only_public_unless(authorized?)
-  show :home, :title => "projects"
-end
-
-get "/login" do
-  login_required
-  session[:user] = current_user
-  redirect root_url
-end
-
-get "/new" do
-  login_required
-
-  @project = Project.new
-  show :new, :title => ["projects", "new project"]
-end
-
-post "/" do
-  login_required
-
-  @project = Project.new(params[:project_data])
-  if @project.save
-    @project.enable_notifiers(params["enabled_notifiers[]"], params["notifiers"])
-    redirect project_url(@project)
-  else
-    show :new, :title => ["projects", "new project"]
-  end
-end
-
-get "/:project" do
-  login_required unless current_project.public?
-  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"])
-    redirect project_url(current_project)
-  else
-    show :new, :title => ["projects", current_project.permalink, "edit"]
-  end
-end
-
-delete "/:project" do
-  login_required
-
-  current_project.destroy
-  redirect root_url
-end
-
-get "/:project/edit" do
-  login_required
-
-  show :new, :title => ["projects", current_project.permalink, "edit"]
-end
-
-post "/:project/push" do
-  login_required
-
-  content_type "text/plain"
-
-  begin
-    current_project.push(params[:payload])
-    "Thanks, build started."
-  rescue JSON::ParserError => exception
-    throw :halt, [422, exception.to_s]
-  end
-end
-
-post "/:project/builds" do
-  login_required
-
-  current_project.build
-  redirect project_url(@project)
-end
-
-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
-  response["Content-Type"] = "text/css; charset=utf-8"
-  sass :integrity
-end
-
-helpers do
-  include Helpers
-end