summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2019-12-29 18:23:31 -0800
committerGitHub <noreply@github.com>2019-12-29 18:23:31 -0800
commita7adb1cbad933f449e601d50b78fda159cc57828 (patch)
tree1141b6c681f729323e0086a608be0f90ce16526b
parentbaf718c504e895544d449412483430ed491f9d99 (diff)
parentd6b2c26efe282c47aaaa9fbedc7f98899babe9db (diff)
downloadchef-zero-a7adb1cbad933f449e601d50b78fda159cc57828.tar.gz
Merge pull request #299 from chef/relative
Use Chefstyle gem and move dev deps to the Gemfile
-rw-r--r--Gemfile4
-rw-r--r--README.md3
-rw-r--r--Rakefile7
-rw-r--r--chef-zero.gemspec5
4 files changed, 13 insertions, 6 deletions
diff --git a/Gemfile b/Gemfile
index dcbb078..31024da 100644
--- a/Gemfile
+++ b/Gemfile
@@ -9,7 +9,9 @@ group :pedant do
end
group :development, :test do
- gem "chefstyle", git: "https://github.com/chef/chefstyle.git", branch: "master"
+ gem "chefstyle"
+ gem "rake"
+ gem "rspec", "~> 3.0"
end
if ENV["GEMFILE_MOD"]
diff --git a/README.md b/README.md
index 03e054c..224aa1a 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
# Chef Zero
-[![Status](https://travis-ci.org/chef/chef-zero.svg?branch=master)](https://travis-ci.org/chef/chef-zero) [![Gem Version](https://badge.fury.io/rb/chef-zero.svg)](http://badge.fury.io/rb/chef-zero)
+[![Build status](https://badge.buildkite.com/943881fa8cbc4bede24eebf34685a49fecd39ea88a316f60b1.svg?branch=master)](https://buildkite.com/chef-oss/chef-chef-zero-master-verify)
+[![Gem Version](https://badge.fury.io/rb/chef-zero.svg)](http://badge.fury.io/rb/chef-zero)
## Description
diff --git a/Rakefile b/Rakefile
index 15a7b0a..2dd1b28 100644
--- a/Rakefile
+++ b/Rakefile
@@ -59,3 +59,10 @@ begin
rescue LoadError
puts "chefstyle gem is not installed. bundle install first to make sure all dependencies are installed."
end
+
+begin
+ require "yard"
+ YARD::Rake::YardocTask.new(:docs)
+rescue LoadError
+ puts "yard is not available. bundle install first to make sure all dependencies are installed."
+end
diff --git a/chef-zero.gemspec b/chef-zero.gemspec
index 7be98d9..36406b8 100644
--- a/chef-zero.gemspec
+++ b/chef-zero.gemspec
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
s.homepage = "https://github.com/chef/chef-zero"
s.license = "Apache-2.0"
- s.required_ruby_version = ">= 2.4.0"
+ s.required_ruby_version = ">= 2.4"
s.add_dependency "mixlib-log", ">= 2.0", "< 4.0"
s.add_dependency "hashie", ">= 2.0", "< 4.0"
@@ -19,9 +19,6 @@ Gem::Specification.new do |s|
s.add_dependency "ffi-yajl", "~> 2.2"
s.add_dependency "rack", "~> 2.0", ">= 2.0.6"
- s.add_development_dependency "rake"
- s.add_development_dependency "rspec"
-
s.bindir = "bin"
s.executables = ["chef-zero"]
s.require_path = "lib"