From 78f9ca82382e0217693b93b0b2d2b78cdcf7edfd Mon Sep 17 00:00:00 2001 From: Mehdi Lahmam Date: Sun, 16 Aug 2015 19:22:32 +0200 Subject: [PATCH 1/2] Allow `bitters reset` and `remove` to take `--path` option In case of a custom path used for Bitters installation, `remove` or `reset` commands were useless as not aware of this path. --- lib/bitters/generator.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/bitters/generator.rb b/lib/bitters/generator.rb index 513a3cfe..c3547884 100644 --- a/lib/bitters/generator.rb +++ b/lib/bitters/generator.rb @@ -21,6 +21,7 @@ def install end desc 'reset', 'Reset Bitters' + method_options path: :string def reset if bitters_files_already_exist? remove_bitters_directory @@ -32,6 +33,7 @@ def reset end desc 'remove', 'Remove Bitters' + method_options path: :string def remove if bitters_files_already_exist? remove_bitters_directory @@ -62,7 +64,7 @@ def install_files end def remove_bitters_directory - FileUtils.rm_rf("base") + FileUtils.rm_rf(install_path) end def all_stylesheets From 3e1600edf13fcbd99fa55f7df31147b16e862912 Mon Sep 17 00:00:00 2001 From: Mehdi Lahmam Date: Sun, 16 Aug 2015 19:24:55 +0200 Subject: [PATCH 2/2] Minor fix for the shown installation path when running `bitters install` Running `bitters install --path foo` outputs "Bitters files installed to "foo/base/base" when it should show "foo/base" only. --- lib/bitters/generator.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bitters/generator.rb b/lib/bitters/generator.rb index c3547884..e3366691 100644 --- a/lib/bitters/generator.rb +++ b/lib/bitters/generator.rb @@ -16,7 +16,7 @@ def install puts "Bitters files already installed, doing nothing." else install_files - puts "Bitters files installed to #{install_path}/base" + puts "Bitters files installed to #{install_path}/" end end