Jacek Sowiński
6590a1eeff
Wrap symlink and regular conflicts into one case
...
This way we're not duplicating collision-related code.
2017-03-20 20:26:14 +01:00
Jeremy Cook
693ae5f05e
Merge pull request #157 from mruwek/verbose-symlink-conflicts
...
Don't overwrite silently on symlink conflicts
2017-03-19 22:02:41 -04:00
Jeremy Cook
da3002f199
Merge pull request #154 from singular0/symlink_realpath
...
Use real paths of symlinks when linking castle into home
2017-03-19 22:02:01 -04:00
Jeremy Cook
59f75711a4
Changed strings to use symbols.
2017-03-19 15:57:44 -04:00
Jacek Sowiński
85f46e01b1
Don't overwrite silently on symlink conflicts
...
Symlink conflicts are now handled in similar fashion as normal
file-conflicts.
2017-03-17 19:31:23 +01:00
Denis Yantarev
5614b6b8b3
Use real paths of symlinks when linking castle into home
2016-12-25 18:34:33 +03:00
Denis Yantarev
4bfd1c60c2
Fix default option value type warning
2016-12-03 15:56:22 +03:00
mail6543210
ed397bdaf8
Use source content instead of source path ( fixes : #148 )
2016-01-21 18:36:52 +08:00
Jeremy Cook
cc83a4e1fa
Preparing for 1.1.3 release.
2015-10-31 09:48:10 -04:00
Jeremy Cook
dcc5cb0bc1
Merge pull request #146 from JCook21/issue134
...
Fix for issue134
2015-10-25 15:21:26 -04:00
Jeremy Cook
978416d1e4
Fixing diff problems by providing source block and checking for
...
directories in diff
2015-10-20 21:47:43 -04:00
Jeremy Cook
1016002638
Merge branch 'named_castles' of https://github.com/rweng/homesick into rweng-named_castles
2015-10-14 22:30:46 -04:00
Jeremy Cook
7632591681
Coding standards fixes based off of Rubocop and minor edits to make
...
logic flow easier to understand.
2015-10-12 19:30:29 -04:00
Robin Wenglewski
332aad8ad0
change 'homesick open' to run '$EDITOR .' instead of '$EDITOR' in castle_dir #142
2015-10-12 16:39:52 +02:00
Robin Wenglewski
171b4c1fb8
add option to pass in destination to homesick clone
2015-10-11 18:21:22 +02:00
Jeremy Cook
60d4458bbc
Merge pull request #124 from shioyama/clone_destination
...
Pass destination when cloning url.
2015-03-22 14:12:41 -04:00
Chris Salzberg
9ad171ab78
Pass destination when cloning url.
2015-03-05 22:26:41 +09:00
Alexander GQ Gerasiov
4641843ffd
Add "requite 'pathname'" to lib/homesick/utils.rb
...
Since Pathname is used in lib/homesick/utils.rb, it should require this module
itself.
Signed-off-by: Alexander GQ Gerasiov <gq@cs.msu.su >
2015-02-22 23:09:18 +03:00
William Boman
fb7595d254
Escape message correctly on git_commit_all.
2015-02-19 16:51:53 +01:00
Jeremy Cook
c8f0999035
Preparing for new release.
2015-01-02 00:06:20 -05:00
Jeremy Cook
46faec7857
Bug fix to make sure git check works properly.
2015-01-01 21:21:27 -05:00
Jeremy Cook
e35d3fe6ba
Merge pull request #128 from wireframe/force-rc
2014-12-13 08:12:04 -05:00
Ryan Sonnek
5700f55dc3
Add --force option to homesick rc command
...
Support automatically eval-ing .homesickrc file without prompting for user input.
This is particularly useful for headless scripts that do not support
user input.
2014-12-01 13:38:43 -06:00
Jeremy Cook
03490531d8
Changed name of git check method to be more descriptive.
2014-11-24 08:49:17 -05:00
Jeremy Cook
7bd9759e81
Added tests for a minimumGit version of 1.8.0.
2014-11-23 22:22:44 -05:00
Jeremy Cook
a808f56caf
Tightened up git checking to check for a minimum installed version of
...
Git.
2014-11-23 14:32:47 -05:00
Jeremy Cook
b7e2b45e69
Added simple implementation to check if git is installed before
...
executing commands.
2014-11-20 21:25:47 -05:00
Jeremy Cook
7451e8c739
Bug fix to cover cases where homes are symlinked.
2014-09-19 14:36:32 -04:00
Jeremy Cook
ee04b5788a
Removed the homesick shell module and folded its code in elsewhere.
2014-06-14 15:03:57 -04:00
Jeremy Cook
3465c37c0e
Updated version to 1.1.1
2014-05-21 20:56:07 -04:00
Jeremy Cook
b60703d496
Bumped version number in preparation for a release.
2014-04-26 18:06:54 -04:00
Jeremy Cook
9a8788fb80
Removed uneeded config lines since the pretend and quiet options are set
...
in global config.
2014-04-26 18:04:34 -04:00
Jeremy Cook
1a44edcde1
Merge pull request #111 from JCook21/Pretend
...
Edits to keep code DRY
2014-04-26 17:45:08 -04:00
Jeremy Cook
f55828f1d4
Fixing a bug that breaks the handling of collisions.
2014-04-22 20:54:05 -04:00
Jeremy Cook
d4f9633a0c
Added ability for methods to be overrode, through the pretend and quiet
...
options, skipping their default behaviour if so.
2014-04-22 19:43:40 -04:00
Nicolas McCurdy
d9ee74bf14
Move GitActions and FileActions into a new Actions module
2014-04-16 20:54:26 -04:00
Nicolas McCurdy
2148697864
Separate Actions into two new modules: FileActions and GitActions
2014-04-16 18:05:02 -04:00
Nicolas McCurdy
1c3403064e
Don't refer to Homesick as a class
2014-04-16 17:57:00 -04:00
Nicolas McCurdy
03d87807e0
Use require instead of autoload ( fix #108 )
2014-04-16 17:48:36 -04:00
Nicolas McCurdy
f6c4e5e42e
Require Thor in Homesick::Shell
2014-04-16 17:29:17 -04:00
Nicolas McCurdy
705a416d74
Extract the CLI into a new Homesick::CLI class, while making Homesick a module
2014-04-16 17:20:05 -04:00
Jeremy Cook
74cfd29272
Small refactoring to keep main homesick class smaller.
2014-04-15 22:20:12 -04:00
Jeremy Cook
53ac09a5e9
Merge pull request #101 from nicolasmccurdy/use-libraries
...
Use stdlib methods to replace most non-git shell calls. Looks good.
2014-04-13 17:17:30 -04:00
Jeremy Cook
efea18327b
Added options for exec command and a new exec_all command.
2014-04-13 10:59:40 -04:00
Nicolas McCurdy
5dc7b5068d
Replace any system calls in lib that don't use git with calls to FileUtils
2014-04-06 02:01:15 -04:00
Jeremy Cook
bea3a0b680
Added exec command to homesick.
2014-04-05 09:21:16 -04:00
Jeremy Cook
94bff3aa9d
Small change to make symlink text a symbol in the map command.
2014-01-25 23:16:15 -05:00
Christian Bundy
7253bdd634
Merge pull request #82 from thenickperson/rubocop-fixes
...
Reduce Rubocop errors
2014-01-23 12:19:57 -08:00
Jeremy Cook
8c6a17404f
Merge pull request #83 from thenickperson/remove-duplicate-methods
...
Remove duplicate methods rm and rm_link
2014-01-22 04:14:27 -08:00
Nicolas McCurdy
98edb54ca4
Merge remote-tracking branch 'upstream/master' into rubocop-fixes
...
Conflicts:
lib/homesick.rb
2014-01-21 22:37:48 -05:00