cider_ci-support 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11d24ff036b756f6464c54c8a3e5d99666b5ffce
-  data.tar.gz: c0a3b182202113a11272f484d2ecc2f944452e30
+  metadata.gz: 7755a6b5d8929021636901148df35366204deb27
+  data.tar.gz: daf12d66d62f38c7960b2671d5c60d9603879c21
 SHA512:
-  metadata.gz: b01c64889c9a6039464e2e89e48d64e3ed43340cff565b631c108bf16661bff9a3e8fc255feff63bd3b51d8b6fc8deebd76ccc8d7f143ff286ef77cceec234b2
-  data.tar.gz: 0447a5befd8d1dbd11a82ec71cbd599e9aaf8bd644b86149db237293de4e06c7101d345feb10b0960bfc86c18d1b76b32df770587b0a92ac8ac0d3b085452b39
+  metadata.gz: bdd647c0ece84d7ff851c4e5749127aada7e877d396819ddea350a698e4023c6628329899502e6cd2a3216063669fb46e44d672c730301211740721224f4c7c0
+  data.tar.gz: 0946eefb9b67795fe011b585968a477fc26539a9aeb0a3a3dc77427a4a090f7ed81bf33560029a44a38a63874cc718674811d35c30255e5fd7bc7e85defff501

data/bin/cider-ci_coverage

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-
 ###############################################################################
 # This script gathers ruby coverage information from a cider-ci instance and
 # aggregates it via simplecov.
@@ -22,6 +21,14 @@ require 'thread/pool'
 require 'mime/types'
 require 'open-uri'
 
+###############################################################################
+# Globals (this is a script after all)
+###############################################################################
+
+Thread.abort_on_exception = true
+@debug = false
+@pool = nil
+
 ###############################################################################
 # Download from Cider-CI
 ###############################################################################
@@ -37,35 +44,45 @@ def get_execution_resource(root, execution_id)
   root.relation('execution').get('id' => execution_id)
 end
 
-def get_and_convert_resultset_attachments(root, tree_id, thread_pool_size)
+def print_progress_and_debug(separator = '.', msg = '')
+  if @debug
+    puts separator.to_s + " " + msg.to_s
+  else
+    print separator
+    STDOUT.flush
+  end
+end
+
+def get_and_convert_resultset_attachments(root, tree_id)
   print 'download_resultset_attachments'; STDOUT.flush
-  pool = Thread.pool thread_pool_size
+
   root.relation('executions').get('treeid' => tree_id).collection \
     .map(&:get).map do |execution|
     execution.relation('tasks').get('state' => 'passed').collection\
       .map do |task_relation|
-      Thread.future pool do
-        print '.'; STDOUT.flush
+      Thread.future @pool do
+        print_progress_and_debug('', task_relation)
         task_relation.get.relation('trials') \
           .get('state' => 'passed').collection.map(&:get).map do |trial|
-          print '.'; STDOUT.flush
+          print_progress_and_debug('.', trial)
           trial.relation('trial-attachments') \
             .get.collection.map do |tar|
+            print_progress_and_debug('.', "getting #{tar}")
             trial_attachment_resource = tar.get
-            print '.'; STDOUT.flush
             if (working_dir = trial.data['scripts'] \
                 .map { |_k, v| v['working_dir'] }.compact.first) \
               && (trial_attachment_resource.data['path'] =~ /resultset\.json/)
-              print '*'; STDOUT.flush
-              resultset = trial_attachment_resource \
-                          .relation('trial-attachment-data-stream') \
-                          .get.response.body
+              result_data_relation = trial_attachment_resource \
+                                     .relation('trial-attachment-data-stream')
+              print_progress_and_debug('*', "getting #{result_data_relation}")
+              resultset = result_data_relation.get.response.body
+              print_progress_and_debug('*', "converting resultset") 
               convert_resultset resultset, working_dir
             end
           end
         end
       end
-    end.map(&:~)
+    end.map { |f| f.value!(3) }
   end.flatten.compact
 end
 
@@ -83,7 +100,7 @@ def upload_as_tree_attachments(root, tree_id)
       root.relation('tree-attachment-data-stream').put(
         { 'treeid' => tree_id, 'path' => filename },
         File.open(filename, 'rb').read, 'content-type' => content_type)
-      print '*'; STDOUT.flush
+      print_progress_and_debug('*')
     end
   end
   puts ''
@@ -131,20 +148,51 @@ end
 # Run
 ###############################################################################
 
-def run_coverage(root, tree_id, thrad_pool_size)
-  get_and_convert_resultset_attachments(
-    root, tree_id, thrad_pool_size).instance_eval do
-      reduce_resultsets self
-    end.instance_eval do
-      if self.empty?
-        fail ScriptError, 'the collected and reduced coverage result is empty'
-      end
-      init_simple_cov
-      SimpleCov::Result.new self
-    end.instance_eval do
-      SimpleCov::Formatter::HTMLFormatter.new.format self
-      self
+def run_coverage(root, tree_id)
+  get_and_convert_resultset_attachments(root, tree_id).instance_eval do
+    reduce_resultsets self
+  end.instance_eval do
+    if self.empty?
+      fail ScriptError, 'the collected and reduced coverage result is empty'
     end
+    init_simple_cov
+    SimpleCov::Result.new self
+  end.instance_eval do
+    SimpleCov::Formatter::HTMLFormatter.new.format self
+    self
+  end
+end
+
+###############################################################################
+# Git 
+###############################################################################
+
+def assert_correct_tree_id(execution)
+  if execution.data['tree_id'] != `git log -n 1 --pretty=%T`.strip
+    fail ScriptError, 'you must be on the same tree_id as the execution'
+  end
+end
+
+def get_current_tree_id
+  begin
+    tree_id = `"git" "log" "-n" "1" "--pretty=%T"`.strip
+  rescue _
+    raise ScriptError, 'could not determine the current tree_id'
+  end
+
+  if $?.exitstatus != 0 
+    raise ScriptError, "could not determine the current tree_id"
+  else
+    tree_id
+  end
+end
+
+###############################################################################
+# Thread pool
+###############################################################################
+
+def set_thread_pool(thread_pool_size)
+  @pool = Thread.pool thread_pool_size  
 end
 
 ###############################################################################
@@ -180,6 +228,10 @@ def parse_options(options)
       options.upload = true
     end
 
+    opts.on('-d', '--debug') do
+      @debug = true
+    end
+
     opts.on('-l', '--limit N', Integer)  do |l|
       options.limit = l
     end
@@ -188,26 +240,6 @@ def parse_options(options)
   options
 end
 
-def assert_correct_tree_id(execution)
-  if execution.data['tree_id'] != `git log -n 1 --pretty=%T`.strip
-    fail ScriptError, 'you must be on the same tree_id as the execution'
-  end
-end
-
-def get_current_tree_id
-  begin
-    tree_id = `"git" "log" "-n" "1" "--pretty=%T"`.strip
-  rescue _
-    raise ScriptError, 'could not determine the current tree_id'
-  end
-
-  if $?.exitstatus != 0 
-    raise ScriptError, "could not determine the current tree_id"
-  else
-    tree_id
-  end
-end
-
 def main
   options = OpenStruct.new
   options.thread_pool_size = 50
@@ -227,8 +259,9 @@ def main
 
   root = connect(options.api_url, options.username, options.password).get
   tree_id = get_current_tree_id
+  set_thread_pool options.thread_pool_size
   FileUtils.rm_rf('coverage')
-  result = run_coverage root, tree_id, options.thread_pool_size
+  result = run_coverage root, tree_id
   upload_as_tree_attachments root, tree_id if options.upload
 
   coverage = (result.covered_lines / result.total_lines.to_f)

data/cider_ci-support.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'flay', '~> 2.5.0'
   spec.add_runtime_dependency 'flog', '~> 4.3.0'
-  spec.add_runtime_dependency 'json_roa-client', '>= 1.0.0.pre.beta.2'
+  spec.add_runtime_dependency 'json_roa-client', '>= 1.0.0'
   spec.add_runtime_dependency 'mime-types'
   spec.add_runtime_dependency 'simplecov', '~> 0.9'
   spec.add_runtime_dependency 'thread', '= 0.1.4'

data/lib/cider_ci/support/version.rb

@@ -1,5 +1,5 @@
 module Cider_CI
   module Support
-    VERSION = '1.1.0'
+    VERSION = '1.2.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cider_ci-support
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Thomas Schank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-06 00:00:00.000000000 Z
+date: 2015-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0.pre.beta.2
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0.pre.beta.2
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement