foca-integrity 0.1.8 → 0.1.9.0

data/test/unit/scm_test.rb

@@ -0,0 +1,54 @@
+require File.dirname(__FILE__) + "/../helpers"
+
+class SCMTest < Test::Unit::TestCase
+  def scm(uri)
+    SCM.new(Addressable::URI.parse(uri), "master", "foo")
+  end
+
+  it "recognizes git URIs" do
+    scm("git://example.org/repo").should be_an(SCM::Git)
+    scm("git@example.org/repo.git").should be_an(SCM::Git)
+    scm("git://example.org/repo.git").should be_an(SCM::Git)
+  end
+
+  it "raises SCMUnknownError if it can't figure the SCM from the URI" do
+    lambda { scm("scm://example.org") }.should raise_error(SCM::SCMUnknownError)
+  end
+
+  it "doesn't need the working tree path for all operations, so it's not required on the constructor" do
+    lambda {
+      SCM.new(Addressable::URI.parse("git://github.com/foca/integrity.git"), "master")
+    }.should_not raise_error
+  end
+
+  describe "SCM::Git::URI" do
+    uris = [
+      "rsync://host.xz/path/to/repo.git/",
+      "rsync://host.xz/path/to/repo.git",
+      "rsync://host.xz/path/to/repo.gi",
+      "http://host.xz/path/to/repo.git/",
+      "https://host.xz/path/to/repo.git/",
+      "git://host.xz/path/to/repo.git/",
+      "git://host.xz/~user/path/to/repo.git/",
+      "ssh://[user@]host.xz[:port]/path/to/repo.git/",
+      "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",
+      "host.xz:/path/to/repo.git/",
+      "host.xz:~user/path/to/repo.git/",
+      "host.xz:path/to/repo.git",
+      "user@host.xz:/path/to/repo.git/",
+      "user@host.xz:~user/path/to/repo.git/",
+      "user@host.xz:path/to/repo.git",
+      "user@host.xz:path/to/repo",
+      "user@host.xz:path/to/repo.a_git"
+    ]
+
+    uris.each do |uri|
+      it "parses the uri #{uri}" do
+        git_url = SCM::Git::URI.new(uri)
+        git_url.working_tree_path.should == "path-to-repo"
+      end
+    end
+  end
+end

data/views/_commit_info.haml

@@ -0,0 +1,24 @@
+%h1&= commit.human_readable_status
+
+- if commit.failed?
+  %form{ :action => commit_path(commit, :builds), :method => :post }
+    %p.submit
+      %button{ :type => :submit, :title => "Rebuild this commit" }<
+        Rebuild
+
+%blockquote
+  %p&= commit.message
+  %p.meta<
+    %span.who<
+      &== by: #{commit.author.name}
+    |
+    %span.when{ :title => commit.commited_at }<
+      &= pretty_date commit.committed_at
+    |
+    %span.what<
+      &== commit: #{commit.identifier}
+
+%h2 Build Output:
+%pre.output
+  :preserve
+    #{bash_color_codes h(commit.output)}

data/views/build.haml

@@ -1,2 +1,2 @@
-#build{ :class => @build.status }
-  = partial(:build_info, :build => @build)
+#build{ :class => @commit.status }
+  = partial(:commit_info, :commit => @commit)

data/views/error.haml

@@ -13,9 +13,10 @@
 
     %dt What can I do?
     %dd
-      Is your
-      %a{ :href => project_url(@project, :edit) } config
-      ok?
+      - if @project
+        Is your
+        %a{ :href => project_url(@project, :edit) } config
+        ok?
       Need
       %a{ :href => "http://integrityapp.com/configure" } help?
       Remember to restart Integrity.

data/views/home.haml

@@ -8,16 +8,14 @@
 - else
   %ul#projects
     - @projects.each do |project|
-      %li{ :class => cycle("even", "odd") + (project.building? ? ' building' : '') + (project.last_build ? (project.last_build.successful? ? ' success' : ' failed') : '') }
+      %li{ :class => cycle("even", "odd") + ' ' + project.status.to_s }
         %a{ :href => project_path(project) }&= project.name
         .meta
           - if project.building?
             Building!
-          - elsif project.last_build.nil?
+          - elsif project.last_commit.nil?
             Never built yet
           - else
-            == Built #{project.last_build.short_commit_identifier}
-            = pretty_date(project.last_build.created_at)
-            = project.last_build.successful? ? "successfully" : "and failed"
+            = project.human_readable_status
   %p#new
     %a{ :href => "/new" } Add a new project

data/views/integrity.sass

@@ -108,6 +108,7 @@ a
       :width 30em
       :padding .2em .4em
       :color = !title_color
+    input.text
       :height 1.4em
     label
       :float left
@@ -177,11 +178,22 @@ a
         :content "."
         :text-indent -9999em
         :text-align left
-      &.destroy
-        :margin-top 0
+      &.destroy, &.manual-build
         button
           :float none
           :display inline
+      &.manual-build
+        button
+          :margin-right 0
+
+  #build form, #last_build form
+    :font-size .75em
+    p.submit
+      :margin 0
+      :padding 0
+      :position absolute
+      :right .5em
+      :top 1.25em
 
   .blank_slate, .error
     p
@@ -213,7 +225,7 @@ a
         :family = !nice_fonts
     dd
       :line-height 1.4
-    
+
     .backtrace
       :margin 1em 0
       :overflow scroll
@@ -254,8 +266,8 @@ a
         :color = !success_color
       &.failed .meta
         :color = !failed_color
-      
-  
+
+
   #previous_builds
     li
       a
@@ -288,9 +300,10 @@ a
           :color = !failed_bg - #444
         &:hover
           :background-color = !failed_bg + #222
-  
+
 
   #build, #last_build
+    :position relative
     h1, blockquote
       :border
         :width 0 1px

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: foca-integrity
 version: !ruby/object:Gem::Version 
-  version: 0.1.8
+  version: 0.1.9.0
 platform: ruby
 authors: 
 - "Nicol\xC3\xA1s Sanguinetti"
@@ -10,101 +10,62 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-12 00:00:00 -08:00
-default_executable: integrity
+date: 2009-03-13 00:00:00 -07:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sinatra
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.0.3
+        version: 0.9.1.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: haml
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: dm-core
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.9.5
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: dm-validations
-  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
-  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
-  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
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.9.5
+        version: 2.0.0
     version: 
 - !ruby/object:Gem::Dependency 
-  name: dm-migrations
+  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: 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
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -113,34 +74,18 @@ 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
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: uuidtools
-  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: 
@@ -149,7 +94,7 @@ dependencies:
         version: "0"
     version: 
 description: Your Friendly Continuous Integration server. Easy, fun and painless!
-email: contacto@nicolassanguinetti.info
+email: info@integrityapp.com
 executables: 
 - integrity
 extensions: []
@@ -157,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.