From 5787a82a0ba9b5e712245b5b058440038e71a83c Mon Sep 17 00:00:00 2001 From: Jake Spain Date: Mon, 30 Jan 2023 16:18:49 -0500 Subject: [PATCH] Move version identifier and update gemfile and gemspec --- Gemfile | 15 +- Gemfile.lock | 208 ++++++++++++++++++++ lib/vmpooler-dns-google-clouddns/version.rb | 5 + lib/vmpooler/dns/google/clouddns/version.rb | 11 -- vmpooler-dns-google-clouddns.gemspec | 46 ++--- 5 files changed, 242 insertions(+), 43 deletions(-) create mode 100644 Gemfile.lock create mode 100644 lib/vmpooler-dns-google-clouddns/version.rb delete mode 100644 lib/vmpooler/dns/google/clouddns/version.rb diff --git a/Gemfile b/Gemfile index b923589..122d6b5 100644 --- a/Gemfile +++ b/Gemfile @@ -1,10 +1,13 @@ -# frozen_string_literal: true +source ENV['GEM_SOURCE'] || 'https://rubygems.org' -source "https://rubygems.org" - -# Specify your gem's dependencies in vmpooler-dns-google-clouddns.gemspec gemspec -gem "rake", "~> 13.0" +# Evaluate Gemfile.local if it exists +if File.exists? "#{__FILE__}.local" + instance_eval(File.read("#{__FILE__}.local")) +end -gem "rubocop", "~> 1.21" +# Evaluate ~/.gemfile if it exists +if File.exists?(File.join(Dir.home, '.gemfile')) + instance_eval(File.read(File.join(Dir.home, '.gemfile'))) +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 0000000..1680833 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,208 @@ +PATH + remote: . + specs: + vmpooler-dns-google-clouddns (0.1.0) + google-cloud-dns (~> 0.35.1) + googleauth (>= 0.16.2, < 1.3.0) + vmpooler (~> 2.3, >= 1.3.0) + +GEM + remote: https://rubygems.org/ + specs: + addressable (2.8.1) + public_suffix (>= 2.0.2, < 6.0) + ast (2.4.2) + bindata (2.4.14) + concurrent-ruby (1.2.0) + connection_pool (2.3.0) + declarative (0.0.20) + deep_merge (1.2.2) + diff-lcs (1.5.0) + docile (1.4.0) + faraday (2.7.4) + faraday-net_http (>= 2.0, < 3.1) + ruby2_keywords (>= 0.0.4) + faraday-net_http (3.0.2) + google-apis-core (0.10.0) + addressable (~> 2.5, >= 2.5.1) + googleauth (>= 0.16.2, < 2.a) + httpclient (>= 2.8.1, < 3.a) + mini_mime (~> 1.0) + representable (~> 3.0) + retriable (>= 2.0, < 4.a) + rexml + webrick + google-apis-dns_v1 (0.29.0) + google-apis-core (>= 0.9.1, < 2.a) + google-cloud-core (1.6.0) + google-cloud-env (~> 1.0) + google-cloud-errors (~> 1.0) + google-cloud-dns (0.35.1) + google-apis-dns_v1 (~> 0.1) + google-cloud-core (~> 1.6) + googleauth (>= 0.16.2, < 2.a) + zonefile (~> 1.04) + google-cloud-env (1.6.0) + faraday (>= 0.17.3, < 3.0) + google-cloud-errors (1.3.0) + googleauth (1.2.0) + faraday (>= 0.17.3, < 3.a) + jwt (>= 1.4, < 3.0) + memoist (~> 0.16) + multi_json (~> 1.11) + os (>= 0.9, < 2.0) + signet (>= 0.16, < 2.a) + httpclient (2.8.3) + jwt (2.6.0) + memoist (0.16.2) + mini_mime (1.1.2) + multi_json (1.15.0) + mustermann (2.0.2) + ruby2_keywords (~> 0.0.1) + net-ldap (0.17.1) + nio4r (2.5.8-java) + opentelemetry-api (1.1.0) + opentelemetry-common (0.19.6) + opentelemetry-api (~> 1.0) + opentelemetry-exporter-jaeger (0.20.1) + opentelemetry-api (~> 1.0) + opentelemetry-common (~> 0.19.2) + opentelemetry-sdk (~> 1.0) + thrift + opentelemetry-instrumentation-base (0.19.0) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-concurrent_ruby (0.19.2) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.19.0) + opentelemetry-instrumentation-http_client (0.19.4) + opentelemetry-api (~> 1.0) + opentelemetry-common (~> 0.19.3) + opentelemetry-instrumentation-base (~> 0.19.0) + opentelemetry-instrumentation-redis (0.21.3) + opentelemetry-api (~> 1.0) + opentelemetry-common (~> 0.19.3) + opentelemetry-instrumentation-base (~> 0.19.0) + opentelemetry-instrumentation-sinatra (0.19.3) + opentelemetry-api (~> 1.0) + opentelemetry-common (~> 0.19.3) + opentelemetry-instrumentation-base (~> 0.19.0) + opentelemetry-registry (0.2.0) + opentelemetry-api (~> 1.1) + opentelemetry-resource_detectors (0.19.1) + google-cloud-env + opentelemetry-sdk + opentelemetry-sdk (1.2.0) + opentelemetry-api (~> 1.1) + opentelemetry-common (~> 0.19.3) + opentelemetry-registry (~> 0.2) + opentelemetry-semantic_conventions + opentelemetry-semantic_conventions (1.8.0) + opentelemetry-api (~> 1.0) + os (1.1.4) + parallel (1.22.1) + parser (3.2.0.0) + ast (~> 2.4.1) + pickup (0.0.11) + prometheus-client (2.1.0) + public_suffix (5.0.1) + puma (5.6.5-java) + nio4r (~> 2.0) + rack (2.2.6.2) + rack-protection (2.2.4) + rack + rainbow (3.1.1) + rake (13.0.6) + redis (4.8.0) + regexp_parser (2.6.2) + representable (3.2.0) + declarative (< 0.1.0) + trailblazer-option (>= 0.1.1, < 0.2.0) + uber (< 0.2.0) + retriable (3.1.2) + rexml (3.2.5) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-core (3.12.0) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.2) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.3) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-support (3.12.0) + rubocop (1.1.0) + parallel (~> 1.10) + parser (>= 2.7.1.5) + rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.8) + rexml + rubocop-ast (>= 1.0.1) + ruby-progressbar (~> 1.7) + unicode-display_width (>= 1.4.0, < 2.0) + rubocop-ast (1.24.1) + parser (>= 3.1.1.0) + ruby-progressbar (1.11.0) + ruby2_keywords (0.0.5) + signet (0.17.0) + addressable (~> 2.8) + faraday (>= 0.17.5, < 3.a) + jwt (>= 1.5, < 3.0) + multi_json (~> 1.10) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-html (0.12.3) + simplecov_json_formatter (0.1.4) + sinatra (2.2.4) + mustermann (~> 2.0) + rack (~> 2.2) + rack-protection (= 2.2.4) + tilt (~> 2.0) + spicy-proton (2.1.15) + bindata (~> 2.3) + statsd-ruby (1.5.0) + thrift (0.17.0) + tilt (2.0.11) + trailblazer-option (0.1.2) + uber (0.1.0) + unicode-display_width (1.8.0) + vmpooler (2.4.0) + concurrent-ruby (~> 1.1) + connection_pool (~> 2.2) + deep_merge (~> 1.2) + net-ldap (~> 0.16) + opentelemetry-exporter-jaeger (= 0.20.1) + opentelemetry-instrumentation-concurrent_ruby (= 0.19.2) + opentelemetry-instrumentation-http_client (= 0.19.4) + opentelemetry-instrumentation-redis (= 0.21.3) + opentelemetry-instrumentation-sinatra (= 0.19.3) + opentelemetry-resource_detectors (= 0.19.1) + opentelemetry-sdk (~> 1.0, >= 1.0.2) + pickup (~> 0.0.11) + prometheus-client (~> 2.0) + puma (~> 5.0, >= 5.0.4) + rack (~> 2.2) + rake (~> 13.0) + redis (~> 4.1) + sinatra (~> 2.0) + spicy-proton (~> 2.1) + statsd-ruby (~> 1.4) + webrick (1.8.1) + zonefile (1.06) + +PLATFORMS + universal-java-1.8 + universal-java-11 + +DEPENDENCIES + rspec (>= 3.2) + rubocop (~> 1.1.0) + simplecov (>= 0.11.2) + vmpooler-dns-google-clouddns! + +BUNDLED WITH + 2.4.5 diff --git a/lib/vmpooler-dns-google-clouddns/version.rb b/lib/vmpooler-dns-google-clouddns/version.rb new file mode 100644 index 0000000..fb3095a --- /dev/null +++ b/lib/vmpooler-dns-google-clouddns/version.rb @@ -0,0 +1,5 @@ +# frozen_string_literal: true + +module VmpoolerDnsGoogleClouddns + VERSION = '0.1.0' +end diff --git a/lib/vmpooler/dns/google/clouddns/version.rb b/lib/vmpooler/dns/google/clouddns/version.rb deleted file mode 100644 index 6cc436b..0000000 --- a/lib/vmpooler/dns/google/clouddns/version.rb +++ /dev/null @@ -1,11 +0,0 @@ -# frozen_string_literal: true - -module Vmpooler - module Dns - module Google - module Clouddns - VERSION = "0.1.0" - end - end - end -end diff --git a/vmpooler-dns-google-clouddns.gemspec b/vmpooler-dns-google-clouddns.gemspec index 9529191..5c0f10f 100644 --- a/vmpooler-dns-google-clouddns.gemspec +++ b/vmpooler-dns-google-clouddns.gemspec @@ -1,38 +1,32 @@ # frozen_string_literal: true -require_relative "lib/vmpooler/dns/google/clouddns/version" +lib = File.expand_path('../lib', __FILE__) +$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) +require 'vmpooler-dns-google-clouddns/version' Gem::Specification.new do |spec| - spec.name = "vmpooler-dns-google-clouddns" - spec.version = Vmpooler::Dns::Google::Clouddns::VERSION - spec.authors = ["TODO: Write your name"] - spec.email = ["TODO: Write your email address"] + spec.name = "vmpooler-dns-google-clouddns" + spec.version = VmpoolerDnsGoogleClouddns::VERSION + spec.authors = ["Puppet by Perforce"] + spec.email = ["support@puppet.com"] - spec.summary = "TODO: Write a short summary, because RubyGems requires one." - spec.description = "TODO: Write a longer description or delete this line." - spec.homepage = "TODO: Put your gem's website or public repo URL here." - spec.required_ruby_version = ">= 2.6.0" - - spec.metadata["allowed_push_host"] = "TODO: Set to your gem server 'https://example.com'" + spec.summary = "Google Cloud DNS for VMPooler" + spec.homepage = "https://github.com/puppetlabs/vmpooler-dns-google-clouddns" + spec.required_ruby_version = Gem::Requirement.new('>= 2.3.0') spec.metadata["homepage_uri"] = spec.homepage - spec.metadata["source_code_uri"] = "TODO: Put your gem's public repo URL here." - spec.metadata["changelog_uri"] = "TODO: Put your gem's CHANGELOG.md URL here." + spec.metadata["source_code_uri"] = spec.homepage + spec.metadata["changelog_uri"] = "https://github.com/puppetlabs/vmpooler-dns-google-clouddns/blob/main/CHANGELOG.md" # Specify which files should be added to the gem when it is released. - # The `git ls-files -z` loads the files in the RubyGem that have been added into git. - spec.files = Dir.chdir(__dir__) do - `git ls-files -z`.split("\x0").reject do |f| - (f == __FILE__) || f.match(%r{\A(?:(?:bin|test|spec|features)/|\.(?:git|circleci)|appveyor)}) - end - end - spec.bindir = "exe" - spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) } + spec.files = Dir[ "lib/**/*" ] spec.require_paths = ["lib"] + spec.add_dependency "googleauth", ">= 0.16.2", "< 1.3.0" + spec.add_dependency "google-cloud-dns", "~> 0.35.1" + spec.add_dependency 'vmpooler', '>= 1.3.0', '~> 2.3' - # Uncomment to register a new dependency of your gem - # spec.add_dependency "example-gem", "~> 1.0" - - # For more information and examples about making a new gem, check out our - # guide at: https://bundler.io/guides/creating_gem.html + # Testing dependencies + spec.add_development_dependency 'rspec', '>= 3.2' + spec.add_development_dependency 'rubocop', '~> 1.1.0' + spec.add_development_dependency 'simplecov', '>= 0.11.2' end