coppertone 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3752897202805df2380313ece71a3fda42830bc636b29f6c48c92a3d4b4e91d6
-  data.tar.gz: 76cf7084e4f25c8198c9f534a66eb9cbf6584df5b3004aa4d07317aabd89fd99
+  metadata.gz: a3eb3fb44816bf803f4cc195a29d87ae442e23d4e7f61d71d31eeee858a2b0e8
+  data.tar.gz: f9211184ee03223a0aa04c0be495d7e7a90e6e294869a5469c2540c0dc8637a2
 SHA512:
-  metadata.gz: 1d9b2a1e83a88e89c6226183ecf64db0cbe7206049dd34c922cbb707add141277c0b69edcffafb46100122a348fbecbe0a4ca339108882c389781514314ea324
-  data.tar.gz: 71c1abefd7b43713bc00933d9448d3746da5d52d15552ffa9a18918fbb4ec1afbd105a0b0738a412f42d7df05208ab01badedc8fa3d3ae52bb83546af2045981
+  metadata.gz: 22fb16e9e7495392c976d1d22fd96c5ee31f788a03131aa070ce8a308a7641c86096781ff64642c497862254c9500a0bce78e9f70ed2099e56ccf78f0f30e632
+  data.tar.gz: 4aeb6e1a5f85c6492103267b75354cffb12cf5f74ab5be8f0cbb979c85113a54610f8c411d5239ad280ef9a0fa8f41216ccc8b5e2c44f73d6f0bf40f4330cdff

data/.circleci/config.yml

@@ -1,79 +1,130 @@
-version: 2
-aliases:
-  - &current_ruby_image
-    circleci/ruby:2.7.2
+# CircleCI 2.1: https://circleci.com/docs/2.0/configuration-reference/
+version: 2.1
+
+# To avoid DockerHub rate limiting we need to auth with our Valimail DockerHub
+# user's API access token. If you add a new shared context, make sure
+# these environment variables are added to it with the credentials from 1Password.
+# https://app.circleci.com/settings/organization/github/ValiMail/contexts
+docker-auth: &docker-auth
+  auth:
+    username: $DOCKERHUB_USERNAME
+    password: $DOCKERHUB_PASSWORD
+
+# Orbs are packages of config that you can import by name or configure inline.
+orbs:
+  # Our orb for managing dependencies
+  # Reference: https://circleci.com/orbs/registry/orb/valimail/dependency-manager
+  # Source: https://github.com/ValiMail/dependency-manager-orb
+  dependency-manager: valimail/dependency-manager@0.4.8
+
+
+# Commands are reusable sets of steps invokable with parameters inside a job.
+commands:
+  test:
+    steps:
+      - run:
+          name: Run test suite
+          command: bundle exec rspec --format progress --format RspecJunitFormatter --out /tmp/test-results/rspec/results.xml
+
+  build-gem:
+    steps:
+      - run:
+          name: Build gem
+          command: bundle exec rake build
+
+  report_coverage:
+    steps:
+      - run:
+          name: Report code coverage to Coveralls, in parallel
+          command: wget -cq https://coveralls.io/coveralls-linux.tar.gz -O - | tar -xz && ./coveralls --parallel
+
+  finish_coverage:
+    steps:
+      - run:
+          name: Inform Coveralls that parallel jobs are all done
+          command: wget -cq https://coveralls.io/coveralls-linux.tar.gz -O - | tar -xz && ./coveralls --done
+
+# Executors define the environment in which the steps of a job will be run.
+executors:
+  ruby-system:
+
+    parameters:
+      ruby-version:
+        description: Ruby version to use, passed in as a string
+        type: string
+        default: "2.7"
 
-  - &defaults
-    working_directory: ~/repo
     docker:
-      - image: *current_ruby_image
-
-  - &step_install_root_dependencies
-    run:
-      name: install root dependencies
-      command: |
-        gem install bundler && bundle install --jobs=4 --retry=3 --path vendor/bundle
-
-  - &step_make_test_output_directory
-    run:
-      name: create test metadata directory
-      command: mkdir /tmp/test-results
-
-  - &step_run_rspec_tests
-    run:
-      name: run rspec with simplecov
-      command: |
-        TEST_FILES="$(circleci tests glob "spec/**/*_spec.rb" | circleci tests split --split-by=timings)"
-
-        COVERAGE=true bundle exec rspec \
-                          --format progress \
-                          --format RspecJunitFormatter \
-                          --out /tmp/test-results/rspec.xml \
-                          ${TEST_FILES}
-
-  - &step_store_test_results
-    store_test_results:
-      path: /tmp/test-results
-
-  - &step_store_test_artifacts
-    store_artifacts:
-      path: /tmp/test-results
-      destination: test-results
-
-  - &step_store_coverage_artifacts
-    store_artifacts:
-      path: coverage
-      destination: coverage
+      - image: cimg/ruby:<< parameters.ruby-version >>
+        <<: *docker-auth
+        environment:
+          BUNDLE_PATH: vendor/bundle
 
+
+# Jobs have two parts: the execution environment and a set of steps.
 jobs:
-  code-quality-job:
-    <<: *defaults
+  ruby-3_0:
+    executor:
+      name: ruby-system
+      ruby-version: "3.0"
+    steps:
+      - checkout
+      - dependency-manager/install-gems:
+          cache-version: v2
+      - test
+      - report_coverage
+      - build-gem
+
+  ruby-2_7:
+    executor:
+      name: ruby-system
+      ruby-version: "2.7"
     steps:
       - checkout
-      - *step_install_root_dependencies
+      - dependency-manager/install-gems:
+          cache-version: v2
+      - test
+      - report_coverage
+      - build-gem
+
+  lint-job:
+    executor: ruby-system
+    steps:
+      - checkout
+      - dependency-manager/install-gems:
+          cache-version: v2
+      - run:
+          name: Lint Ruby
+          command: bundle exec rubocop
+      - run:
+          name: Scan for Ruby gem vulnerabilties
+          command: |
+            gem install bundler-audit
+            bundle audit check --update
       - run:
-          name: Run Rubocop
+          name: Scan for Ruby and RubyGems vulnerabilties
           command: |
-            bundle exec rubocop
+            bundle add ruby_audit --group "test"
+            bundle exec ruby-audit check
 
-  current_ruby-job:
-    working_directory: ~/repo
-    docker:
-      - image: *current_ruby_image
-    steps: &test_run_steps
-      - checkout
-      - *step_install_root_dependencies
-      - *step_make_test_output_directory
-      - *step_run_rspec_tests
-      - *step_store_test_results
-      - *step_store_test_artifacts
-      - *step_store_coverage_artifacts
+  finish-coverage:
+    resource_class: small
+    executor: ruby-system
+    steps:
+      - finish_coverage
 
+# Workflows are sequences of jobs.
 workflows:
-    version: 2
-    build-test_current-ruby:
-      jobs:
-        - current_ruby-job
-        - code-quality-job:
-            requires:
-              - current_ruby-job # let primary job fetch all dependencies first
+  build:
+    jobs:
+      - ruby-2_7:
+          context: valimail-saas-tokens
+      - ruby-3_0:
+          context: valimail-saas-tokens
+      - finish-coverage:
+          context: valimail-saas-tokens
+          requires:
+            - ruby-2_7
+            - ruby-3_0
+      - lint-job:
+          context: valimail-saas-tokens

data/lib/coppertone/utils/domain_utils.rb

@@ -66,7 +66,7 @@ module Coppertone
       end
 
       def self.valid_label?(l)
-        !l.empty? && (l.length <= 63) && !l.match(/\s/)
+        !l.empty? && (l.length <= 63) && !l.match(/(\s|@)/)
       end
 
       def self.macro_expanded_domain(domain)

data/lib/coppertone/version.rb

@@ -1,3 +1,3 @@
 module Coppertone
-  VERSION = '0.0.12'.freeze
+  VERSION = '0.0.13'.freeze
 end

data/spec/utils/domain_utils_spec.rb

@@ -49,6 +49,12 @@ describe Coppertone::Utils::DomainUtils do
       expect(subject.valid?('rst.*.example.com')).to eq(true)
     end
 
+    it 'should reject domains with ampersands' do
+      expect(subject.valid?('@dmarc.126.com')).to eq(false)
+      expect(subject.valid?('abcd@domainkey.gmail.com')).to eq(false)
+      expect(subject.valid?('abcd.x@domainkey.gmail.com')).to eq(false)
+    end
+
     it 'should reject IP addresses' do
       expect(subject.valid?('192.38.7.14')).to eq(false)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coppertone
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Peter M. Goldstein
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-04 00:00:00.000000000 Z
+date: 2021-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport