summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKartik Null Cating-Subramanian <ksubramanian@chef.io>2015-10-09 18:06:17 -0400
committerKartik Null Cating-Subramanian <ksubramanian@chef.io>2015-10-09 18:06:17 -0400
commit6d7adf9b39459541250049ae03d9e2c6abe94b90 (patch)
tree9be15c86a3e05ac30152a74744f62d1d67917b9d
parent057d2ee6a2c3b66430bf2259bba6e77331d3b958 (diff)
parentee8039ae47fe057f5f1d1a2d60117299a0966370 (diff)
downloadchef-jk/notification_blocks.tar.gz
Merge pull request #4049 from chef/ksubrama/gemspecjk/notification_blocks
Add gemspec files to allow bundler to run from the gem
-rw-r--r--Gemfile2
-rw-r--r--chef-config/chef-config.gemspec2
-rw-r--r--chef.gemspec2
3 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index 9d5cf0fea1..8ace5e22be 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@ gemspec :name => "chef"
gem "activesupport", "< 4.0.0", :group => :compat_testing, :platform => "ruby"
-gem 'chef-config', path: "chef-config"
+gem 'chef-config', path: "chef-config" if File.exists?(__FILE__ + '../chef-config')
group(:docgen) do
gem "yard"
diff --git a/chef-config/chef-config.gemspec b/chef-config/chef-config.gemspec
index 475bd0f2d2..6619f04169 100644
--- a/chef-config/chef-config.gemspec
+++ b/chef-config/chef-config.gemspec
@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
spec.add_development_dependency(rspec, "~> 3.2")
end
- spec.files = %w(Rakefile LICENSE README.md) +
+ spec.files = %w(Rakefile LICENSE README.md) + Dir.glob("*.gemspec") +
Dir.glob("{lib,spec}/**/*", File::FNM_DOTMATCH).reject {|f| File.directory?(f) }
spec.bindir = "bin"
diff --git a/chef.gemspec b/chef.gemspec
index b1abe7670a..96673f391a 100644
--- a/chef.gemspec
+++ b/chef.gemspec
@@ -52,5 +52,5 @@ Gem::Specification.new do |s|
s.executables = %w( chef-client chef-solo knife chef-shell chef-apply )
s.require_path = 'lib'
- s.files = %w(Gemfile Rakefile LICENSE README.md CONTRIBUTING.md) + Dir.glob("{distro,lib,tasks,spec}/**/*", File::FNM_DOTMATCH).reject {|f| File.directory?(f) }
+ s.files = %w(Gemfile Rakefile LICENSE README.md CONTRIBUTING.md) + Dir.glob("{distro,lib,tasks,spec}/**/*", File::FNM_DOTMATCH).reject {|f| File.directory?(f) } + Dir.glob("*.gemspec")
end