Skip to content

Instantly share code, notes, and snippets.

@andruby

andruby/clone-web-venture.diff

Last active August 29, 2015 14:20
Show Gist options

  • Select an option

    Learn more about clone URLs
  • Save andruby/652ebd128bf61093625a to your computer and use it in GitHub Desktop.

Select an option

Learn more about clone URLs
Save andruby/652ebd128bf61093625a to your computer and use it in GitHub Desktop.
Download ZIP
diff -bur onegame/web/venture onegame-2/web/venture
Raw
clone-web-venture.diff
diff -bur ./app/adapters/session.js ../../../onegame-2/web/venture/app/adapters/session.js
--- ./app/adapters/session.js 2015-05-08 09:50:25.000000000 +0200
+++ ../../../onegame-2/web/venture/app/adapters/session.js 2015-05-08 09:36:43.000000000 +0200
@@ -1,4 +1,5 @@
-import Adapter from './application';
+import Adapter from 'basegame/adapters/application';
export default Adapter.extend({
namespace: 'api',
});
+
diff -bur ./node_modules/basegame/package.json ../../../onegame-2/web/venture/node_modules/basegame/package.json
--- ./node_modules/basegame/package.json 2015-05-08 10:11:01.000000000 +0200
+++ ../../../onegame-2/web/venture/node_modules/basegame/package.json 2015-05-08 09:40:38.000000000 +0200
@@ -49,7 +49,7 @@
},
"homepage": "https://github.com/VentureSpirit/basegame",
"_id": "[email protected]",
- "_shasum": "26ca098e14f0993ca64cc064a3ee43c54c5e7120",
+ "_shasum": "ee6fd36eb9dafea99a71d25ff99268db03f8cd7f",
"_from": "git+ssh://[email protected]/venturespirit/basegame.git#v0.4.3",
"_resolved": "git+ssh://[email protected]/venturespirit/basegame.git#536bbf2dec57772bfb0d2a654e4cc9fdb34650de",
"_fromGithub": true
diff -bur ./node_modules/broccoli-asset-rev/node_modules/rsvp/package.json ../../../onegame-2/web/venture/node_modules/broccoli-asset-rev/node_modules/rsvp/package.json
--- ./node_modules/broccoli-asset-rev/node_modules/rsvp/package.json 2015-05-08 10:11:05.000000000 +0200
+++ ../../../onegame-2/web/venture/node_modules/broccoli-asset-rev/node_modules/rsvp/package.json 2015-05-08 09:40:41.000000000 +0200
@@ -67,7 +67,7 @@
"homepage": "https://github.com/tildeio/rsvp.js",
"_id": "[email protected]",
"_shasum": "f0a19ac40e620e86bf8cf6e86df3e281c02bab86",
- "_from": "rsvp@>=3.0.16 <4.0.0",
+ "_from": "rsvp@>=3.0.6 <3.1.0",
"_npmVersion": "2.7.3",
"_nodeVersion": "1.6.2",
"_npmUser": {
diff -bur ./node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/engine.io/node_modules/ws/build/Makefile ../../../onegame-2/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/engine.io/node_modules/ws/build/Makefile
--- ./node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/engine.io/node_modules/ws/build/Makefile 2015-05-08 10:11:46.000000000 +0200
+++ ../../../onegame-2/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/engine.io/node_modules/ws/build/Makefile 2015-05-08 09:41:27.000000000 +0200
@@ -339,7 +339,7 @@
endif
quiet_cmd_regen_makefile = ACTION Regenerating $@
-cmd_regen_makefile = cd $(srcdir); /usr/local/lib/node_modules/npm/node_modules/node-gyp/gyp/gyp_main.py -fmake --ignore-environment "--toplevel-dir=." -I/Users/andrew/Sites/onegame/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/engine.io/node_modules/ws/build/config.gypi -I/usr/local/lib/node_modules/npm/node_modules/node-gyp/addon.gypi -I/Users/andrew/.node-gyp/0.12.2/common.gypi "--depth=." "-Goutput_dir=." "--generator-output=build" "-Dlibrary=shared_library" "-Dvisibility=default" "-Dnode_root_dir=/Users/andrew/.node-gyp/0.12.2" "-Dmodule_root_dir=/Users/andrew/Sites/onegame/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/engine.io/node_modules/ws" binding.gyp
+cmd_regen_makefile = cd $(srcdir); /usr/local/lib/node_modules/npm/node_modules/node-gyp/gyp/gyp_main.py -fmake --ignore-environment "--toplevel-dir=." -I/Users/andrew/Sites/onegame-2/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/engine.io/node_modules/ws/build/config.gypi -I/usr/local/lib/node_modules/npm/node_modules/node-gyp/addon.gypi -I/Users/andrew/.node-gyp/0.12.2/common.gypi "--depth=." "-Goutput_dir=." "--generator-output=build" "-Dlibrary=shared_library" "-Dvisibility=default" "-Dnode_root_dir=/Users/andrew/.node-gyp/0.12.2" "-Dmodule_root_dir=/Users/andrew/Sites/onegame-2/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/engine.io/node_modules/ws" binding.gyp
Makefile: $(srcdir)/../../../../../../../../../../../../../../.node-gyp/0.12.2/common.gypi $(srcdir)/build/config.gypi $(srcdir)/binding.gyp $(srcdir)/../../../../../../../../../../../../../../../../usr/local/lib/node_modules/npm/node_modules/node-gyp/addon.gypi
$(call do_cmd,regen_makefile)
Binary files ./node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/engine.io/node_modules/ws/build/Release/bufferutil.node and ../../../onegame-2/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/engine.io/node_modules/ws/build/Release/bufferutil.node differ
Binary files ./node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/engine.io/node_modules/ws/build/Release/obj.target/bufferutil/src/bufferutil.o and ../../../onegame-2/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/engine.io/node_modules/ws/build/Release/obj.target/bufferutil/src/bufferutil.o differ
Binary files ./node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/engine.io/node_modules/ws/build/Release/obj.target/validation/src/validation.o and ../../../onegame-2/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/engine.io/node_modules/ws/build/Release/obj.target/validation/src/validation.o differ
Binary files ./node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/engine.io/node_modules/ws/build/Release/validation.node and ../../../onegame-2/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/engine.io/node_modules/ws/build/Release/validation.node differ
diff -bur ./node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/build/Makefile ../../../onegame-2/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/build/Makefile
--- ./node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/build/Makefile 2015-05-08 10:11:48.000000000 +0200
+++ ../../../onegame-2/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/build/Makefile 2015-05-08 09:41:28.000000000 +0200
@@ -339,7 +339,7 @@
endif
quiet_cmd_regen_makefile = ACTION Regenerating $@
-cmd_regen_makefile = cd $(srcdir); /usr/local/lib/node_modules/npm/node_modules/node-gyp/gyp/gyp_main.py -fmake --ignore-environment "--toplevel-dir=." -I/Users/andrew/Sites/onegame/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/build/config.gypi -I/usr/local/lib/node_modules/npm/node_modules/node-gyp/addon.gypi -I/Users/andrew/.node-gyp/0.12.2/common.gypi "--depth=." "-Goutput_dir=." "--generator-output=build" "-Dlibrary=shared_library" "-Dvisibility=default" "-Dnode_root_dir=/Users/andrew/.node-gyp/0.12.2" "-Dmodule_root_dir=/Users/andrew/Sites/onegame/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws" binding.gyp
+cmd_regen_makefile = cd $(srcdir); /usr/local/lib/node_modules/npm/node_modules/node-gyp/gyp/gyp_main.py -fmake --ignore-environment "--toplevel-dir=." -I/Users/andrew/Sites/onegame-2/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/build/config.gypi -I/usr/local/lib/node_modules/npm/node_modules/node-gyp/addon.gypi -I/Users/andrew/.node-gyp/0.12.2/common.gypi "--depth=." "-Goutput_dir=." "--generator-output=build" "-Dlibrary=shared_library" "-Dvisibility=default" "-Dnode_root_dir=/Users/andrew/.node-gyp/0.12.2" "-Dmodule_root_dir=/Users/andrew/Sites/onegame-2/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws" binding.gyp
Makefile: $(srcdir)/../../../../../../../../../../../../../../../../.node-gyp/0.12.2/common.gypi $(srcdir)/build/config.gypi $(srcdir)/binding.gyp $(srcdir)/../../../../../../../../../../../../../../../../../../usr/local/lib/node_modules/npm/node_modules/node-gyp/addon.gypi
$(call do_cmd,regen_makefile)
diff -bur ./node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/build/Release/.deps/Release/obj.target/bufferutil/src/bufferutil.o.d.raw ../../../onegame-2/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/build/Release/.deps/Release/obj.target/bufferutil/src/bufferutil.o.d.raw
--- ./node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/build/Release/.deps/Release/obj.target/bufferutil/src/bufferutil.o.d.raw 2015-05-08 10:11:48.000000000 +0200
+++ ../../../onegame-2/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/build/Release/.deps/Release/obj.target/bufferutil/src/bufferutil.o.d.raw 2015-05-08 09:41:29.000000000 +0200
@@ -7,4 +7,4 @@
/Users/andrew/.node-gyp/0.12.2/src/node_buffer.h \
/Users/andrew/.node-gyp/0.12.2/src/smalloc.h \
/Users/andrew/.node-gyp/0.12.2/src/node_object_wrap.h \
- /Users/andrew/Sites/onegame/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/node_modules/nan/nan.h
+ /Users/andrew/Sites/onegame-2/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/node_modules/nan/nan.h
diff -bur ./node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/build/bufferutil.target.mk ../../../onegame-2/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/build/bufferutil.target.mk
--- ./node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/build/bufferutil.target.mk 2015-05-08 10:11:48.000000000 +0200
+++ ../../../onegame-2/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/build/bufferutil.target.mk 2015-05-08 09:41:28.000000000 +0200
@@ -42,7 +42,7 @@
-I/Users/andrew/.node-gyp/0.12.2/src \
-I/Users/andrew/.node-gyp/0.12.2/deps/uv/include \
-I/Users/andrew/.node-gyp/0.12.2/deps/v8/include \
- -I/Users/andrew/Sites/onegame/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/node_modules/nan
+ -I/Users/andrew/Sites/onegame-2/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/node_modules/nan
DEFS_Release := \
'-D_DARWIN_USE_64_BIT_INODE=1' \
@@ -82,7 +82,7 @@
-I/Users/andrew/.node-gyp/0.12.2/src \
-I/Users/andrew/.node-gyp/0.12.2/deps/uv/include \
-I/Users/andrew/.node-gyp/0.12.2/deps/v8/include \
- -I/Users/andrew/Sites/onegame/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/node_modules/nan
+ -I/Users/andrew/Sites/onegame-2/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/node_modules/nan
OBJS := \
$(obj).target/$(TARGET)/src/bufferutil.o
diff -bur ./node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/build/validation.target.mk ../../../onegame-2/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/build/validation.target.mk
--- ./node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/build/validation.target.mk 2015-05-08 10:11:48.000000000 +0200
+++ ../../../onegame-2/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/build/validation.target.mk 2015-05-08 09:41:28.000000000 +0200
@@ -42,7 +42,7 @@
-I/Users/andrew/.node-gyp/0.12.2/src \
-I/Users/andrew/.node-gyp/0.12.2/deps/uv/include \
-I/Users/andrew/.node-gyp/0.12.2/deps/v8/include \
- -I/Users/andrew/Sites/onegame/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/node_modules/nan
+ -I/Users/andrew/Sites/onegame-2/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/node_modules/nan
DEFS_Release := \
'-D_DARWIN_USE_64_BIT_INODE=1' \
@@ -82,7 +82,7 @@
-I/Users/andrew/.node-gyp/0.12.2/src \
-I/Users/andrew/.node-gyp/0.12.2/deps/uv/include \
-I/Users/andrew/.node-gyp/0.12.2/deps/v8/include \
- -I/Users/andrew/Sites/onegame/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/node_modules/nan
+ -I/Users/andrew/Sites/onegame-2/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/node_modules/nan
OBJS := \
$(obj).target/$(TARGET)/src/validation.o
diff -bur ./node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/builderror.log ../../../onegame-2/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/builderror.log
--- ./node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/builderror.log 2015-05-08 10:11:48.000000000 +0200
+++ ../../../onegame-2/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/builderror.log 2015-05-08 09:41:29.000000000 +0200
@@ -1,105 +1,105 @@
In file included from ../src/bufferutil.cc:15:
-/Users/andrew/Sites/onegame/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/node_modules/nan/nan.h:213:5: error: no member named 'ThrowException' in namespace 'v8'
+/Users/andrew/Sites/onegame-2/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/node_modules/nan/nan.h:213:5: error: no member named 'ThrowException' in namespace 'v8'
_NAN_THROW_ERROR(v8::Exception::Error, errmsg);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-/Users/andrew/Sites/onegame/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/node_modules/nan/nan.h:209:11: note: expanded from macro '_NAN_THROW_ERROR'
+/Users/andrew/Sites/onegame-2/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/node_modules/nan/nan.h:209:11: note: expanded from macro '_NAN_THROW_ERROR'
v8::ThrowException(fun(v8::String::New(errmsg))); \
~~~~^
-/Users/andrew/Sites/onegame/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/node_modules/nan/nan.h:213:5: error: no member named 'New' in 'v8::String'
+/Users/andrew/Sites/onegame-2/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/node_modules/nan/nan.h:213:5: error: no member named 'New' in 'v8::String'
_NAN_THROW_ERROR(v8::Exception::Error, errmsg);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-/Users/andrew/Sites/onegame/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/node_modules/nan/nan.h:209:42: note: expanded from macro '_NAN_THROW_ERROR'
+/Users/andrew/Sites/onegame-2/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/node_modules/nan/nan.h:209:42: note: expanded from macro '_NAN_THROW_ERROR'
v8::ThrowException(fun(v8::String::New(errmsg))); \
~~~~~~~~~~~~^
-/Users/andrew/Sites/onegame/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/node_modules/nan/nan.h:218:9: error: no type named 'ThrowException' in namespace 'v8'
+/Users/andrew/Sites/onegame-2/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/node_modules/nan/nan.h:218:9: error: no type named 'ThrowException' in namespace 'v8'
v8::ThrowException(error);
~~~~^
-/Users/andrew/Sites/onegame/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/node_modules/nan/nan.h:222:65: error: no member named 'New' in 'v8::String'
+/Users/andrew/Sites/onegame-2/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/node_modules/nan/nan.h:222:65: error: no member named 'New' in 'v8::String'
v8::Local<v8::Value> err = v8::Exception::Error(v8::String::New(msg));
~~~~~~~~~~~~^
-/Users/andrew/Sites/onegame/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/node_modules/nan/nan.h:224:26: error: no member named 'New' in 'v8::String'
+/Users/andrew/Sites/onegame-2/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/node_modules/nan/nan.h:224:26: error: no member named 'New' in 'v8::String'
obj->Set(v8::String::New("code"), v8::Int32::New(errorNumber));
~~~~~~~~~~~~^
-/Users/andrew/Sites/onegame/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/node_modules/nan/nan.h:224:65: error: too few arguments to function call, expected 2, have 1
+/Users/andrew/Sites/onegame-2/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/node_modules/nan/nan.h:224:65: error: too few arguments to function call, expected 2, have 1
obj->Set(v8::String::New("code"), v8::Int32::New(errorNumber));
~~~~~~~~~~~~~~ ^
/Users/andrew/.node-gyp/0.12.2/deps/v8/include/v8.h:2012:3: note: 'New' declared here
static Local<Integer> New(Isolate* isolate, int32_t value);
^
In file included from ../src/bufferutil.cc:15:
-/Users/andrew/Sites/onegame/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/node_modules/nan/nan.h:229:5: error: no member named 'ThrowException' in namespace 'v8'
+/Users/andrew/Sites/onegame-2/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/node_modules/nan/nan.h:229:5: error: no member named 'ThrowException' in namespace 'v8'
_NAN_THROW_ERROR(v8::Exception::TypeError, errmsg);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-/Users/andrew/Sites/onegame/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/node_modules/nan/nan.h:209:11: note: expanded from macro '_NAN_THROW_ERROR'
+/Users/andrew/Sites/onegame-2/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/node_modules/nan/nan.h:209:11: note: expanded from macro '_NAN_THROW_ERROR'
v8::ThrowException(fun(v8::String::New(errmsg))); \
~~~~^
-/Users/andrew/Sites/onegame/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/node_modules/nan/nan.h:229:5: error: no member named 'New' in 'v8::String'
+/Users/andrew/Sites/onegame-2/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/node_modules/nan/nan.h:229:5: error: no member named 'New' in 'v8::String'
_NAN_THROW_ERROR(v8::Exception::TypeError, errmsg);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-/Users/andrew/Sites/onegame/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/node_modules/nan/nan.h:209:42: note: expanded from macro '_NAN_THROW_ERROR'
+/Users/andrew/Sites/onegame-2/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/node_modules/nan/nan.h:209:42: note: expanded from macro '_NAN_THROW_ERROR'
v8::ThrowException(fun(v8::String::New(errmsg))); \
~~~~~~~~~~~~^
-/Users/andrew/Sites/onegame/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/node_modules/nan/nan.h:233:5: error: no member named 'ThrowException' in namespace 'v8'
+/Users/andrew/Sites/onegame-2/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/node_modules/nan/nan.h:233:5: error: no member named 'ThrowException' in namespace 'v8'
_NAN_THROW_ERROR(v8::Exception::RangeError, errmsg);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-/Users/andrew/Sites/onegame/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/node_modules/nan/nan.h:209:11: note: expanded from macro '_NAN_THROW_ERROR'
+/Users/andrew/Sites/onegame-2/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/node_modules/nan/nan.h:209:11: note: expanded from macro '_NAN_THROW_ERROR'
v8::ThrowException(fun(v8::String::New(errmsg))); \
~~~~^
-/Users/andrew/Sites/onegame/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/node_modules/nan/nan.h:233:5: error: no member named 'New' in 'v8::String'
+/Users/andrew/Sites/onegame-2/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/node_modules/nan/nan.h:233:5: error: no member named 'New' in 'v8::String'
_NAN_THROW_ERROR(v8::Exception::RangeError, errmsg);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-/Users/andrew/Sites/onegame/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/node_modules/nan/nan.h:209:42: note: expanded from macro '_NAN_THROW_ERROR'
+/Users/andrew/Sites/onegame-2/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/node_modules/nan/nan.h:209:42: note: expanded from macro '_NAN_THROW_ERROR'
v8::ThrowException(fun(v8::String::New(errmsg))); \
~~~~~~~~~~~~^
-/Users/andrew/Sites/onegame/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/node_modules/nan/nan.h:450:49: error: too few arguments to function call, single argument 'isolate' was not specified
+/Users/andrew/Sites/onegame-2/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/node_modules/nan/nan.h:450:49: error: too few arguments to function call, single argument 'isolate' was not specified
v8::Local<v8::Object> obj = v8::Object::New();
~~~~~~~~~~~~~~~ ^
/Users/andrew/.node-gyp/0.12.2/deps/v8/include/v8.h:2388:3: note: 'New' declared here
static Local<Object> New(Isolate* isolate);
^
In file included from ../src/bufferutil.cc:15:
-/Users/andrew/Sites/onegame/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/node_modules/nan/nan.h:451:14: error: no member named 'NewSymbol' in 'v8::String'; did you mean 'IsSymbol'?
+/Users/andrew/Sites/onegame-2/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/node_modules/nan/nan.h:451:14: error: no member named 'NewSymbol' in 'v8::String'; did you mean 'IsSymbol'?
obj->Set(NanSymbol("callback"), fn);
^~~~~~~~~~~~~~~~~~~~~
-/Users/andrew/Sites/onegame/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/node_modules/nan/nan.h:103:38: note: expanded from macro 'NanSymbol'
+/Users/andrew/Sites/onegame-2/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/node_modules/nan/nan.h:103:38: note: expanded from macro 'NanSymbol'
#define NanSymbol(value) v8::String::NewSymbol(value)
~~~~~~~~~~~~^
/Users/andrew/.node-gyp/0.12.2/deps/v8/include/v8.h:1379:8: note: 'IsSymbol' declared here
bool IsSymbol() const;
^
In file included from ../src/bufferutil.cc:15:
-/Users/andrew/Sites/onegame/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/node_modules/nan/nan.h:451:14: error: call to non-static member function without an object argument
+/Users/andrew/Sites/onegame-2/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/node_modules/nan/nan.h:451:14: error: call to non-static member function without an object argument
obj->Set(NanSymbol("callback"), fn);
^~~~~~~~~~~~~~~~~~~~~
-/Users/andrew/Sites/onegame/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/node_modules/nan/nan.h:103:38: note: expanded from macro 'NanSymbol'
+/Users/andrew/Sites/onegame-2/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/node_modules/nan/nan.h:103:38: note: expanded from macro 'NanSymbol'
#define NanSymbol(value) v8::String::NewSymbol(value)
~~~~~~~~~~~~^~~~~~~~~
-/Users/andrew/Sites/onegame/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/node_modules/nan/nan.h:457:12: error: no member named 'Dispose' in 'v8::Persistent<v8::Object, v8::NonCopyablePersistentTraits<v8::Object> >'
+/Users/andrew/Sites/onegame-2/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/node_modules/nan/nan.h:457:12: error: no member named 'Dispose' in 'v8::Persistent<v8::Object, v8::NonCopyablePersistentTraits<v8::Object> >'
handle.Dispose();
~~~~~~ ^
-/Users/andrew/Sites/onegame/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/node_modules/nan/nan.h:458:12: error: no member named 'Clear' in 'v8::Persistent<v8::Object, v8::NonCopyablePersistentTraits<v8::Object> >'
+/Users/andrew/Sites/onegame-2/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/node_modules/nan/nan.h:458:12: error: no member named 'Clear' in 'v8::Persistent<v8::Object, v8::NonCopyablePersistentTraits<v8::Object> >'
handle.Clear();
~~~~~~ ^
-/Users/andrew/Sites/onegame/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/node_modules/nan/nan.h:462:46: error: no member named 'NewSymbol' in 'v8::String'; did you mean 'IsSymbol'?
+/Users/andrew/Sites/onegame-2/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/node_modules/nan/nan.h:462:46: error: no member named 'NewSymbol' in 'v8::String'; did you mean 'IsSymbol'?
return NanPersistentToLocal(handle)->Get(NanSymbol("callback"))
^~~~~~~~~~~~~~~~~~~~~
-/Users/andrew/Sites/onegame/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/node_modules/nan/nan.h:103:38: note: expanded from macro 'NanSymbol'
+/Users/andrew/Sites/onegame-2/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/node_modules/nan/nan.h:103:38: note: expanded from macro 'NanSymbol'
#define NanSymbol(value) v8::String::NewSymbol(value)
~~~~~~~~~~~~^
/Users/andrew/.node-gyp/0.12.2/deps/v8/include/v8.h:1379:8: note: 'IsSymbol' declared here
bool IsSymbol() const;
^
In file included from ../src/bufferutil.cc:15:
-/Users/andrew/Sites/onegame/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/node_modules/nan/nan.h:462:46: error: call to non-static member function without an object argument
+/Users/andrew/Sites/onegame-2/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/node_modules/nan/nan.h:462:46: error: call to non-static member function without an object argument
return NanPersistentToLocal(handle)->Get(NanSymbol("callback"))
^~~~~~~~~~~~~~~~~~~~~
-/Users/andrew/Sites/onegame/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/node_modules/nan/nan.h:103:38: note: expanded from macro 'NanSymbol'
+/Users/andrew/Sites/onegame-2/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/node_modules/nan/nan.h:103:38: note: expanded from macro 'NanSymbol'
#define NanSymbol(value) v8::String::NewSymbol(value)
~~~~~~~~~~~~^~~~~~~~~
-/Users/andrew/Sites/onegame/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/node_modules/nan/nan.h:463:25: error: expected '(' for function-style cast or type construction
+/Users/andrew/Sites/onegame-2/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/node_modules/nan/nan.h:463:25: error: expected '(' for function-style cast or type construction
.As<v8::Function>();
~~~~~~~~~~~~^
-/Users/andrew/Sites/onegame/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/node_modules/nan/nan.h:463:27: error: expected expression
+/Users/andrew/Sites/onegame-2/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws/node_modules/nan/nan.h:463:27: error: expected expression
.As<v8::Function>();
^
fatal error: too many errors emitted, stopping now [-ferror-limit=]
@@ -112,7 +112,7 @@
gyp ERR! stack at Process.ChildProcess._handle.onexit (child_process.js:1074:12)
gyp ERR! System Darwin 14.3.0
gyp ERR! command "node" "/usr/local/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js" "rebuild"
-gyp ERR! cwd /Users/andrew/Sites/onegame/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws
+gyp ERR! cwd /Users/andrew/Sites/onegame-2/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/ws
gyp ERR! node -v v0.12.2
gyp ERR! node-gyp -v v1.0.3
gyp ERR! not ok
diff -bur ./node_modules/ember-cli/node_modules/testem/node_modules/tap/node_modules/inherits/package.json ../../../onegame-2/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/tap/node_modules/inherits/package.json
--- ./node_modules/ember-cli/node_modules/testem/node_modules/tap/node_modules/inherits/package.json 2015-05-08 10:11:44.000000000 +0200
+++ ../../../onegame-2/web/venture/node_modules/ember-cli/node_modules/testem/node_modules/tap/node_modules/inherits/package.json 2015-05-08 09:41:24.000000000 +0200
@@ -30,7 +30,7 @@
"shasum": "b17d08d326b4423e568eff719f91b0b1cbdf69f1",
"tarball": "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
},
- "_from": "inherits@*",
+ "_from": "inherits@>=2.0.1 <2.1.0",
"_npmVersion": "1.3.8",
"_npmUser": {
"name": "isaacs",
diff -bur ./node_modules/ember-cli-babel/node_modules/broccoli-babel-transpiler/node_modules/babel-core/node_modules/regenerator/node_modules/recast/package.json ../../../onegame-2/web/venture/node_modules/ember-cli-babel/node_modules/broccoli-babel-transpiler/node_modules/babel-core/node_modules/regenerator/node_modules/recast/package.json
--- ./node_modules/ember-cli-babel/node_modules/broccoli-babel-transpiler/node_modules/babel-core/node_modules/regenerator/node_modules/recast/package.json 2015-05-08 10:11:13.000000000 +0200
+++ ../../../onegame-2/web/venture/node_modules/ember-cli-babel/node_modules/broccoli-babel-transpiler/node_modules/babel-core/node_modules/regenerator/node_modules/recast/package.json 2015-05-08 09:40:49.000000000 +0200
@@ -44,7 +44,7 @@
},
"_id": "[email protected]",
"_shasum": "c616c1b7c4a82f0b9eb68734fc8f46ad2f5d2ac5",
- "_from": "recast@>=0.10.1 <0.11.0",
+ "_from": "recast@>=0.10.3 <0.11.0",
"_npmVersion": "1.4.9",
"_npmUser": {
"name": "benjamn",
diff -bur ./node_modules/ember-cli-babel/node_modules/broccoli-babel-transpiler/node_modules/babel-core/node_modules/regexpu/node_modules/recast/package.json ../../../onegame-2/web/venture/node_modules/ember-cli-babel/node_modules/broccoli-babel-transpiler/node_modules/babel-core/node_modules/regexpu/node_modules/recast/package.json
--- ./node_modules/ember-cli-babel/node_modules/broccoli-babel-transpiler/node_modules/babel-core/node_modules/regexpu/node_modules/recast/package.json 2015-05-08 10:11:13.000000000 +0200
+++ ../../../onegame-2/web/venture/node_modules/ember-cli-babel/node_modules/broccoli-babel-transpiler/node_modules/babel-core/node_modules/regexpu/node_modules/recast/package.json 2015-05-08 09:40:49.000000000 +0200
@@ -44,7 +44,7 @@
},
"_id": "[email protected]",
"_shasum": "c616c1b7c4a82f0b9eb68734fc8f46ad2f5d2ac5",
- "_from": "recast@>=0.10.1 <0.11.0",
+ "_from": "recast@>=0.10.3 <0.11.0",
"_npmVersion": "1.4.9",
"_npmUser": {
"name": "benjamn",
diff -bur ./node_modules/ember-cli-babel/node_modules/broccoli-filter/package.json ../../../onegame-2/web/venture/node_modules/ember-cli-babel/node_modules/broccoli-filter/package.json
--- ./node_modules/ember-cli-babel/node_modules/broccoli-filter/package.json 2015-05-08 10:11:02.000000000 +0200
+++ ../../../onegame-2/web/venture/node_modules/ember-cli-babel/node_modules/broccoli-filter/package.json 2015-05-08 09:40:36.000000000 +0200
@@ -35,7 +35,7 @@
"_id": "[email protected]",
"scripts": {},
"_shasum": "23cae3891ff9ebb7b4d7db00c6dcf03535daf7ad",
- "_from": "broccoli-filter@>=0.1.6 <0.2.0",
+ "_from": "broccoli-filter@>=0.1.10 <0.2.0",
"_npmVersion": "2.9.0",
"_nodeVersion": "2.0.0",
"_npmUser": {
diff -bur ./node_modules/ember-cli-dependency-checker/node_modules/chalk/node_modules/has-ansi/node_modules/ansi-regex/package.json ../../../onegame-2/web/venture/node_modules/ember-cli-dependency-checker/node_modules/chalk/node_modules/has-ansi/node_modules/ansi-regex/package.json
--- ./node_modules/ember-cli-dependency-checker/node_modules/chalk/node_modules/has-ansi/node_modules/ansi-regex/package.json 2015-05-08 10:11:01.000000000 +0200
+++ ../../../onegame-2/web/venture/node_modules/ember-cli-dependency-checker/node_modules/chalk/node_modules/has-ansi/node_modules/ansi-regex/package.json 2015-05-08 09:40:38.000000000 +0200
@@ -57,7 +57,7 @@
"homepage": "https://github.com/sindresorhus/ansi-regex",
"_id": "[email protected]",
"_shasum": "0d8e946967a3d8143f93e24e298525fc1b2235f9",
- "_from": "ansi-regex@>=0.2.1 <0.3.0",
+ "_from": "ansi-regex@>=0.2.0 <0.3.0",
"_npmVersion": "1.4.9",
"_npmUser": {
"name": "sindresorhus",
diff -bur ./node_modules/ember-cli-dependency-checker/node_modules/chalk/node_modules/strip-ansi/node_modules/ansi-regex/package.json ../../../onegame-2/web/venture/node_modules/ember-cli-dependency-checker/node_modules/chalk/node_modules/strip-ansi/node_modules/ansi-regex/package.json
--- ./node_modules/ember-cli-dependency-checker/node_modules/chalk/node_modules/strip-ansi/node_modules/ansi-regex/package.json 2015-05-08 10:11:01.000000000 +0200
+++ ../../../onegame-2/web/venture/node_modules/ember-cli-dependency-checker/node_modules/chalk/node_modules/strip-ansi/node_modules/ansi-regex/package.json 2015-05-08 09:40:38.000000000 +0200
@@ -57,7 +57,7 @@
"homepage": "https://github.com/sindresorhus/ansi-regex",
"_id": "[email protected]",
"_shasum": "0d8e946967a3d8143f93e24e298525fc1b2235f9",
- "_from": "ansi-regex@>=0.2.1 <0.3.0",
+ "_from": "ansi-regex@>=0.2.0 <0.3.0",
"_npmVersion": "1.4.9",
"_npmUser": {
"name": "sindresorhus",
diff -bur ./node_modules/ember-cli-qunit/node_modules/broccoli-jshint/node_modules/broccoli-filter/package.json ../../../onegame-2/web/venture/node_modules/ember-cli-qunit/node_modules/broccoli-jshint/node_modules/broccoli-filter/package.json
--- ./node_modules/ember-cli-qunit/node_modules/broccoli-jshint/node_modules/broccoli-filter/package.json 2015-05-08 10:11:03.000000000 +0200
+++ ../../../onegame-2/web/venture/node_modules/ember-cli-qunit/node_modules/broccoli-jshint/node_modules/broccoli-filter/package.json 2015-05-08 09:40:37.000000000 +0200
@@ -35,7 +35,7 @@
"_id": "[email protected]",
"scripts": {},
"_shasum": "23cae3891ff9ebb7b4d7db00c6dcf03535daf7ad",
- "_from": "broccoli-filter@>=0.1.6 <0.2.0",
+ "_from": "broccoli-filter@>=0.1.11 <0.2.0",
"_npmVersion": "2.9.0",
"_nodeVersion": "2.0.0",
"_npmUser": {
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment