Speedbump after running "rake git:pull" #5

Closed
wincent opened this Issue Jul 1, 2010 · 8 comments

2 participants

@wincent

Just a little speedbump I've run into a couple of times now after running "rake git:pull", which appears to happen whenever you bump the version number (abbreviated output):

# repos/rspec-expectations
# git pull --rebase
   23e7564..9434cf5  master     -> origin/master
 * [new tag]         v2.0.0.beta.15 -> v2.0.0.beta.15
==================================================
# repos/rspec-mocks
# git pull --rebase
   111f0af..9ee36b0  master     -> origin/master
 * [new tag]         v2.0.0.beta.15 -> v2.0.0.beta.15
==================================================
# repos/rspec-core
# git pull --rebase
   5e1c466..f3f7626  master     -> origin/master
 * [new branch]      way-faster -> origin/way-faster
 * [new tag]         v2.0.0.beta.15 -> v2.0.0.beta.15
==================================================
# repos/rspec
# git pull --rebase
   cd1e497..c42415b  master     -> origin/master
==================================================
# repos/rspec-rails
# git pull --rebase
   abb1396..4c2e18c  master     -> origin/master
 * [new tag]         v2.0.0.beta.15 -> v2.0.0.beta.15

Now, when I try to run "rake" I get this (again abbreviated):

# repos/rspec-expectations
# rake
rake aborted!
Could not find rspec-core-2.0.0.beta.14 in any of the sources
==================================================
# repos/rspec-mocks
# rake
rake aborted!
Could not find rspec-core-2.0.0.beta.14 in any of the sources
==================================================
# repos/rspec-core
# rake
rake aborted!
git://github.com/dchelimsky/aruba.git (at add-gemspec) is not checked out. Please run `bundle install`
==================================================
# repos/rspec
# rake
rake aborted!
Could not find rspec-core-2.0.0.beta.14 in any of the sources
==================================================
# repos/rspec-rails
# rake
rake aborted!
Could not find rspec-core-2.0.0.beta.14 in any of the sources

If I just do this:

rm repos/*/Gemfile.lock

Then "rake" runs fine again and all specs and features pass.

What do you think about doing this "rm" automatically after running the "rake git:pull" task? Or do you think it should be a separate task?

Cheers,
Wincent

@dchelimsky
RSpec member

There's already a bundle:unlock task that does this. I'll just make it a dependency of the git:pull task. WDYT?

@wincent

Update: I see there already is a "bundle:unlock" task... So I guess my question is now, do you think it might be a good idea to make the "git:pull" task depend on this one?

Cheers,
Wincent

@dchelimsky
RSpec member

Definitely want to keep it separate task so I can use it when I'm moving things around independently within each repo.

@dchelimsky
RSpec member

Some kind of minds think alike!

@wincent

Hehe, your replies are faster than my ping times.

Cheers,
Wincent

@dchelimsky
RSpec member

It's github's new "IRC via issues" feature ;)

@dchelimsky
RSpec member

FYI - I won't likely get to this until later today/tomorrow. Feel free to submit a patch if you want and I'll merge it.

Cheers,
David

@jeremywadsack jeremywadsack pushed a commit to jeremywadsack/rspec-dev that referenced this issue Apr 8, 2012
@dchelimsky dchelimsky don't diff single line strings
Closes #5.
108291c
This issue was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment