From 2147f6f18bef02a6f44fa4a25374159eea4f574c Mon Sep 17 00:00:00 2001
From: Steven Danna <steve@chef.io>
Date: Wed, 1 May 2019 10:59:24 +0100
Subject: [PATCH] Generate a valid project by default

Omnibus was previously generating an invalid project by default
because it:

- Didn't include a version-manifest software definition
- Didn't include the "preparation" software definition
- Had an invalid Gemfile

This fixes those issues, getting us a bit closer to the Getting
Starting directions working out of the box for people.

Fixes #887
Partially addresses #841

Signed-off-by: Steven Danna <steve@chef.io>
---
 lib/omnibus/generator.rb                      |  1 +
 lib/omnibus/generator_files/Gemfile.erb       |  4 +--
 .../config/projects/project.rb.erb            |  3 --
 .../config/software/preparation.rb.erb        | 30 +++++++++++++++++++
 4 files changed, 33 insertions(+), 5 deletions(-)
 create mode 100644 lib/omnibus/generator_files/config/software/preparation.rb.erb

diff --git a/lib/omnibus/generator.rb b/lib/omnibus/generator.rb
index ef9b6334a..74bb8c89a 100644
--- a/lib/omnibus/generator.rb
+++ b/lib/omnibus/generator.rb
@@ -90,6 +90,7 @@ def create_project_definition
 
     def create_example_software_definitions
       template("config/software/zlib.rb.erb", "#{target}/config/software/#{name}-zlib.rb", template_options)
+      template("config/software/preparation.rb.erb", "#{target}/config/software/preparation.rb", template_options)
     end
 
     def create_kitchen_files
diff --git a/lib/omnibus/generator_files/Gemfile.erb b/lib/omnibus/generator_files/Gemfile.erb
index eab7ec7db..da9936e22 100644
--- a/lib/omnibus/generator_files/Gemfile.erb
+++ b/lib/omnibus/generator_files/Gemfile.erb
@@ -16,6 +16,6 @@ group :development do
   gem 'berkshelf'
 
   # Use Test Kitchen with Vagrant for converging the build environment
-  gem 'test-kitchen',
-  gem 'kitchen-vagrant',
+  gem 'test-kitchen'
+  gem 'kitchen-vagrant'
 end
diff --git a/lib/omnibus/generator_files/config/projects/project.rb.erb b/lib/omnibus/generator_files/config/projects/project.rb.erb
index a4846fec6..0578c3466 100644
--- a/lib/omnibus/generator_files/config/projects/project.rb.erb
+++ b/lib/omnibus/generator_files/config/projects/project.rb.erb
@@ -21,8 +21,5 @@ dependency "preparation"
 # <%= config[:name] %> dependencies/components
 # dependency "somedep"
 
-# Version manifest file
-dependency "version-manifest"
-
 exclude "**/.git"
 exclude "**/bundler/git"
diff --git a/lib/omnibus/generator_files/config/software/preparation.rb.erb b/lib/omnibus/generator_files/config/software/preparation.rb.erb
new file mode 100644
index 000000000..a523eb36d
--- /dev/null
+++ b/lib/omnibus/generator_files/config/software/preparation.rb.erb
@@ -0,0 +1,30 @@
+#
+# Copyright <%= Time.now.year %> YOUR NAME
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+name "preparation"
+description "the steps required to preprare the build"
+default_version "1.0.0"
+
+license :project_license
+skip_transitive_dependency_licensing true
+
+build do
+  block do
+    touch "#{install_dir}/embedded/lib/.gitkeep"
+    touch "#{install_dir}/embedded/bin/.gitkeep"
+    touch "#{install_dir}/bin/.gitkeep"
+  end
+end