From 5f3a51c0e00be7dbc5bd3aa9b476a0253f441840 Mon Sep 17 00:00:00 2001 From: Lance Albertson Date: Sat, 5 Oct 2019 10:53:46 -0700 Subject: [PATCH 1/4] Cinc stable patches --- bin/{chef-zero => cinc-zero} | 0 chef-zero.gemspec | 8 ++++---- lib/chef_zero/dist.rb | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) rename bin/{chef-zero => cinc-zero} (100%) diff --git a/bin/chef-zero b/bin/cinc-zero similarity index 100% rename from bin/chef-zero rename to bin/cinc-zero diff --git a/chef-zero.gemspec b/chef-zero.gemspec index 8ba61410..c7a484b8 100644 --- a/chef-zero.gemspec +++ b/chef-zero.gemspec @@ -6,9 +6,9 @@ Gem::Specification.new do |s| s.version = ChefZero::VERSION s.summary = "Self-contained, easy-setup, fast-start in-memory Chef server for testing and solo setup purposes" s.description = s.summary - s.author = "Chef Software, Inc." - s.email = "oss@chef.io" - s.homepage = "https://github.com/chef/chef-zero" + s.author = ["Chef Software, Inc.", "Cinc Project"] + s.email = ["oss@chef.io", "maintainers@cinc.sh"] + s.homepage = "https://gitlab.com/cinc-project/chef-zero" s.license = "Apache-2.0" s.required_ruby_version = ">= 2.6" @@ -21,7 +21,7 @@ Gem::Specification.new do |s| s.add_dependency "webrick" s.bindir = "bin" - s.executables = ["chef-zero"] + s.executables = ["cinc-zero"] s.require_path = "lib" s.files = %w{LICENSE Gemfile Rakefile} + Dir.glob("*.gemspec") + Dir.glob("{lib,spec}/**/*", File::FNM_DOTMATCH).reject { |f| File.directory?(f) } diff --git a/lib/chef_zero/dist.rb b/lib/chef_zero/dist.rb index 6ef8acab..61aec3f4 100644 --- a/lib/chef_zero/dist.rb +++ b/lib/chef_zero/dist.rb @@ -1,9 +1,9 @@ module ChefZero class Dist # When referencing a product directly - PRODUCT = "Chef Zero".freeze + PRODUCT = "Cinc Zero".freeze # The binary alias - CLIENT = "chef-zero".freeze + CLIENT = "cinc-zero".freeze end end From 78031baa4c0edbc4157255401ca65e440ca5ddf2 Mon Sep 17 00:00:00 2001 From: Lance Albertson Date: Sat, 5 Oct 2019 11:55:52 -0700 Subject: [PATCH 2/4] Gitlab CI configuration --- .gitlab-ci.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 00000000..ed58695d --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,13 @@ +image: cincproject/omnibus-debian +stages: + - test + - publish + +test: + stage: test + tags: + - osuosl + script: + - source /home/omnibus/load-omnibus-toolchain.sh + - bundle install --with development + - bundle exec rake From 0d91d4b4d6761e83ece7ecd1740ae7f1bb8c9ee9 Mon Sep 17 00:00:00 2001 From: Lance Albertson Date: Sat, 5 Oct 2019 22:22:29 -0700 Subject: [PATCH 3/4] Move chef/ohai dep into a chef group so it can be excluded --- Gemfile | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index d6cfa54b..929e8b4f 100644 --- a/Gemfile +++ b/Gemfile @@ -14,12 +14,14 @@ group :development, :test do gem "rspec", "~> 3.0" end -if ENV["GEMFILE_MOD"] - puts "GEMFILE_MOD: #{ENV["GEMFILE_MOD"]}" - instance_eval(ENV["GEMFILE_MOD"]) -else - gem "chef", "~> 14.0" - gem "ohai", "~> 14.0" +group :chef do + if ENV["GEMFILE_MOD"] + puts "GEMFILE_MOD: #{ENV['GEMFILE_MOD']}" + instance_eval(ENV["GEMFILE_MOD"]) + else + gem "chef", "~> 14.0" + gem "ohai", "~> 14.0" + end end group :debug do From 2bfce1849dcc068c32c81d85d7078c99ae11fe6b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 7 Sep 2022 13:19:23 +0000 Subject: [PATCH 4/4] Update rack requirement from ~> 2.0, >= 2.0.6 to >= 2.0.6, < 4 Updates the requirements on [rack](https://github.com/rack/rack) to permit the latest version. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/2.0.6...3.0.0) --- updated-dependencies: - dependency-name: rack dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- chef-zero.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chef-zero.gemspec b/chef-zero.gemspec index c7a484b8..73f8bcb2 100644 --- a/chef-zero.gemspec +++ b/chef-zero.gemspec @@ -17,7 +17,7 @@ Gem::Specification.new do |s| s.add_dependency "hashie", ">= 2.0", "< 5.0" s.add_dependency "uuidtools", "~> 2.1" s.add_dependency "ffi-yajl", "~> 2.2" - s.add_dependency "rack", "~> 2.0", ">= 2.0.6" + s.add_dependency "rack", ">= 2.0.6", "< 4" s.add_dependency "webrick" s.bindir = "bin"