aggkit 0.4.4.9175 → 0.4.4.9269

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf5000289c64872b2a5da5a64ac18c101314a33f
-  data.tar.gz: 0c56d5da4ea55650e15807c0b67f5099fe7fad4b
+  metadata.gz: d76188c57b22e43746746cf2951cbbb032a85ff7
+  data.tar.gz: c2eae741b4bbae79e47176bd7ed9e4487fdbcace
 SHA512:
-  metadata.gz: b0a47c26d9910d9e435c9aa643d3f8640dcc1a3f1608f8ce88efe9d414586f2fa9120feeb492d1165893a47ed10a9df5a9fd7ffaef5d3a39584968721dc52e7c
-  data.tar.gz: 57d183318dff2d8517271a70e2afa0d7f77848b8b546c528ccc17be25fb5f5e6c3b332a3975b1a7aee1b8740b0bc8ef9184ef4694352b15e30fbb25fdf0038b4
+  metadata.gz: c2b32a2be893c42ffc3624cbe474384adf6a171c3f461745f8208089d8bc37d1e72c860835aefcb9d67b8b03106d830b49683f60d6b9fd6c0826c88557b56250
+  data.tar.gz: 399b46ce2649b2a74393058e4d790a0d90405ef840baa333b4219cc0bc5756ce6d69074853e88bf9484657baa5de50870787077eb792a011a6186fef64503ff3

data/.gitlab-ci.yml

@@ -46,6 +46,11 @@ test-2.1:
     RUBY_VERSION: '2.1'
   script:
     - docker/run_tests.sh 
+    - cp docker/rspec* .
+  artifacts:
+    reports:
+      junit: rspec*.xml
+
 
 test-2.5:
   image: rnds/ruby:2.3.0-test
@@ -54,6 +59,39 @@ test-2.5:
     RUBY_VERSION: '2.5'
   script:
     - docker/run_tests.sh 
+    - cp docker/rspec* .
+  artifacts:
+    reports:
+      junit: rspec*.xml
+
+
+pronto:
+  image: rnds/ruby:2.3.0-test
+  stage: tests
+  script:
+    - gem install pronto pronto-rubocop pronto-flay
+    - PRONTO_GITLAB_SLUG=${CI_PROJECT_ID} PRONTO_GITLAB_API_PRIVATE_TOKEN=${BOT_TOKEN} pronto run -f gitlab -c origin/master
+
+code_quality:
+  stage: tests
+  image: docker:stable
+  variables:
+    DOCKER_DRIVER: overlay2
+  allow_failure: true
+  services:
+    - docker:stable-dind
+  before_script:
+    - echo ok
+  script:
+    - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
+    - docker run
+        --env SOURCE_CODE="$PWD"
+        --volume "$PWD":/code
+        --volume /var/run/docker.sock:/var/run/docker.sock
+        "registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code
+  artifacts:
+    reports:
+      codequality: gl-code-quality-report.json
 
 pushgem:
   image: rnds/ruby:2.3.0-test
@@ -64,4 +102,6 @@ pushgem:
     - chmod 600 ~/.gem/credentials
     - export GEMFILE=`ls *.gem | tail -n 1`
     - gem push $GEMFILE
+  only:
+    - master
 

data/.pronto.yml

@@ -0,0 +1,8 @@
+all:
+  exclude:
+    - 'spec/**/*'
+eslint:
+  exclude:
+    - 'app/assets/**/*'
+max_warnings: 150
+verbose: false

data/.rspec

@@ -2,3 +2,5 @@
 --tty
 --format progress
 --require spec_helper
+--format RspecJunitFormatter
+--out rspec.xml

data/Gemfile

@@ -8,5 +8,7 @@ group :test do
   gem 'rspec'
   gem 'rspec-retry'
   gem 'rspec-set'
+  gem 'rspec_junit_formatter'
+  gem 'simplecov'
 end
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    aggkit (0.4.4.9175)
+    aggkit (0.4.4)
       diplomat
       dotenv
       json
@@ -14,6 +14,7 @@ GEM
     diff-lcs (1.3)
     diplomat (2.0.5)
       faraday (~> 0.9)
+    docile (1.3.1)
     dotenv (2.7.1)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
@@ -36,6 +37,13 @@ GEM
       rspec-core (> 3.3)
     rspec-set (0.1.3)
     rspec-support (3.8.0)
+    rspec_junit_formatter (0.4.1)
+      rspec-core (>= 2, < 4, != 2.12.0)
+    simplecov (0.16.1)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
     tty-tree (0.2.0)
 
 PLATFORMS
@@ -49,6 +57,8 @@ DEPENDENCIES
   rspec
   rspec-retry
   rspec-set
+  rspec_junit_formatter
+  simplecov
 
 BUNDLED WITH
    1.16.2

data/README.md

@@ -1,7 +1,9 @@
 # aggkit
 Helper tools for work with docker and consul
 
-[![Build Status](https://travis-ci.com/RnD-Soft/aggkit.svg?branch=master)](https://travis-ci.com/RnD-Soft/aggkit) [![Gem Version](https://badge.fury.io/rb/aggkit.svg)](https://badge.fury.io/rb/aggkit)
+[![pipeline status](http://br.rnds.pro/aggredator/support/aggkit/badges/master/pipeline.svg)](http://br.rnds.pro/aggredator/support/aggkit/commits/master)
+[![Gem Version](https://badge.fury.io/rb/aggkit.svg)](https://badge.fury.io/rb/aggkit)
+[![coverage report](http://br.rnds.pro/aggredator/support/aggkit/badges/master/coverage.svg)](http://br.rnds.pro/aggredator/support/aggkit/commits/master)
 
 ## Scripts
 

data/bin/aggmerge

@@ -123,7 +123,7 @@ end
 
 if File.basename($PROGRAM_NAME) == File.basename(__FILE__)
   # version в базовом хэше для того чтобы первым попасть в итоговый файл.
-  result = ENV['COMPOSE_FILE'].split(':').reduce({'version' => nil}) do |parent, file|
+  result = ENV['COMPOSE_FILE'].split(':').reduce('version' => nil) do |parent, file|
     yml = process_compose_hash(YAML.load(File.read(file)), File.dirname(file), parent)
     if yml['version'] && parent['version'] && yml['version'] != parent['version']
       raise "version mismatch: #{file}"

data/bin/aggstart

@@ -93,7 +93,7 @@ if @opts[:watch]
         %W[-config-dir #{folder}]
       end.flatten
 
-      consulcmd = %W[consul agent] + configs + %W[-node #{@opts[:node_name]}]
+      consulcmd = %w[consul agent] + configs + %W[-node #{@opts[:node_name]}]
       watcher.add *consulcmd
       @opts[:consul] = ENV['CONSUL_HTTP_ADDR'] = 'localhost'
     end

data/docker/run_tests.sh

@@ -16,6 +16,7 @@ docker-compose up -d --force-recreate --build || exit 1
 echo "\n ** Testing with Ruby $RUBY_VERSION **\n"
 docker-compose exec -T tests /bin/bash -c -l "rvm use $RUBY_VERSION; exec bundle exec rspec $@"
 
+docker cp "$(docker-compose ps -q tests)":/home/app/rspec.xml ./rspec-${RUBY_VERSION}.xml || true
 
 code=$?
 if [ $code -ne 0 ]; then

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aggkit
 version: !ruby/object:Gem::Version
-  version: 0.4.4.9175
+  version: 0.4.4.9269
 platform: ruby
 authors:
 - Godko Ivan
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-28 00:00:00.000000000 Z
+date: 2019-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diplomat
@@ -116,6 +116,7 @@ files:
 - ".dockerignore"
 - ".gitignore"
 - ".gitlab-ci.yml"
+- ".pronto.yml"
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"