shivers 0.6.0.pre.2 → 0.6.0.pre.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43c706fcd9ee52297c5d84d3e00255c5e6491c32cad8b4c6c8e0a5947cb9f3c4
-  data.tar.gz: e1ea8200afed650095e73d6eda8adec4700c9a4c5a3ee6d6ba67c81adae00c7f
+  metadata.gz: ef585fce1c9a709b6be59c8ec024e9b571dd9f9bf9a93f1e40ac7fea0d99af30
+  data.tar.gz: 25eb7d476ee1baf3fbd1df9430733de393555bc237e2243c9f0aca9e6e0ee6a9
 SHA512:
-  metadata.gz: 77f32cb667c3282149aebf75eddcedf9718f5db52a72b19958d3aab6c3e964da0280acef3dfcb901cb75697eef419995e85f80cd5fbc781bbe153327a20920b1
-  data.tar.gz: 7e4836752db8ce9855150320c14399584d1f1c152ecc2a35def311784b5447f706ed26fdcb148280fcaadd5195b67448adfe673ba5dad941001e929a47379d63
+  metadata.gz: ee2027a2e57acec384d68bf3ea5610cdece6b90a45888d9b2cc078fc6e352602eeea1f4069c11e4e1d68d1b4ed3df25517db04ed9ce68d90416508af5af5d85e
+  data.tar.gz: e485203e86ad45a75e54538f0194ae841d285df52fb7c4248f84690918750aceb2e4bc746621c2c986bcbaf82151976346e3329793da0258d882702063b23ec4

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify dependencies in lino.gemspec

data/Gemfile.lock

@@ -1,54 +1,68 @@
 PATH
   remote: .
   specs:
-    shivers (0.6.0.pre.2)
+    shivers (0.6.0.pre.3)
       semantic (~> 1.6)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.3.2)
+    activesupport (7.0.2.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
+    ast (2.4.2)
     colored2 (3.1.2)
-    concurrent-ruby (1.1.8)
-    diff-lcs (1.4.4)
+    concurrent-ruby (1.1.9)
+    diff-lcs (1.5.0)
     docile (1.4.0)
-    excon (0.82.0)
-    fakefs (0.20.1)
-    faraday (1.4.2)
+    excon (0.92.0)
+    fakefs (1.4.1)
+    faraday (1.10.0)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
       faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.1)
-      multipart-post (>= 1.2, < 3)
+      faraday-net_http_persistent (~> 1.0)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      faraday-retry (~> 1.0)
       ruby2_keywords (>= 0.0.4)
     faraday-em_http (1.0.0)
     faraday-em_synchrony (1.0.0)
     faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.3)
+      multipart-post (>= 1.2, < 3)
     faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.1.0)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
     gem-release (2.2.2)
     hamster (3.0.0)
       concurrent-ruby (~> 1.0)
-    i18n (1.8.10)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
     lino (3.0.0)
       hamster (~> 3.0)
       open4 (~> 1.3)
-    minitest (5.14.4)
+    minitest (5.15.0)
     multipart-post (2.1.1)
-    octokit (4.21.0)
+    octokit (4.22.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
     open4 (1.3.4)
+    parallel (1.21.0)
+    parser (3.1.1.0)
+      ast (~> 2.4.1)
     public_suffix (4.0.6)
+    rainbow (3.1.1)
     rake (13.0.6)
     rake_circle_ci (0.9.0)
       colored2 (~> 3.1)
@@ -58,7 +72,7 @@ GEM
     rake_factory (0.29.0)
       activesupport (>= 4)
       rake (~> 13.0)
-    rake_github (0.7.0)
+    rake_github (0.9.0)
       colored2 (~> 3.1)
       octokit (~> 4.16)
       rake_factory (~> 0.23)
@@ -70,20 +84,38 @@ GEM
       colored2 (~> 3.1)
       rake_factory (~> 0.23)
       sshkey (~> 2.0)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    regexp_parser (2.2.1)
+    rexml (3.2.5)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-    ruby2_keywords (0.0.4)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    rubocop (1.26.0)
+      parallel (~> 1.10)
+      parser (>= 3.1.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.16.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.16.0)
+      parser (>= 3.1.1.0)
+    rubocop-rake (0.6.0)
+      rubocop (~> 1.0)
+    rubocop-rspec (2.9.0)
+      rubocop (~> 1.19)
+    ruby-progressbar (1.11.0)
+    ruby2_keywords (0.0.5)
     ruby_gpg2 (0.8.0)
       lino (>= 1.5)
     sawyer (0.8.2)
@@ -95,29 +127,31 @@ GEM
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.3)
+    simplecov_json_formatter (0.1.4)
     sshkey (2.0.0)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    zeitwerk (2.4.2)
+    unicode-display_width (2.1.0)
 
 PLATFORMS
-  ruby
-  x86_64-darwin-19
+  arm64-darwin-21
   x86_64-linux
 
 DEPENDENCIES
-  bundler (~> 2.0)
-  fakefs (~> 0.18)
-  gem-release (~> 2.0)
-  rake (~> 13.0)
-  rake_circle_ci (~> 0.9)
-  rake_github (~> 0.7)
-  rake_gpg (~> 0.14)
-  rake_ssh (~> 0.6)
-  rspec (~> 3.9)
+  bundler
+  fakefs
+  gem-release
+  rake
+  rake_circle_ci
+  rake_github
+  rake_gpg
+  rake_ssh
+  rspec
+  rubocop
+  rubocop-rake
+  rubocop-rspec
   shivers!
-  simplecov (~> 0.16)
+  simplecov
 
 BUNDLED WITH
-   2.2.32
+   2.3.9

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'yaml'
 require 'fileutils'
 require 'rake_circle_ci'
@@ -6,18 +8,20 @@ require 'rake_ssh'
 require 'rake_gpg'
 require 'securerandom'
 require 'rspec/core/rake_task'
+require 'rubocop/rake_task'
 
-task :default => :spec
-
-RSpec::Core::RakeTask.new(:spec)
+task default: %i[
+  library:fix
+  test:unit
+]
 
 namespace :encryption do
   namespace :passphrase do
+    desc 'Generate encryption passphrase for CI GPG key'
     task :generate do
-      FileUtils.mkdir_p("config/secrets/ci/")
-      File.open('config/secrets/ci/encryption.passphrase', 'w') do |f|
-        f.write(SecureRandom.base64(36))
-      end
+      FileUtils.mkdir_p('config/secrets/ci/')
+      File.write('config/secrets/ci/encryption.passphrase',
+                 SecureRandom.base64(36))
     end
   end
 end
@@ -25,83 +29,102 @@ end
 namespace :keys do
   namespace :deploy do
     RakeSSH.define_key_tasks(
-        path: 'config/secrets/ci/',
-        comment: 'maintainers@infrablocks.io')
+      path: 'config/secrets/ci/',
+      comment: 'maintainers@infrablocks.io'
+    )
   end
 
   namespace :gpg do
     RakeGPG.define_generate_key_task(
-        output_directory: 'config/secrets/ci',
-        name_prefix: 'gpg',
-        owner_name: 'InfraBlocks Maintainers',
-        owner_email: 'maintainers@infrablocks.io',
-        owner_comment: 'shivers CI Key')
+      output_directory: 'config/secrets/ci',
+      name_prefix: 'gpg',
+      owner_name: 'InfraBlocks Maintainers',
+      owner_email: 'maintainers@infrablocks.io',
+      owner_comment: 'shivers CI Key'
+    )
   end
 end
 
+RuboCop::RakeTask.new
+
+namespace :library do
+  desc 'Run all checks of the library'
+  task check: [:rubocop]
+
+  desc 'Attempt to automatically fix issues with the library'
+  task fix: [:'rubocop:auto_correct']
+end
+
+namespace :test do
+  RSpec::Core::RakeTask.new(:unit)
+end
+
 RakeCircleCI.define_project_tasks(
-    namespace: :circle_ci,
-    project_slug: 'github/infrablocks/shivers'
+  namespace: :circle_ci,
+  project_slug: 'github/infrablocks/shivers'
 ) do |t|
   circle_ci_config =
-      YAML.load_file('config/secrets/circle_ci/config.yaml')
+    YAML.load_file('config/secrets/circle_ci/config.yaml')
 
-  t.api_token = circle_ci_config["circle_ci_api_token"]
+  t.api_token = circle_ci_config['circle_ci_api_token']
   t.environment_variables = {
-      ENCRYPTION_PASSPHRASE:
-          File.read('config/secrets/ci/encryption.passphrase')
-              .chomp
+    ENCRYPTION_PASSPHRASE:
+      File.read('config/secrets/ci/encryption.passphrase')
+          .chomp
   }
   t.checkout_keys = []
   t.ssh_keys = [
-      {
-          hostname: "github.com",
-          private_key: File.read('config/secrets/ci/ssh.private')
-      }
+    {
+      hostname: 'github.com',
+      private_key: File.read('config/secrets/ci/ssh.private')
+    }
   ]
 end
 
 RakeGithub.define_repository_tasks(
-    namespace: :github,
-    repository: 'infrablocks/shivers',
-) do |t|
+  namespace: :github,
+  repository: 'infrablocks/shivers'
+) do |t, args|
   github_config =
-      YAML.load_file('config/secrets/github/config.yaml')
+    YAML.load_file('config/secrets/github/config.yaml')
 
-  t.access_token = github_config["github_personal_access_token"]
+  t.access_token = github_config['github_personal_access_token']
   t.deploy_keys = [
-      {
-          title: 'CircleCI',
-          public_key: File.read('config/secrets/ci/ssh.public')
-      }
+    {
+      title: 'CircleCI',
+      public_key: File.read('config/secrets/ci/ssh.public')
+    }
   ]
+  t.branch_name = args.branch_name
+  t.commit_message = args.commit_message
 end
 
 namespace :pipeline do
-  task :prepare => [
-      :'circle_ci:project:follow',
-      :'circle_ci:env_vars:ensure',
-      :'circle_ci:checkout_keys:ensure',
-      :'circle_ci:ssh_keys:ensure',
-      :'github:deploy_keys:ensure'
+  desc 'Prepare CircleCI Pipeline'
+  task prepare: %i[
+    circle_ci:project:follow
+    circle_ci:env_vars:ensure
+    circle_ci:checkout_keys:ensure
+    circle_ci:ssh_keys:ensure
+    github:deploy_keys:ensure
   ]
 end
 
 namespace :version do
-  desc "Bump version for specified type (pre, major, minor, patch)"
+  desc 'Bump version for specified type (pre, major, minor, patch)'
   task :bump, [:type] do |_, args|
     bump_version_for(args.type)
   end
 end
 
-desc "Release gem"
+desc 'Release gem'
 task :release do
-  sh "gem release --tag --push"
+  sh 'gem release --tag --push'
 end
 
 def bump_version_for(version_type)
-  sh "gem bump --version #{version_type} " +
-      "&& bundle install " +
-      "&& export LAST_MESSAGE=\"$(git log -1 --pretty=%B)\" " +
-      "&& git commit -a --amend -m \"${LAST_MESSAGE} [ci skip]\""
+  sh "gem bump --file lib/shivers/library_version.rb --version #{version_type} " \
+     '&& bundle install ' \
+     '&& export LAST_MESSAGE="$(git log -1 --pretty=%B)" ' \
+     '&& git commit -a --amend -m "${LAST_MESSAGE} [ci skip]"'
 end

data/bin/console

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'bundler/setup'
 require 'shivers'

data/lib/shivers/format.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require_relative 'value_equality'
+
+module Shivers
+  class Format
+    include ValueEquality
+
+    def initialize(formatter)
+      @formatter = formatter
+    end
+
+    def visit(visitor)
+      @formatter.call(visitor)
+    end
+
+    def state
+      [@formatter]
+    end
+  end
+end

data/lib/shivers/library_version.rb

@@ -0,0 +1,3 @@
+module Shivers
+  VERSION = '0.6.0.pre.3'
+end

data/lib/shivers/matchers/child.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Shivers
+  module Matchers
+    class Child
+      include ValueEquality
+
+      attr_reader :matcher, :capturer, :child
+
+      def initialize(matcher, capturer, child)
+        @matcher = matcher
+        @capturer = capturer
+        @child = child
+      end
+
+      def state
+        [@matcher, @capturer, @child]
+      end
+    end
+  end
+end

data/lib/shivers/matchers/parent.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Shivers
+  module Matchers
+    class Parent
+      include ValueEquality
+
+      attr_reader :matcher, :capturer, :children
+
+      def initialize(matcher, capturer, children)
+        @matcher = matcher
+        @capturer = capturer
+        @children = children
+      end
+
+      def state
+        [@matcher, @capturer, @children]
+      end
+    end
+  end
+end

data/lib/shivers/matchers/recursive.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Shivers
+  module Matchers
+    class Recursive
+      include ValueEquality
+
+      attr_reader :capture_group, :first, :rest
+
+      def initialize(capture_group, first, rest)
+        @capture_group = capture_group
+        @first = first
+        @rest = rest
+      end
+
+      def state
+        [@capture_group, @first, @rest]
+      end
+    end
+  end
+end

data/lib/shivers/matchers.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require_relative 'matchers/parent'
+require_relative 'matchers/child'
+require_relative 'matchers/recursive'
+
+module Shivers
+  module Matchers
+  end
+end

data/lib/shivers/parts/alphanumeric.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require_relative 'mixins/multivaluable'
+require_relative '../value_equality'
+
+module Shivers
+  module Parts
+    class Alphanumeric
+      include ValueEquality
+      include Mixins::Multivaluable
+
+      def initialize(data = {})
+        @traits = data[:traits] || []
+      end
+
+      def matcher
+        /[a-zA-Z0-9]+/
+      end
+
+      def convert(value)
+        value
+      end
+
+      def capturable?
+        true
+      end
+
+      def ==(other)
+        other.class == self.class && other.state == state
+      end
+
+      alias eql? ==
+
+      def hash
+        self.class.hash ^ state.hash
+      end
+
+      def state
+        [@traits]
+      end
+    end
+  end
+end

data/lib/shivers/parts/alphanumeric_or_hyphen.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require_relative 'mixins/multivaluable'
+require_relative '../value_equality'
+
+module Shivers
+  module Parts
+    class AlphanumericOrHyphen
+      include ValueEquality
+      include Mixins::Multivaluable
+
+      def initialize(data = {})
+        @traits = data[:traits] || []
+      end
+
+      def matcher
+        /[a-zA-Z0-9-]+/
+      end
+
+      def convert(value)
+        value
+      end
+
+      def capturable?
+        true
+      end
+
+      def ==(other)
+        other.class == self.class && other.state == state
+      end
+
+      alias eql? ==
+
+      def hash
+        self.class.hash ^ state.hash
+      end
+
+      def state
+        [@traits]
+      end
+    end
+  end
+end

data/lib/shivers/parts/mixins/multivaluable.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Shivers
+  module Parts
+    module Mixins
+      module Multivaluable
+        def multivalued?
+          @traits.include?(:multivalued)
+        end
+
+        def merge(first, second)
+          multivalued? ? concatable(first).concat(concatable(second)) : second
+        end
+
+        private
+
+        def concatable(value)
+          if value.nil?
+            []
+          elsif value.is_a?(Array)
+            value
+          else
+            [value]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/shivers/parts/numeric.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require_relative 'mixins/multivaluable'
+require_relative '../value_equality'
+
+module Shivers
+  module Parts
+    class Numeric
+      include ValueEquality
+      include Mixins::Multivaluable
+
+      def initialize(_ = {}); end
+
+      def matcher
+        /0|[1-9]\d*/
+      end
+
+      def convert(value)
+        value&.to_i
+      end
+
+      def capturable?
+        true
+      end
+
+      def ==(other)
+        other.class == self.class && other.state == state
+      end
+
+      alias eql? ==
+
+      def hash
+        self.class.hash ^ state.hash
+      end
+
+      def state
+        []
+      end
+    end
+  end
+end