Commit Graph

11975 Commits

Author SHA1 Message Date
David Glasser
a1237ba1a8 fix typo 2014-11-22 11:17:21 -08:00
Ben Newman
f15f56fff7 Upgrade pathwatcher to prevent tests from hanging.
I fixed https://github.com/atom/node-pathwatcher/issues/47 with
https://github.com/atom/node-pathwatcher/pull/48, and @kevinsawicki
published my changes to NPM as pathwatcher@2.3.3.

These changes make it so pathwatcher no longer keeps our test processes
alive when they would otherwise naturally exit.
2014-11-21 17:37:15 -08:00
David Greenspan
b1ba8c3a64 Fix comment in resolver 2014-11-21 12:43:01 -08:00
David Glasser
e281442835 Fix meteor update --patch.
Broken in d90511128b which is in 1.0 but not 0.9.4. So we should
not create any explicitly-marked-as-patch releases against 1.0.
2014-11-18 14:28:28 -08:00
David Glasser
f404f28275 Use simpler query for getSortedVersions
The old one read and parsed JSON blobs from sqlite instead of just using
pre-existing columns.
2014-11-18 14:02:07 -08:00
Ben Newman
88477358ac Add node-pathwatcher NPM package to dev bundle. 2014-11-17 20:27:29 -05:00
Ben Newman
2cb7d51d21 Revert "Add watchman and sane to the dev bundle."
This reverts commit c426ffe899.
2014-11-17 20:11:32 -05:00
David Glasser
2548eba93a Update examples to use 'meteor-platform'
Pin iron:router to @0.9.4 in localmarket. (Maybe fixes #2969.)

Organize localmarket packages and add comments.

This commit does not update the versions files; that will happen at
release time.
2014-11-17 16:49:59 -08:00
Andy Lash
6b8221d0f9 made query parameter available to oauth1 services 2014-11-17 13:44:13 -08:00
David Greenspan
917ccbe967 Improve LocalCatalog comment 2014-11-17 08:42:29 -08:00
David Glasser
a11c8d8e09 Revert part of 8f3966fb
It looks wrong to see `Deploying to http://foo` without the
meteor.com.  (The "Now serving" message gets the full site name from the
server and is fine.)

Original commit was from #2770.
2014-11-16 17:50:52 -08:00
David Greenspan
34b1f5b428 Add a simple test around build IDS 2014-11-14 23:53:17 -08:00
David Greenspan
f8783d4461 Remove unnecessary parts of Catalog stubs 2014-11-14 22:34:34 -08:00
David Greenspan
49533d35ca Comment more about benchmark data 2014-11-14 21:58:09 -08:00
David Greenspan
6f32ebc585 Merge branch 'fix-gems-benchmark' into devel
The larger, "benchmark" tests of the constraint solver broke when we
got rid of ECVs earlier this week, because they relied on setting the
ECV to get certain package version semantics.  (We didn't notice they
were broken because these slow tests aren't run unless you ask for
them explicitly via an environment variable.)

This branch fixes up the data to behave equivalently but without
relying on ECVs.  It also removes code that post-processes the dataset
by baking the processing into the data itself.  This is appropriate,
because we ought to be able to specify constraint solver tests in a
simple input-data-output-data sort of way.
2014-11-14 21:48:41 -08:00
David Greenspan
0d80637f05 Remove unnecessary code in benchmark tests 2014-11-14 21:47:34 -08:00
David Greenspan
5253e2b9ac Merge branch 'devel' into fix-gems-benchmark
Conflicts:
	packages/constraint-solver/constraint-solver-tests.js
2014-11-14 21:37:15 -08:00
David Greenspan
995b8477b4 Simulate non-semver >= using alternations
The original benchmark/test translated all constraints into either inexact or exact Meteor constraints — that is, Rails’s `~>1.2.3`, `>1.2.3`, and `>=1.2.3` became the inexact `1.2.3`, and `=1.2.3` became `=1.2.3` — but also gave all versions of all packages an ECV of 0.0.0, meaning all versions are compatible with each other.

In order to make this test pass without ECV, we need to emulate pure `>=` (without incompatibility between major versions) in some other way.  So, for each constraint of the form `foo@a.b.c` where `foo` has larger major versions available than `a`, we allow those major versions as well.  For example, if we depend on `foo@1.1.11` and the largest version of `foo` is `3.2.0`, we rewrite `1.1.11` to `1.1.11 || 2.0.0 || 3.0.0` in order to emulate a pure `>=1.1.11` with no concern for major version compatibility.
2014-11-14 21:32:30 -08:00
David Greenspan
10fd23cc99 Revert accidental committal of client test-data
Client should not get test-data right now; that was just for debugging.
2014-11-14 16:28:47 -08:00
David Greenspan
95cdfc5662 Remove or translate all “numbers” besides a.b.c
in test-data.  Importantly, tests still pass!

For example:
- Convert 1.2 to 1.2.0
- Convert 1.2.0.0 to 1.2.0
- Remove 1.2.0.1 completely
- Remove all rcs, betas, alphas, pres, etc.

Remove unused “platform” property.

Next step: Make the test not depend on setting ECVs in order to pass.
2014-11-14 16:26:57 -08:00
David Greenspan
7f695a2c4a Pre-convert all constraints 2014-11-14 14:40:20 -08:00
David Greenspan
f3c420e350 Move benchmark tests to own file, add comments 2014-11-14 13:35:05 -08:00
David Greenspan
8fd3b98368 Merge branch 'constraint-explorer' into devel 2014-11-14 13:03:20 -08:00
David Greenspan
1094c62e32 Clean up branch for merge
Disable new test until we “fix” it (make it break)
2014-11-14 13:00:23 -08:00
Sashko Stubailo
14735344f4 Revert "Change all uses of word elide to omit"
This reverts commit 442274f266.
2014-11-14 10:49:37 -08:00
Sashko Stubailo
442274f266 Change all uses of word elide to omit 2014-11-14 10:21:34 -08:00
Sashko Stubailo
bf47ae7a98 Replace _relativeToSiteRootUrl with absoluteUrl 2014-11-13 17:42:43 -08:00
David Glasser
b96c5d7962 include a few more non-core packages 2014-11-12 17:28:46 -08:00
David Glasser
399681e04f move sha1 from Builder to watch
since watch actually uses it and Builder doesn't
2014-11-12 17:13:41 -08:00
David Glasser
a4b5c02721 Fix test broken by faye-proxy merge 2014-11-12 16:30:35 -08:00
David Glasser
e2f2a2238c A few more History notes 2014-11-12 16:25:28 -08:00
David Glasser
e18c9afb86 Merge branch 'faye-proxy' into devel
We worked with the Faye maintainer to test a "native" implementation of
proxied websockets, and now we use that with the high-level
faye-websocket module again instead of duplicating a bunch of
faye-websocket's functionality using its low-level websocket-driver
module.
2014-11-12 16:20:04 -08:00
David Glasser
45eea35a95 Update History.md 2014-11-12 16:19:50 -08:00
David Glasser
3a61be67ab Use Faye's proxy support. 2014-11-12 16:14:45 -08:00
David Glasser
5eb32ab334 Upgrade to release of Faye with proxy support 2014-11-12 16:14:45 -08:00
David Glasser
f9766a123f Revert "server DDP: Use low-level websocket-driver module"
This reverts commit a98c6d030a.
2014-11-12 15:58:00 -08:00
David Glasser
cea791f7c9 Revert "factor out creation of socket"
This reverts commit ac0014d852.
2014-11-12 15:58:00 -08:00
David Glasser
3a54db35c6 Revert "Support $HTTPS_PROXY in Node DDP client."
(Let a comment in tools remain.)

This reverts commit fb7921ade2.
2014-11-12 15:58:00 -08:00
David Glasser
1956f7b9c7 Revert "Cargo cult more cleanup code from faye"
This reverts commit b0d47e10bc.
2014-11-12 15:57:59 -08:00
David Glasser
d320f9c134 Escape package names for paths in in tropohouse 2014-11-12 15:41:26 -08:00
Sashko Stubailo
be644e474e Improve name of escape function for package names 2014-11-12 15:31:10 -08:00
Sashko Stubailo
d2881cfea2 Add functions for escaping and unescaping package names for FS 2014-11-12 15:28:44 -08:00
David Glasser
3f4cf649b1 Use underscore correctly in package-version-parser 2014-11-12 14:18:42 -08:00
Ben Newman
c426ffe899 Add watchman and sane to the dev bundle. 2014-11-11 21:08:49 -05:00
David Glasser
4aa33782fa New Console.withProgressDisplayVisible function
This replaces the pattern of turning two flags on and off by hand.

Also, avoid calling _updateProgressDisplay unless you're actually
changing values.
2014-11-11 17:28:30 -08:00
David Glasser
352af3b8e0 Show build-under-source warning for --directory
Don't look up cordova platforms for (deprecated) "meteor bundle".
2014-11-11 16:48:19 -08:00
David Glasser
8b0a745d30 Clean up parsing/writing of cordovaDependencies
As far as I understand, cordovaDependencies exist in these places:

- On an entire package (not an individual unibuild), as stored in the
  main JSON blob (isopack.json)
- On a target (combination of many packages), as stored in the star

This commit removes some stray code where they show up in other places:

- A field (which is never written) is read from the individual unibuild
  JSON file and passed to the Unibuild constructor, which does not
  expect it.
- A field (which is never read) is written to the buildinfo.json file.

Also, an assignment to Isopack.cordovaDependencies is pulled out of a
loop.
2014-11-11 11:59:38 -08:00
Sashko Stubailo
dc36a14cd7 Merge branch 'devel' of github.com:meteor/meteor into devel 2014-11-11 11:23:40 -08:00
Sashko Stubailo
1b94d28d85 Add version warning 2014-11-11 11:23:24 -08:00
Slava Kim
a45b367cc2 Add the appcache package back to the full docs 2014-11-11 11:06:11 -08:00