foca-integrity 0.1.4 → 0.1.6

data/test/helpers/expectations/have_tag.rb

@@ -0,0 +1,128 @@
+require 'hpricot'
+
+# 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.
+#
+# response.should have_tag("li") do |ul|
+#   ul.should have_text("List Item")      # with hack
+#   ul.to_s.should have_text("List Item") # without hack
+# end
+class Hpricot::Elem
+  alias body to_s
+end
+
+module Matchy::Expectations
+  class HaveTag < Base
+    def initialize(test_case, selector, inner_text_or_options, options, &block)
+        #@expected = expected
+        @test_case = test_case
+      @selector = selector
+
+      if Hash === inner_text_or_options
+        @inner_text = nil
+        @options    = inner_text_or_options
+      else
+        @inner_text = inner_text_or_options
+        @options    = options
+      end
+    end
+
+    def matches?(actual, &block)
+      @actual = actual
+      @doc = hpricot_document(@actual)
+
+      matched_elements = @doc.search(@selector)
+
+      return @options[:count] == 0 if matched_elements.empty?
+
+      matched_elements = filter_on_inner_text(matched_elements) if @inner_text
+      matched_elements = filter_on_nested_expectations(matched_elements, block) if block
+
+      @actual_count = matched_elements.length
+
+      return false unless acceptable_count?(@actual_count)
+
+      !matched_elements.empty?
+    end
+
+    def failure_message
+      explanation = @actual_count ? "but found #{@actual_count}" : "but did not"
+      "expected\n#{@doc.to_s}\nto have #{failure_count_phrase} #{failure_selector_phrase}, #{explanation}"
+    end
+
+    def negative_failure_message
+      explanation = @actual_count ? "but found #{@actual_count}" : "but did"
+      "expected\n#{@doc.to_s}\nnot to have #{failure_count_phrase} #{failure_selector_phrase}, #{explanation}"
+    end
+
+    private
+      def hpricot_document(input)
+        if Hpricot === input
+          input
+        elsif input.respond_to?(:body)
+          Hpricot(input.body)
+        else
+          Hpricot(input.to_s)
+        end
+      end
+
+      def filter_on_inner_text(elements)
+        elements.select do |element|
+          next(element.inner_text =~ @inner_text) if @inner_text.is_a?(Regexp)
+          element.inner_text == @inner_text
+        end
+      end
+
+      def filter_on_nested_expectations(elements, block)
+        elements.select do |el|
+          begin
+            block.call(el)
+          rescue NoMethodError
+            false
+          else
+            true
+          end
+        end
+      end
+
+      def acceptable_count?(actual_count)
+        if @options[:count]
+          return false unless @options[:count] === actual_count
+        end
+        if @options[:minimum]
+          return false unless actual_count >= @options[:minimum]
+        end
+        if @options[:maximum]
+          return false unless actual_count <= @options[:maximum]
+        end
+
+        true
+      end
+
+      def failure_count_phrase
+        if @options[:count]
+          "#{@options[:count]} elements matching"
+        elsif @options[:minimum] || @options[:maximum]
+          count_explanations = []
+          count_explanations << "at least #{@options[:minimum]}" if @options[:minimum]
+          count_explanations << "at most #{@options[:maximum]}"  if @options[:maximum]
+          "#{count_explanations.join(' and ')} elements matching"
+        else
+          "an element matching"
+        end
+      end
+
+      def failure_selector_phrase
+        phrase = @selector.inspect
+        phrase << (@inner_text ? " with inner text #{@inner_text.inspect}" : "")
+      end
+  end
+
+  module TestCaseExtensions
+    def have_tag(selector, inner_text_or_options = nil, options = {}, &block)
+      Matchy::Expectations::HaveTag.new(self, selector, inner_text_or_options, options, &block)
+    end
+  end
+end

data/test/helpers/expectations/predicates.rb

@@ -0,0 +1,37 @@
+module Matchy::Expectations
+  class PredicateExpectation < Base
+    def initialize(predicate, *arguments)
+      @test_case = arguments.pop
+      @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?
+      message
+    end
+
+    def negative_failure_message
+      message = "Expected #{@receiver.inspect} not to be #{@predicate}"
+      message << " with #{@arguments.map {|e| e.inspect }.join(", ")}" unless @arguments.empty?
+      message
+    end
+  end
+  
+  module TestCaseExtensions
+    def method_missing(method, *args, &block)
+      if method.to_s =~ /^be_(.*)/
+        args << self
+        Matchy::Expectations::PredicateExpectation.new($1, *args)
+      else
+        super
+      end
+    end
+  end
+end

data/test/helpers/expectations.rb

@@ -0,0 +1,5 @@
+require File.dirname(__FILE__) + "/expectations/be_a"
+require File.dirname(__FILE__) + "/expectations/change"
+require File.dirname(__FILE__) + "/expectations/have"
+require File.dirname(__FILE__) + "/expectations/predicates"
+require File.dirname(__FILE__) + "/expectations/have_tag"

data/test/helpers/fixtures.rb

@@ -0,0 +1,83 @@
+require 'rubygems'
+require 'dm-sweatshop'
+
+include DataMapper::Sweatshop::Unique
+
+class Array
+  def pick
+    self[rand(self.length)]
+  end
+end
+
+def commit_metadata
+  meta_data = <<-EOS
+---
+:author: #{/\w+ \w+ <\w+@example.org>/.gen}
+:message: >-
+  #{/\w+/.gen}
+:date: #{unique {|i| Time.mktime(2008, 12, 15, 18, (59 - i) % 60) }}
+EOS
+end
+
+def create_notifier!(name)
+  klass = Class.new(Integrity::Notifier::Base) do
+    def self.to_haml; "";   end
+    def deliver!;     nil;  end
+  end
+
+  unless Integrity::Notifier.const_defined?(name)
+    Integrity::Notifier.const_set(name, klass)
+  end
+end
+
+
+Integrity::Project.fixture do
+  { :name       => (name = unique { /\w+/.gen }),
+    :uri        => "git://github.com/#{/\w+/.gen}/#{name}.git",
+    :branch     => ["master", "test-refactoring", "lh-34"].pick,
+    :command    => ["rake", "make", "ant -buildfile test.xml"].pick,
+    :public     => [true, false].pick,
+    :building   => [true, false].pick }
+end
+
+Integrity::Project.fixture(:integrity) do
+  { :name       => "Integrity",
+    :uri        => "git://github.com/foca/integrity.git",
+    :branch     => "master",
+    :command    => "rake",
+    :public     => true,
+    :building   => false }
+end
+
+Integrity::Project.fixture(:my_test_project) do
+  { :name       => "My Test Project",
+    :uri        => Integrity.root / "my-test-project",
+    :branch     => "master",
+    :command    => "./test",
+    :public     => true,
+    :building   => false }
+end
+
+Integrity::Build.fixture do
+  { :output     => /[:paragraph:]/.gen,
+    :successful => true,
+    :created_at => unique {|i| Time.mktime(2008, 12, 15, 18, (59 - i) % 60) },
+    :commit_identifier => Digest::SHA1.hexdigest(/[:paragraph:]/.gen),
+    :commit_metadata   => commit_metadata }
+end
+
+Integrity::Notifier.fixture(:irc) do
+  create_notifier! "IRC"
+
+  { :project => Integrity::Project.generate,
+    :name => "IRC",
+    :config => { :uri => "irc://irc.freenode.net/integrity" }}
+end
+
+Integrity::Notifier.fixture(:twitter) do
+  create_notifier! "Twitter"
+
+  { :project => Integrity::Project.generate,
+    :name => "Twitter",
+    :config => { :email => "foo@example.org", :pass => "secret" }}
+end

data/test/helpers.rb

@@ -0,0 +1,48 @@
+require File.dirname(__FILE__) + "/../lib/integrity"
+
+begin
+  require "test/unit"
+  require "redgreen"
+  require "context"
+  require "storyteller"
+  require "pending"
+  require "matchy"
+  require "rr"
+  require "mocha"
+  require "ruby-debug"
+rescue LoadError
+  puts "You're missing some gems required to run the tests."
+  puts "Please run `rake test:install_dependencies`"
+  puts "You'll probably need to run that command as root or with sudo."
+  puts 
+  puts "Thanks :)"
+  puts
+  
+  exit 1
+end
+
+require File.dirname(__FILE__) / "helpers" / "expectations"
+require File.dirname(__FILE__) / "helpers" / "fixtures"
+require File.dirname(__FILE__) / "helpers" / "acceptance"
+
+module TestHelper
+  def setup_and_reset_database!
+    DataMapper.setup(:default, "sqlite3::memory:")
+    DataMapper.auto_migrate!
+  end
+
+  def ignore_logs!
+    stub(Integrity).log { nil }
+  end
+end
+
+class Test::Unit::TestCase
+  class << self
+    alias_method :specify, :test
+  end
+
+  include RR::Adapters::TestUnit
+  include Integrity
+  include TestHelper
+end
+

data/views/_build_info.haml

@@ -0,0 +1,18 @@
+%h1<
+  &== Built #{build.short_commit_identifier} #{build.successful? ? "successfully" : "and failed"}
+%blockquote
+  %p&= build.commit_message
+  %p.meta<
+    %span.who<
+      &== by: #{build.commit_author.name}
+    |
+    %span.when{ :title => build.commited_at.iso8601 }<
+      &= pretty_date build.commited_at
+    |
+    %span.what<
+      &== commit: #{build.commit_identifier}
+
+%h2 Build Output:
+%pre.output
+  :preserve
+    #{bash_color_codes h(build.output)}

data/views/build.haml

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

data/views/error.haml

@@ -7,12 +7,19 @@
     %dd
       %strong&= @error.message
       %pre.backtrace= @error.backtrace.join("\n")
+    %dd
+      %strong Query parameters:
+      %pre.query_params= params.inspect
 
     %dt What can I do?
     %dd
-      Is your 
-      %a{ :href => "http://integrityapp.com/configure" } config 
-      ok? If not, try restarting integrity. If you think everything is fine,
+      Is your
+      %a{ :href => project_url(@project, :edit) } config
+      ok?
+      Need
+      %a{ :href => "http://integrityapp.com/configure" } help?
+      Remember to restart Integrity.
+      If you think everything is fine,
       then drop by our irc channel:
       %a{ :href => "irc://irc.freenode.org:6667/integrity" } #integrity
       on freenode, and we'll try to help.

data/views/home.haml

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

data/views/integrity.sass

@@ -358,7 +358,7 @@ a
       .color37
         :color #fff
 
-  #push_url
+  #push_path
     :display block
     :margin
       :top 1em

data/views/layout.haml

@@ -7,6 +7,9 @@
     %link{ :media => "screen", :type => "text/css", :href => "/reset.css", :rel => "stylesheet" }
     %link{ :media => "screen", :type => "text/css", :href => "/buttons.css", :rel => "stylesheet" }
     %link{ :media => "screen", :type => "text/css", :href => "/integrity.css", :rel => "stylesheet" }
+    - unless @project.nil?
+      %link{ :rel => "alternate", :type => "application/atom+xml", :title => "Build history Atom", :href => "#{project_path(@project)}.atom"}
+
   %body
     #header
       %h1= @title.join(" / ")

data/views/new.haml

@@ -1,34 +1,31 @@
-%form{ :method => "post", :action => (@project.new_record? ? "/" : project_url(@project)) }
+%form{ :method => "post", :action => (@project.new_record? ? "/" : project_path(@project)) }
   - unless @project.new_record?
     .hidden
       %input{ :name => "_method", :type => "hidden", :value => "put" }
 
   %p.required{ :class => error_class(@project, :name) }
-    %label{ :for => "project_name" }
-      Name
-      = errors_on @project, :name
+    %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
+    %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
+    %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
+      &== Build script #{errors_on @project, :command}
     %textarea#project_build_script{ :name => "project_data[command]", :cols => 40, :rows => 1 }&= @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|
@@ -44,7 +41,7 @@
   %p
     %code#push_url= push_url_for(@project)
 
-  %form{ :method => "post", :action => project_url(@project) }
+  %form{ :method => "post", :action => project_path(@project) }
     .hidden
       %input{ :name => "_method", :type => "hidden", :value => "delete" }
     %h2 Delete this project

data/views/notifier.haml

@@ -1,6 +1,6 @@
 %h2.notifier
   %label
-    %input.checkbox{ checkbox("enabled_notifiers[]", enabled, :value => notifier) }
+    %input.checkbox{ checkbox("enabled_notifiers[]", enabled, :value => notifier, :id => "enabled_notifiers_#{notifier.downcase}") }
     == #{notifier} Notifications
     %span.warning be aware that no validation will be made on these fields
 %fieldset{ :id => "#{notifier.downcase}_config" }

data/views/project.builder

@@ -0,0 +1,21 @@
+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.link      :href => "#{project_url(@project)}.atom", :rel => "self"
+  xml.id        "#{project_url(@project)}.atom"
+
+  @project.builds.each do |build|
+    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.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")
+   end
+  end
+end

data/views/project.haml

@@ -1,8 +1,8 @@
 #administrative
-  %a{ :href => project_url(@project, :edit) } Edit Project
+  %a{ :href => project_path(@project, :edit) } Edit Project
 
 - if @project.builds.empty?
-  %form.blank_slate{ :action => project_url(@project, :builds), :method => :post }
+  %form.blank_slate{ :action => project_path(@project, :builds), :method => :post }
     %p No builds for this project, buddy
     %h1
       You can request a
@@ -10,9 +10,9 @@
 - else
   - @build = @project.last_build
   #last_build{ :class => @build.status }
-    = haml(:build_info, :layout => false)
+    = partial(:build_info, :build => @build)
 
-  %form{ :action => project_url(@project, :builds), :method => :post }
+  %form{ :action => project_path(@project, :builds), :method => :post }
     %p.submit
       %button{ :type => :submit } Request Manual Build
 
@@ -21,12 +21,8 @@
     %ul#previous_builds
       - @project.previous_builds.each do |build|
         %li{ :class => build.status }
-          %a{ :href => build_url(build) }
-            %strong.build
-              Build
-              &= build.short_commit_identifier
-            %span.attribution
-              by
-              = succeed "," do
-                &= build.commit_author.name
-              &= pretty_date build.commited_at
+          %a{ :href => build_path(build) }
+            %strong.build<
+              &== Build #{build.short_commit_identifier}
+            %span.attribution<
+              == by #{build.commit_author.name}, #{pretty_date build.commited_at}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: foca-integrity
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors: 
 - "Nicol\xC3\xA1s Sanguinetti"
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-08 00:00:00 -08:00
+date: 2009-01-29 00:00:00 -08:00
 default_executable: integrity
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.2
+        version: 0.9.0.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: haml
@@ -76,6 +76,15 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.9.5
     version: 
+- !ruby/object:Gem::Dependency 
+  name: dm-migrations
+  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
   version_requirement: 
@@ -113,7 +122,7 @@ dependencies:
         version: 0.0.2
     version: 
 - !ruby/object:Gem::Dependency 
-  name: rspec_hpricot_matchers
+  name: thor
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -122,7 +131,7 @@ dependencies:
         version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: thor
+  name: uuidtools
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -159,22 +168,41 @@ files:
 - integrity.gemspec
 - lib/integrity.rb
 - lib/integrity/build.rb
-- lib/integrity/builder.rb
 - lib/integrity/core_ext/object.rb
 - lib/integrity/core_ext/string.rb
-- lib/integrity/core_ext/time.rb
+- lib/integrity/helpers.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/urls.rb
+- lib/integrity/installer.rb
+- lib/integrity/migrations.rb
 - lib/integrity/notifier.rb
 - 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
 - public/buttons.css
 - public/reset.css
 - public/spinner.gif
-- vendor/sinatra-hacks/lib/hacks.rb
+- test/helpers.rb
+- test/helpers/acceptance.rb
+- test/helpers/acceptance/git_helper.rb
+- test/helpers/acceptance/textfile_notifier.rb
+- test/helpers/expectations.rb
+- test/helpers/expectations/be_a.rb
+- test/helpers/expectations/change.rb
+- test/helpers/expectations/have.rb
+- test/helpers/expectations/have_tag.rb
+- test/helpers/expectations/predicates.rb
+- test/helpers/fixtures.rb
+- views/_build_info.haml
 - views/build.haml
-- views/build_info.haml
 - views/error.haml
 - views/home.haml
 - views/integrity.sass
@@ -182,10 +210,9 @@ files:
 - views/new.haml
 - views/not_found.haml
 - views/notifier.haml
+- views/project.builder
 - views/project.haml
 - views/unauthorized.haml
-- spec/spec_helper.rb
-- spec/form_field_matchers.rb
 has_rdoc: false
 homepage: http://integrityapp.com
 post_install_message: Run `integrity help` for information on how to setup Integrity.

data/lib/integrity/core_ext/time.rb

@@ -1,13 +0,0 @@
-class Time
-  alias :strftime_without_ordinals :strftime
-  def strftime(format_string)
-    format_string.gsub! "%o", case day
-      when 1, 21, 31 then "st"
-      when 2, 22     then "nd"
-      when 3, 23     then "rd"
-      else                "th"
-    end
-
-    strftime_without_ordinals(format_string)
-  end
-end