Commit Graph

9646 Commits

Author SHA1 Message Date
Matthew Arbesfeld
dbbb6b136c remove errant console.log 2014-08-27 15:39:35 -07:00
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
124b0d869e Bump versions for CORDOVA-PREVIEW@4 release/CORDOVA-PREVIEW@4 2014-08-27 13:41:07 -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
Justin SB
3ce808aae5 Spiderable now uses a flag to determine when the initial JS has loaded
Other approaches seemed to be heuristics that broke down in edge cases:
a timeout wasn't guaranteed if your JS was slow; page.load in PhantomJS
wasn't firing reliably because of long polling.
2014-08-27 09:46:36 -07:00
Emily Stark
d059106bba Remove dead 'admin remove-member' command 2014-08-27 08:56:34 -07:00
Emily Stark
83f3e53183 Merge branch 'organizations' into devel 2014-08-27 08:54:45 -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
Avital Oliver
d7636ebda0 Add COMPAT WITH 0.8.3 comment 2014-08-26 23:16:31 -07:00
Avital Oliver
9c9eadc079 Add COMPAT WITH 0.8.3 comment 2014-08-26 23:16:03 -07:00
Matthew Arbesfeld
a5eea24d47 Update autoupdate description 2014-08-26 23:05:59 -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
Matthew Arbesfeld
a038ef99e8 Update autoupdate description 2014-08-26 23:04:03 -07:00
Avital Oliver
8373507288 Fix hot code push from pre-0.9.0 apps
For 0.9.0, we changed the structure of documents in the
ClientVersions collection. So now we just throw in a single
dummy document in the old format, triggering a reload.

Fixes #2447
2014-08-26 22:23:11 -07:00
David Glasser
6a6837e32c Fix constraint solver benchmark 2014-08-26 22:16:09 -07:00
Avital Oliver
5a3774c758 Fix hot code push from pre-0.9.0 apps
For 0.9.0, we changed the structure of documents in the
ClientVersions collection. So now we just throw in a single
dummy document in the old format, triggering a reload.

Fixes #2447
2014-08-26 22:16:03 -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
David Glasser
c2c67b128e Fix infinite reload *AND* no-reload bugs in tests
The root of the problem David Greenspan tried to fix was that
__meteor_runtime_config__.autoupdateVersion was incorrectly 'unknown'
when running tests (due to packages/test-in-browser/autoupdate.js being
handled wrong by autoupdate_server.js).  Turns out the right solution is
to ensure the version is known, not to avoid reloading when the version
is unknown.
2014-08-26 20:45:07 -07:00
David Glasser
7358986f13 Revert "Fix infinite reload loop running tests"
This reverts commit 35d816a363.
2014-08-26 20:43:22 -07:00
David Glasser
5d4a93d627 Revert "Fix the fix to the infinite reload loop"
This reverts commit 1ad3dd17af.
2014-08-26 20:43:21 -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
David Greenspan
1ad3dd17af Fix the fix to the infinite reload loop
…after talking to arbesfeld
2014-08-26 17:46:52 -07:00
David Greenspan
35d816a363 Fix infinite reload loop running tests
(just a guess at the fix; arbesfeld to fix the fix if necessary)
2014-08-26 17:46:49 -07:00
Slava Kim
3413db8c26 Fix the failing test as nwo the url is different 2014-08-26 17:31:49 -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
David Greenspan
86ff4a0637 Fix the fix to the infinite reload loop
…after talking to arbesfeld
2014-08-26 16:28:07 -07:00
Slava Kim
d4f8f8ce25 Don't serve the manifest for Cordova program if such program is not present 2014-08-26 16:04:26 -07:00