bucky-core 0.9.13 → 0.9.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b9ddfb233321416ab533a5e156cd947f0d5e44b
-  data.tar.gz: d2eb7b14ed2c76e537312f701fe93ae45bfb4b43
+  metadata.gz: 168d32b4b8668e9c8f8147d6b04e11ae18c1a3eb
+  data.tar.gz: 14b3d823f29d0df70ffe2940221bf8d7833f58c0
 SHA512:
-  metadata.gz: 13028e8366556af56000d2f0a96b3b4c523a7b6ff4e62e98fd6147d33bee5100f35742e6f232d5394435e3a0e446fd434cc36b73bd56796619ed0c94c53d17da
-  data.tar.gz: f0350162e227a603748e2371f69656bb3be679e07bdaba669843613f9b7925a6a260a3aed39d07b65f4c7c9f13c562b750ee1e4dfdcae42989d231468686dede
+  metadata.gz: a3a782f487cf7cb3c56ecb1628e52cc74efaefde79a16420bcb723a8bfa9628ab9e122652e30df9e91626555a5529e1d759fda99f248a2482f77dcc4b9a67eea
+  data.tar.gz: 880bbe4d10ff837ddae6fa9c3c16db2a285e7174ce20d50a971b29976f4b7650da1c2069b2db5f781912ae1e07c2c3487f9bc84f15a7832e0a1572c0fcf40552

data/.circleci/config.yml

@@ -1,15 +1,36 @@
 version: 2
 jobs:
+  generate_cache_for_system_test:
+    machine: true
+    steps:
+      - checkout
+      - restore_cache:
+          key: docker-{{ checksum ".circleci/config.yml" }}-{{ checksum "docker-compose.system-test.yml" }}-{{ checksum "Dockerfile.system-test" }}-{{ checksum "bucky-core.gemspec" }}
+      - run:
+          command: |
+            if [ ! -f ~/caches/images.tar ]; then
+              docker-compose -f docker-compose.system-test.yml build && \
+              mkdir -p ~/caches && \
+              docker save $(docker images | awk 'NR>=2 && ! /^<none>/{print $1}') -o ~/caches/images.tar
+            fi
+      - save_cache:
+          key: docker-{{ checksum ".circleci/config.yml" }}-{{ checksum "docker-compose.system-test.yml" }}-{{ checksum "Dockerfile.system-test" }}-{{ checksum "bucky-core.gemspec" }}
+          paths: ~/caches/images.tar
   system_test:
     machine: true
+    parallelism: 2
     steps:
       - checkout
+      - restore_cache:
+          key: docker-{{ checksum ".circleci/config.yml" }}-{{ checksum "docker-compose.system-test.yml" }}-{{ checksum "Dockerfile.system-test" }}-{{ checksum "bucky-core.gemspec" }}
+      - run:
+          command: docker load -q -i ~/caches/images.tar
       - run:
           name: docker up
-          command: docker-compose -f docker-compose.system-test.yml up --build -d
+          command: docker-compose -f docker-compose.system-test.yml up --no-build -d
       - run:
           name: execute system testing
-          command: docker exec bucky-core bats /bucky-core/system_testing/testing_code
+          command: 'circleci tests glob system_testing/testing_code/*.bats | xargs -n 1 -I {} docker exec bucky-core bats "/bucky-core/"{} | circleci tests split'
       - run:
           name: docker down
           command: docker-compose -f docker-compose.system-test.yml down
@@ -23,7 +44,7 @@ jobs:
       - checkout
       - type: cache-restore
         key: unit-test-{{ checksum "Gemfile.lock" }}
-      - run: bundle install --path vendor/bundle
+      - run: bundle install --path vendor/bundle --quiet
       - type: cache-save
         key: unit-test-{{ checksum "Gemfile.lock" }}
         paths:
@@ -39,14 +60,14 @@ jobs:
           ./cc-test-reporter before-build
           bundle exec rspec
           ./cc-test-reporter after-build --coverage-input-type simplecov --exit-code $?
-  syntax_check:
+  static_code_analysis:
     docker:
       - image: circleci/ruby:2.4.2-node
     steps:
       - checkout
       - type: cache-restore
         key: syntax-check-{{ checksum "Gemfile.lock" }}
-      - run: bundle install --path vendor/bundle
+      - run: bundle install --path vendor/bundle --quiet
       - type: cache-save
         key: syntax-check-{{ checksum "Gemfile.lock" }}
         paths:
@@ -72,11 +93,12 @@ workflows:
   version: 2
   test:
     jobs:
+      - static_code_analysis
       - unit_test
-      - system_test
-  lint:
-    jobs:
-      - syntax_check
+      - generate_cache_for_system_test
+      - system_test:
+          requires:
+            - generate_cache_for_system_test
   deploy:
     jobs:
       - publish:

data/bucky-core.gemspec

@@ -39,6 +39,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rubocop',        '~> 0.63'
   spec.add_development_dependency 'simplecov-console', '~> 0.4.2'
 
+  spec.add_runtime_dependency 'addressable', '~> 2.5'
   spec.add_runtime_dependency 'color_echo',         '~> 3.1'
   spec.add_runtime_dependency 'json',               '~> 2.1'
   spec.add_runtime_dependency 'nokogiri',           '~> 1.8'

data/lib/bucky/test_equipment/verifications/status_checker.rb

@@ -146,7 +146,7 @@ module Bucky
         def exclude_href?(href)
           return true if href.nil?
 
-          exclude_regexps = [/^javascript.+/, /^tel:\d.+/, /^mailto:.+/]
+          exclude_regexps = [/^javascript.+/i, /^tel:\d.+/i, /^mailto:.+/i]
           exclude_regexps.keep_if { |reg| reg.match?(href) }
           return true unless exclude_regexps.empty?
 

data/lib/bucky/utils/requests.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'net/http'
-require 'uri'
+require 'addressable/uri'
 
 module Bucky
   module Utils
@@ -17,7 +17,7 @@ module Bucky
       # @param  [Integer/Float] read_timeout max wait time until recieve response
       # @return [Net::HTTP]         HttpStatusCode
       def get_response(uri, device, open_timeout, read_timeout)
-        parsed_uri = URI.parse(uri.to_str.strip)
+        parsed_uri = Addressable::URI.parse(uri.to_str.strip)
         query = parsed_uri.query ? "?#{parsed_uri.query}" : ''
         # If path is empty, add "/" e.g) http://example.com
         path = parsed_uri.path.empty? ? '/' : parsed_uri.path

data/lib/bucky/version.rb

@@ -2,6 +2,6 @@
 
 module Bucky
   module Version
-    VERSION = '0.9.13'
+    VERSION = '0.9.14'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bucky-core
 version: !ruby/object:Gem::Version
-  version: 0.9.13
+  version: 0.9.14
 platform: ruby
 authors:
 - NaotoKishino
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-12 00:00:00.000000000 Z
+date: 2019-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -169,6 +169,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.2
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: color_echo
   requirement: !ruby/object:Gem::Requirement