git-check-ci 0.1.1 → 0.1.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    git-check-ci (0.1.1)
+    git-check-ci (0.1.2)
       daemons (~> 1.1)
       httparty
       json

data/README.md

@@ -36,11 +36,11 @@ Run the setup command:
     Setup is now complete. Doing a test run.
     All good! Now the 'check' and 'fast-check' commands should work.
 
-Add it to your prompt:
+Add it to your prompt (simplistic example):
     
     --- add me to e.g. ~/.profile ---
     eval "$(git check-ci init)"
-    export PS1="\$(GitCheckCI) \u\$"
+    export PS1="\[\$(_git_ci_color)\]\$(_git_ci_status) \u@\h\$"
 
 Reload your shell:
 
@@ -79,5 +79,5 @@ The `GitCheckCI` shell helper does two things:
 
 The spawned server check the CI status over HTTP every minute and stores the response in the Git configuration (used as an IPC of sorts).
 
-It's done that way because `GitCheckCI` needs to be really, really fast---anything slower than 30ms will make your prompt feel unresponsive.
+It's done that way because the `_git_ci_*` shell functions need to be really, really fast---anything slower than 30ms will make your prompt feel unresponsive.
 

data/lib/git-check-ci/checker.rb

@@ -51,9 +51,11 @@ module GitCheckCI
 
     # save the CI result to the Git config
     def save(code_and_response)
+      color, icon = Formatter.handle_response(code_and_response)
       @config.ci.last_checked = Time.now.strftime('%s')
       @config.ci.response     = code_and_response.to_json
-      @config.ci.status       = Formatter.handle_response(code_and_response)
+      @config.ci.color        = color
+      @config.ci.status       = icon
       nil
     end
 

data/lib/git-check-ci/formatter.rb

@@ -6,10 +6,10 @@ module GitCheckCI
 
     def handle_response(data)
       case data[:body]
-        when /failed/              then build_string(:red,    '✗')
-        when /(pending|building)/  then build_string(:gray,   '●')
-        when /[0-9a-f]{40}/        then build_string(:green,  '✔')
-        else build_string(:yellow, '!')
+        when /failed/              then [ color_code(:red),    '✗' ]
+        when /(pending|building)/  then [ color_code(:gray),   '•' ]
+        when /[0-9a-f]{40}/        then [ color_code(:green),  '✔' ]
+        else [ color_code(:yellow), '!' ]
       end
     end
 
@@ -17,7 +17,7 @@ module GitCheckCI
     private
 
 
-    def build_string(color, symbol)
+    def color_code(color)
       reset  = "\033[0m"
       color_code = case color
         when :red    then "\033[31m"
@@ -26,8 +26,6 @@ module GitCheckCI
         when :gray   then "\033[37m"
         else ""
       end
-
-      "#{color_code}#{symbol}#{reset}"
     end
 
 

data/lib/git-check-ci/shell.rb

@@ -65,7 +65,10 @@ module GitCheckCI
     desc "init", "Output shell config."
     def init
       puts %q[
-        GitCheckCI() {
+        _git_ci_color() {
+          git config ci.color 2>&1 || true
+        }
+        _git_ci_status() {
           # exit early if not in a git repository
           git status > /dev/null 2>&1 || return
 
@@ -81,6 +84,10 @@ module GitCheckCI
           # try to return a status
           git config ci.status 2> /dev/null || echo '?'
         }
+        GitCheckCI() {
+          echo "*** GitCheckCI is deprecated, use _git_ci_status"
+          _git_ci_status
+        }
       ]
     end
 

data/lib/git-check-ci/version.rb

@@ -1,3 +1,3 @@
 module GitCheckCI
-  VERSION = '0.1.1' unless defined?(GitCheckCI::VERSION)
+  VERSION = '0.1.2' unless defined?(GitCheckCI::VERSION)
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: git-check-ci
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Julien Letessier
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-05 00:00:00 +01:00
+date: 2012-07-09 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency