diff --git a/Gemfile b/Gemfile index 52b033ecc6..6e55785b1d 100644 --- a/Gemfile +++ b/Gemfile @@ -17,10 +17,3 @@ source "https://rubygems.org" gemspec - - # Pinning Train to 1.4.6 because newer versions cause healthcheck related build failures -gem "train", git: "https://github.com/chef/train.git", branch: "v1.4.6" - -group :localdev do - gem "irbtools-more", require: "irbtools/binding" -end diff --git a/Gemfile.lock b/Gemfile.lock index bb20556a91..763cbe7624 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,20 +1,3 @@ -GIT - remote: https://github.com/chef/train.git - revision: daefae3357bdaa903ec75da9ab6b222073f6fa07 - branch: v1.4.6 - specs: - train (1.4.6) - aws-sdk (~> 2) - azure_mgmt_resources (~> 0.15) - docker-api (~> 1.26) - inifile - json (>= 1.8, < 3.0) - mixlib-shellout (~> 2.0) - net-scp (~> 1.2) - net-ssh (>= 2.9, < 5.0) - winrm (~> 2.0) - winrm-fs (~> 1.0) - PATH remote: . specs: @@ -48,13 +31,10 @@ GEM aws-sigv4 (1.0.3) azure_mgmt_resources (0.16.0) ms_rest_azure (~> 0.10.0) - binding.repl (3.0.0) binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) - bond (0.5.1) builder (3.2.3) byebug (10.0.2) - cd (1.0.1) chef (14.3.37) addressable bundler (>= 1.10) @@ -131,22 +111,15 @@ GEM chefstyle (0.10.0) rubocop (= 0.55.0) citrus (3.0.2) - clipboard (1.1.2) - code (0.9.2) - coderay (~> 1.1) - method_source (~> 0.9) coderay (1.1.2) concurrent-ruby (1.0.5) cookbook-omnifetch (0.8.0) mixlib-archive (~> 0.4) - core_docs (0.9.3) - yard (~> 0.8) debug_inspector (0.0.3) - debugging (1.1.1) - binding.repl (~> 3.0) - paint (>= 0.9, < 3.0) - did_you_mean (1.2.1) + declarative (0.0.10) + declarative-option (0.1.0) diff-lcs (1.3) + digest-crc (0.4.1) docile (1.3.1) docker-api (1.34.2) excon (>= 0.47.0) @@ -155,12 +128,7 @@ GEM unf (>= 0.0.5, < 1.0.0) equatable (0.5.0) erubis (2.7.0) - every_day_irb (2.0.0) - cd (~> 1.0) excon (0.62.0) - fancy_irb (1.1.0) - paint (>= 0.9, < 3.0) - unicode-display_width (~> 1.1) faraday (0.15.2) multipart-post (>= 1.2, < 3) faraday-cookie_jar (0.0.6) @@ -170,13 +138,147 @@ GEM ffi-yajl (2.3.1) libyajl2 (~> 1.2) fuzzyurl (0.9.0) + google-api-client (0.19.8) + addressable (~> 2.5, >= 2.5.1) + googleauth (>= 0.5, < 0.7.0) + httpclient (>= 2.8.1, < 3.0) + mime-types (~> 3.0) + representable (~> 3.0) + retriable (>= 2.0, < 4.0) + google-cloud (0.51.1) + google-cloud-bigquery (~> 1.1) + google-cloud-bigquery-data_transfer (~> 0.1) + google-cloud-container (~> 0.1) + google-cloud-dataproc (~> 0.1) + google-cloud-datastore (~> 1.4) + google-cloud-dlp (~> 0.1) + google-cloud-dns (~> 0.28) + google-cloud-error_reporting (~> 0.30) + google-cloud-firestore (~> 0.21) + google-cloud-language (~> 0.30) + google-cloud-logging (~> 1.5) + google-cloud-monitoring (~> 0.27) + google-cloud-os_login (~> 0.1) + google-cloud-pubsub (~> 0.30) + google-cloud-resource_manager (~> 0.29) + google-cloud-spanner (~> 1.3) + google-cloud-speech (~> 0.29) + google-cloud-storage (~> 1.10) + google-cloud-trace (~> 0.31) + google-cloud-translate (~> 1.2) + google-cloud-video_intelligence (~> 1.0) + google-cloud-vision (~> 0.28) + google-cloud-bigquery (1.5.0) + concurrent-ruby (~> 1.0) + google-api-client (~> 0.19.8) + google-cloud-core (~> 1.2) + googleauth (~> 0.6.2) + google-cloud-bigquery-data_transfer (0.1.0) + google-gax (~> 1.0) + google-cloud-container (0.1.0) + google-gax (~> 1.0.1) + google-cloud-core (1.2.2) + google-cloud-env (~> 1.0) + google-cloud-dataproc (0.1.0) + google-gax (~> 1.0.0) + google-cloud-datastore (1.4.0) + google-cloud-core (~> 1.2) + google-gax (~> 1.0) + google-protobuf (~> 3.3) + google-cloud-dlp (0.4.0) + google-gax (~> 1.0) + google-cloud-dns (0.28.0) + google-api-client (~> 0.19.0) + google-cloud-core (~> 1.2) + googleauth (~> 0.6.2) + zonefile (~> 1.04) + google-cloud-env (1.0.2) + faraday (~> 0.11) + google-cloud-error_reporting (0.30.1) + google-cloud-core (~> 1.2) + google-gax (~> 1.0) + stackdriver-core (~> 1.3) + google-cloud-firestore (0.22.0) + concurrent-ruby (~> 1.0) + google-cloud-core (~> 1.2) + google-gax (~> 1.0) + google-cloud-language (0.30.0) + google-gax (~> 1.0) + google-cloud-logging (1.5.1) + google-cloud-core (~> 1.2) + google-gax (~> 1.0) + stackdriver-core (~> 1.3) + google-cloud-monitoring (0.28.0) + google-gax (~> 1.0) + google-cloud-os_login (0.1.0) + google-gax (~> 1.0.0) + google-cloud-pubsub (0.31.0) + concurrent-ruby (~> 1.0) + google-cloud-core (~> 1.2) + google-gax (~> 1.0) + grpc-google-iam-v1 (~> 0.6.9) + google-cloud-resource_manager (0.29.0) + google-api-client (~> 0.19.8) + google-cloud-core (~> 1.2) + googleauth (~> 0.6.2) + google-cloud-spanner (1.6.0) + concurrent-ruby (~> 1.0) + google-cloud-core (~> 1.2) + google-gax (~> 1.0) + grpc-google-iam-v1 (~> 0.6.9) + google-cloud-speech (0.30.0) + google-gax (~> 1.0) + google-cloud-storage (1.12.0) + digest-crc (~> 0.4) + google-api-client (~> 0.19.0) + google-cloud-core (~> 1.2) + googleauth (~> 0.6.2) + google-cloud-trace (0.33.1) + google-cloud-core (~> 1.2) + google-gax (~> 1.0) + stackdriver-core (~> 1.3) + google-cloud-translate (1.2.0) + faraday (~> 0.13) + google-cloud-core (~> 1.2) + googleauth (~> 0.6.2) + google-cloud-video_intelligence (1.0.0) + google-gax (~> 1.0) + google-cloud-vision (0.29.0) + google-cloud-core (~> 1.2) + google-gax (~> 1.0) + google-gax (1.0.1) + google-protobuf (~> 3.2) + googleapis-common-protos (>= 1.3.5, < 2.0) + googleauth (~> 0.6.2) + grpc (>= 1.7.2, < 2.0) + rly (~> 0.2.3) + google-protobuf (3.6.0) + googleapis-common-protos (1.3.7) + google-protobuf (~> 3.0) + googleapis-common-protos-types (~> 1.0) + grpc (~> 1.0) + googleapis-common-protos-types (1.0.1) + google-protobuf (~> 3.0) + googleauth (0.6.2) + faraday (~> 0.12) + jwt (>= 1.4, < 3.0) + logging (~> 2.0) + memoist (~> 0.12) + multi_json (~> 1.11) + os (~> 0.9) + signet (~> 0.7) + grpc (1.13.0) + google-protobuf (~> 3.1) + googleapis-common-protos-types (~> 1.0.0) + grpc-google-iam-v1 (0.6.9) + googleapis-common-protos (>= 1.3.1, < 2.0) + grpc (~> 1.0) gssapi (1.2.0) ffi (>= 1.0.1) gyoku (1.3.1) builder (>= 2.1.2) hashie (3.5.7) highline (1.7.10) - hirb (0.7.3) http (2.2.2) addressable (~> 2.3) http-cookie (~> 1.0) @@ -189,49 +291,21 @@ GEM httpclient (2.8.3) inifile (3.0.0) iniparse (1.4.4) - instance (0.2.0) - interactive_editor (0.0.11) - spoon (>= 0.0.1) ipaddress (0.8.3) - irbtools (2.2.1) - binding.repl (~> 3.0) - clipboard (~> 1.1) - code (~> 0.9) - coderay (~> 1.1) - debugging (~> 1.1) - every_day_irb (~> 2.0) - fancy_irb (~> 1.1) - hirb (~> 0.7, >= 0.7.3) - instance (~> 0.2) - interactive_editor (~> 0.0, >= 0.0.10) - method_locator (~> 0.0, >= 0.0.4) - methodfinder (~> 2.0) - ori (~> 0.1.0) - os - paint (>= 0.9, < 3.0) - ruby_engine (~> 1.0) - ruby_info (~> 1.0) - ruby_version (~> 1.0) - wirb (~> 2.0) - irbtools-more (2.2.1) - binding_of_caller (~> 0.7) - bond (~> 0.5) - core_docs (>= 0.9.2) - did_you_mean (~> 1.0) - irbtools (~> 2.0) - looksee (~> 4.0) iso8601 (0.9.1) jmespath (1.4.0) json (2.1.0) + jwt (2.1.0) libyajl2 (1.2.0) little-plugger (1.1.4) logging (2.2.2) little-plugger (~> 1.1) multi_json (~> 1.10) - looksee (4.0.0) - method_locator (0.0.4) + memoist (0.16.0) method_source (0.9.0) - methodfinder (2.2.1) + mime-types (3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0521) minitar (0.6.1) mixlib-archive (0.4.8) mixlib-log @@ -282,11 +356,10 @@ GEM plist (~> 3.1) systemu (~> 2.6.4) wmi-lite (~> 1.0) - ori (0.1.0) - os (1.0.0) + os (0.9.6) paint (1.0.1) parallel (1.12.1) - parser (2.5.1.0) + parser (2.5.1.2) ast (~> 2.4.0) pastel (0.7.2) equatable (~> 0.5.0) @@ -310,6 +383,12 @@ GEM rack (2.0.5) rainbow (3.0.0) rake (12.3.1) + representable (3.0.4) + declarative (< 0.1.0) + declarative-option (< 0.2.0) + uber (< 0.2.0) + retriable (3.1.2) + rly (0.2.3) rspec (3.7.0) rspec-core (~> 3.7.0) rspec-expectations (~> 3.7.0) @@ -337,9 +416,6 @@ GEM ruby-progressbar (~> 1.7) unicode-display_width (~> 1.0, >= 1.0.1) ruby-progressbar (1.9.0) - ruby_engine (1.0.1) - ruby_info (1.0.1) - ruby_version (1.0.1) rubyntlm (0.6.2) rubyzip (1.2.1) semverse (2.0.0) @@ -349,6 +425,11 @@ GEM rspec-its specinfra (~> 2.72) sfl (2.3) + signet (0.8.1) + addressable (~> 2.3) + faraday (~> 0.9) + jwt (>= 1.5, < 3.0) + multi_json (~> 1.10) simplecov (0.16.1) docile (~> 1.1) json (>= 1.8, < 3) @@ -362,8 +443,8 @@ GEM net-ssh (>= 2.7) net-telnet sfl - spoon (0.0.6) - ffi + stackdriver-core (1.3.0) + google-cloud-core (~> 1.2) syslog-logger (1.6.8) systemu (2.6.5) thor (0.20.0) @@ -371,10 +452,25 @@ GEM toml-rb (1.1.1) citrus (~> 3.0, > 3.0) tomlrb (1.2.7) + train (1.4.24) + aws-sdk (~> 2) + azure_mgmt_resources (~> 0.15) + docker-api (~> 1.26) + google-api-client (~> 0.19.8) + google-cloud (~> 0.51.1) + googleauth (~> 0.6.2) + inifile + json (>= 1.8, < 3.0) + mixlib-shellout (~> 2.0) + net-scp (~> 1.2) + net-ssh (>= 2.9, < 5.0) + winrm (~> 2.0) + winrm-fs (~> 1.0) tty-color (0.4.3) tty-cursor (0.6.0) tty-spinner (0.8.0) tty-cursor (>= 0.5.0) + uber (0.1.0) unf (0.1.4) unf_ext unf_ext (0.0.7.5) @@ -392,15 +488,13 @@ GEM winrm-elevated (1.1.0) winrm (~> 2.0) winrm-fs (~> 1.0) - winrm-fs (1.2.0) + winrm-fs (1.2.1) erubis (~> 2.7) logging (>= 1.6.1, < 3.0) rubyzip (~> 1.1) winrm (~> 2.0) - wirb (2.1.2) - paint (>= 0.9, < 3.0) wmi-lite (1.0.0) - yard (0.9.14) + zonefile (1.06) PLATFORMS ruby @@ -409,7 +503,6 @@ DEPENDENCIES bundler chef-apply! chefstyle - irbtools-more pry pry-byebug pry-stack_explorer @@ -417,7 +510,6 @@ DEPENDENCIES rspec rspec_junit_formatter simplecov - train! BUNDLED WITH 1.16.2 diff --git a/chef-apply.gemspec b/chef-apply.gemspec index 7d7f62a94b..dcbf3e26fd 100644 --- a/chef-apply.gemspec +++ b/chef-apply.gemspec @@ -31,10 +31,10 @@ Gem::Specification.new do |spec| spec.license = "Apache-2.0" spec.required_ruby_version = ">= 2.5.0" - spec.files = %w{Rakefile LICENSE README.md} + + spec.files = %w{Rakefile LICENSE README.md warning.txt} + Dir.glob("Gemfile*") + # Includes Gemfile and locks Dir.glob("*.gemspec") + - Dir.glob("{lib,bin,vendor,i18n}/**/*", File::FNM_DOTMATCH).reject { |f| File.directory?(f) } + Dir.glob("{bin,i18n,lib,spec}/**/*", File::FNM_DOTMATCH).reject { |f| File.directory?(f) } spec.bindir = "bin" spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) } spec.require_paths = ["lib"]