Gemfile and *.gemspec files are more honest

- move runtime dependencies into respective gemspec files
- remove `:production` and `:bats` gem groups
- ensure Gemfile has required `:development` / `:test` dependencies
  declared
- move version locking to Gemfile so that it is controlled in one place

src/Gemfile

@@ -8,25 +8,10 @@ gem 'bosh-nats-sync', path: 'bosh-nats-sync'
 gem 'bosh-template', path: 'bosh-template'
 gem 'bosh_common', path: 'bosh_common'
 
-gem 'rake'
-
-# json version is hardcoded in release director and health_monitor
-# when modified needs to be updated there as well
-gem 'json', '~>2'
-
-gem 'ruby-prof'
-
 gem 'io-stream', '<= 0.4.0' # TODO unpin; v0.4.1 "expected `[#<Socket:(closed)>].empty?` to be truthy, got false"
-
-group :production do
- gem 'mysql2'
- gem 'pg'
-end
-
-group :bat do
- gem 'minitar'
- gem 'net-ssh'
-end
+gem 'mysql2'
+gem 'pg'
+gem 'sequel', '~> 5.29.0'
 
 group :development, :test do
  gem 'bosh-dev', path: 'bosh-dev'
@@ -37,33 +22,26 @@ group :development, :test do
  gem 'rspec'
  gem 'rspec-instafail'
  gem 'rspec-its'
- gem 'async-rspec'
 
- gem 'fakefs'
  gem 'parallel_tests'
- gem 'rack-test'
- gem 'sinatra', '>= 2.2.0'
- gem 'sinatra-contrib', '>= 2.2.0'
- gem 'webmock'
-
- gem 'simplecov', require: false
-
- gem 'pry-byebug'
- gem 'pry-remote'
 
  gem 'rubocop'
  gem 'rubocop-git'
 
- # for director
- gem 'factory_bot'
+ gem 'simplecov', require: false
 
- # for root level specs
- gem 'nats-pure', '~>2.3'
- gem 'rest-client'
+ gem 'pry-byebug'
+ gem 'pry-remote'
 
+ gem 'async-rspec'
  gem 'blue-shell'
+ gem 'factory_bot'
+ gem 'fakefs'
+ gem 'minitar'
+ gem 'rack-test'
+ gem 'sinatra', '>= 2.2.0'
+ gem 'sinatra-contrib', '>= 2.2.0'
  gem 'sqlite3'
  gem 'timecop'
-
- gem 'unix-crypt'
+ gem 'webmock'
 end

src/Gemfile.lock

@@ -12,6 +12,7 @@ PATH
  bosh-director
  bosh_common
  bundler
+ json
  logging
  openssl
 
@@ -34,6 +35,7 @@ PATH
  bosh_common (~> 0.0.0)
  bosh_cpi
  cf-uaa-lib
+ json
  logging
  membrane
  nats-pure
@@ -44,8 +46,8 @@ PATH
  rack-test
  rake
  rufus-scheduler
- sequel (~> 5.29.0)
- sinatra (~> 2.2.0)
+ sequel
+ sinatra
  sys-filesystem
  talentbox-delayed_job_sequel
  tzinfo-data
@@ -74,6 +76,7 @@ PATH
  specs:
  bosh-nats-sync (0.0.0)
  cf-uaa-lib
+ json
  logging
  openssl
  rest-client
@@ -224,7 +227,6 @@ GEM
  timeout
  net-smtp (0.5.0)
  net-protocol
- net-ssh (7.3.0)
  netrc (0.11.0)
  nio4r (2.7.3)
  openssl (3.2.0)
@@ -312,7 +314,6 @@ GEM
  parser (>= 3.3.1.0)
  rubocop-git (0.1.3)
  rubocop (>= 0.24.1)
- ruby-prof (1.7.0)
  ruby-progressbar (1.13.0)
  ruby2_keywords (0.0.5)
  rufus-scheduler (3.9.2)
@@ -381,30 +382,24 @@ DEPENDENCIES
  factory_bot
  fakefs
  io-stream (<= 0.4.0)
- json (~> 2)
  minitar
  mysql2
- nats-pure (~> 2.3)
- net-ssh
  parallel_tests
  pg
  pry-byebug
  pry-remote
  rack-test
- rake
- rest-client
  rspec
  rspec-instafail
  rspec-its
  rubocop
  rubocop-git
- ruby-prof
+ sequel (~> 5.29.0)
  simplecov
  sinatra (>= 2.2.0)
  sinatra-contrib (>= 2.2.0)
  sqlite3
  timecop
- unix-crypt
  webmock
 
 BUNDLED WITH

src/bosh-dev/bosh-dev.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
  spec.add_dependency 'bosh-director'
  spec.add_dependency 'bundler'
  spec.add_dependency 'logging'
+ spec.add_dependency 'json'
  spec.add_dependency 'openssl'
 
  spec.add_development_dependency 'fakefs'

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

@@ -25,4 +25,5 @@ Gem::Specification.new do |spec|
  spec.add_dependency 'openssl'
 
  spec.add_development_dependency 'fakefs'
+ spec.add_development_dependency 'minitar'
 end

src/bosh-director/bosh-director.gemspec

@@ -43,6 +43,7 @@ Gem::Specification.new do |spec|
  spec.add_dependency 'bcrypt'
  spec.add_dependency 'bosh_cpi'
  spec.add_dependency 'cf-uaa-lib'
+ spec.add_dependency 'json'
  spec.add_dependency 'logging'
  spec.add_dependency 'membrane'
  spec.add_dependency 'nats-pure'
@@ -53,8 +54,8 @@ Gem::Specification.new do |spec|
  spec.add_dependency 'rack-test'
  spec.add_dependency 'rake'
  spec.add_dependency 'rufus-scheduler'
- spec.add_dependency 'sequel', '~>5.29.0'
- spec.add_dependency 'sinatra', '~>2.2.0'
+ spec.add_dependency 'sequel'
+ spec.add_dependency 'sinatra'
  spec.add_dependency 'sys-filesystem'
  spec.add_dependency 'talentbox-delayed_job_sequel'
  spec.add_dependency 'tzinfo-data'
@@ -63,4 +64,5 @@ Gem::Specification.new do |spec|
  spec.add_development_dependency 'timecop'
  spec.add_development_dependency 'fakefs'
  spec.add_development_dependency 'factory_bot'
+ spec.add_development_dependency 'minitar'
 end

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

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
  spec.executables << 'bosh-nats-sync'
 
  spec.add_dependency 'cf-uaa-lib'
+ spec.add_dependency 'json'
  spec.add_dependency 'logging'
  spec.add_dependency 'openssl'
  spec.add_dependency 'rufus-scheduler'