gitlab-labkit 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e2b96ee615763a900d4250febc1c88ba8d144e4fa8cc972480a4f6ff9eab37e
-  data.tar.gz: ff1fa050ecde439b8bee866a8898e83bd6e8938a4f6f3cb46cce6c3b293d379d
+  metadata.gz: de8b261c2e8cb807efc60666a66cb873ac78515f6683500a5d012d1eb8239253
+  data.tar.gz: 81db5405e294b647fa851c6673e48f898d0b729785b26173c30ff19860e3d7fb
 SHA512:
-  metadata.gz: 14a684e60485902bd23d4fad464c730eb126a0443731de937f152146ae0fbf8935574798c2f810b5fd649a9365d81de9f0e97935bf9da44e89646837a6b1fa71
-  data.tar.gz: b66791346a37b628f8ebe37a272f3d78b3e9793f9011540c85cd5682f6a7942797de3f08657defe528c83cc8feaaf3569fe853b4c5525275363b1ecbd82919f1
+  metadata.gz: c38a4dac36cc77fb4cc2df6308ce7e4053be708689b0970f0aebf605da02a347c32c9ffa364bd7db84f6b8e9d978ff07eda1c66d827cac472ca6a5275e4bf654
+  data.tar.gz: eb0e29293b2185d51f57c16e18087d408e38f2a9f0d5f6ffc12319b87691e2b367e3e9e8f10eddc3301c782a3900a650785be6ba8f3ae5032e648084ed6346ac

data/.gitignore

@@ -0,0 +1,3 @@
+Gemfile.lock
+*.gem
+node_modules

data/.gitlab-ci.yml

@@ -0,0 +1,26 @@
+.test_template: &test_definition
+  stage: test
+  script:
+    - bundle install
+    - bundle exec rake verify build install
+
+test:2.6:
+  image: ruby:2.6
+  <<: *test_definition
+
+test:2.5:
+  image: ruby:2.5
+  <<: *test_definition
+
+test:2.4:
+  image: ruby:2.4
+  <<: *test_definition
+
+deploy:
+  stage: deploy
+  script:
+    - "printf '---\n:rubygems_api_key: $RUBYGEMS_API_KEY\n' > ~/.gem/credentials"
+    - bundle install
+    - bundle exec rake release[remote]
+  only:
+    - tags

data/.prettierrc

@@ -0,0 +1,3 @@
+{
+  "printWidth": 160
+}

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--require ./spec/spec_helper

data/.rubocop.yml

@@ -0,0 +1,12 @@
+require:
+  - rubocop-rspec
+
+inherit_gem:
+  gitlab-styles:
+    - rubocop-default.yml
+
+Style/HashSyntax:
+  EnforcedStyle: no_mixed_keys
+
+Style/SymbolLiteral:
+  Enabled: No

data/.ruby-version

@@ -0,0 +1 @@
+ruby-2.5.3

data/Gemfile

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+gemspec

data/Rakefile

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require "bundler/gem_tasks"
+
+begin
+  require 'rspec/core/rake_task'
+  RSpec::Core::RakeTask.new(:spec)
+rescue LoadError
+end
+
+require 'rubocop/rake_task'
+RuboCop::RakeTask.new
+
+task :format do
+  prettier_cmd = "./node_modules/.bin/prettier --write --plugin=@prettier/plugin-ruby '**/*.rb'"
+  sh "#{prettier_cmd} || npm install && #{prettier_cmd}"
+end
+
+task "format:check" do
+  prettier_cmd = "./node_modules/.bin/prettier --check --plugin=@prettier/plugin-ruby '**/*.rb'"
+  sh "#{prettier_cmd} || npm install && #{prettier_cmd}"
+end
+
+task :default => %w[spec rubocop build format:check]
+
+task :fix => %w[format rubocop:auto_correct]
+
+task :verify => %w[spec rubocop]

data/gitlab-labkit.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'gitlab-labkit'
-  spec.version       = '0.0.3'
+  spec.version       = '0.0.4'
   spec.authors       = ['Andrew Newdigate']
   spec.email         = ['andrew@gitlab.com']
 
@@ -11,8 +11,9 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'http://about.gitlab.com'
   spec.license       = 'MIT'
 
-  spec.files = Dir.glob('lib/**/*.{rb,md}') + %w[gitlab-labkit.gemspec] # LICENSE README.md
+  spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^spec/}) }
   spec.require_paths = ["lib"]
+  spec.required_ruby_version = '>= 2.3.0'
 
   spec.add_runtime_dependency 'activesupport', '~> 5'
   spec.add_runtime_dependency 'grpc', '~> 1.15'

data/lib/gitlab-labkit.rb

@@ -0,0 +1,7 @@
+# rubocop:disable Naming/FileName
+module Labkit
+  autoload :Correlation, 'labkit/correlation'
+  autoload :Tracing, 'labkit/tracing'
+  autoload :Logging, 'labkit/logging'
+end
+# rubocop:enable Naming/FileName

data/lib/labkit/tracing.rb

@@ -44,10 +44,10 @@ module Labkit
 
     # This will provide a link into the distributed tracing for the current trace,
     # if it has been captured.
-    def self.tracing_url
+    def self.tracing_url(service_name)
       return unless tracing_url_enabled?
 
-      tracing_url_template.to_s % { correlation_id: Labkit::Correlation::CorrelationId.current_id.to_s, service: Labkit.process_name }
+      format(tracing_url_template.to_s, { correlation_id: Labkit::Correlation::CorrelationId.current_id.to_s, service: service_name })
     end
   end
 end

data/package-lock.json

@@ -0,0 +1,22 @@
+{
+  "name": "labkit-ruby",
+  "requires": true,
+  "lockfileVersion": 1,
+  "dependencies": {
+    "@prettier/plugin-ruby": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/@prettier/plugin-ruby/-/plugin-ruby-0.5.1.tgz",
+      "integrity": "sha512-i5vcRvswNc0FhR41CnKCIy4hIztXDJb99vFavn/4cDeSk9Gu2OYnorDCpgjSVnu8l7go2P4na+Rws3qoxrX09A==",
+      "dev": true,
+      "requires": {
+        "prettier": "^1.16.4"
+      }
+    },
+    "prettier": {
+      "version": "1.16.4",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.16.4.tgz",
+      "integrity": "sha512-ZzWuos7TI5CKUeQAtFd6Zhm2s6EpAD/ZLApIhsF9pRvRtM1RFo61dM/4MSRUA0SuLugA/zgrZD8m0BaY46Og7g==",
+      "dev": true
+    }
+  }
+}

data/package.json

@@ -0,0 +1,7 @@
+{
+  "name": "labkit-ruby",
+  "devDependencies": {
+    "@prettier/plugin-ruby": "^0.5.1",
+    "prettier": "^1.16.4"
+  }
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-labkit
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Andrew Newdigate
@@ -185,8 +185,16 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
+- ".gitlab-ci.yml"
+- ".prettierrc"
+- ".rspec"
+- ".rubocop.yml"
+- ".ruby-version"
+- Gemfile
+- Rakefile
 - gitlab-labkit.gemspec
-- lib/labkit.rb
+- lib/gitlab-labkit.rb
 - lib/labkit/correlation.rb
 - lib/labkit/correlation/correlation_id.rb
 - lib/labkit/logging.rb
@@ -203,6 +211,8 @@ files:
 - lib/labkit/tracing/sidekiq/client_middleware.rb
 - lib/labkit/tracing/sidekiq/server_middleware.rb
 - lib/labkit/tracing/sidekiq/sidekiq_common.rb
+- package-lock.json
+- package.json
 homepage: http://about.gitlab.com
 licenses:
 - MIT
@@ -215,7 +225,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/labkit.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module Labkit
-  autoload :Correlation, 'labkit/correlation'
-  autoload :Tracing, 'labkit/tracing'
-  autoload :Logging, 'labkit/logging'
-
-  def self.process_name
-    return 'sidekiq' if Sidekiq.server?
-    return 'console' if defined?(Rails::Console)
-    return 'test' if Rails.env.test?
-
-    'web'
-  end
-end