Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Lockfile 2.0 - cleaned branch #481

Merged
merged 55 commits into from
May 1, 2013
Merged

Lockfile 2.0 - cleaned branch #481

merged 55 commits into from
May 1, 2013

Conversation

reset
Copy link
Contributor

@reset reset commented May 1, 2013

this branch remedies a merge conflict from #363. See #363 for full details.

sethvargo added 30 commits April 29, 2013 19:26
@sethvargo
Use new lockfile
fa91991
@sethvargo
Use new lockfile in the berksfile
586ec8b
@sethvargo
Add filepath and fix some errors in lockfile
51fe4ce
@sethvargo
Read and write cookbook_sources to json
d09f36e
@sethvargo
Add new errors for LockfileNotFound
0b33012
@sethvargo
Update lockfile spec and fixture
9f4c125
@sethvargo
Fix failing specs in berksfile
400f8ca
@sethvargo
Reverse JSON matcher (because it's backwards)
2fe3b52
@sethvargo
Update lockfile feature and fix filesystem step
f0f2f9c
@sethvargo
Add ref attribute to lockfile for git resources and don't populate em…
f60df9c 
…pty values
@sethvargo
Add OutdatedCookbookSource error
74533b6
@sethvargo
Add legacy support converter for old lockfiles
a580d63
@sethvargo
Add better #to_s and #inspect for CookbookSource
714e173
@sethvargo
Add #to_s and #inspect to lockfile
d072ee1
@sethvargo
Add/Fix update_command features
38751d3
@sethvargo
Allow programatically setting the version_constraint for a cookbook_s…
1df8b58 
…ource
@sethvargo
Add feature to test legacy lockfile support
5d0ac45
@sethvargo
Fix #to_s and add #inspect to CookbookSource spec
847106c
@sethvargo
Add lockfile feature for a git location
e155f09
@sethvargo
Better tests for git locations
5eebf2c
@sethvargo
Update berksfile to use new lockfile
5910bd3
@sethvargo
Fix lockfile feature so it passes on travis by use git:// instead of …
e4dee9b 
…git@
@sethvargo
Decode error doesn't indicate we're using an old lockfile
4ebd720
@sethvargo
Remove debugging method
d34b393
@sethvargo
Add old comments to #install
a5694b1
@sethvargo
Re-refactor lockfile to use a hash instead of an array for O(1) lookups
ac3232d
@sethvargo
Fix failing install feature
4ea2b80
@sethvargo
Fix failing update features
2e09a15
@sethvargo
Write the correct hash from the CookbookSource
038f75d
@sethvargo
Fix failing update feature
bfee639
sethvargo and others added 23 commits April 29, 2013 19:28
@sethvargo
Use new #resolve in Cli
65c177e
@sethvargo
Fix broken show feature
11e80c5
@sethvargo
Fix broken update feature
2b77535
@sethvargo
Fix failing unit specs
a90edb1
@sethvargo
Update fixtures to new lockfile
3a393ff
@sethvargo
Update lockfile spec
9256edb
@sethvargo
Add more specs to Lockfile
c0979d2
@sethvargo
Parse it as JSON
bd1fb17 
- Convert to a Hash
- Deep sort the Hash
- Convert back to JSON (pretty)

This makes the output for the cucumber test more "realistic" and the diffs are more human-readable.
@sethvargo
Finally got all specs passing
dfa4c51
@sethvargo
Fix specs on Ruby 1.9.2
d35caf5
@sethvargo
Use FileMatcher, DirectoryMatcher, and RootMatcher instead of File
0a79977 
This avoids Ruby 1.9.2 getting confused and picking the wrong File class when stubbing in a test.
@sethvargo
Explicitly use :site for the location for outdated cookbooks
6e32566
@sethvargo
Use #api_uri, not #site to get the URL of a SiteLocation
6827d06
@sethvargo
Use the correct partial path in lockfile feature
1f24ac5
@sethvargo
Remove debugging things. Fix broken specs.
85b4d93
@sethvargo
Document InvalidSiteShortnameError parameter
61f3f21
@sethvargo
Document OutdatedCookbookSource parameter
ed760b5
@sethvargo
Pass the correct arguments to OutdatedCookbookSource
951602d
@sethvargo
Add feature for OutdatedCookbookSource
6294197
@sethvargo
Remove @Focus flag (whoops)
17d5e8d
@sethvargo
Suppress PathLocation information if it's in the cookbook_store
2ab9be1
@sethvargo
Fix PathLocation#to_s and add specs
da84da3
@reset
fix incompatibilities between merged berksfile/berksfile_spec
730b743
@reset reset mentioned this pull request May 1, 2013
Closed
@justincampbell
Copy link
Contributor

👍 with rc

reset added a commit that referenced this pull request May 1, 2013
@reset
Merge pull request #481 from RiotGames/sethvargo-lockfile_2.0
d3a7db6 
Lockfile 2.0 - cleaned branch
@reset reset merged commit d3a7db6 into master May 1, 2013
@reset reset deleted the sethvargo-lockfile_2.0 branch May 1, 2013 01:32
@ivey ivey mentioned this pull request May 1, 2013
Closed
@berkshelf berkshelf locked and limited conversation to collaborators Jun 16, 2017
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@reset @justincampbell @sethvargo