Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Unified gemspec and fixed dependencies across train and train-core. #563

Merged
merged 1 commit into from
Jan 28, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ group :test do
# but it's close enough to show the gempath handler can find a plugin
# See test/unit/
gem "train-test-fixture", path: "test/fixtures/plugins/train-test-fixture"
gem "mocha", "~> 1.1"
end

group :integration do
Expand Down
23 changes: 6 additions & 17 deletions train-core.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,11 @@ lib = File.expand_path("../lib", __FILE__)
$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
require "train/version"

CORE_TRANSPORTS = [
"lib/train/transports/local.rb",
"lib/train/transports/mock.rb",
"lib/train/transports/ssh.rb",
"lib/train/transports/ssh_connection.rb",
"lib/train/transports/cisco_ios_connection.rb",
"lib/train/transports/winrm.rb",
"lib/train/transports/winrm_connection.rb",
].freeze

Gem::Specification.new do |spec|
spec.name = "train-core"
spec.version = Train::VERSION
spec.authors = ["Dominik Richter"]
spec.email = ["drichter@chef.io"]
spec.authors = ["Chef InSpec Team"]
spec.email = ["inspec@chef.io"]
spec.summary = "Transport interface to talk to a selected set of backends."
spec.description = "A minimal Train with a backends for ssh and winrm."
spec.license = "Apache-2.0"
Expand All @@ -31,16 +21,15 @@ Gem::Specification.new do |spec|

spec.required_ruby_version = ">= 2.4"

spec.files = %w{LICENSE} + Dir
.glob("lib/**/*", File::FNM_DOTMATCH)
.reject { |f| f =~ %r{lib/train/transports} unless CORE_TRANSPORTS.include?(f) }
spec.files = Dir.glob("{LICENSE,lib/**/*}")
.grep_v(%r{transports/(azure|clients|docker|gcp|helpers|vmware)})
.reject { |f| File.directory?(f) }

spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
spec.require_paths = ["lib"]

spec.add_dependency "inifile", "~> 3.0"
spec.add_dependency "json", ">= 1.8", "< 3.0"
spec.add_dependency "mixlib-shellout", ">= 2.0", "< 4.0"
spec.add_dependency "net-ssh", ">= 2.9", "< 6.0"
spec.add_dependency "net-scp", ">= 1.2", "< 3.0"
spec.add_dependency "net-ssh", ">= 2.9", "< 6.0"
end
30 changes: 14 additions & 16 deletions train.gemspec
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# coding: utf-8
# encoding: utf-8
lib = File.expand_path("../lib", __FILE__)
$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
require "train/version"

Gem::Specification.new do |spec|
spec.name = "train"
spec.version = Train::VERSION
spec.authors = ["Dominik Richter"]
spec.email = ["drichter@chef.io"]
spec.authors = ["Chef InSpec Team"]
spec.email = ["inspec@chef.io"]
spec.summary = "Transport interface to talk to different backends."
spec.description = "Transport interface to talk to different backends."
spec.license = "Apache-2.0"
Expand All @@ -19,28 +19,26 @@ Gem::Specification.new do |spec|
"bug_tracker_uri" => "https://github.com/inspec/train/issues",
}

spec.files = %w{LICENSE} + Dir.glob("lib/**/*", File::FNM_DOTMATCH).reject { |f| File.directory?(f) }
spec.required_ruby_version = ">= 2.4"

spec.files = Dir.glob("{LICENSE,lib/**/*}")
.grep(%r{transports/(azure|clients|docker|gcp|helpers|vmware)})
.reject { |f| File.directory?(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 = ["lib"]

spec.required_ruby_version = ">= 2.4"
spec.add_dependency "train-core", "= #{Train::VERSION}"
spec.add_dependency "train-winrm", "~> 0.2"

spec.add_dependency "json", ">= 1.8", "< 3.0"
spec.add_dependency "mixlib-shellout", ">= 2.0", "< 4.0"
spec.add_dependency "net-ssh", ">= 2.9", "< 6.0"
spec.add_dependency "net-scp", ">= 1.2", "< 3.0"
spec.add_dependency "docker-api", "~> 1.26"
spec.add_dependency "azure_mgmt_resources", "~> 0.15"
# azure, docker, gcp dependencies
spec.add_dependency "activesupport", "~> 5.2.3"
spec.add_dependency "azure_graph_rbac", "~> 0.16"
spec.add_dependency "azure_mgmt_key_vault", "~> 0.17"
spec.add_dependency "azure_mgmt_resources", "~> 0.15"
spec.add_dependency "azure_mgmt_security", "~> 0.18"
spec.add_dependency "azure_mgmt_storage", "~> 0.18"
spec.add_dependency "activesupport", "~> 5.2.3"
spec.add_dependency "docker-api", "~> 1.26"
spec.add_dependency "google-api-client", ">= 0.23.9", "< 0.35.0"
spec.add_dependency "googleauth", ">= 0.6.6", "< 0.11.0"
spec.add_dependency "inifile"

spec.add_development_dependency "mocha", "~> 1.1"
end