upfluence-utils 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b2b841f2316f1af620920943ae85e2e885ae8dcfeb78b262dd4499d56166087
-  data.tar.gz: 54d9bcce6108662e99d265529874d7e81150a995a461e4a35f01be26eafb8cf0
+  metadata.gz: 34482caf62162c18d2dd1baccb5a6779d6842ada6fe2bd9ea93cb59f4a5dd023
+  data.tar.gz: 11d5ee4d37890bce173e6504c68717eb84b02b83e08dc7b49922876cea8b1be1
 SHA512:
-  metadata.gz: 5b4b2f1319518137e8b7eee871902a2083d29e1d30e3978bf07a4a6faa2401caa5c7c3098c1d15e185a94fc2f6071d21360ac676deed27b0cb3c06760b5f99eb
-  data.tar.gz: 3bc0090d731535354f87b1d432c8794b3b092ef7390d41ccbb195e23e20d7e6e43029aa3f539e14e7b40e66ba7e69eeb1541e55767ae5f5145e89da949c6e269
+  metadata.gz: 5783891f47a807fb2e330666f95e613959551c35f515988b3c565a9cb29f81b720adcb2bc2f80e1657e90d789d244546bcb05fb9157d1f17f85e94aab054c377
+  data.tar.gz: 6cc44d846140cbc7b5066d778ebce30944532c9b3e082ccbbb433741cc5ccacd945a5263fa29c94acb6a47f90a58e8a052888b9a7d6f7cfce7c9c6a69bc8fd97

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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: upfluence-utils
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Upfluence
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-21 00:00:00.000000000 Z
+date: 2022-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -234,7 +234,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - dev@upfluence.com
 executables: []
@@ -292,7 +292,7 @@ homepage: https://github.com/upfluence/rbutils
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -307,8 +307,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.2.32
+signing_key:
 specification_version: 4
 summary: Upfluence common utils for Ruby projects
 test_files: []