mini_phone 0.1.0 → 1.0.0.beta.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f62c6d5370c3066ee7a24d8fbb4b6297f3382708f2492ffde4a4637239134064
-  data.tar.gz: ed947cb56dc592a7aa2be638ca1d59f608ff2ac5b3fab52e573c0ad3bde99306
+  metadata.gz: 98edc8a1bf120a002c013d80d48ea0bd55c2f1d2bcb2912c02721ee58140a8f7
+  data.tar.gz: 52849767577cb45129bae6fb875f343316291da9600de16dbe406cc8c7705242
 SHA512:
-  metadata.gz: d32d5ee76afd3d7ccd526f5854725ab718f45c5c9c0cb03be318e895b87c0fd33af8fefe2f6797320e15bd09e8134c900a783e0354e716e94e3b0d8228bab561
-  data.tar.gz: e8612f26f40ab9ad5fbbf50d36201f1b2d2411728ef31bf005608029af1cbc4ee427802c68e6a583b0f089ca5fc3306115c5ebae28776ddbc630c35069b7b8dc
+  metadata.gz: a6ee4d57ff10389a45d0072b464098cee65fde3d7792127002e9a82879bd08077dec3182dcc243213510f4dd303c643202135f586c528463516f042dfae7c6cf
+  data.tar.gz: 564fb760f1a5cdcb9b81835511dc3a382632fa93b8235abb6384a3aa85ce727eaaa9cff031bf377669a102208776179e1b08000dc72a6cfe7d83caa75bde96a7

data/.github/workflows/ci.yml

@@ -5,21 +5,21 @@ on: push
 
 jobs:
   build:
-    runs-on: ubuntu-16.04
     strategy:
       fail-fast: false
       matrix:
-        ruby: ["2.5", "2.6", "2.7"]
+        ruby: ["2.5", "2.6", "2.7", "3.0"]
         os: [ubuntu-latest, macos-latest]
         experimental: [false]
-        include:
-          - ruby: "truffleruby"
-            os: ubuntu-latest
-            experimental: true
-          - ruby: "truffleruby"
-            os: macos-latest
-            experimental: true
+        # include:
+        #   - ruby: "truffleruby"
+        #     os: ubuntu-latest
+        #     experimental: true
+        #   - ruby: "truffleruby"
+        #     os: macos-latest
+        #     experimental: true
     name: ${{ matrix.ruby }} on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
     continue-on-error: ${{ matrix.experimental }}
     env:
       CI_EXPERIMENTAL: ${{ matrix.experimental }}

data/.github/workflows/release.yml

@@ -0,0 +1,55 @@
+---
+name: Release
+
+on:
+  push:
+    tags:
+      - "v*"
+
+jobs:
+  build:
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ["2.7"]
+        os: [ubuntu-latest, macos-latest]
+    name: ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+
+      - name: Install dependencies (system)
+        if: ${{ matrix.os == 'ubuntu-latest' }}
+        run: sudo apt-get -yqq install libphonenumber-dev
+
+      - name: Install dependencies (system)
+        if: ${{ matrix.os == 'macos-latest' }}
+        run: brew install --build-from-source libphonenumber && brew link libphonenumber
+
+      - name: Install dependencies (ruby)
+        run: gem install bundler && bundle install --jobs 4 --retry 3
+
+      - name: Login
+        run: |
+          mkdir -p ~/.gem
+
+          cat << EOF > ~/.gem/credentials
+          ---
+          :github: ${GITHUB_AUTH_TOKEN}
+          :rubygems_api_key: ${RUBYGEMS_AUTH_TOKEN}
+          EOF
+
+          chmod 0600 ~/.gem/credentials
+        env:
+          GITHUB_AUTH_TOKEN: "Bearer ${{secrets.GITHUB_TOKEN}}"
+          RUBYGEMS_AUTH_TOKEN: "${{secrets.RUBYGEMS_AUTH_TOKEN}}"
+          OWNER: ${{ github.repository_owner }}
+
+      - name: 🛳 Ship it
+        run: |
+          bundle exec rake publish:native
+          bundle exec rake publish:non_native || true

data/.gitignore

@@ -15,5 +15,5 @@ mkmf.log
 # rspec failure tracking
 .rspec_status
 Gemfile.lock
-vendor/
+vendor/cache/
 *.gem

data/.rubocop.yml

@@ -12,7 +12,12 @@ AllCops:
   TargetRubyVersion: 2.5
   NewCops: enable
   SuggestExtensions: false
+  Exclude:
+    - pkg/**/*
+    - tmp/**/*
 
 Metrics/BlockLength:
   Exclude:
     - spec/**/*
+    - Rakefile
+    - Gemfile

data/Rakefile

@@ -5,16 +5,17 @@ require 'rspec/core/rake_task'
 require 'rubygems/package_task'
 require 'rake/extensiontask'
 
-
 RSpec::Core::RakeTask.new(:spec)
 
 task build: :compile
 
 task default: %i[clobber compile spec]
 
-spec = Gem::Specification::load(File.expand_path('../mini_phone.gemspec', __FILE__))
+spec = Gem::Specification.load(File.expand_path('mini_phone.gemspec', __dir__))
 
 Gem::PackageTask.new(spec) do |pkg|
+  pkg.need_zip = true
+  pkg.need_tar = true
 end
 
 Rake::ExtensionTask.new('mini_phone', spec) do |ext|
@@ -26,3 +27,47 @@ task bench: %i[clobber compile] do
     require_relative f
   end
 end
+
+task :deploy do
+  sh 'code -w ./lib/mini_phone/version.rb'
+  version = `ruby -r ./lib/mini_phone/version.rb -e 'print MiniPhone::VERSION'`.strip
+  sh "git commit -am 'Bump to v#{version} :confetti_ball:'"
+  sh 'gem_push=no bundle exec rake release'
+end
+
+namespace :publish do
+  def push_to_github_registry(gem)
+    puts "Pushing #{gem} to GitHub Package Registry"
+    sh "gem push #{gem} --host https://rubygems.pkg.github.com/ianks --key github"
+    true
+  rescue StandardError
+    warn 'Could not publish to Github Package Registry'
+    false
+  end
+
+  def push_to_rubygems(gem)
+    puts "Pushing #{gem} to rubygems"
+    sh "gem push #{gem}"
+    true
+  rescue StandardError
+    warn 'Could not publish to rubygems'
+    false
+  end
+
+  task native: %i[native gem] do
+    g = "./pkg/mini_phone-#{MiniPhone::VERSION}-#{Gem::Platform.new(RUBY_PLATFORM)}.gem"
+
+    push_to_rubygems(g)
+  end
+
+  task non_native: [:gem] do
+    g = "./pkg/mini_phone-#{MiniPhone::VERSION}.gem"
+
+    results = []
+
+    results << push_to_rubygems(g)
+    results << push_to_github_registry(g)
+
+    abort if results.all? { |r| r == true }
+  end
+end

data/ext/mini_phone/mini_phone.cc

@@ -30,7 +30,7 @@ static inline VALUE is_phone_number_valid(VALUE self, VALUE str, VALUE cc) {
 }
 
 extern "C" VALUE rb_is_phone_number_valid(VALUE self, VALUE str) {
-  VALUE def_cc = rb_iv_get(rb_mMiniPhone, "@default_country_code");
+  VALUE def_cc = rb_iv_get(rb_mMiniPhone, "@default_country");
 
   return is_phone_number_valid(self, str, def_cc);
 }
@@ -51,7 +51,7 @@ extern "C" VALUE rb_is_phone_number_possible(VALUE self, VALUE str) {
   PhoneNumber parsed_number;
   PhoneNumberUtil *phone_util = PhoneNumberUtil::GetInstance();
 
-  VALUE def_cc = rb_iv_get(rb_mMiniPhone, "@default_country_code");
+  VALUE def_cc = rb_iv_get(rb_mMiniPhone, "@default_country");
   std::string phone_number(RSTRING_PTR(str), RSTRING_LEN(str));
   std::string country_code(RSTRING_PTR(def_cc), RSTRING_LEN(def_cc));
 
@@ -68,11 +68,11 @@ extern "C" VALUE rb_is_phone_number_impossible(VALUE self, VALUE str) {
   return rb_is_phone_number_possible(self, str) == Qtrue ? Qfalse : Qtrue;
 }
 
-extern "C" VALUE rb_set_default_country_code(VALUE self, VALUE str_code) {
-  return rb_iv_set(self, "@default_country_code", str_code);
+extern "C" VALUE rb_set_default_country(VALUE self, VALUE str_code) {
+  return rb_iv_set(self, "@default_country", str_code);
 }
 
-extern "C" VALUE rb_get_default_country_code(VALUE self) { return rb_iv_get(self, "@default_country_code"); }
+extern "C" VALUE rb_get_default_country(VALUE self) { return rb_iv_get(self, "@default_country"); }
 
 extern "C" void rb_phone_number_dealloc(PhoneNumberInfo *phone_number_info) { delete phone_number_info; }
 
@@ -108,7 +108,7 @@ extern "C" VALUE rb_phone_number_initialize(int argc, VALUE *argv, VALUE self) {
   rb_scan_args(argc, argv, "11", &str, &def_cc);
 
   if (NIL_P(def_cc)) {
-    def_cc = rb_iv_get(rb_mMiniPhone, "@default_country_code");
+    def_cc = rb_iv_get(rb_mMiniPhone, "@default_country");
   }
 
   rb_iv_set(self, "@input", str);
@@ -339,7 +339,7 @@ extern "C" void Init_mini_phone(void) {
   rb_mMiniPhone = rb_define_module("MiniPhone");
 
   // Unknown
-  rb_iv_set(rb_mMiniPhone, "@default_country_code", rb_str_new("ZZ", 2));
+  rb_iv_set(rb_mMiniPhone, "@default_country", rb_str_new("ZZ", 2));
 
   rb_define_module_function(rb_mMiniPhone, "valid?", reinterpret_cast<VALUE (*)(...)>(rb_is_phone_number_valid), 1);
   rb_define_module_function(rb_mMiniPhone, "valid_for_country?",
@@ -351,9 +351,9 @@ extern "C" void Init_mini_phone(void) {
   rb_define_module_function(rb_mMiniPhone, "impossible?", reinterpret_cast<VALUE (*)(...)>(rb_is_phone_number_invalid),
                             1);
   rb_define_module_function(rb_mMiniPhone,
-                            "default_country_code=", reinterpret_cast<VALUE (*)(...)>(rb_set_default_country_code), 1);
-  rb_define_module_function(rb_mMiniPhone, "default_country_code",
-                            reinterpret_cast<VALUE (*)(...)>(rb_get_default_country_code), 0);
+                            "default_country=", reinterpret_cast<VALUE (*)(...)>(rb_set_default_country), 1);
+  rb_define_module_function(rb_mMiniPhone, "default_country",
+                            reinterpret_cast<VALUE (*)(...)>(rb_get_default_country), 0);
   rb_define_module_function(rb_mMiniPhone, "parse", reinterpret_cast<VALUE (*)(...)>(rb_phone_number_parse), -1);
 
   rb_cPhoneNumber = rb_define_class_under(rb_mMiniPhone, "PhoneNumber", rb_cObject);

data/lib/mini_phone/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MiniPhone
-  VERSION = '0.1.0'
+  VERSION = '1.0.0.beta.0'
 end

data/mini_phone.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
   spec.license       = 'MIT'
   spec.required_ruby_version = Gem::Requirement.new('>= 2.5.0')
 
-  spec.platform      = Gem::Platform::RUBY
+  spec.platform = Gem::Platform::RUBY
 
   # spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mini_phone
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0.beta.0
 platform: ruby
 authors:
 - Ian Ker-Seymer
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-04 00:00:00.000000000 Z
+date: 2021-01-07 00:00:00.000000000 Z
 dependencies: []
 description: Plugs directly in the the Google's native C++ [libphonenumber](https://github.com/google/libphonenumber)
   for extemely _fast_ and _robust_ phone number parsing, validation, and formatting.
@@ -22,6 +22,7 @@ extra_rdoc_files: []
 files:
 - ".clang-format"
 - ".github/workflows/ci.yml"
+- ".github/workflows/release.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -46,7 +47,7 @@ metadata:
   homepage_uri: https://github.com/ianks/mini_phone
   source_code_uri: https://github.com/ianks/mini_phone
   changelog_uri: https://github.com/ianks/mini_phone/blob/master/CHANGELOG.md
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -57,12 +58,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
-signing_key:
+rubygems_version: 3.1.4
+signing_key: 
 specification_version: 4
 summary: Uses the Google libphonenumber C lib to parse, validate, and format phone
   numbers