jenkins-status-tool 0.0.6 → 0.0.7

data/README.markdown

@@ -101,26 +101,28 @@ lets say that our Jenkins server is running on ```jenkins-server:1234```
 ## Embed it
 you can easily embed the current status of your builds in any html type document.
 
+**HTML**
+
 ```
-<img src="https://jenkins-status-tool-url/projects/PROJECT-NAME/status.png"/>
+<img src="https://jenkins-status-tool-url/project/PROJECT-NAME/status.png"/>
 ```
 
-TextLite
+**TextLite**
 
 ```bash
-"!https://jenkins-status-tool-url/projects/PROJECT-NAME/status.png!":http://jenkins.example.com/jobs/PROJET-NAME
+"!https://jenkins-status-tool-url/project/PROJECT-NAME/status.png!":http://jenkins.example.com/jobs/PROJET-NAME
 ```
 
-RDoc
+**RDoc**
 
 ```bash
-{<img src="https://jenkins-status-tool-url/projects/PROJECT-NAME/status.png" />}[http://jenkins.example.com/jobs/PROJET-NAME]
+{<img src="https://jenkins-status-tool-url/project/PROJECT-NAME/status.png" />}[http://jenkins.example.com/jobs/PROJET-NAME]
 ```
 
-MarkDown
+**MarkDown**
 
 ```bash
-[![Build Status](https://jenkins-status-tool-url/projects/PROJECT-NAME/status.png)](http://jenkins.example.com/jobs/PROJET-NAME)
+[![Build Status](https://jenkins-status-tool-url/project/PROJECT-NAME/status.png)](http://jenkins.example.com/jobs/PROJET-NAME)
 ```
 
 >

data/lib/jenkins-status-tool/config.rb

@@ -1,22 +1,23 @@
-require 'ostruct'
 require 'singleton'
 
 module JenkinsStatusTool
-  class Config < OpenStruct
+  class Config
+
     include Singleton
+
+    attr_reader :options
     
     def initialize
-      super
-      self.port    = 7676
-      self.jenkins = "localhost:8080"
-      self.pid     = '/var/run/jenkins-status-tool.pid'
-      self.root    = File.expand_path File.join(JenkinsStatusTool::ROOT, "..")
-      self.https   = false
+      @options = Utils.default_options
     end
     
     def https?
-      self.https
+      options[:https]
+    end
+
+    def method_missing(m, *a, &b)
+      options.fetch(m) rescue options.send(m,*a,&b)
     end
     
   end
-end
+end

data/lib/jenkins-status-tool/jenkins-broker.rb

@@ -1,24 +1,35 @@
 require 'rubygems'
 require 'open-uri'
-require 'singleton'
 require 'json'
 
 module JenkinsStatusTool
   class JenkinsBroker
-    include Singleton
     
     def project_info project
-      json["jobs"].select {|o| o["name"] == project}.first rescue Hash.new
+      find_job project or Hash.new
     end
     
     def raw relative_path
-      open("http://#{Config.instance.jenkins}/#{relative_path}").read rescue nil
+      open("http://#{jenkins}/#{relative_path}").read rescue nil
     end
-        
+
     private
+    
+    def jobs
+      json["jobs"] || Array.new { Hash.new }
+    end
+
+    def find_job job
+      jobs.select {|o| o["name"] == job}.first
+    end
+
+    def jenkins
+      Config.instance.jenkins
+    end
+
     def json
-      JSON.parse open("http://#{Config.instance.jenkins}/api/json").read
+      JSON.parse open("http://#{jenkins}/api/json").read
     end
-    
+
   end
-end
+end

data/lib/jenkins-status-tool/jenkins-project.rb

@@ -1,25 +1,29 @@
-require 'ostruct'
-
 module JenkinsStatusTool
-  class JenkinsProject < OpenStruct
+  class JenkinsProject
+
+    attr_reader :project, :jenkins
 
     def initialize hash
-      super
-      self.project = hash.fetch :project
-      self.jenkins = JenkinsBroker::instance
+      @project = hash.fetch :project
+      @jenkins = JenkinsBroker.new
     end
     
     def status
       case color
-      when /red/     then :fail
-      when /blue/    then :pass
-      when /gray/    then :inactive
+      when :red  then :fail
+      when :blue then :pass
+      when :gray then :inactive
       else :unknown
       end
     end
 
     def color
-      data["color"]
+      case data["color"]
+      when /red/  then :red
+      when /blue/ then :blue
+      when /gray/ then :gray
+      else nil
+      end
     end
     
     def rcov_image
@@ -28,7 +32,7 @@ module JenkinsStatusTool
     
     private
     def rcov_path
-      [job,project,rcov,graph].join "/"
+      ["job",project,"rcov","graph"].join "/"
     end
     
     def data

data/lib/jenkins-status-tool/runner.rb

@@ -33,23 +33,23 @@ module JenkinsStatusTool
         opts.separator "Options:"
         
         opts.on('-j', '--jenkins URL', 'Jenkins url, e.g http://jenkins:8080, default is localhost') do |url|
-          config.jenkins = url
+          config[:jenkins] = url
         end
         
         opts.on('-p', '--port URL', 'listening port, default is 7676') do |port|
-          config.port = port
+          config[:port] = port
         end
         
         opts.on("-d", "--daemonize","run in background") do
-          config.daemonize = true
+          config[:daemonize] = true
         end
         
         opts.on("-P", "--pid-file FILE","pid file, default /var/run/jenkins-status-tool.pid") do |file|
-          config.pid = file
+          config[:pid] = file
         end
         
         opts.on('-s', '--https', 'add this switch if you are running behind https forwarder (e.g stunnel)') do
-          config.https = true
+          config[:https] = true
         end
         
         opts.separator ""

data/lib/jenkins-status-tool/utils.rb

@@ -1,17 +1,17 @@
-require 'singleton'
-
 module JenkinsStatusTool
   module Utils
+    module_function
 
-    class Singleton
-      include Object::Singleton
-      
-      def self.method_missing(m,*a,&b)
-        instance.send(m,*a,&b)
-      end
-      
+    def default_options
+      {
+        :port    => 7676,
+        :jenkins => "localhost:8080",
+        :pid     => '/tmp/jenkins-status-tool.pid',
+        :root    => File.expand_path("../../..",__FILE__),
+        :https   => false,
+        :daemonize => false
+      }
     end
     
   end
-end
-
+end

data/lib/jenkins-status-tool/version.rb

@@ -1,5 +1,5 @@
 module JenkinsStatusTool
   class Version
-    VERSION = "0.0.6"
+    VERSION = "0.0.7"
   end
 end

data/lib/jenkins-status-tool/webapp.rb

@@ -3,8 +3,8 @@ require 'sinatra/base'
 module JenkinsStatusTool
   class WebApp < Sinatra::Base
         
-    set :root, Config::instance.root
-    set :port, Config::instance.port
+    set :root, Config.instance.root
+    set :port, Config.instance.port
     
     get "/" do
       erb :index
@@ -53,8 +53,8 @@ module JenkinsStatusTool
       @project ||= JenkinsProject.new symbolize_params
     end
         
-    def config 
-      Config::instance
+    def config
+      Config.instance
     end
     
   end

data/tasks/build.rake

@@ -4,8 +4,8 @@ JenkinsStatusTool::GemSpec = Gem::Specification.new do |s|
   s.name                  = "jenkins-status-tool"
   s.version               = JenkinsStatusTool.version
   s.platform              = Gem::Platform::RUBY
-  s.summary               = "JenkinsStatusTool"
-  s.description           = "JenkinsStatusTool - get jenkins status"
+  s.summary               = "A Small web-service that fetch project status from Jenkins/Hudson"
+  s.description           = "Small tool to get the build status from Jenkins. Useful for embedding Jenkins CI status images on your Github project."
   s.author                = "Eran Barak Levi"
   s.email                 = 'eran@kontera.com'
   s.homepage              = 'http://www.kontera.com'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jenkins-status-tool
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-05 00:00:00.000000000 Z
+date: 2012-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70176230374160 !ruby/object:Gem::Requirement
+  requirement: &70231733093720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70176230374160
+  version_requirements: *70231733093720
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70176230373560 !ruby/object:Gem::Requirement
+  requirement: &70231733093140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,8 +32,9 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70176230373560
-description: JenkinsStatusTool - get jenkins status
+  version_requirements: *70231733093140
+description: Small tool to get the build status from Jenkins. Useful for embedding
+  Jenkins CI status images on your Github project.
 email: eran@kontera.com
 executables:
 - jenkins-status-tool
@@ -84,5 +85,5 @@ rubyforge_project: jenkins-status-tool
 rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
-summary: JenkinsStatusTool
+summary: A Small web-service that fetch project status from Jenkins/Hudson
 test_files: []