From e0b88d91bef8777e0e628111e241d0fc9e2c1487 Mon Sep 17 00:00:00 2001
From: Ben Hollis <ben@benhollis.net>
Date: Fri, 14 Sep 2012 23:31:44 -0700
Subject: [PATCH] Add skip-gemfile, skip-bundle, and skip-git options to
 middleman init, aligning with rails options.

---
 middleman-core/lib/middleman-core/cli/init.rb  | 12 ++++++++++--
 middleman-core/lib/middleman-core/templates.rb |  9 +++++++--
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/middleman-core/lib/middleman-core/cli/init.rb b/middleman-core/lib/middleman-core/cli/init.rb
index bf062ff8..ecd37046 100644
--- a/middleman-core/lib/middleman-core/cli/init.rb
+++ b/middleman-core/lib/middleman-core/cli/init.rb
@@ -28,10 +28,18 @@ module Middleman::Cli
       :type    => :boolean,
       :default => false,
       :desc    => 'Include a config.ru file'
-    method_option "bundler",
+    method_option "skip-gemfile",
       :type    => :boolean,
       :default => false,
-      :desc    => 'Create a Gemfile and use Bundler to manage gems'
+      :desc    => "Don't create a Gemfile"
+    method_option "skip-bundle",
+      :type    => :boolean,
+      :default => false,
+      :desc    => "Don't run bundle install"
+    method_option "skip-git",
+      :type    => :boolean,
+      :default => false,
+      :desc    => 'Skip Git ignores and keeps'
     # The init task
     # @param [String] name
     def init(name)
diff --git a/middleman-core/lib/middleman-core/templates.rb b/middleman-core/lib/middleman-core/templates.rb
index 0c35536d..8aee9fd2 100644
--- a/middleman-core/lib/middleman-core/templates.rb
+++ b/middleman-core/lib/middleman-core/templates.rb
@@ -50,23 +50,28 @@ module Middleman::Templates
       template "shared/config.ru", File.join(location, "config.ru")
     end
 
+    class_option :'skip-bundle', :type => :boolean, :default => false
+    class_option :'skip-gemfile', :type => :boolean, :default => false
+
     # Write a Bundler Gemfile file for project
     # @return [void]
     def generate_bundler!
+      return if options[:'skip-gemfile']
       template "shared/Gemfile.tt", File.join(location, "Gemfile")
 
+      return if options[:'skip-bundle']
       inside(location) do
         ::Middleman::Cli::Bundle.new.invoke(:bundle)
       end unless ENV["TEST"]
     end
 
     # Output a .gitignore file
-    class_option :git, :type => :boolean, :default => true
+    class_option :'skip-git', :type => :boolean, :default => false
 
     # Write a .gitignore file for project
     # @return [void]
     def generate_gitignore!
-      return unless options[:git]
+      return if options[:'skip-git']
       copy_file "shared/gitignore", File.join(location, ".gitignore")
     end
   end