diff --git a/package.json b/package.json index b299ac08..f0b02af1 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "jsstyle": "jscs src bin examples/*.js", "compile": "babel --source-maps --out-dir=./lib src", "watch": "babel --watch --source-maps --out-dir=./lib src", - "copy": "cp src/server/*.json lib/server/ && cp -R src/sc-classes lib/", + "copy": "cp src/server/*.json lib/server/ && cp -R src/supercollider-js lib/", "docs": "esdoc -c esdoc.json", "build": "npm run compile && npm run copy", "prepublish": "npm run build", diff --git a/src/lang/__tests__/sclang-test.js b/src/lang/__tests__/sclang-test.js index f826ffb5..a175c883 100644 --- a/src/lang/__tests__/sclang-test.js +++ b/src/lang/__tests__/sclang-test.js @@ -35,13 +35,13 @@ describe('sclang', function() { describe('sclangConfigOptions', function() { - it('should include sc-classes', function() { + it('should include supercollider-js', function() { var sclang = new SCLang(); var opts = sclang.sclangConfigOptions(); expect(opts.includePaths.length).toEqual(1); var isIn = _.some(opts.includePaths, function(p) { // and that directory should really exist - return p.match(/sc\-classes/) && fs.existsSync(p); + return p.match(/supercollider\-js/) && fs.existsSync(p); }); expect(isIn).toBeTruthy(); }); @@ -51,7 +51,7 @@ describe('sclang', function() { var opts = sclang.sclangConfigOptions({ sclang_conf: path.join(__dirname, 'fixtures', 'sclang_test_conf.yaml') }); - // as well as sc-classes + // as well as supercollider-js expect(opts.includePaths.length).toEqual(2 + 1); expect(opts.excludePaths.length).toEqual(1); }); @@ -104,11 +104,11 @@ describe('sclang', function() { }); describe('sclangConfigOptions', function() { - it('should include sc-classes', function() { + it('should include supercollider-js', function() { var sclang = new SCLang(); var config = sclang.sclangConfigOptions(); expect(config.includePaths.length).toEqual(1); - expect(config.includePaths[0].match(/sc-classes/)).toBeTruthy(); + expect(config.includePaths[0].match(/supercollider-js/)).toBeTruthy(); }); it('postInlineWarning should not be undefined', function() { diff --git a/src/lang/internals/__tests__/fixtures/io-compile-success.txt b/src/lang/internals/__tests__/fixtures/io-compile-success.txt index 5d1ae183..11a1d4e2 100644 --- a/src/lang/internals/__tests__/fixtures/io-compile-success.txt +++ b/src/lang/internals/__tests__/fixtures/io-compile-success.txt @@ -3,7 +3,7 @@ empty compiling class library... NumPrimitives = 710 compiling dir: '/Users/crucial/code/supercollider/build/Install/SuperCollider/SuperCollider.app/Contents/Resources/SCClassLibrary' - compiling dir: '/Users/crucial/github/atom-supercollider/node_modules/supercolliderjs/lib/sc-classes' + compiling dir: '/Users/crucial/github/atom-supercollider/node_modules/supercolliderjs/lib/supercollider-js' compiling dir: '/Users/crucial/Library/Application Support/SuperCollider/downloaded-quarks/Steno' pass 1 done numentries = 819694 / 11593660 = 0.071 diff --git a/src/lang/sclang.js b/src/lang/sclang.js index 4d593ccf..bea224b9 100644 --- a/src/lang/sclang.js +++ b/src/lang/sclang.js @@ -218,7 +218,7 @@ export class SCLang extends EventEmitter { sclangConfigOptions(options={}) { var runtimeIncludePaths = [ - path.resolve(__dirname, '../../lib/sc-classes') + path.resolve(__dirname, '../../lib/supercollider-js') ], sclang_conf = {}; diff --git a/src/sc-classes/sc-classes.quark b/src/sc-classes/sc-classes.quark deleted file mode 100644 index ca6d9fea..00000000 --- a/src/sc-classes/sc-classes.quark +++ /dev/null @@ -1,4 +0,0 @@ -( - 'summary': "supercollider.js adds this package in order to overide methods of Error.reportError so they post formatted JSON errors to standard out", - 'version': "0.8.2" -) diff --git a/src/sc-classes/SuperColliderJS.sc b/src/supercollider-js/SuperColliderJS.sc similarity index 100% rename from src/sc-classes/SuperColliderJS.sc rename to src/supercollider-js/SuperColliderJS.sc diff --git a/src/sc-classes/SystemOverwrites/plusError.sc b/src/supercollider-js/SystemOverwrites/plusError.sc similarity index 100% rename from src/sc-classes/SystemOverwrites/plusError.sc rename to src/supercollider-js/SystemOverwrites/plusError.sc diff --git a/src/sc-classes/SystemOverwrites/plusQuarks.sc b/src/supercollider-js/SystemOverwrites/plusQuarks.sc similarity index 96% rename from src/sc-classes/SystemOverwrites/plusQuarks.sc rename to src/supercollider-js/SystemOverwrites/plusQuarks.sc index 72bf7ec4..1c2aeea3 100644 --- a/src/sc-classes/SystemOverwrites/plusQuarks.sc +++ b/src/supercollider-js/SystemOverwrites/plusQuarks.sc @@ -43,7 +43,7 @@ *prSaveConfig { var scjs = LanguageConfig.includePaths.detect({ arg p; - p.contains("supercolliderjs/lib/sc-classes"); + p.contains("supercolliderjs/lib/supercollider-js"); }); if (scjs.notNil, { diff --git a/src/sc-classes/SystemOverwrites/plusSynthDesc.sc b/src/supercollider-js/SystemOverwrites/plusSynthDesc.sc similarity index 100% rename from src/sc-classes/SystemOverwrites/plusSynthDesc.sc rename to src/supercollider-js/SystemOverwrites/plusSynthDesc.sc diff --git a/src/supercollider-js/supercollider-js.quark b/src/supercollider-js/supercollider-js.quark new file mode 100644 index 00000000..dcbed0fd --- /dev/null +++ b/src/supercollider-js/supercollider-js.quark @@ -0,0 +1,4 @@ +( + 'summary': "supercollider.js adds this quark to support two-way communication between supercollider and the node.js host. It also overides methods of the Error classes so that they print errors as JSON data.", + 'version': "0.11.0" +)