diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..ed58695 --- /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 diff --git a/Gemfile b/Gemfile index d6cfa54..929e8b4 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 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 8ba6141..2fa3846 100644 --- a/chef-zero.gemspec +++ b/chef-zero.gemspec @@ -6,22 +6,22 @@ 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" s.add_dependency "mixlib-log", ">= 2.0", "< 4.0" - s.add_dependency "hashie", ">= 2.0", "< 5.0" + s.add_dependency "hashie", ">= 2.0", "< 6.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 "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 6ef8aca..61aec3f 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