integrity 0.1.9.1 → 0.1.9.2

data/test/unit/helpers_test.rb

@@ -1,25 +1,68 @@
 require File.dirname(__FILE__) + "/../helpers"
 
 class BrowsePublicProjectsTest < Test::Unit::TestCase
-  include ::Integrity::Helpers
+  setup do
+    @h = Module.new { extend Integrity::Helpers }
+  end
 
   test "#pretty_date" do
-    pretty_date(Time.now).should == "today"
-    pretty_date(Time.new - 86400).should == "yesterday"
+    @h.pretty_date(Time.now).should == "today"
+    @h.pretty_date(Time.new - 86400).should == "yesterday"
+
+    @h.pretty_date(Time.mktime(1995, 12, 01)).should == "on Dec 01st"
+    @h.pretty_date(Time.mktime(1995, 12, 21)).should == "on Dec 21st"
+    @h.pretty_date(Time.mktime(1995, 12, 31)).should == "on Dec 31st"
+
+    @h.pretty_date(Time.mktime(1995, 12, 22)).should == "on Dec 22nd"
+    @h.pretty_date(Time.mktime(1995, 12, 22)).should == "on Dec 22nd"
+
+    @h.pretty_date(Time.mktime(1995, 12, 03)).should == "on Dec 03rd"
+    @h.pretty_date(Time.mktime(1995, 12, 23)).should == "on Dec 23rd"
+
+    @h.pretty_date(Time.mktime(1995, 12, 15)).should == "on Dec 15th"
+    @h.pretty_date(Time.mktime(1995, 12, 15)).should == "on Dec 15th"
+    @h.pretty_date(Time.mktime(1995, 12, 15)).should == "on Dec 15th"
+  end
+
+  describe "urls" do
+    before do
+      Integrity.config[:base_uri] = "http://example.org/ci"
+
+      @project = Project.gen(:name => "Foo Bar")
+      @build   = Build.gen(:successful)
+      @commit  = @build.commit
+    end
+
+    test "root" do
+      assert_equal "http://example.org/ci", @h.root_url.to_s
+      assert_equal "/ci", @h.root_path
+      assert_equal "/ci/stylesheet.css", @h.root_path("/stylesheet.css")
 
-    pretty_date(Time.mktime(1995, 12, 01)).should == "on Dec 01st"
-    pretty_date(Time.mktime(1995, 12, 21)).should == "on Dec 21st"
-    pretty_date(Time.mktime(1995, 12, 31)).should == "on Dec 31st"
+      Integrity.config[:base_uri] = nil
+      @h.instance_variable_set(:@url, nil)
+      lambda { @h.root_url }.should raise_error
+
+      stub(@h).request { OpenStruct.new(:url => "http://0.0.0.0/") }
+      assert_equal "http://0.0.0.0/", @h.root_url.to_s
+    end
 
-    pretty_date(Time.mktime(1995, 12, 22)).should == "on Dec 22nd"
-    pretty_date(Time.mktime(1995, 12, 22)).should == "on Dec 22nd"
+    test "project" do
+      assert_equal "/ci/foo-bar", @h.project_path(@project)
+      assert_equal "http://example.org/ci/foo-bar",
+        @h.project_url(@project).to_s
+    end
 
-    pretty_date(Time.mktime(1995, 12, 03)).should == "on Dec 03rd"
-    pretty_date(Time.mktime(1995, 12, 23)).should == "on Dec 23rd"
+    test "commit" do
+      assert_equal "/ci/foo-bar/commits/#{@commit.identifier}",
+        @h.commit_path(@build.commit)
+      assert_equal "http://example.org/ci/foo-bar/commits/#{@commit.identifier}",
+        @h.commit_url(@build.commit).to_s
+    end
 
-    pretty_date(Time.mktime(1995, 12, 15)).should == "on Dec 15th"
-    pretty_date(Time.mktime(1995, 12, 15)).should == "on Dec 15th"
-    pretty_date(Time.mktime(1995, 12, 15)).should == "on Dec 15th"
+    test "compat" do
+      assert_equal @h.build_path(@build), @h.commit_path(@build.commit)
+      assert_equal @h.build_url(@build),  @h.commit_url(@build.commit)
+    end
   end
 
   describe "#push_url_for" do
@@ -27,30 +70,30 @@ class BrowsePublicProjectsTest < Test::Unit::TestCase
       @project = Project.gen(:integrity)
       Integrity.config[:admin_username] = "admin"
       Integrity.config[:admin_password] = "test"
-
-      stub(self).request {
-        OpenStruct.new(:url => "http://integrity.example.org:1234")
-      }
+      Integrity.config[:base_uri] = "http://integrity.example.org:1234"
     end
 
     test "with auth disabled" do
       Integrity.config[:use_basic_auth] = false
 
-      push_url_for(@project).should == "http://integrity.example.org:1234/integrity/push"
+      assert_equal "http://integrity.example.org:1234/integrity/push",
+        @h.push_url_for(@project)
     end
 
     test "with auth and hashing enabled" do
       Integrity.config[:use_basic_auth]      = true
       Integrity.config[:hash_admin_password] = true
 
-      push_url_for(@project).should == "http://admin:<password>@integrity.example.org:1234/integrity/push"
+      assert_equal "http://admin:<password>@integrity.example.org:1234/integrity/push",
+        @h.push_url_for(@project)
     end
 
     test "with auth enabled and hashing disabled" do
       Integrity.config[:use_basic_auth]      = true
       Integrity.config[:hash_admin_password] = false
 
-      push_url_for(@project).should == "http://admin:test@integrity.example.org:1234/integrity/push"
+      assert_equal "http://admin:test@integrity.example.org:1234/integrity/push",
+        @h.push_url_for(@project)
     end
   end
 end

data/test/unit/integrity_test.rb

@@ -1,14 +1,31 @@
 require File.dirname(__FILE__) + "/../helpers"
 
 class IntegrityTest < Test::Unit::TestCase
-  test "Integrity.new loads configuration from a file" do
-    stub(DataMapper).setup { nil }
+  describe "#new" do
+    setup do
+      stub(DataMapper).setup { nil }
+      @config_file = File.dirname(__FILE__) + "/../../config/config.sample.yml"
+    end
 
-    file = File.dirname(__FILE__) + "/../../config/config.sample.yml"
-    Integrity.new(file)
+    it "doesn't require any argument" do
+      Integrity.new
 
-    Integrity.config[:base_uri].should == "http://integrity.domain.tld"
-    Integrity.config[:export_directory].should == "/path/to/scm/exports"
+      assert_equal Integrity.default_configuration[:log],
+        Integrity.config[:log]
+    end
+
+    it "loads configuration from a file" do
+      Integrity.new(@config_file)
+
+      assert_equal "http://integrity.domain.tld", Integrity.config[:base_uri]
+      assert_equal "/path/to/scm/exports",        Integrity.config[:export_directory]
+    end
+
+    it "takes configuration as an hash" do
+      Integrity.new(:base_uri => "http://foo.org")
+
+      assert_equal "http://foo.org", Integrity.config[:base_uri]
+    end
   end
 
   specify "config is just a hash" do

data/test/unit/notifier_test.rb

@@ -1,6 +1,11 @@
 require File.dirname(__FILE__) + "/../helpers"
 
 class NotifierTest < Test::Unit::TestCase
+  test "deprecated methods" do
+    Notifier::Base.new(Build.gen, {}).should respond_to(:build)
+    Notifier::Base.new(Build.gen, {}).should respond_to(:build_url)
+  end
+
   specify "IRC fixture is valid and can be saved" do
     lambda do
       Notifier.generate(:irc).tap do |project|

data/test/unit/project_test.rb

@@ -110,6 +110,11 @@ class ProjectTest < Test::Unit::TestCase
       project = Project.gen(:commits => commits)
       project.last_commit.should == commits.sort_by {|c| c.committed_at }.last
     end
+
+    test "deprecated properties" do
+      @project.last_build.should      == @project.last_commit
+      @project.previous_builds.should == @project.previous_commits
+    end
   end
 
   describe "Validation" do

data/views/home.haml

@@ -4,7 +4,7 @@
     %h1
       Why don't you
       = succeed "?" do
-        %a{ :href => "/new" } create your first project
+        %a{ :href => root_path("/new") } create your first project
 - else
   %ul#projects
     - @projects.each do |project|
@@ -18,4 +18,4 @@
           - else
             = project.human_readable_status
   %p#new
-    %a{ :href => "/new" } Add a new project
+    %a{ :href => root_path("/new") } Add a new project

data/views/layout.haml

@@ -4,11 +4,12 @@
     %meta{ :content => "text/html; charset=utf-8", :"http-equiv" => "Content-Type" }
     %meta{ :content => "en", :"http-equiv" => "Content-Language" }
     %title= "#{@title.last} | integrity"
-    %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" }
+    - stylesheets(:reset, :buttons, :integrity)
     - unless @project.nil?
-      %link{ :rel => "alternate", :type => "application/atom+xml", :title => "Build history Atom", :href => "#{project_path(@project)}.atom"}
+      %link{ :rel  => "alternate",                   |
+        :type   => "application/atom+xml",           |
+        :title  => "Build history Atom",             |
+        :href   => "#{project_path(@project)}.atom"} |
 
   %body
     #header
@@ -24,5 +25,5 @@
           %strong&= current_user
         - else
           Hey there!
-          %a{ :href => "/login" } Log In
+          %a{ :href => root_path("/login") } Log In
           if you have a user

data/views/new.haml

@@ -1,4 +1,4 @@
-%form{ :method => "post", :action => (@project.new_record? ? "/" : project_path(@project)) }
+%form{ :method => "post", :action => (@project.new_record? ? root_path("/") : project_path(@project)) }
   - unless @project.new_record?
     .hidden
       %input{ :name => "_method", :type => "hidden", :value => "put" }

data/views/not_found.haml

@@ -1,7 +1,7 @@
 .error
   %h1
     Ehm, you seem a bit lost, sir. Maybe going to the
-    %a{ :href => "/", :rel => "home" } list of projects
+    %a{ :href => root_path("/"), :rel => "home" } list of projects
     will help?
   %dl
     %dt Ouch. This is a 404 error-thingie, right?
@@ -14,7 +14,7 @@
         %strong DON'T PANIC
       / if you didn't get the reference you aren't as nerd as you should be
       You should probably just go back to
-      %a{ :href => "/", :rel => "home" } the projects list
+      %a{ :href => root_path("/"), :rel => "home" } the projects list
       or, alternatively, go
       = succeed "." do
         %a{ :href => request.referer } back from whence you came

data/views/unauthorized.haml

@@ -1,10 +1,10 @@
 .error
   %h1
     So... you don't know the password? Hmm... You can
-    %a{ :href => "/login" } try again
+    %a{ :href => root_path("/login") } try again
     or
     = succeed "." do
-      %a{ :href => "/", :rel => "home" } go back
+      %a{ :href => root_path("/"), :rel => "home" } go back
 
   %dl
     %dt Er... So... I'm trying to login without a password...
@@ -19,12 +19,12 @@
     %dd
       This just means that you can't access some part of this Integrity
       server, but that shouldn't let you out of some of the
-      %a{ :href => "/" } awesome projects
+      %a{ :href => root_path("/") } awesome projects
       hosted here. If this was just a misunderstanding and you
       %strong do
       have a password, then
       = succeed "." do
-        %a{ :href => "/login" } click here to try again
+        %a{ :href => root_path("/login") } click here to try again
 
     %dt
       So what the hell is

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: integrity
 version: !ruby/object:Gem::Version 
-  version: 0.1.9.1
+  version: 0.1.9.2
 platform: ruby
 authors: 
 - "Nicol\xC3\xA1s Sanguinetti"
@@ -23,6 +23,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.9.1.1
     version: 
+- !ruby/object:Gem::Dependency 
+  name: sinatra-authorization
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: haml
   type: :runtime
@@ -83,6 +93,96 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: rr
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: webrat
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: do_sqlite3
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: dm-sweatshop
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: ParseTree
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: jeremymcanally-context
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: jeremymcanally-pending
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: foca-storyteller
+  type: :development
+  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: info@integrityapp.com
 executables: 
@@ -92,6 +192,8 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- .gitignore
+- CHANGES
 - README.markdown
 - Rakefile
 - bin/integrity
@@ -140,12 +242,13 @@ files:
 - test/acceptance/delete_project_test.rb
 - test/acceptance/edit_project_test.rb
 - test/acceptance/error_page_test.rb
-- test/acceptance/helpers.rb
 - test/acceptance/installer_test.rb
 - test/acceptance/manual_build_project_test.rb
+- test/acceptance/not_found_page_test.rb
 - test/acceptance/notifier_test.rb
 - test/acceptance/project_syndication_test.rb
 - test/acceptance/stylesheet_test.rb
+- test/acceptance/unauthorized_page_test.rb
 - test/helpers.rb
 - test/helpers/acceptance.rb
 - test/helpers/acceptance/email_notifier.rb
@@ -168,10 +271,6 @@ files:
 - test/unit/project_builder_test.rb
 - test/unit/project_test.rb
 - test/unit/scm_test.rb
-- vendor/sinatra-ditties/README.rdoc
-- vendor/sinatra-ditties/lib/sinatra/ditties.rb
-- vendor/sinatra-ditties/lib/sinatra/ditties/authorization.rb
-- vendor/sinatra-ditties/lib/sinatra/ditties/mailer.rb
 - views/_commit_info.haml
 - views/build.haml
 - views/error.haml

data/test/acceptance/helpers.rb

@@ -1,2 +0,0 @@
-require File.dirname(__FILE__) + "/../helpers"
-require File.dirname(__FILE__) / ".." / "helpers" / "acceptance"

data/vendor/sinatra-ditties/README.rdoc

@@ -1,3 +0,0 @@
-= Sinatra Ditties
-
-All those handy tunes in one elegant package.

data/vendor/sinatra-ditties/lib/sinatra/ditties.rb

@@ -1,12 +0,0 @@
-require "sinatra/base"
-
-module Sinatra
-  module Ditties
-    def self.version
-      "0.0.2".freeze
-    end
-  end
-
-  autoload :Authorization, File.dirname(__FILE__) + "/ditties/authorization"
-  autoload :Mailer,        File.dirname(__FILE__) + "/ditties/mailer"
-end