Skip to content

Commit

Permalink
perl -pi -e 's/skybreak/meteor/g' **/*
Browse files Browse the repository at this point in the history
  • Loading branch information
n1mmy committed Jan 5, 2012
1 parent 23cd5b6 commit 05794f5
Show file tree
Hide file tree
Showing 23 changed files with 108 additions and 108 deletions.
24 changes: 12 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,24 +23,24 @@ Install Meteor (only OS X, for now):

Create a project:

skybreak create try-skybreak
meteor create try-meteor

Run it:

cd try-skybreak
skybreak
cd try-meteor
meteor

Deploy it to the world, for free:

skybreak deploy try-skybreak.meteor.com
meteor deploy try-meteor.meteor.com

## Slow Start (for developers)

If you want to run on the bleeding edge, or help develop Meteor, you
can run Meteor directly from a git checkout.

git clone [email protected]:skybreak/skybreak.git
cd skybreak
git clone [email protected]:meteor/meteor.git
cd meteor

If you're the sort of person who likes to build everything from scratch,
you can build all the Meteor dependencies (node.js, npm, mongodb, etc)
Expand All @@ -50,24 +50,24 @@ automatically download pre-compiled binaries when you first run it.
# OPTIONAL
./admin/generate-dev-bundle.sh

Now you can run skybreak directly from the checkout (if you did not
Now you can run meteor directly from the checkout (if you did not
build the dependency bundle above, this will take a few moments to
download a pre-build version).

./skybreak --help
./meteor --help

Or install to ```/usr/local``` like the normal install process. This
will cause ```skybreak``` to be in your ```PATH```.
will cause ```meteor``` to be in your ```PATH```.

./install.sh
skybreak --help
meteor --help

## Developer Resources

Get in touch! We'd love to hear what you think. You can get involved
in several ways:

* Announcement list: sign up at http://preview.meteor.com/
* Google group for discussion: http://groups.google.com/group/skybreak-users
* IRC: ```#skybreak``` on ```irc.freenode.net```
* Google group for discussion: http://groups.google.com/group/meteor-users
* IRC: ```#meteor``` on ```irc.freenode.net```
* Email us: ```[email protected]```
14 changes: 7 additions & 7 deletions admin/cut-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ if [ -d dev_bundle ] ; then
fi

# Force dev_bundle re-creation
./skybreak --version || \
./meteor --version || \
warn_and_exit "dev_bundle installation failed."


Expand All @@ -46,13 +46,13 @@ echo "Installing."
./install.sh

# get the version number.
VERSION="$(/usr/local/bin/skybreak --version | sed 's/.* //')"
VERSION="$(/usr/local/bin/meteor --version | sed 's/.* //')"

# tar it up
TARBALL=~/skybreak-package-${VERSION}.tar.gz
TARBALL=~/meteor-package-${VERSION}.tar.gz
echo "Tarring to: $TARBALL"

tar -C /usr/local --exclude .skybreak/local -czf "$TARBALL" skybreak
tar -C /usr/local --exclude .meteor/local -czf "$TARBALL" meteor

# commit to git
echo
Expand Down Expand Up @@ -90,9 +90,9 @@ cat <<EOF
EOF
read

s3cmd -P put "$TARBALL" s3://com.skybreakplatform.static
s3cmd -P put ./admin/install-s3.sh s3://com.skybreakplatform.static/update/
s3cmd -P put ./admin/manifest.json s3://com.skybreakplatform.static/update/
s3cmd -P put "$TARBALL" s3://com.meteorplatform.static
s3cmd -P put ./admin/install-s3.sh s3://com.meteorplatform.static/update/
s3cmd -P put ./admin/manifest.json s3://com.meteorplatform.static/update/

echo
echo "//////////////////////"
Expand Down
4 changes: 2 additions & 2 deletions admin/generate-dev-bundle.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ else
fi


# save off skybreak checkout dir as final target
# save off meteor checkout dir as final target
cd `dirname $0`/..
TARGET_DIR=`pwd`

Expand Down Expand Up @@ -128,7 +128,7 @@ index ee2bf49..a68f9cb 100644
}
- this.log.info('socket.io started');
+ // this.log.info('socket.io started'); // XXX skybreak disabled
+ // this.log.info('socket.io started'); // XXX meteor disabled
};
Manager.prototype.__proto__ = EventEmitter.prototype
Expand Down
4 changes: 2 additions & 2 deletions admin/increment-version.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ var UPDATE_FILES = ['app/lib/updater.js', 'admin/install-s3.sh',
['admin/manifest.json', 'g']];

// Files to update for dev_bundle
var BUNDLE_FILES = ['admin/generate-dev-bundle.sh', 'skybreak'];
var BUNDLE_FILES = ['admin/generate-dev-bundle.sh', 'meteor'];


var opt = require('optimist')
Expand All @@ -36,7 +36,7 @@ var CURRENT_VERSION = updater.CURRENT_VERSION;
var files = UPDATE_FILES;

if (argv.dev_bundle) {
var version_path = path.join(__dirname, '..', 'skybreak');
var version_path = path.join(__dirname, '..', 'meteor');
var version_data = fs.readFileSync(version_path, 'utf8');
var version_match = /BUNDLE_VERSION=([\d\.]+)/.exec(version_data);
CURRENT_VERSION = version_match[1];
Expand Down
12 changes: 6 additions & 6 deletions admin/install-s3.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

URL="http://d377jur38fl888.cloudfront.net/skybreak-package-0.0.41.tar.gz"
TARGET="/usr/local/skybreak"
URL="http://d377jur38fl888.cloudfront.net/meteor-package-0.0.41.tar.gz"
TARGET="/usr/local/meteor"
PARENT="/usr/local"

# Check for MacOS
Expand Down Expand Up @@ -59,16 +59,16 @@ curl --progress-bar $URL | tar -C "$PARENT" -xzf -

# add to $PATH
mkdir -p "$PARENT/bin"
rm -f "$PARENT/bin/skybreak"
ln -s "$TARGET/bin/skybreak" "$PARENT/bin/skybreak"
rm -f "$PARENT/bin/meteor"
ln -s "$TARGET/bin/meteor" "$PARENT/bin/meteor"

cat <<EOF
Meteor installed! To get started fast:
$ skybreak create ~/my_cool_app
$ meteor create ~/my_cool_app
$ cd ~/my_cool_app
$ skybreak
$ meteor
Or see the docs at:
Expand Down
2 changes: 1 addition & 1 deletion admin/manifest.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"version": "0.0.41",
"url": "https://d377jur38fl888.cloudfront.net/skybreak-package-0.0.41.tar.gz"
"url": "https://d377jur38fl888.cloudfront.net/meteor-package-0.0.41.tar.gz"
}
12 changes: 6 additions & 6 deletions app/lib/bundler.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// /static [served by node for now]
// /server
// server.js, db.js, .... [contents of app/server]
// node_modules [for now, contents of (skybreak_root)/lib/node_modules]
// node_modules [for now, contents of (meteor_root)/lib/node_modules]
// /app.html
// /app [user code]
// /app.json: [data for server.js]
Expand Down Expand Up @@ -189,7 +189,7 @@ _.extend(Bundle.prototype, {
},

add_standard_packages: function () {
// standard client packages (for now), for the classic skybreak stack
// standard client packages (for now), for the classic meteor stack
this.api.require('deps');
this.api.require('session');
this.api.require('livedata');
Expand Down Expand Up @@ -270,7 +270,7 @@ _.extend(Bundle.prototype, {
* - skip_dev_bundle : don't put any node_modules in the bundle.
* - symlink_dev_bundle : symlink bundle's node_modules to prebuilt
* local installation (to save startup time when running locally,
* used by skybreak run).
* used by meteor run).
*/
exports.bundle = function (app_dir, output_path, options) {
options = options || {};
Expand All @@ -280,7 +280,7 @@ exports.bundle = function (app_dir, output_path, options) {
////////// Packages //////////

// has to come before user packages, because we don't (presently)
// require packages to declare dependencies on 'standard skybreak
// require packages to declare dependencies on 'standard meteor
// stuff' like minimongo
bundle.add_standard_packages();

Expand Down Expand Up @@ -438,10 +438,10 @@ exports.bundle = function (app_dir, output_path, options) {

// XXX enhance dependencies to include all dependencies, not just
// user code, so we can get reload behavior when developing packages
// or skybreak itself. that includes (1) any file that went in the
// or meteor itself. that includes (1) any file that went in the
// bundle (from 'static', 'app/server', or a package), (2)
// package.js for each package that was included. also conceptually
// we need to restart on 'skybreak add'.
// we need to restart on 'meteor add'.
dependencies_json.extensions = bundle.registeredExtensions();

fs.writeFileSync(path.join(build_path, 'app.json'),
Expand Down
6 changes: 3 additions & 3 deletions app/lib/files.js
Original file line number Diff line number Diff line change
Expand Up @@ -94,14 +94,14 @@ var files = module.exports = {
return ret;
},

// given a path, traverse upwards until we find a .skybreak
// given a path, traverse upwards until we find a .meteor
// directory that contains a 'packages' file. returns either the
// path to a top-level app or null for no app found. if filepath
// isn't given, use cwd.
find_app_dir: function (filepath) {
var test_dir = filepath || process.cwd();
while (test_dir) {
if (path.existsSync(path.join(test_dir, '.skybreak/packages'))) {
if (path.existsSync(path.join(test_dir, '.meteor/packages'))) {
break;
}
var new_dir = path.dirname(test_dir);
Expand Down Expand Up @@ -151,7 +151,7 @@ var files = module.exports = {
return false;
},

// Return the root of dev_bundle (probably /usr/local/skybreak in an
// Return the root of dev_bundle (probably /usr/local/meteor in an
// install, or (checkout root)/dev_bundle in a checkout..)
get_dev_bundle: function () {
if (files.in_checkout()) {
Expand Down
4 changes: 2 additions & 2 deletions app/lib/project.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ var _ = require('./third/underscore.js');
var project = module.exports = {

_get_lines: function (app_dir) {
var raw = fs.readFileSync(path.join(app_dir, '.skybreak/packages'), 'utf8');
var raw = fs.readFileSync(path.join(app_dir, '.meteor/packages'), 'utf8');
var lines = raw.split(/\r*\n\r*/);

// strip blank lines at the end
Expand All @@ -28,7 +28,7 @@ var project = module.exports = {
},

_write_packages: function (app_dir, lines) {
fs.writeFileSync(path.join(app_dir, '.skybreak/packages'),
fs.writeFileSync(path.join(app_dir, '.meteor/packages'),
lines.join('\n') + '\n', 'utf8');
},

Expand Down
2 changes: 1 addition & 1 deletion app/lib/updater.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ var semver = require("semver");

var manifest_options = {
host: 's3.amazonaws.com',
path: '/com.skybreakplatform.static/update/manifest.json'
path: '/com.meteorplatform.static/update/manifest.json'
};


Expand Down
6 changes: 3 additions & 3 deletions app/server/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,12 @@ var run = function (bundle_dir) {
var info = JSON.parse(info_raw);

// start up app
__skybreak_bootstrap__ = {require: require, startup_hooks: [], app: app};
__meteor_bootstrap__ = {require: require, startup_hooks: [], app: app};
Fiber(function () {
// (put in a fiber to let Sky.db operations happen during loading)

// pass in database info
__skybreak_bootstrap__.mongo_url = mongo_url;
__meteor_bootstrap__.mongo_url = mongo_url;

// load app code
_.each(info.load, function (filename) {
Expand All @@ -98,7 +98,7 @@ var run = function (bundle_dir) {
});

// run the user startup hooks.
_.each(__skybreak_bootstrap__.startup_hooks, function (x) { x(); });
_.each(__meteor_bootstrap__.startup_hooks, function (x) { x(); });

// only start listening after all the startup code has run.
app.listen(port, function() {});
Expand Down
2 changes: 1 addition & 1 deletion app/skybreak/deploy.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ var deploy_app = function (url, app_dir, opt_set_password) {
};

var bundle_and_deploy = function (site, app_dir, password, set_password) {
var build_dir = path.join(app_dir, '.skybreak/local/build_tar');
var build_dir = path.join(app_dir, '.meteor/local/build_tar');
var bundle_path = path.join(build_dir, 'bundle');
var bundle_opts = { skip_dev_bundle: true };

Expand Down
14 changes: 7 additions & 7 deletions app/skybreak/run.js
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,10 @@ var launch_mongo = function (app_dir, port, launch_callback, on_exit_callback) {
var mongod_path = path.join(files.get_dev_bundle(), 'mongodb/bin/mongod');

// store data in app_dir
var data_path = path.join(app_dir, '.skybreak/local/db');
var data_path = path.join(app_dir, '.meteor/local/db');
files.mkdir_p(data_path, 0755);
var pid_path = path.join(app_dir, '.skybreak/local/mongod.pid');
var port_path = path.join(app_dir, '.skybreak/local/mongod.port');
var pid_path = path.join(app_dir, '.meteor/local/mongod.pid');
var port_path = path.join(app_dir, '.meteor/local/mongod.port');

// read old pid file, kill old process.
var pid;
Expand Down Expand Up @@ -323,17 +323,17 @@ var watch_files = function (app_dir, get_extensions, on_change) {

////////// Upgrade check //////////

// XXX this should move to main skybreak command-line, probably?
// XXX this should move to main meteor command-line, probably?
var start_update_checks = function () {
var update_check = function () {
updater.get_manifest(function (manifest) {
if (manifest && updater.needs_upgrade(manifest)) {
console.log("////////////////////////////////////////");
console.log("////////////////////////////////////////");
console.log();
console.log("skybreak is out of date. Please run:");
console.log("meteor is out of date. Please run:");
console.log();
console.log(" skybreak update");
console.log(" meteor update");
console.log();
console.log("////////////////////////////////////////");
console.log("////////////////////////////////////////");
Expand All @@ -352,7 +352,7 @@ exports.run = function (app_dir, bundle_path, bundle_opts, port) {
var outer_port = port || 3000;
var inner_port = outer_port + 1;
var mongo_port = outer_port + 2;
var mongo_url = "mongodb://localhost:" + mongo_port + "/skybreak";
var mongo_url = "mongodb://localhost:" + mongo_port + "/meteor";

var deps = {};
var started_watching_files = false;
Expand Down
2 changes: 1 addition & 1 deletion app/skybreak/skel/client/~name~.css
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ body {
line-height: 1.3;
}

#skybreak {
#meteor {
position: absolute;
left: 0px;
bottom: 0px;
Expand Down
2 changes: 1 addition & 1 deletion app/skybreak/skel/client/~name~.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<body>
<div id="wrapper">
<img src="planes.png" id="skybreak">
<img src="planes.png" id="meteor">

<h1>~name~</h1>

Expand Down
Loading

0 comments on commit 05794f5

Please sign in to comment.