tc-client 0.0.2 → 0.0.3

data/bin/tc-client

@@ -2,16 +2,41 @@
 
 $LOAD_PATH.unshift File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'tc-client'
+require 'optparse'
 
-client = TCClient.new(false)
+options = {}
+OptionParser.new do |opts|
+  opts.banner = "Usage: tc-client <project name> <build name> [options]"
+
+  opts.on("-v", "--[no-]verbose", "Run verbosely") do |v|
+    options[:verbose] = v
+  end
+
+  opts.separator "" 
+  opts.separator "Common tasks" 
+  opts.on_tail("-h", "--help", "Show this message") do
+    puts opts
+    exit
+  end
+
+  opts.on_tail("--version", "Show version") do
+    require 'version'
+    puts "TCClient v#{TCClient::Version}"
+    exit
+  end
+end.parse!
+
+client = TCClient.new(options[:verbose])
 
 case ARGV.length
 when 1 then
-  puts "Available builds on #{ARGV[0]}: "
-  puts client.builds(ARGV[0]).map { |x| x[:name] }
+  builds = client.builds(ARGV[0])
+  puts "Available builds on #{builds[:project_name]}: "
+  puts builds[:builds].map { |x| x[:name] }
 when 2
-  puts "Last 10 builds on #{ARGV[0]} [#{ARGV[1]}]: "
-  client.statuses(ARGV[0], ARGV[1]).each do |x|
+  statuses = client.statuses(ARGV[0], ARGV[1])
+  puts "Last 10 builds on #{statuses[:project_name]} '#{statuses[:build_name]}': "
+  statuses[:statuses].each do |x|
     puts "#{x[:build]} (#{x[:status]})"
   end
 else

data/lib/tc-client.rb

@@ -23,17 +23,20 @@ class TCClient
   end
 
   def builds(project)
-    p = projects.select{|x| x[:name] == project}.first[:href]
-    xml = get(p)
+    p = projects.select{|x| x[:name].match /#{project}/i }
+    return [{:name => "Can't find a project matching '#{project}'"}] if p.empty?
+    xml = get(p.first[:href])
     doc = REXML::Document.new xml
-    doc.elements.collect("project/buildTypes/buildType") { |b| { :name => b.attributes["name"], :href => b.attributes["href"] } }
+    { :project_name => p.first[:name], :builds => doc.elements.collect("project/buildTypes/buildType") { |b| { :name => b.attributes["name"], :href => b.attributes["href"] } } }
   end
 
   def statuses(project, build)
-    b = builds(project).select{|x| x[:name] == build}.first[:href]
-    xml = get("#{b}/builds?count=10")
+    all = builds(project)
+    b = all[:builds].select{|x| x[:name].match /#{build}/i}
+    return [{:build => "Can't find a build matching: '#{build}'", :status => "FATAL"}] if b.empty?
+    xml = get("#{b.first[:href]}/builds?count=10")
     doc = REXML::Document.new xml
-    doc.elements.collect("builds/build") {|x| { :build => x.attributes["number"], :status => x.attributes["status"] } } 
+    { :project_name => all[:project_name], :build_name => b.first[:name], :statuses => doc.elements.collect("builds/build") {|x| { :build => x.attributes["number"], :status => x.attributes["status"] } } }
   end
 
   def get(what)

data/lib/version.rb

@@ -1,3 +1,3 @@
 class TCClient
-  VERSION = "0.0.2"
+  Version = "0.0.3"
 end

data/tc-client.gemspec

@@ -5,7 +5,7 @@ require "version"
 
 Gem::Specification.new do |s|
   s.name        = "tc-client"
-  s.version     = TCClient::VERSION
+  s.version     = TCClient::Version
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Kristoffer Roupe"]
   s.email       = ["kitofr@gmail.com"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tc-client
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Kristoffer Roupe
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-21 00:00:00 +01:00
+date: 2012-04-04 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency