Commit Graph

2331 Commits

Author SHA1 Message Date
Matthew Arbesfeld
bd86ed3450 Use <base href> tag to load from persistent storage.
This lets us use the correct path for assets in the `public` folder.
2014-08-27 15:33:00 -07:00
Matthew Arbesfeld
75427d70ce Merge branch 'devel' into cordova-hcp
Conflicts:
	docs/client/docs.js
	examples/leaderboard/.meteor/versions
	meteor
	packages/backbone/package.js
	packages/constraint-solver/package.js
	packages/meetup/package.js
	packages/meteor-tool/package.js
	packages/showdown/package.js
	packages/stylus/package.js
	scripts/admin/meteor-release-experimental.json
	tools/commands-packages.js
	tools/commands.js
	tools/project.js
	tools/tests/old/app-with-private/.meteor/versions
	tools/tests/old/app-with-public/.meteor/versions
	tools/tests/old/empty-app/.meteor/versions
2014-08-27 13:38:57 -07:00
Emily Stark
d059106bba Remove dead 'admin remove-member' command 2014-08-27 08:56:34 -07:00
Emily Stark
f7c4e8a3b4 Rename orgs commands 2014-08-27 08:54:19 -07:00
Emily Stark
f17be05c79 Clean up some organization commands error handling.
Particularly when we have an expired/revoked token.
2014-08-27 08:54:19 -07:00
Emily Stark
1c991ee8b5 Prompt for login on orgs commands if you're logged out 2014-08-27 08:54:19 -07:00
Emily Stark
5c884cbe11 Remove delete-organization command and tests.
We're not going to allow organization deletion just yet.
2014-08-27 08:54:19 -07:00
Emily Stark
f1e03a6539 Remove obsolete XXX 2014-08-27 08:54:19 -07:00
Emily Stark
c07f940ec2 Remove stray 'console.log's 2014-08-27 08:54:19 -07:00
Emily Stark
a15b9ed7ae More organizations selftest 2014-08-27 08:54:18 -07:00
Emily Stark
2e7e9fbb9e Add guards against proc not existing in selftest 2014-08-27 08:54:18 -07:00
Emily Stark
d785da8dcd Skip unknown usernames rather than print "<unknown>".
Not sure what the original motivation for printing <unknown> was (it
shouldn't ever come up in normal operation, only if something weird
happens like we manually unset a user's username in the database). But
it's now rather inconvenient because we don't yet clean up deleted
organizations from a site, so you would see <unknown> for every
authorized organization that has been deleted. While we should
eventually clean up deleted organizations from a site's
"authorized_orgs" field, for now this will clean up the output of this
command.
2014-08-27 08:54:18 -07:00
Emily Stark
96019ffe66 Print errors from delete-organization 2014-08-27 08:54:18 -07:00
Emily Stark
aa0998750f Beginnings of an orgs selftest 2014-08-27 08:54:18 -07:00
Emily Stark
554c5f81b6 Print error messages for orgs commands 2014-08-27 08:54:18 -07:00
Emily Stark
a023e4b60c Grab selftest.fail from packaging branch 2014-08-27 08:54:18 -07:00
Emily Stark
a5d60f443f Add some more orgs commands 2014-08-27 08:54:18 -07:00
Emily Stark
922e1099a7 create-organization and list-organizations commands 2014-08-27 08:54:18 -07:00
David Glasser
cc16bcafe3 Merge branch 'release-0.9.0.1' into devel
Conflicts:
	packages/autoupdate/autoupdate_client.js
2014-08-27 00:00:15 -07:00
David Glasser
273b70bea4 prerelease versions shouldn't prompt you do update
Replace catalog.getLatestVersion with catalog.getLatestMainlineVersion,
which skips prerelease versions (those with dashes in the
version). Ensure that this function is only used by high-level commands
like 'meteor list'.  Replace other uses of that function with other
equivalent functions.

Also, don't stack trace on 'meteor add' constraint failure.
2014-08-26 23:56:51 -07:00
David Glasser
07d9a5e36c Arch-specific plugins make a package arch-specific.
Fixes #2449.
2014-08-26 23:35:28 -07:00
David Glasser
3564c3ac4e Fix 'meteor add x@version' over x@other
Before, we were running the constraint solver with both the new and the
old constraint, which would fail if they were not simultaneously
satisfiable. (We were writing the right thing to disk if it succeeded,
at least.)
2014-08-26 23:04:29 -07:00
David Glasser
43e01c09eb Improve treatment of prerelease (dashed) packages
Drop the "at-least" constraint type entirely. It was not user-accessible
and was only used in the form ">=0.0.0" to represent a constraint with
no version constraint at all. This type of constraint is now called
"any-reasonable".

The definition of "any-reasonable" is:

  - Any version that is not a pre-release (has no dash)
  - Or a pre-release version that is explicitly mentioned in a TOP-LEVEL
    constraint passed to the constraint solver

For example, constraints from .meteor/packages, constraints from the
release, and constraints from the command line of "meteor add" end up
being top-level.

Why only top-level-constrained pre-release versions, and not versions we
find explicitly desired by some other desired version while walking the
graph?

The constraint solver assumes that adding a constraint to the resolver
state can't make previously impossible choices now possible.  If
pre-releases mentioned anywhere worked, then applying the constraints
"any reasonable" followed by "1.2.3-rc1" would result in "1.2.3-rc1"
ruled first impossible and then possible again. That's no good, so we
have to fix the meaning based on something at the start.  (We could try
to apply our prerelease-avoidance tactics solely in the cost functions,
but then it becomes a much less strict rule.)

At the very least, this change should allow you to run meteor on a
preview branch like cordova-hcp without getting a conflict between the
prerelease package on the branch/release and the lack of an explicit
constraint in .meteor/packages on that package, because we are
reintepreting the .meteor/packages constraint as meaning "anything
reasonable" and the in-the-release version counts as reasonable.
2014-08-26 21:54:48 -07:00
Emily Stark
64ecaaf136 Add 'net' tag to "talk to package server" test 2014-08-26 20:49:11 -07:00
Emily Stark
2e870042d3 Add new argument to another loginWithTokenOrOAuth call 2014-08-26 20:49:11 -07:00
Emily Stark
4bb1c3f6ce Do login prompt when talking to package server with expired credential 2014-08-26 20:49:11 -07:00
Emily Stark
f89e633553 Add 'net' tag to "talk to package server" test 2014-08-26 18:19:24 -07:00
Emily Stark
28e2719ae5 Add new argument to another loginWithTokenOrOAuth call 2014-08-26 17:53:23 -07:00
Slava Kim
c8fd50c76f Replace colons with underscores in build output's filenames and urls 2014-08-26 17:30:04 -07:00
Slava Kim
b2deab208c remove the hack on replacing colons with dashes in emitted filenames 2014-08-26 17:18:52 -07:00
Emily Stark
38d6525cea Do login prompt when talking to package server with expired credential 2014-08-26 17:04:42 -07:00
Slava Kim
5178aa9c7f Indent the message of plugin installation
similar to the message of package installation
2014-08-26 15:06:39 -07:00
David Glasser
2732de966d Merge branch 'master' into devel
Conflicts:
	History.md
2014-08-26 08:09:22 -07:00
David Glasser
f7c6f505ac Never springboard to a red pill 2014-08-25 22:49:32 -07:00
David Glasser
0562466ad4 Rename upgraders file to .finished-upgraders
The idea is that dotfiles in .meteor (like .id and .finished-upgraders)
aren't intended to be human-editable, whereas packages, release,
and versions are (although there are commands to edit them too).
2014-08-25 21:21:43 -07:00
David Glasser
bfb8359499 Only choose prerelease package versions if asked
Make sure 'meteor add foo' gives the same constraint to the solver as
'foo' from .meteor/packages: namely, '>=0.0.0' not
'unconstrained' (since the first rules out rcs and the second doesn't)
2014-08-25 19:57:28 -07:00
Emily Stark
ec0d2bc8b5 Progress towards self-test using DEPLOY_HOSTNAME.
Still can't run all tests against testing servers because the testing
accounts server would need to be configured to send email.
2014-08-25 19:37:47 -07:00
David Glasser
2ee41fda74 Projects should start with all known upgraders 2014-08-25 17:38:27 -07:00
David Glasser
0bbdc175a5 An extra update message 2014-08-25 17:36:03 -07:00
David Glasser
08f0a3bab0 Fixes to unforced update to not-quite-last release
Make sure that project._ensureDepsUpToDate does not get run mid-update,
since it might decide that various things are not compatible with the
packages in the current release. When the update command runs the
constraint solver explicitly, it passes ignoreProjectDeps, but implicit
calls can lead to an unhappy process.exit.
2014-08-25 17:25:08 -07:00
David Glasser
1eaf87b881 fix typo 2014-08-25 16:46:30 -07:00
David Glasser
166583845e Fix 'meteor update'
We were accidentally considering this equivalent to 'meteor update
--release LATEST', meaning we could not update to an intermediate
release (and that it could update you backwards).
2014-08-25 16:42:41 -07:00
David Glasser
76961d6161 don't crash if wiping packages during release.load 2014-08-25 16:01:17 -07:00
David Glasser
581832d967 Update notices 2014-08-25 15:48:58 -07:00
Slava Kim
beb5b95312 Run adb logcat -c asynchronously
so we can print out errors and timeout the operation. Should help in case of
having more than 1 device or emulator open or having an emulator from a wrong
enviornment being open and confusing the user.
2014-08-25 15:40:52 -07:00
Slava Kim
d7cc32ccd3 A safer way to dispatch DOM events from cordova_loader.js 2014-08-25 15:40:52 -07:00
Slava Kim
4f54e31725 add android.sh for managing avds 2014-08-25 15:40:52 -07:00
David Glasser
5ab9a66b29 Fix typo. Now I will make this release twice. 2014-08-25 14:32:25 -07:00
David Glasser
ca7217bc18 patch releases need to be recommended
for them to work with update --patch

or for them to be advertised
2014-08-25 14:13:05 -07:00
David Glasser
106bde8163 First draft of banners and upgraders.
old-banner needs to be manually copied into manifest.json
2014-08-25 14:00:04 -07:00