Make gemspec files consistent and set min ruby version to 3.0

src/bosh-core/bosh-core.gemspec

@@ -4,19 +4,21 @@ require File.expand_path('../lib/bosh/core/version', __FILE__)
 Gem::Specification.new do |spec|
  spec.name = 'bosh-core'
  spec.version = Bosh::Core::VERSION
- spec.authors = 'Pivotal'
- spec.email = '[email protected]'
- spec.description = 'Bosh::Core provides things BOSH needs to exist'
- spec.summary = 'Bosh::Core provides things BOSH needs to exist'
+ spec.summary = 'BOSH core'
+ spec.description = 'BOSH core provides things BOSH needs to exist'
+
+ spec.authors = ['Cloud Foundry']
+ spec.email = ['[email protected]']
  spec.homepage = 'https:/cloudfoundry/bosh'
- spec.license = 'Apache 2.0'
+ spec.license = 'Apache-2.0'
+ spec.required_ruby_version = '>= 3.0.0'
 
- spec.required_ruby_version = Gem::Requirement.new('>= 1.9.3')
+ spec.files = Dir['lib/**/*'].select { |f| File.file?(f) }
+ spec.test_files = Dir['spec/**/*'].select { |f| File.file?(f) }
 
- spec.files = Dir['lib/**/*'].select{ |f| File.file? f }
- spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
- spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
- spec.require_paths = %w[lib]
+ spec.bindir = 'bin'
+ spec.executables = Dir["#{spec.bindir}/*"].select { |f| File.file?(f) }.map { |f| File.basename(f) }
+ spec.require_paths = ['lib']
 
  spec.add_dependency 'openssl'
 end

src/bosh-dev/bosh-dev.gemspec

@@ -1,20 +1,24 @@
 # coding: utf-8
+require File.expand_path('../lib/bosh/dev/version', __FILE__)
+
 Gem::Specification.new do |spec|
  spec.name = 'bosh-dev'
- spec.version = '0.0.0'
- spec.authors = 'Pivotal'
- spec.email = '[email protected]'
- spec.description = 'Bosh::Dev makes development on BOSH easier'
- spec.summary = 'Bosh::Dev makes development on BOSH easier'
- spec.homepage = 'https:/cloudfoundry/bosh'
- spec.license = 'Apache 2.0'
+ spec.version = Bosh::Dev::VERSION
+ spec.summary = 'BOSH dev'
+ spec.description = 'BOSH dev - utilities for BOSH development'
+
+ spec.authors = ['Cloud Foundry']
+ spec.email = ['[email protected]']
+ spec.homepage = 'https:/cloudfoundry/bosh'
+ spec.license = 'Apache-2.0'
+ spec.required_ruby_version = '>= 3.0.0'
 
- spec.required_ruby_version = Gem::Requirement.new('>= 1.9.3')
+ spec.files = Dir['lib/**/*'].select { |f| File.file?(f) }
+ spec.test_files = Dir['spec/**/*'].select { |f| File.file?(f) }
 
- spec.files = Dir['lib/**/*'].select{ |f| File.file? f }
- spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
- spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
- spec.require_paths = %w[lib]
+ spec.bindir = 'bin'
+ spec.executables = Dir["#{spec.bindir}/*"].select { |f| File.file?(f) }.map { |f| File.basename(f) }
+ spec.require_paths = ['lib']
 
  spec.add_dependency 'bosh_common'
  spec.add_dependency 'bosh-core'

src/bosh-dev/lib/bosh/dev/version.rb

@@ -0,0 +1,5 @@
+module Bosh
+ module Dev
+ VERSION = '0.0.0'
+ end
+end

src/bosh-director-core/bosh-director-core.gemspec

@@ -1,27 +1,28 @@
 # coding: utf-8
 require File.expand_path('../lib/bosh/director/core/version', __FILE__)
 
-version = Bosh::Director::Core::VERSION
-
 Gem::Specification.new do |spec|
  spec.name = 'bosh-director-core'
- spec.version = version
- spec.authors = 'Pivotal'
- spec.email = '[email protected]'
- spec.description = 'Bosh::Director::Core provides common Director code for Director and Microbosh Deployer'
- spec.summary = 'Bosh::Director::Core provides common Director code for Director and Microbosh Deployer'
+ spec.version = Bosh::Director::Core::VERSION
+ spec.platform = Gem::Platform::RUBY
+ spec.description = 'BOSH director-core'
+ spec.summary = 'BOSH director-core common code for Director and Microbosh Deployer'
+
+ spec.authors = ['Cloud Foundry']
+ spec.email = ['[email protected]']
  spec.homepage = 'https:/cloudfoundry/bosh'
- spec.license = 'Apache 2.0'
+ spec.license = 'Apache-2.0'
+ spec.required_ruby_version = '>= 3.0.0'
 
- spec.required_ruby_version = Gem::Requirement.new('>= 1.9.3')
+ spec.files = Dir['lib/**/*'].select { |f| File.file?(f) }
+ spec.test_files = Dir['spec/**/*'].select { |f| File.file?(f) }
 
- spec.files = Dir['lib/**/*'].select{ |f| File.file? f }
- spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
- spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
- spec.require_paths = %w[lib]
+ spec.bindir = 'bin'
+ spec.executables = Dir["#{spec.bindir}/*"].select { |f| File.file?(f) }.map { |f| File.basename(f) }
+ spec.require_paths = ['lib']
 
- spec.add_dependency 'bosh_common', "~>#{version}"
- spec.add_dependency 'bosh-template', "~>#{version}"
+ spec.add_dependency 'bosh_common', "~>#{Bosh::Director::Core::VERSION}"
+ spec.add_dependency 'bosh-template', "~>#{Bosh::Director::Core::VERSION}"
  spec.add_dependency 'openssl'
 
  spec.add_development_dependency 'fakefs'

src/bosh-director/bosh-director.gemspec

@@ -1,44 +1,34 @@
 # coding: utf-8
 require File.expand_path('../lib/bosh/director/version', __FILE__)
 
-version = Bosh::Director::VERSION
-
 Gem::Specification.new do |spec|
  spec.name = 'bosh-director'
- spec.version = version
+ spec.version = Bosh::Director::VERSION
  spec.platform = Gem::Platform::RUBY
  spec.summary = 'BOSH Director'
  spec.description = 'BOSH Director'
- spec.author = 'VMware'
- spec.homepage = 'https:/cloudfoundry/bosh'
- spec.license = 'Apache 2.0'
- spec.email = '[email protected]'
- spec.required_ruby_version = Gem::Requirement.new('>= 1.9.3')
 
- spec.files  = Dir['db/**/*', 'lib/**/*'].select{ |f| File.file? f }
- spec.require_path = 'lib'
- spec.bindir  = 'bin'
- spec.executables << 'bosh-director'
- spec.executables << 'bosh-director-console'
- spec.executables << 'bosh-director-drain-workers'
- spec.executables << 'bosh-director-metrics-server'
- spec.executables << 'bosh-director-migrate'
- spec.executables << 'bosh-director-scheduler'
- spec.executables << 'bosh-director-sync-dns'
- spec.executables << 'bosh-director-trigger-one-time-sync-dns'
- spec.executables << 'bosh-director-worker'
+ spec.authors = ['Cloud Foundry']
+ spec.email = ['[email protected]']
+ spec.homepage = 'https:/cloudfoundry/bosh'
+ spec.license = 'Apache-2.0'
+ spec.required_ruby_version = '>= 3.0.0'
+
+ spec.files = Dir['lib/**/*'].select { |f| File.file?(f) }
+ spec.test_files = Dir['spec/**/*'].select { |f| File.file?(f) }
+
+ spec.bindir = 'bin'
+ spec.executables  = Dir["#{spec.bindir}/bosh-director-*"].select { |f| File.file?(f) }.map { |f| File.basename(f) }
+ spec.require_paths = ['lib']
 
  # NOTE: We must specify all transitive BOSH gem dependencies found in the
  # external CPIs, in order to ensure appropriate versions are installed.
  # Also do the same in bosh_cli_plugin_micro.gemspec
  # Review this once CPIs are completely externalized and "micro" goes away.
- # ----------------------------------------------------------------------------
- spec.add_dependency 'bosh_common', "~>#{version}"
- # ----------------------------------------------------------------------------
-
- spec.add_dependency 'bosh-core', "~>#{version}"
- spec.add_dependency 'bosh-director-core', "~>#{version}"
- spec.add_dependency 'bosh-template', "~>#{version}"
+ spec.add_dependency 'bosh_common', "~>#{Bosh::Director::VERSION}"
+ spec.add_dependency 'bosh-core', "~>#{Bosh::Director::VERSION}"
+ spec.add_dependency 'bosh-director-core', "~>#{Bosh::Director::VERSION}"
+ spec.add_dependency 'bosh-template', "~>#{Bosh::Director::VERSION}"
 
  spec.add_dependency 'bcrypt'
  spec.add_dependency 'bosh_cpi'

src/bosh-monitor/bosh-monitor.gemspec

@@ -6,32 +6,34 @@ Gem::Specification.new do |spec|
  spec.version = Bosh::Monitor::VERSION
  spec.platform = Gem::Platform::RUBY
  spec.summary = 'BOSH Health Monitor'
- spec.description = "BOSH Health Monitor"
- spec.author = 'VMware'
- spec.homepage = 'https:/cloudfoundry/bosh'
- spec.license = 'Apache 2.0'
- spec.email = '[email protected]'
- spec.required_ruby_version = Gem::Requirement.new('>= 1.9.3')
+ spec.description = 'BOSH Health Monitor'
 
- spec.files = Dir['README.md', 'lib/**/*'].select{ |f| File.file? f }
- spec.require_path = 'lib'
- spec.bindir = 'bin'
- spec.executables << 'bosh-monitor-console'
- spec.executables << 'bosh-monitor'
+ spec.authors = ['Cloud Foundry']
+ spec.email = ['[email protected]']
+ spec.homepage = 'https:/cloudfoundry/bosh'
+ spec.license = 'Apache-2.0'
+ spec.required_ruby_version = '>= 3.0.0'
+
+ spec.files = Dir['lib/**/*'].select { |f| File.file?(f) }
+ spec.test_files = Dir['spec/**/*'].select { |f| File.file?(f) }
+
+ spec.bindir = 'bin'
+ spec.executables = Dir["#{spec.bindir}/*"].select { |f| File.file?(f) }.map { |f| File.basename(f) }
+ spec.require_paths = ['lib']
 
  spec.add_dependency 'async'
  spec.add_dependency 'async-http'
  spec.add_dependency 'async-io'
+ spec.add_dependency 'cf-uaa-lib'
+ spec.add_dependency 'dogapi'
  spec.add_dependency 'logging'
  spec.add_dependency 'nats-pure'
  spec.add_dependency 'net-smtp'
  spec.add_dependency 'openssl'
  spec.add_dependency 'ostruct'
  spec.add_dependency 'puma'
  spec.add_dependency 'sinatra'
- spec.add_dependency 'dogapi'
  spec.add_dependency 'riemann-client'
- spec.add_dependency 'cf-uaa-lib'
 
  spec.add_development_dependency 'async-rspec'
  spec.add_development_dependency 'timecop'

src/bosh-nats-sync/.gitignore

@@ -0,0 +1 @@
+Gemfile.lock

src/bosh-nats-sync/bosh-nats-sync.gemspec

@@ -7,16 +7,19 @@ Gem::Specification.new do |spec|
  spec.platform = Gem::Platform::RUBY
  spec.summary = 'BOSH Nats Sync'
  spec.description = 'BOSH Nats Sync'
- spec.author = 'VMware'
- spec.homepage = 'https:/cloudfoundry/bosh'
- spec.license = 'Apache 2.0'
- spec.email = '[email protected]'
- spec.required_ruby_version = Gem::Requirement.new('>= 1.9.3')
 
- spec.files = Dir['README.md', 'lib/**/*'].select{ |f| File.file? f }
- spec.require_path = 'lib'
- spec.bindir = 'bin'
- spec.executables << 'bosh-nats-sync'
+ spec.authors = ['Cloud Foundry']
+ spec.email = ['[email protected]']
+ spec.homepage = 'https:/cloudfoundry/bosh'
+ spec.license = 'Apache-2.0'
+ spec.required_ruby_version = '>= 3.0.0'
+
+ spec.files = Dir['lib/**/*'].select { |f| File.file?(f) }
+ spec.test_files = Dir['spec/**/*'].select { |f| File.file?(f) }
+
+ spec.bindir = 'bin'
+ spec.executables = Dir["#{spec.bindir}/*"].select { |f| File.file?(f) }.map { |f| File.basename(f) }
+ spec.require_paths = ['lib']
 
  spec.add_dependency 'cf-uaa-lib'
  spec.add_dependency 'json'

src/bosh-template/bosh-template.gemspec

@@ -5,20 +5,21 @@ Gem::Specification.new do |spec|
  spec.name = 'bosh-template'
  spec.version = Bosh::Template::VERSION
  spec.platform = Gem::Platform::RUBY
- spec.summary = 'Renders bosh templates'
- spec.description = "Renders bosh templates"
- spec.author = 'Pivotal'
- spec.email = '[email protected]'
- spec.homepage = 'https:/cloudfoundry/bosh'
- spec.license = 'Apache-2.0'
+ spec.summary = 'BOSH template'
+ spec.description = 'BOSH template renderer'
 
- spec.required_ruby_version = Gem::Requirement.new('>= 1.9.3')
+ spec.authors = ['Cloud Foundry']
+ spec.email = ['[email protected]']
+ spec.homepage = 'https:/cloudfoundry/bosh'
+ spec.license = 'Apache-2.0'
+ spec.required_ruby_version = '>= 3.0.0'
 
- spec.files = Dir['README.md', 'lib/**/*'].select{ |f| File.file? f }
- spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
- spec.require_path = 'lib'
- spec.bindir = 'bin'
- spec.executables << 'bosh-template'
+ spec.files = Dir['lib/**/*'].select { |f| File.file?(f) }
+ spec.test_files = Dir['spec/**/*'].select { |f| File.file?(f) }
+
+ spec.bindir = 'bin'
+ spec.executables = Dir["#{spec.bindir}/*"].select { |f| File.file?(f) }.map { |f| File.basename(f) }
+ spec.require_paths = ['lib']
 
  spec.add_dependency 'activesupport'
  spec.add_dependency 'openssl'

src/bosh_common/bosh_common.gemspec

@@ -6,15 +6,20 @@ Gem::Specification.new do |spec|
  spec.version = Bosh::Common::VERSION
  spec.platform = Gem::Platform::RUBY
  spec.summary = 'BOSH common'
- spec.description = "BOSH common"
- spec.author = 'VMware'
- spec.homepage = 'https:/cloudfoundry/bosh'
- spec.license = 'Apache-2.0'
- spec.email = '[email protected]'
- spec.required_ruby_version = Gem::Requirement.new('>= 2.7.0')
+ spec.description = 'BOSH common'
 
- spec.files = Dir['lib/**/*'].select{ |f| File.file? f }
- spec.require_path = 'lib'
+ spec.authors = ['Cloud Foundry']
+ spec.email = ['[email protected]']
+ spec.homepage = 'https:/cloudfoundry/bosh'
+ spec.license = 'Apache-2.0'
+ spec.required_ruby_version = '>= 3.0.0'
+
+ spec.files = Dir['lib/**/*'].select { |f| File.file?(f) }
+ spec.test_files = Dir['spec/**/*'].select { |f| File.file?(f) }
+
+ spec.bindir = 'bin'
+ spec.executables = Dir["#{spec.bindir}/*"].map{ |f| File.basename(f) }
+ spec.require_paths = ['lib']
 
  spec.add_dependency 'semi_semantic'
  spec.add_dependency 'logging'