orc-cli 0.1.1 → 0.1.2

data/lib/cli/client_collector.rb

@@ -4,6 +4,7 @@ module CTT::Cli
   class ClientCollector
 
     def initialize(command, suite, runner)
+      @log  = runner.log
       @url  = runner.url
       @info = {}
       @suite  = suite
@@ -26,8 +27,11 @@ module CTT::Cli
       3.times do
         begin
           response = RestClient.post("#{@url}/upload", payload)
+          @log.debug("post results. URL: #{@url}/upload, payload: #{payload}," +
+                         " response code: #{response.code}")
           break if response.code == 200
-        rescue
+        rescue Exception => e
+          @log.error("post results. URL: #{@url}/upload. Error: #{e.to_s}")
         end
       end
       FileUtils.rm(payload[:file].path)
@@ -37,10 +41,10 @@ module CTT::Cli
       get_os
       get_ruby_version
       get_test_reports
+      get_git_info
       get_uuid
       get_timestamp
       get_hostname
-      get_username
       get_ipaddr
     end
 
@@ -48,10 +52,6 @@ module CTT::Cli
       @info[:hostname] = `hostname`.strip
     end
 
-    def get_username
-      @info[:username] = Etc.getlogin
-    end
-
     def get_ipaddr
       @info[:ip] = UDPSocket.open {|s| s.connect("64.233.187.99", 1); s.addr.last}
     end
@@ -77,12 +77,25 @@ module CTT::Cli
       end
     end
 
+    def get_git_info
+      pwd = Dir.pwd
+      Dir.chdir(@suite_path)
+      begin
+        @info[:git_hash] = `git log --oneline -n 1`
+        @info[:email]    = `git config --get user.email`
+        @info[:username] = `git config --get user.name`
+      rescue
+      end
+      Dir.chdir(pwd)
+    end
+
     def get_ruby_version
       @info[:ruby_version] = `ruby -v`
     end
 
     def get_test_reports
-      suite_config_path = File.absolute_path(File.join(@suites.suites["suites"][@suite], TEST_SUITE_CONFIG_FILE))
+      @suite_path = File.absolute_path(@suites.suites["suites"][@suite])
+      suite_config_path = File.join(@suite_path, TEST_SUITE_CONFIG_FILE)
       suite_config = YAML.load_file(suite_config_path)
       unless suite_config["results"]
         say("no results field in #{suite_config_path}. abort!", :red)

data/lib/cli/version.rb

@@ -1,6 +1,6 @@
 
 module CTT
   module Cli
-    VERSION = '0.1.1'
+    VERSION = '0.1.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: orc-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-21 00:00:00.000000000Z
+date: 2013-01-05 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure