upfluence-utils 0.10.3 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7224bbbf6f3f8148ab29757de71e78d20150d0ec1723ebd783495ef75eee42d3
-  data.tar.gz: 6521d96e7d1379e19f3a9d5d6e2dc73d657fb5aa2717b4656f4baa03aa09e3e4
+  metadata.gz: 34482caf62162c18d2dd1baccb5a6779d6842ada6fe2bd9ea93cb59f4a5dd023
+  data.tar.gz: 11d5ee4d37890bce173e6504c68717eb84b02b83e08dc7b49922876cea8b1be1
 SHA512:
-  metadata.gz: '0742070824a9cb9ce9812484e99e1bc2fc741da8de26fee3229ecebeecc4fc8833e0d9fa25243b58898c9e5b5e91521c7c4b226e937b42c49d22f79eaca68599'
-  data.tar.gz: 997855dfb5c929120397e603a640b253b87444e72c961c006aa1341a88df4adf529e583e2516b51e156950b419879032486bf96b5f8f3008f366c60cf0f76871
+  metadata.gz: 5783891f47a807fb2e330666f95e613959551c35f515988b3c565a9cb29f81b720adcb2bc2f80e1657e90d789d244546bcb05fb9157d1f17f85e94aab054c377
+  data.tar.gz: 6cc44d846140cbc7b5066d778ebce30944532c9b3e082ccbbb433741cc5ccacd945a5263fa29c94acb6a47f90a58e8a052888b9a7d6f7cfce7c9c6a69bc8fd97

data/lib/upfluence/http/server.rb

@@ -78,7 +78,7 @@ module Upfluence
 
         Thread.new { run_prometheus_exporter } if @options[:push_gateway_url]
 
-        @handler.run(@builder, @options) do |server|
+        @handler.run(@builder, **@options) do |server|
           server.threaded = @options[:threaded] if server.respond_to? :threaded=
 
           if server.respond_to?(:threadpool_size=) && @options[:threadpool_size]

data/lib/upfluence/peer.rb

@@ -1,28 +1,126 @@
+require 'cgi'
+
 module Upfluence
   class Peer
+    class Version
+      class SemanticVersion
+        attr_reader :major, :minor, :patch, :suffix
+
+        def initialize(major:, minor:, patch:, suffix: nil)
+          @major = major
+          @minor = minor
+          @patch = patch
+          @suffix = suffix
+        end
+
+        def to_s
+          v = "v#{@major}.#{@minor}.#{@patch}"
+
+          v += "-#{@suffix}" if @suffix
+          v
+        end
+
+        class << self
+          def parse(version)
+            return nil unless version
+
+            v, suffix = version.split('-', 2)
+
+            vs = v.split('.')
+
+            return nil unless vs.count.eql? 3
+
+            SemanticVersion.new(
+              major:  vs[0].delete_prefix('v').to_i,
+              minor:  vs[1].to_i,
+              patch:  vs[2].to_i,
+              suffix: suffix
+            )
+          end
+        end
+      end
+
+      class GitVersion
+        attr_reader :commit, :remote, :branch
+
+        def initialize(commit:, remote: nil, branch: nil)
+          @commit = commit
+          @remote = remote
+          @branch = branch
+        end
+
+        def to_s
+          "v0.0.0+git-#{@commit[0..6]}"
+        end
+      end
+
+      DEFAULT_VERSION = 'v0.0.0-dirty'.freeze
+
+      attr_reader :git, :semantic
+
+      def initialize(git, semantic)
+        @git = git
+        @semantic = semantic
+      end
+
+      def to_s
+        return @semantic.to_s if @semantic
+        return @git.to_s if @git
+
+        DEFAULT_VERSION
+      end
+    end
+
     attr_reader :environment, :authority, :instance_name, :project_name,
                 :app_name
 
-    def initialize(opts = {})
-      @authority = opts[:authority] || 'local'
-      @instance_name = opts[:instance_name] || 'unknown-server'
-      @app_name = opts[:app_name] || 'unknown-name'
-      @project_name = opts[:project_name] || 'unknown-app'
-      @environment = opts[:environment] || 'development'
+    def initialize(authority:, instance_name:, app_name:, project_name:,
+                   environment:, version: nil)
+      @authority = authority || 'local'
+      @instance_name = instance_name ||  'unknown-server'
+      @app_name = app_name || 'unknown-app'
+      @project_name = project_name || 'unknown-app'
+      @environment = environment || 'development'
+      @version = version
     end
 
     def to_url
-      "peer://#{@environment}@#{@authority}/#{@instance_name}"
+      query = {
+        'app-name'         => @app_name,
+        'project-name'     => @project_name,
+        'git-version'      => @version.git&.commit,
+        'semantic-version' => @version.semantic&.to_s
+      }.compact.map { |k, v| "#{k}=#{CGI.escape(v)}" }.join('&')
+
+      "peer://#{@environment}@#{@authority}/#{@instance_name}?#{query}"
     end
 
     class << self
       def from_env
         Peer.new(
           authority:     ENV['AUTHORITY'],
-          instance_name: ENV['INSTANCE_NAME'],
+          instance_name: ENV['UNIT_NAME'],
           app_name:      ENV['APP_NAME'],
           project_name:  ENV['PROJECT_NAME'],
-          environment:   ENV['ENV']
+          environment:   ENV['ENV'],
+          version:       Version.new(
+            build_git_version,
+            Version::SemanticVersion.parse(ENV['VERSION'])
+          )
+        )
+      end
+
+      private
+
+      def build_git_version
+        commit = ENV['GIT_COMMIT']
+
+        return nil unless commit
+
+        Version::GitVersion.new(
+          commit: commit,
+          remote: ENV['GIT_REMOTE'],
+          branch: ENV['GIT_BRANCH']
         )
       end
     end

data/lib/upfluence/utils/thrift/middleware/error_catcher.rb

@@ -17,7 +17,7 @@ module Upfluence
           def method_missing(method, *args, &block)
             @app.send(method, *args, &block)
           rescue ::Thrift::Exception => e
-            if STANDARD_THRIFT_EXCEPTIONS.include? exc.class
+            if STANDARD_THRIFT_EXCEPTIONS.include? e.class
               @error_logger.notify(e, method, *args)
             end
 

data/lib/upfluence/utils/version.rb

@@ -1,5 +1,5 @@
 module Upfluence
   module Utils
-    VERSION = '0.10.3'.freeze
+    VERSION = '0.11.1'.freeze
   end
 end

data/rbutils.gemspec

@@ -15,10 +15,11 @@ Gem::Specification.new do |spec|
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.require_paths = ["lib"]
+  spec.required_ruby_version = '>= 2.7.0'
 
-  spec.add_development_dependency "bundler", "~> 1.12"
-  spec.add_development_dependency "rake", ">= 12.3.3"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "bundler", ">= 2.2"
+  spec.add_development_dependency "rake", ">= 13.0.0"
+  spec.add_development_dependency "rspec", ">= 3.10"
   spec.add_runtime_dependency 'upfluence-thrift'
   spec.add_runtime_dependency 'sinatra'
   spec.add_runtime_dependency 'redis'

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: upfluence-utils
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 0.11.1
 platform: ruby
 authors:
 - Upfluence
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-09 00:00:00.000000000 Z
+date: 2022-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: 13.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: 13.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: upfluence-thrift
   requirement: !ruby/object:Gem::Requirement
@@ -300,14 +300,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: Upfluence common utils for Ruby projects