termcity 0.5.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1fe6111612429630e0d33e5812ca88f64a64277
-  data.tar.gz: 2ddf23d6ed8c78cc5f0430a7cd8f1e3bb45d6613
+  metadata.gz: c892485b183a6b842bc3423e3e763e46cf7290f0
+  data.tar.gz: 9624a4743a97c74b8615a0ab6131fdedc9f800e2
 SHA512:
-  metadata.gz: 3e427dd57a1a013ee9b51654b05ad08e5ba64c7291e4e6eb65aa93bf2f148f1808eafa7730bb64a08fc3352e7ae1b9d54efe3c78add9042fa598ca8afd98ce53
-  data.tar.gz: 4bb7a19d404fc7a2a1d5f84e31b951f5a33b83f285cbba8dd9ec6a2b97792cb0aae3a322902f19a2073505b7c682590c5832ce010abc6877bf27a6866b7f0488
+  metadata.gz: 57adcd164a8300e3b36d43a2696c9cde192cd9147fd7c1aef643c8643fb412dd1a09b873ceae23d1679f7663939f48a3dab40ee44f9144c6965827a530f38312
+  data.tar.gz: e2ff976bdf83a13e6341f0bd2e81b509d1a2ae5861bd437906c1fb4447dbdf08b73595d78a631d6292b29c58344573557c2dd024db64ba8c61837b28bf3c6ac0

data/exe/termcity

@@ -13,7 +13,8 @@ HELP = <<~TXT
   [Options]
 
   -b, --branch: defaults to current repo branch
-  -p, --project: defaults to camelcasing repo directory
+  -p, --teamcity-project: defaults to camelcasing repo directory
+  -n, --circleci-reponame: defaults to repo directory
   -r, --revision: defaults to latest revision known to CI
 
   [CREDENTIALS]:
@@ -51,10 +52,14 @@ OptionParser.new do |opts|
     options[:branch] = b
   end
 
-  opts.on("-p PROJECT_ID", "--project PROJECT_ID", "The project id (defaults to camelCasing on repo directory)") do |p|
+  opts.on("-p PROJECT_ID", "--teamcity-project PROJECT_ID", "The project id (defaults to camelCasing on repo directory)") do |p|
     options[:project_id] = p
   end
 
+  opts.on("-n REPONAME", "--circleci-reponame REPONAME", "The reponame (defaults to repo directory)") do |p|
+    options[:reponame] = p
+  end
+
   opts.on("-r REVISION", "--revision REVISION", "The git revision to look for (defaults to revision of latest test run)") do |r|
     options[:revision] = r
 
@@ -84,21 +89,35 @@ if !options[:branch]
   end
 end
 
+root_dir = nil
+
 if !options[:project_id]
-  root_dir =
-    `git rev-parse --show-toplevel`
+  root_dir ||=
+    File.basename(
+      `git rev-parse --show-toplevel`
       .chomp
       .tap { raise "detecting root dir failed" unless $?==0}
+    )
 
   camelcase_root_dir =
-    File
-    .basename(root_dir)
+    root_dir
     .sub(/^[a-z\d]*/) { $&.capitalize }
     .gsub(/(?:_|(\/))([a-z\d]*)/) { $2.capitalize }
 
   options[:project_id] = camelcase_root_dir
 end
 
+if !options[:reponame]
+  root_dir ||=
+    File.basename(
+      `git rev-parse --show-toplevel`
+      .chomp
+      .tap { raise "detecting root dir failed" unless $?==0}
+    )
+
+  options[:reponame] = root_dir
+end
+
 creds_file = File.expand_path("~/.termcity")
 if !File.exist?(creds_file)
   warn "Could not find a credentials file. See --help for info."
@@ -122,5 +141,6 @@ Termcity::CLI.simple_format(
   host: yaml["host"],
   branch: options[:branch],
   revision: options[:revision],
-  project_id: options[:project_id]
+  project_id: options[:project_id],
+  reponame: options[:reponame]
 )

data/lib/termcity/api.rb

@@ -19,8 +19,8 @@ module Termcity
       @host = host
     end
 
-    def summary(branch:, project_id:, revision:)
-      path = "/builds?branch=#{branch}&project_id=#{project_id}"
+    def summary(branch:, project_id:, revision:, reponame:)
+      path = "/builds?branch=#{branch}&project_id=#{project_id}&reponame=#{reponame}"
       path = "#{path}&revision=#{revision}" if revision
       url = URI.join(@host, path).to_s
       get(url)

data/lib/termcity/cli.rb

@@ -10,12 +10,13 @@ module Termcity
       new(**args).simple_format
     end
 
-    def initialize(branch:, token:, host:, project_id:, revision:)
+    def initialize(branch:, token:, host:, project_id:, revision:, reponame:)
       @branch = branch
       @token = token
       @host = host
       @project_id = project_id
       @revision = revision
+      @reponame = reponame
     end
 
     def simple_format
@@ -29,6 +30,7 @@ module Termcity
         branch: @branch,
         revision: @revision,
         project_id: @project_id,
+        reponame: @reponame,
       )
 
       formatter =

data/lib/termcity/formatters/iterm2.rb

@@ -11,15 +11,15 @@ module Termcity
       end
 
       def format(summary)
-        rows = summary.builds.map do |raw:, status:|
+        rows = summary.builds.map do |build|
           cols = []
 
-          text = simple_formatter.status_string(status) { |t|
-            "#{linkify(t, raw.fetch("web_url"))}#{" "*(10-t.length)}"
+          text = simple_formatter.status_string(build) { |t|
+            "#{linkify(t, build.fetch("web_url"))}#{" "*(10-t.length)}"
           }
 
-          cols << linkify(text, raw.fetch("web_url"))
-          cols << raw.fetch("build_type")
+          cols << linkify(text, build.fetch("web_url"))
+          cols << build.fetch("build_type")
           cols.join(" ")
         end
 

data/lib/termcity/formatters/simple.rb

@@ -5,22 +5,13 @@ module Termcity
     class Simple
       include Utils::Color
 
-      STATUSES = {
-        queued: "queued",
-        failing: "failing",
-        running: "running",
-        failed_to_start: "failstrt",
-        failed: "failed",
-        success: "success"
-      }
-
       COLORS = {
-        failing: :red,
-        queued: :yellow,
-        running: :blue,
-        failed_to_start: :default,
-        failed: :red,
-        success: :green
+        "failing" => :red,
+        "queued" => :yellow,
+        "running" => :blue,
+        "failstrt" => :default,
+        "failed" => :red,
+        "success" => :green
       }
 
       attr_reader :io
@@ -29,22 +20,22 @@ module Termcity
       end
 
       def format(summary)
-        rows = summary.builds.map do |raw:, status:|
+        rows = summary.builds.map { |build|
           cols = []
-          cols << status_string(status)
-          cols << raw.fetch("build_type")
-          cols << raw.fetch("web_url")
+          cols << status_string(build)
+          cols << build.fetch("build_type")
+          cols << build.fetch("web_url")
 
           cols.join(" : ")
-        end
+        }
 
         @io.puts(summarize(summary, rows))
       end
 
-      def status_string(type:, re_enqueued:)
-        name = STATUSES.fetch(type)
-        name = "#{name},q" if re_enqueued
-        color = COLORS[type]
+      def status_string(build)
+        name = build.fetch("status")
+        name = "#{name},q" if build.fetch("re_enqueued")
+        color = COLORS[build.fetch("status")]
 
         text =
           if block_given?
@@ -62,12 +53,13 @@ module Termcity
           "This revision may still be in the queue (or may be unkown/old)"
         else
 
-          revision = summary.builds.map {|b| b.dig(:raw, "sha")}.compact.first
+          revision = summary.builds.map {|b| b.dig("sha")}.compact.first
           [
             rows,
             "",
             "Revision: #{revision}",
-            "Overview: #{summary.overview_link}",
+            "Teamcity Overview: #{summary.teamcity_link}",
+            "CircleCI Overview: #{summary.circle_link}",
             counts(summary),
           ].join("\n")
         end
@@ -79,7 +71,7 @@ module Termcity
           ["Success", summary.counts[:success]],
           ["Failure", summary.counts[:failure]],
           ["Running", summary.counts[:running]],
-          ["FailedToStart", summary.counts[:failed_to_start]],
+          ["FailedToStart", summary.counts[:failstrt]],
           ["Queued", summary.counts[:queued]],
           ["Re-Queued", summary.counts[:re_enqueued]]
         ]

data/lib/termcity/summary.rb

@@ -1,10 +1,11 @@
 module Termcity
   class Summary
-    def initialize(revision:, api:, branch:, project_id:)
+    def initialize(revision:, api:, branch:, project_id:, reponame:)
       @branch = branch
       @project_id = project_id
       @api = api
       @revision = revision
+      @reponame = reponame
     end
 
     def builds
@@ -15,8 +16,12 @@ module Termcity
       data[:counts]
     end
 
-    def overview_link
-      data.dig(:links, :overview)
+    def teamcity_link
+      data.dig(:links, :teamcity_overview)
+    end
+
+    def circle_link
+      data.dig(:links, :circle_overview)
     end
 
     def data
@@ -28,18 +33,26 @@ module Termcity
           failure: 0,
           running: 0,
           queued: 0,
-          failed_to_start: 0,
+          failstrt: 0,
           re_enqueued: 0,
         }
 
-        summary = @api.summary(branch: @branch, project_id: @project_id, revision: @revision)
+        summary = @api.summary(
+          branch: @branch,
+          project_id: @project_id,
+          revision: @revision,
+          reponame: @reponame
+        )
 
         builds = summary.fetch("builds")
           .sort_by {|b| b.fetch("build_type")}
           .map {|b| summarize(b, counts) }
 
         {
-          links: {overview: summary.dig("links", "overview")},
+          links: {
+            teamcity_overview: summary.dig("links", "teamcity_overview"),
+            circle_overview: summary.dig("links", "circle_overview")
+          },
           builds: builds,
           counts: counts
         }
@@ -47,44 +60,16 @@ module Termcity
     end
 
     def summarize(build, counts)
-      status = status(build)
-
       count_type =
-        if [:failing, :failed].include?(status[:type])
+        if ["failing", "failed"].include?(build.fetch("status"))
           :failure
         else
-          status[:type]
+          build.fetch("status").to_sym
         end
       counts[count_type] += 1
       counts[:total] += 1
-      counts[:re_enqueued] +=1 if status[:re_enqueued]
-
-      {
-        raw: build,
-        status: status
-      }
-    end
-
-    def status(build)
-      re_enqueued = build.fetch("re_enqueued")
-
-      if build.fetch("state") == "queued"
-        {type: :queued, re_enqueued: false}
-      elsif build.fetch("state") == "running"
-        if build.fetch("status") == "FAILURE"
-          {type: :failing, re_enqueued: re_enqueued}
-        else
-          {type: :running, re_enqueued: re_enqueued}
-        end
-      else
-        if build.fetch("failed_to_start", false)
-          {type: :failed_to_start, re_enqueued: re_enqueued}
-        elsif build.fetch("status") == "FAILURE"
-          {type: :failed, re_enqueued: re_enqueued}
-        else
-          {type: :success, re_enqueued: re_enqueued}
-        end
-      end
+      counts[:re_enqueued] +=1 if build.fetch("re_enqueued")
+      build
     end
   end
 end

data/lib/termcity/version.rb

@@ -1,3 +1,3 @@
 module Termcity
-  VERSION = "0.5.0"
+  VERSION = "1.0.0"
 end

data/termcity.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Pete Kinnecom"]
   spec.email         = ["git@k7u7.com"]
 
-  spec.summary       = %q{Terminal view of TeamCity}
-  spec.description   = %q{See TeamCity build status for a branch in your terminal. Pipe it to grep or whatever. Get nicely formatted links if you use iTerm2.}
+  spec.summary       = %q{Terminal view of TeamCity/CircleCI}
+  spec.description   = %q{See TeamCity/CircleCI build status for a branch in your terminal. Pipe it to grep or whatever. Get nicely formatted links if you use iTerm2.}
   # spec.homepage      = "none"
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: termcity
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Pete Kinnecom
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-05 00:00:00.000000000 Z
+date: 2018-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,8 +38,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-description: See TeamCity build status for a branch in your terminal. Pipe it to grep
-  or whatever. Get nicely formatted links if you use iTerm2.
+description: See TeamCity/CircleCI build status for a branch in your terminal. Pipe
+  it to grep or whatever. Get nicely formatted links if you use iTerm2.
 email:
 - git@k7u7.com
 executables:
@@ -85,5 +85,5 @@ rubyforge_project:
 rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
-summary: Terminal view of TeamCity
+summary: Terminal view of TeamCity/CircleCI
 test_files: []