Permalink
Browse files

Merge pull request #92 from tpope/hidden_home_config_file

Make home Guardfile hidden
  • Loading branch information...
2 parents c2b2c15 + 524af46 commit 8c5be4536b5ff8e6db96902722bd72e0c955d97b Thibaud Guillaume-Gentil committed Jun 22, 2011
Showing with 7 additions and 5 deletions.
  1. +2 −0 CHANGELOG.md
  2. +2 −2 README.md
  3. +1 −1 lib/guard/dsl.rb
  4. +2 −2 spec/guard/dsl_spec.rb
View
2 CHANGELOG.md
@@ -13,6 +13,7 @@
- Pull request [#84](https://github.com/guard/guard/pull/84): Use RbConfig instead of obsolete and deprecated Config. ([@etehtsea][])
- Pull request [#80](https://github.com/guard/guard/pull/80): Watching dotfile (hidden files under unix). (reported by [@chrisberkhout][], fixed by [@yannlugrin][])
- Clear the terminal on start when the `:clear` option is given. ([@rymai][])
+- Rename home directory Guardfile to `.Guardfile`. ([@tpope][])
## 0.4.2 - June 7, 2011
@@ -183,6 +184,7 @@
[@thibaudgg]: https://github.com/thibaudgg
[@thierryhenrio]: https://github.com/thierryhenrio
[@tinogomes]: https://github.com/tinogomes
+[@tpope]: https://github.com/tpope
[@veged]: https://github.com/veged
[@wereHamster]: https://github.com/wereHamster
[@yannlugrin]: https://github.com/yannlugrin
View
4 README.md
@@ -38,7 +38,7 @@ Generate an empty Guardfile with:
$ guard init
```
-You may optionally place this Guardfile in your home directory to use it across multiple projects.
+You may optionally place a .Guardfile in your home directory to use it across multiple projects.
Add the guards you need to your Guardfile (see the existing guards below).
@@ -120,7 +120,7 @@ or if you use Bundler, to run the Guard executable specific to your bundle:
$ bundle exec guard [start]
```
-Guard will look for a Guardfile in your current directory. If it does not find one, it will look in your `$HOME` directory for one.
+Guard will look for a Guardfile in your current directory. If it does not find one, it will look in your `$HOME` directory for a .Guardfile.
Command line options
--------------------
View
2 lib/guard/dsl.rb
@@ -84,7 +84,7 @@ def local_guardfile_path
end
def home_guardfile_path
- File.expand_path(File.join("~", "Guardfile"))
+ File.expand_path(File.join("~", ".Guardfile"))
end
end
View
4 spec/guard/dsl_spec.rb
@@ -4,7 +4,7 @@
subject { described_class }
before(:each) do
@local_guardfile_path = File.join(Dir.pwd, 'Guardfile')
- @home_guardfile_path = File.expand_path(File.join("~", "Guardfile"))
+ @home_guardfile_path = File.expand_path(File.join("~", ".Guardfile"))
::Guard.stub!(:options).and_return(:debug => true)
end
@@ -129,7 +129,7 @@
describe ".guardfile_default_path" do
let(:local_path) { File.join(Dir.pwd, 'Guardfile') }
- let(:user_path) { File.expand_path(File.join("~", 'Guardfile')) }
+ let(:user_path) { File.expand_path(File.join("~", '.Guardfile')) }
before do
File.stub(:exist? => false)

0 comments on commit 8c5be45

Please sign in to comment.