tracking_number 1.3.1 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4eb2264c89e8b80f9f99c8317e20609b2ba773c43b25ba464fa9193e401248ab
-  data.tar.gz: b71e24abcba506de9b335b4a97e096d3d8c07707ac8df486a4af04e061acf9da
+  metadata.gz: 6d8a86aeaa8c06073cb379d6c64b1637b8246c8cd54f821696c20c39348061b2
+  data.tar.gz: 8e561f7d1ea8c26d0003297ea4ce5cf9835b805bb6278714c10f81a164375f38
 SHA512:
-  metadata.gz: '099e22c11617fc59cd2085de26bacee52fb08f46a5b09d10b082f6dd74446deb36ef010ad3bc7806b2e55adb0f959f820e25b6d9d13d7bcaa921ba1668cbb17b'
-  data.tar.gz: b1f0eabcf9715f42a61e502f34dd63c6deaa3584767f8d02dc24bf6ae1623a7bdedefb3f06d730fc7e5a4b360071b5e510b57b5e93461a0cd1207323f4749c3d
+  metadata.gz: 5920313b3ea08d709c564a3ca5b03e9ee34e0fe213e83fbdee53680504a24f02dac5fa9e774f864d77259e960100177abf9430b5e717991ec589d881f9f9d246
+  data.tar.gz: df3aab7b35d0cbfaa9b012439de32f0e38dac1217d65c14939dccbc8792ccb918059f58eafcb2f37d52de9f0b911ccaac8bfd16dceb9f0b94923fa0de8a94695

data/.github/dependabot.yml

@@ -16,3 +16,7 @@ updates:
   - dependency-name: rake
     versions:
     - 13.0.3
+- package-ecosystem: "gitsubmodule"
+  directory: "lib/data"
+  schedule:
+    interval: "daily"

data/.github/workflows/release.yml

@@ -0,0 +1,36 @@
+---
+name: Generate New Release
+
+on:
+  workflow_dispatch:
+
+jobs:
+  release:
+    name: Release
+    runs-on: ubuntu-18.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          submodules: true
+          persist-credentials: false
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - name: Build
+        run: |
+          gem install bundler
+          git submodule update --init --recursive
+          bundle install --jobs 4 --retry 3
+      - name: Setup Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: 14
+      - name: Install Dependencies
+        run: yarn install --frozen-lockfile
+      - name: Release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GEM_HOST_API_KEY: ${{ secrets.GEM_HOST_API_KEY }}
+        run: node_modules/.bin/semantic-release

data/.github/workflows/ruby.yml

@@ -6,10 +6,12 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu-latest ]
-        ruby: [ '2.5', '2.6', '2.7', '3.0', '3.1' ]
+        ruby: [ '2.6', '2.7', '3.0', '3.1' ]
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v3
+      with:
+        submodules: true
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
@@ -17,6 +19,17 @@ jobs:
     - name: Build and test with Rake
       run: |
         gem install bundler
-        git submodule update --init
+        git submodule update --init --recursive
         bundle install --jobs 4 --retry 3
         bundle exec rake
+  publish:
+    name: Release
+    runs-on: ubuntu-latest
+    if: github.ref == 'refs/heads/main'
+    needs: [test]
+    steps:
+      - name: Dispatch Release
+        uses: benc-uk/workflow-dispatch@v1
+        with:
+          workflow: Generate New Release
+          token: ${{ secrets.GITHUB_TOKEN }}

data/.tool-versions

@@ -0,0 +1 @@
+ruby 3.0.3

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+tracking_number changelog
+
+## [1.3.5](https://github.com/jkeen/tracking_number/compare/v1.3.4...v1.3.5) (2023-01-09)
+
+
+### Bug Fixes
+
+* modify release process to include submodules, the lack of which caused the 1.3.2 gem release to not work at all ([578af83](https://github.com/jkeen/tracking_number/commit/578af83d1b9da51c6edb8400d3aba8b195b66629))
+
+## [1.3.2](https://github.com/jkeen/tracking_number/compare/v1.3.1...v1.3.2) (2022-12-23)
+
 # Changelog
 
 ## [v1.2](https://github.com/jkeen/tracking_number/tree/v1.2) (2022-11-03)

data/lib/data/couriers/ups.json

@@ -139,8 +139,8 @@
       "name": "UPS Waybill",
       "regex": [
         "\\s*(?<ServiceType>([A-Z]\\s*){1})",
-        "(?<SerialNumber>(?:[0-9]\\s*){9,9})",
-        "(?<CheckDigit>[0-9]\\s*)"
+        "(?<SerialNumber>(?:[0-9]\\s*){9})",
+        "(?<CheckDigit>[0-9]\\s*){1}"
       ],
       "validation": {
         "checksum": {
@@ -161,6 +161,10 @@
             {
               "matches": "K",
               "name": "UPS Ground"
+            },
+            {
+              "matches": "V",
+              "name": "UPS WorldWide Express Saver"
             }
           ]
         }
@@ -170,12 +174,16 @@
         "valid": [
           "K1506235620",
           "K2479825491",
-          "J4603636537"
+          "J4603636537",
+          "V0490119172",
+          "V0431105627"
         ],
         "invalid": [
           "K1506235622",
           "K2479825492",
-          "J4603636538"
+          "J4603636538",
+          "V0411335627",
+          "V0423305841"
         ]
       }
     }

data/lib/tracking_number/version.rb

@@ -1,3 +1,3 @@
 module TrackingNumber
-  VERSION = "1.3.1"
+  VERSION = "1.3.5"
 end

data/package.json

@@ -0,0 +1,92 @@
+{
+  "name": "tracking_number",
+  "version": "1.x.x-semantic-release",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/jkeen/tracking_number.git"
+  },
+  "author": "jkeen",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/jkeen/tracking_number/issues"
+  },
+  "homepage": "https://github.com/jkeen/tracking_number#readme",
+  "scripts": {
+    "semantic-release": "semantic-release"
+  },
+  "devDependencies": {
+    "semantic-release-rubygem": "^1.2.0",
+    "semantic-release": "^19.0.3",
+    "@semantic-release/changelog": "^6.0.1",
+    "@semantic-release/git": "^10.0.1" 
+  },
+  "release": {
+    "branches": ["main"],
+    "plugins": [
+      [
+        "@semantic-release/commit-analyzer",
+        {
+          "releaseRules": [
+            {
+              "type": "*!",
+              "release": "major"
+            },
+            {
+              "type": "feat",
+              "release": "minor"
+            },
+            {
+              "type": "build",
+              "release": "patch"
+            },
+            {
+              "type": "ci",
+              "release": "patch"
+            },
+            {
+              "type": "chore",
+              "release": "patch"
+            },
+            {
+              "type": "docs",
+              "release": "patch"
+            },
+            {
+              "type": "refactor",
+              "release": "patch"
+            },
+            {
+              "type": "style",
+              "release": "patch"
+            },
+            {
+              "type": "test",
+              "release": "patch"
+            }
+          ],
+          "parserOpts": {
+            "noteKeywords": ["BREAKING CHANGE", "BREAKING CHANGES", "BREAKING"]
+          }
+        }
+      ],
+      "@semantic-release/release-notes-generator",
+      [
+        "@semantic-release/changelog",
+        {
+          "changelogTitle": "tracking_number changelog",
+          "changelogFile": "CHANGELOG.md"
+        }
+      ],
+      "semantic-release-rubygem",
+      "@semantic-release/github",
+      [
+        "@semantic-release/git",
+        {
+          "assets": ["CHANGELOG.md"],
+          "message": "${nextRelease.version} CHANGELOG [skip ci]\n\n${nextRelease.notes}"
+        }
+      ]
+    ],
+    "debug": false,
+    "dryRun": false
+  }}

data/tracking_number.gemspec

@@ -17,19 +17,28 @@ Gem::Specification.new do |s|
   ]
 
   s.files = `git ls-files`.split("\n")
-  gem_dir = "#{File.expand_path(File.join(__FILE__, '..'))}/"
 
+  gem_dir = "#{File.expand_path(File.join(__FILE__, '..'))}/"
   `git submodule --quiet foreach pwd`.split($OUTPUT_RECORD_SEPARATOR).each do |submodule_path|
     Dir.chdir(submodule_path.chomp) do
       submodule_relative_path = submodule_path.sub gem_dir, ''
-      # issue git ls-files in submodule's directory and
+
+      # issue git ls-files in submodule's directory
+      submodule_files = `git ls-files -- couriers/*`.split($OUTPUT_RECORD_SEPARATOR)
+
       # prepend the submodule path to create absolute file paths
+      submodule_files_fullpaths = submodule_files.map do |filename|
+        "#{submodule_path}/#{filename}"
+      end
 
-      `git ls-files -- couriers/*`.split($OUTPUT_RECORD_SEPARATOR).each do |filename|
-        file_path = "#{submodule_relative_path}/#{filename}"
-        puts "adding file #{file_path}"
-        s.files << file_path
+      # remove leading path parts to get paths relative to the gem's root dir
+      # (this assumes, that the gemspec resides in the gem's root dir)
+      submodule_files_paths = submodule_files_fullpaths.map do |filename|
+        filename.gsub gem_dir, ''
       end
+
+      # add relative paths to gem.files
+      s.files += submodule_files_paths
     end
   end