orc-cli 0.1.0 → 0.1.1

data/lib/cli/client_collector.rb

@@ -4,6 +4,7 @@ module CTT::Cli
   class ClientCollector
 
     def initialize(command, suite, runner)
+      @url  = runner.url
       @info = {}
       @suite  = suite
       @suites = runner.suites
@@ -11,6 +12,7 @@ module CTT::Cli
 
       @info[:suite]   = @suite
       @info[:command] = command
+
     end
 
     def post
@@ -23,7 +25,7 @@ module CTT::Cli
       #retry 3 times
       3.times do
         begin
-          response = RestClient.post("#{RESULTS_SERVER_URL}/tac/upload", payload)
+          response = RestClient.post("#{@url}/upload", payload)
           break if response.code == 200
         rescue
         end
@@ -33,6 +35,7 @@ module CTT::Cli
 
     def collect
       get_os
+      get_ruby_version
       get_test_reports
       get_uuid
       get_timestamp
@@ -74,6 +77,9 @@ module CTT::Cli
       end
     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))

data/lib/cli/commands/test_suite_management.rb

@@ -16,10 +16,12 @@ module CTT::Cli::Command
       pieces.insert(0, "") if pieces.size == 1
       action, suite = pieces
 
-      @action = action
-      @suite = suite
-      @configs = runner.configs
-      @suites = runner.suites
+      @action   = action
+      @suite    = suite
+      @configs  = runner.configs
+      @suites   = runner.suites
+      @url      = runner.url
+      @log      = runner.log
     end
 
     def run
@@ -115,6 +117,7 @@ module CTT::Cli::Command
     end
 
     def check_configuration
+      check_orc_version
       unless @suites.suites["suites"].has_key?(@suite)
         say("suite configure file: #{@suites.file} did not has key: #{@suite}")
         exit(1)
@@ -184,5 +187,42 @@ module CTT::Cli::Command
       end
       @suite_configs
     end
+
+    def check_orc_version
+      response = nil
+      #retry 3 times
+      3.times do
+        begin
+          response = RestClient.get("#{@url}/version")
+          @log.debug("check version. response body: #{response.to_s}, response code: #{response.code}")
+          break if response.code == 200
+        rescue Exception => e
+          @log.error("check version. url: #{@url}/version, #{e.to_s}")
+        end
+      end
+
+      if response
+        target = JSON.parse(response.to_s)["version"]
+        if need_upgrade?(VERSION, target)
+          say("your orc-cli gem should be >= #{target}. Abort!", :red)
+          exit(1)
+        end
+      end
+    end
+
+    def need_upgrade?(current, target)
+      upgrade = false
+      curr_vers = current.split(".")
+      targ_vers = target.split(".")
+
+      targ_vers.each_with_index do |item, index|
+        if item > curr_vers[index]
+          upgrade = true
+          break
+        end
+      end
+
+      upgrade
+    end
   end
 end

data/lib/cli/consts.rb

@@ -3,6 +3,6 @@ module CTT::Cli
 
   TEST_SUITE_CONFIG_FILE   = "orc.yml"
   TEST_RESULT_FILE         = "junitResult.xml"
-  RESULTS_SERVER_URL       = "http://giant.cloudfoundry.com"
+  RESULTS_SERVER_URL       = "http://mordor.cloudfoundry.com"
 
 end

data/lib/cli/runner.rb

@@ -3,7 +3,7 @@ module CTT::Cli
 
   class Runner
 
-    attr_reader    :commands, :uuid, :command
+    attr_reader    :commands, :uuid, :command, :url, :log
     attr_accessor  :configs, :suites
 
 
@@ -22,6 +22,9 @@ module CTT::Cli
       @commands = @configs.commands
       @suites   = Suites.new
       @uuid     = UUIDTools::UUID.random_create
+      @log      = Logger.new(File.join(ENV["HOME"], ".orc/orc.log"), 'weekly')
+      @url      = ENV['ORC_RESULTS_SERVER_URL'] ?
+          format_url(ENV['ORC_RESULTS_SERVER_URL']) : RESULTS_SERVER_URL
     end
 
     def run
@@ -130,5 +133,12 @@ module CTT::Cli
               nil
           end
     end
+
+    def format_url(url)
+      unless url =~ /^http/
+        url = "http://#{url}"
+      end
+      url
+    end
   end
 end

data/lib/cli/version.rb

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

data/lib/cli.rb

@@ -10,6 +10,8 @@ require "tempfile"
 require "uuidtools"
 require "etc"
 require "restclient"
+require "logger"
+require "json"
 
 
 

metadata

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