integritray 0.1.1 → 0.2.2

data/CHANGELOG

@@ -0,0 +1,6 @@
+= 0.2.2
+Invoke authentication on private projects [Gabe Varela]
+= 0.2.0
+Updates for compatibility with latest Integrity [Smestad]
+= 0.1.1
+Fix build status when project is pending [Jonas Nicklas]

data/README.rdoc

@@ -5,13 +5,15 @@ for use with CCMenu and other tray items.
 
 == Usage
 Install the integritray gem: 
-  gem install jfrench-integritray
+  gem install integritray
 
 Require in your Integrity application's config.ru:
   require 'integrity/integritray'
   
 Point CCMenu or your tray item of choice to the feed URL:
   http://my.integration.server/projects.xml
+  to view private projects
+  http://user:password@my.integration.server/projects.xml?private=true
   
 You may have to manually specify that this is a CruiseControl.rb-type server;
 CCMenu has trouble determining which type of server to treat this as.

data/Rakefile

@@ -8,9 +8,11 @@ begin
     gem.summary = %Q{CCMenu support for Integrity}
     gem.email = "josh@digitalpulp.com"
     gem.homepage = "http://github.com/jfrench/integritray"
-    gem.authors = ["Josh French"]
-  end
+    gem.authors = ["Josh French", "Justin Smestad", "Gabe Varela"]
 
+    gem.add_dependency 'sinatra', '>= 0.9.4'
+  end
+  Jeweler::GemcutterTasks.new
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.2

data/integritray.gemspec

@@ -1,12 +1,15 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{integritray}
-  s.version = "0.1.1"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Josh French"]
-  s.date = %q{2009-07-08}
+  s.authors = ["Josh French", "Justin Smestad"]
+  s.date = %q{2010-01-06}
   s.email = %q{josh@digitalpulp.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -15,6 +18,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
      ".gitignore",
+     "CHANGELOG",
      "LICENSE",
      "README.rdoc",
      "Rakefile",
@@ -27,7 +31,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/jfrench/integritray}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.4}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{CCMenu support for Integrity}
   s.test_files = [
     "test/acceptance/acceptance_helper.rb",
@@ -39,8 +43,12 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<sinatra>, [">= 0.9.4"])
     else
+      s.add_dependency(%q<sinatra>, [">= 0.9.4"])
     end
   else
+    s.add_dependency(%q<sinatra>, [">= 0.9.4"])
   end
 end
+

data/lib/integrity/integritray.rb

@@ -1,49 +1,58 @@
-class Integrity::App < Sinatra::Default
-  get '/projects.xml' do
-    builder do |xml|
-      @projects = authorized? ? Project.all : Project.all(:public => true)
-      response["Content-Type"] = "application/xml; charset=utf-8"
-      xml.Projects do
-        @projects.each do |project|
-          xml.Project xml_opts_for_project(project)
+
+module Integrity
+  module Integritray
+    module Helpers
+
+      def xml_opts_for_project(project)
+        opts = {}
+        opts['name']     = project.name
+        opts['category'] = project.branch
+        opts['activity'] = activity(project.last_build.status) if project.last_build
+        opts['webUrl']   = project_url(project)
+        if project.last_build
+          opts['lastBuildStatus'] = build_status(project.last_build.status)
+          opts['lastBuildLabel']  = project.last_build.commit.short_identifier
+          opts['lastBuildTime']   = project.last_build.completed_at
         end
+        opts
       end
-    end
-  end
-
-  # Move route definition with the literal routes where it won't be hidden behind any general matchers
-  xml_route = routes['GET'].pop
-  first_literal_route = routes['GET'].find { |route| route.first.inspect.include? 'integrity' }
-  routes['GET'].insert(routes['GET'].index(first_literal_route), xml_route)
-  
-  private
-    def xml_opts_for_project(project)
-      opts = {}
-      opts['name']     = project.name
-      opts['category'] = project.branch
-      opts['activity'] = activity(project.last_commit.status)
-      opts['webUrl']   = project_url(project)
-      if project.last_commit
-        opts['lastBuildStatus'] = build_status(project.last_commit.status)
-        opts['lastBuildLabel']  = project.last_commit.short_identifier
-        opts['lastBuildTime']   = project.last_commit.build.completed_at if project.last_commit.build
+
+      def activity(status)
+        case status
+        when :success, :failed then 'Sleeping'
+        when :pending then 'Building'
+        else 'Sleeping'
+        end
       end
-      opts
-    end
-    
-    def activity(status)
-      case status
-      when :success, :failed then 'Sleeping'
-      when :pending then 'Building'
-      else 'Sleeping'
-      end      
+
+      def build_status(status)
+        case status
+        when :success, :pending then 'Success'
+        when :failed then 'Failure'
+        else 'Unknown'
+        end
+      end
+
     end
-    
-    def build_status(status)
-      case status
-      when :success, :pending then 'Success'
-      when :failed then 'Failure'
-      else 'Unknown'
+
+
+    def self.registered(app)
+      app.helpers Integritray::Helpers
+
+      app.get '/projects.xml' do
+        login_required if params["private"]
+        builder do |xml|
+          @projects = authorized? ? Project.all : Project.all(:public => true)
+          response["Content-Type"] = "application/xml; charset=utf-8"
+          xml.Projects do
+            @projects.each do |project|
+              xml.Project xml_opts_for_project(project)
+            end
+          end
+        end
       end
+
     end
-end
+
+  end # Integritray
+end # Integrity

data/test/acceptance/integritray_test.rb

@@ -55,4 +55,18 @@ class IntegritrayTest < Test::Unit::AcceptanceTestCase
     assert_have_tag("projects/project[@activity='Sleeping']")
     assert_have_tag("projects/project[@lastbuildstatus='Failure']")
   end
+
+  scenario "projects.xml has a tag representing my unbuilt project" do
+    project = Project.gen(:integrity, :public => true)
+    commit = project.last_commit
+    puts commit.inspect
+    visit "/projects.xml"
+
+    assert_have_tag("projects")
+    assert_have_tag("projects/project[@name='Integrity']")
+    assert_have_tag("projects/project[@weburl='#{project_url(project)}']")
+    assert_have_tag("projects/project[@category='#{project.branch}']")
+    assert_have_no_tag("projects/project[@activity]")
+    assert_have_no_tag("projects/project[@lastbuildstatus]")
+  end
 end

metadata

@@ -1,18 +1,29 @@
 --- !ruby/object:Gem::Specification 
 name: integritray
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Josh French
+- Justin Smestad
+- Gabe Varela
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-07-08 00:00:00 -04:00
+date: 2010-01-15 00:00:00 -05:00
 default_executable: 
-dependencies: []
-
+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.4
+    version: 
 description: 
 email: josh@digitalpulp.com
 executables: []
@@ -25,6 +36,7 @@ extra_rdoc_files:
 files: 
 - .document
 - .gitignore
+- CHANGELOG
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -57,7 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: CCMenu support for Integrity