cider_ci-support 1.0.0.pre.beta.2 → 1.0.0.pre.beta.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a34b6f0b4b99b7a5e12f2e6b48a71ebfdb8bd58
-  data.tar.gz: 2afc2fa2fc2edd6a45c4f05da5654bf313641921
+  metadata.gz: 641dd67b2153a83498378c4be26221537b512584
+  data.tar.gz: e4a14b1eb982f3f29107cd1c8672d78fbd3668f6
 SHA512:
-  metadata.gz: bc29eca73106ae5335c2496cb32b2620c1f0778197545478466cd79f71a37125b9cf2f1f180183d4c167b59d18cb538bf70a88e44c8b2abfcba73975fe8e6621
-  data.tar.gz: b4935d76a6db7f7b69c5ed8fd6017ec61fa8aaab041a20a34ba3b739240a7feac4d3044d816ee82954883156e8c36e00168f63229387dad9984d757b2d569e93
+  metadata.gz: 07acab8d1d9d399c3236c8d6efc5407c0d34df5ebf749775ead6012f280150b25acf4f15ed821637cfeb34204ee709ca860bc61eb6a78f99a4cfd2c4db285c0c
+  data.tar.gz: faf94688042a57f38438b5ebea929d6c628f9ef5fb7f16fe753010f7761a0f4224b645817152bdd461782b14a0cd53398b6b1d85ac798e88bfe59b2b5956e1b6

data/README.md

@@ -8,17 +8,13 @@ This gem provides convenience executables to work with Cider-CI.
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'cider_ci-support'
+gem 'cider_ci-support', '= 1.0.0.pre.beta.3'
 ```
 
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install cider_ci-rails
+Read [this][] if you want to know why the version looks strange and why
+you should use `=`.
 
+  [this]: https://github.com/json-roa/json-roa_ruby-client#semantic-versioning-and-rubygems-versioning
 
 ## Usage
 
@@ -40,7 +36,16 @@ Or install it yourself as:
 
 4. Within the top level directory of you project, e.g. 
 
-    cider-ci_coverage -e EXECUTION_ID
+  ~~~
+  cider-ci_coverage 
+  ~~~
+
+  which will create the coverage output in `./coverage/`. Alternatively
 
+  ~~~
+  cider-ci_coverage --upload
+  ~~~
 
+  will additionally upload the files `./coverage/**/*`
+  as tree-attachments. 
 

data/bin/cider-ci_coverage

@@ -23,7 +23,7 @@ require 'thread/pool'
 require 'mime/types'
 require 'open-uri'
 
-#require 'pry'
+require 'pry'
 
 ###############################################################################
 # Download from Cider-CI
@@ -40,33 +40,35 @@ def get_execution_resource root, execution_id
   root.relation('execution').get('id' => execution_id )
 end 
 
-
-def get_and_convert_resultset_attachments execution, thread_pool_size
+def get_and_convert_resultset_attachments root, tree_id, thread_pool_size
   print "download_resultset_attachments"; STDOUT.flush
   pool = Thread.pool thread_pool_size
-  execution.relation('tasks').get("state" => "passed").collection\
-    .map do |task_relation|
-    Thread.future pool do 
-      print "."; STDOUT.flush
-      task_relation.get().relation('trials') \
-        .get("state" => "passed").collection.map(&:get).map do |trial|
+  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
-        trial.relation('trial-attachments') \
-          .get.collection.map do |tar|
-          trial_attachment_resource= tar.get 
+        task_relation.get().relation('trials') \
+          .get("state" => "passed").collection.map(&:get).map do |trial|
           print "."; STDOUT.flush
-          if (working_dir= trial.data['scripts'] \
-              .map{|k,v| v["working_dir"]}.compact.first) \
-            and (trial_attachment_resource.data['path'] =~ /resultset\.json/)
-            print "*"; STDOUT.flush
-            resultset= trial_attachment_resource \
-              .relation('data-stream').get.response.body
-            convert_resultset resultset, working_dir
+          trial.relation('trial-attachments') \
+            .get.collection.map do |tar|
+            trial_attachment_resource= tar.get 
+            print "."; STDOUT.flush
+            if (working_dir= trial.data['scripts'] \
+                .map{|k,v| v["working_dir"]}.compact.first) \
+              and (trial_attachment_resource.data['path'] =~ /resultset\.json/)
+              print "*"; STDOUT.flush
+              resultset= trial_attachment_resource \
+                .relation('trial-attachment-data-stream').get.response.body
+              convert_resultset resultset, working_dir
+            end
           end
         end
       end
-    end
-  end.map(&:~).flatten.compact
+    end.map(&:~)
+  end.flatten.compact
 end
 
 
@@ -74,14 +76,15 @@ end
 # Upload      
 ###############################################################################
 
-def upload_as_tree_attachments execution
+# TODO add tree-attachments relation at cider root
+def upload_as_tree_attachments root, tree_id
   print "upload_as_tree_attachments"; STDOUT.flush
-  upload_relation= execution.relation("tree-attachments").get() \
-    .relation("data-stream")
+
   Dir.glob("coverage/**/*").each do |filename| 
     if content_type= MIME::Types.of(filename).first.content_type rescue nil
       payload= Faraday::UploadIO.new(filename, content_type)
-      upload_relation.put({"path" => filename}, 
+      root.relation("tree-attachment-data-stream").put({"treeid" => tree_id, 
+                                                        "path" => filename}, 
                           File.open(filename, "rb").read, 
                           {"content-type" => content_type})
       print "*"; STDOUT.flush
@@ -135,11 +138,12 @@ end
 # Run
 ###############################################################################
 
-def run_coverage execution, thrad_pool_size
-  get_and_convert_resultset_attachments(execution,thrad_pool_size) \
+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
+    raise ScriptError, "the collected and reduced coverage result is empty" if self.empty? 
     init_simple_cov
     SimpleCov::Result.new self
   end.instance_eval do
@@ -180,6 +184,10 @@ def parse_options options
       options.password= p
     end
 
+    opts.on('-u', '--upload') do 
+      options.upload= true
+    end
+
   end.parse!
 
   options
@@ -192,16 +200,28 @@ def assert_correct_tree_id 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
-  options.execution_id= nil
   options.username= ENV['CIDER_CI_USERNAME']
   options.password= ENV['CIDER_CI_PASSWORD']
   options.api_url= ENV['CIDER_CI_API_URL']
+  options.upload= false
   parse_options options
-  options.execution_id || raise(OptionParser::MissingArgument \
-                                , "execution_id is required")
   options.api_url || raise(OptionParser::MissingArgument \
                                 , "api_url is required, set CIDER_CI_API_URL or provide -a option")
   options.username || raise(OptionParser::MissingArgument \
@@ -209,13 +229,13 @@ def main
   options.password || raise(OptionParser::MissingArgument \
                             , "password is required, set CIDER_CI_PASSWORD")
 
-
   root = connect(options.api_url, options.username, options.password).get()
-  execution= get_execution_resource root, options.execution_id
-  assert_correct_tree_id execution
+  tree_id = get_current_tree_id 
   FileUtils.rm_rf('coverage')
-  run_coverage execution, options.thread_pool_size
-  upload_as_tree_attachments execution
+  run_coverage root, tree_id, options.thread_pool_size
+  if options.upload 
+    upload_as_tree_attachments root, tree_id
+  end
 end
 
 main 

data/cider_ci-support.gemspec

@@ -24,5 +24,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'mime-types'
   spec.add_runtime_dependency 'thread', '= 0.1.4'
   spec.add_runtime_dependency 'simplecov', '~> 0.9'
-  spec.add_runtime_dependency 'json_roa-client', "= 1.0.0.pre.beta.1"
+  spec.add_runtime_dependency 'json_roa-client', ">= 1.0.0.pre.beta.2"
 end

data/lib/cider_ci/support/version.rb

@@ -1,5 +1,5 @@
 module Cider_CI
   module Support
-    VERSION = "1.0.0-beta.2"
+    VERSION = "1.0.0-beta.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cider_ci-support
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.beta.2
+  version: 1.0.0.pre.beta.3
 platform: ruby
 authors:
 - Thomas Schank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-10 00:00:00.000000000 Z
+date: 2014-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,16 +84,16 @@ dependencies:
   name: json_roa-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0.pre.beta.1
+        version: 1.0.0.pre.beta.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0.pre.beta.1
+        version: 1.0.0.pre.beta.2
 description: ''
 email:
 - DrTom@schank.ch