From 66905980249b8fca1f566227ac0839edc183e252 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 23 May 2013 18:16:13 -0700 Subject: [PATCH 1/4] Use TextMate packages instead of vendoring bundles --- .gitmodules | 84 ----------------------- package.json | 30 +++++++- script/cibuild | 1 + vendor/packages/c.tmbundle | 1 - vendor/packages/clojure.tmbundle | 1 - vendor/packages/coffee-script-tmbundle | 1 - vendor/packages/css.tmbundle | 1 - vendor/packages/git.tmbundle | 1 - vendor/packages/go.tmbundle | 1 - vendor/packages/html.tmbundle | 1 - vendor/packages/hyperlink-helper.tmbundle | 1 - vendor/packages/java.tmbundle | 1 - vendor/packages/javascript.tmbundle | 1 - vendor/packages/json.tmbundle | 1 - vendor/packages/less.tmbundle | 1 - vendor/packages/mustache.tmbundle | 1 - vendor/packages/objective-c.tmbundle | 1 - vendor/packages/pegjs.tmbundle | 1 - vendor/packages/perl.tmbundle | 1 - vendor/packages/php.tmbundle | 1 - vendor/packages/property-list.tmbundle | 1 - vendor/packages/puppet-textmate.tmbundle | 1 - vendor/packages/python.tmbundle | 1 - vendor/packages/ruby-on-rails-tmbundle | 1 - vendor/packages/ruby.tmbundle | 1 - vendor/packages/sass.tmbundle | 1 - vendor/packages/shellscript.tmbundle | 1 - vendor/packages/sql.tmbundle | 1 - vendor/packages/text.tmbundle | 1 - vendor/packages/xml.tmbundle | 1 - vendor/packages/yaml.tmbundle | 1 - 31 files changed, 30 insertions(+), 113 deletions(-) delete mode 160000 vendor/packages/c.tmbundle delete mode 160000 vendor/packages/clojure.tmbundle delete mode 160000 vendor/packages/coffee-script-tmbundle delete mode 160000 vendor/packages/css.tmbundle delete mode 160000 vendor/packages/git.tmbundle delete mode 160000 vendor/packages/go.tmbundle delete mode 160000 vendor/packages/html.tmbundle delete mode 160000 vendor/packages/hyperlink-helper.tmbundle delete mode 160000 vendor/packages/java.tmbundle delete mode 160000 vendor/packages/javascript.tmbundle delete mode 160000 vendor/packages/json.tmbundle delete mode 160000 vendor/packages/less.tmbundle delete mode 160000 vendor/packages/mustache.tmbundle delete mode 160000 vendor/packages/objective-c.tmbundle delete mode 160000 vendor/packages/pegjs.tmbundle delete mode 160000 vendor/packages/perl.tmbundle delete mode 160000 vendor/packages/php.tmbundle delete mode 160000 vendor/packages/property-list.tmbundle delete mode 160000 vendor/packages/puppet-textmate.tmbundle delete mode 160000 vendor/packages/python.tmbundle delete mode 160000 vendor/packages/ruby-on-rails-tmbundle delete mode 160000 vendor/packages/ruby.tmbundle delete mode 160000 vendor/packages/sass.tmbundle delete mode 160000 vendor/packages/shellscript.tmbundle delete mode 160000 vendor/packages/sql.tmbundle delete mode 160000 vendor/packages/text.tmbundle delete mode 160000 vendor/packages/xml.tmbundle delete mode 160000 vendor/packages/yaml.tmbundle diff --git a/.gitmodules b/.gitmodules index 2b810e39b..9cbd72b2b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,93 +1,9 @@ -[submodule "vendor/packages/text.tmbundle"] - path = vendor/packages/text.tmbundle - url = https://github.com/textmate/text.tmbundle.git -[submodule "vendor/packages/css.tmbundle"] - path = vendor/packages/css.tmbundle - url = https://github.com/textmate/css.tmbundle.git -[submodule "vendor/packages/html.tmbundle"] - path = vendor/packages/html.tmbundle - url = https://github.com/textmate/html.tmbundle.git -[submodule "vendor/packages/javascript.tmbundle"] - path = vendor/packages/javascript.tmbundle - url = https://github.com/textmate/javascript.tmbundle.git -[submodule "vendor/packages/ruby-on-rails-tmbundle"] - path = vendor/packages/ruby-on-rails-tmbundle - url = https://github.com/drnic/ruby-on-rails-tmbundle.git -[submodule "vendor/packages/ruby.tmbundle"] - path = vendor/packages/ruby.tmbundle - url = https://github.com/textmate/ruby.tmbundle.git -[submodule "vendor/packages/coffee-script-tmbundle"] - path = vendor/packages/coffee-script-tmbundle - url = https://github.com/kevinsawicki/coffee-script-tmbundle.git -[submodule "vendor/packages/puppet-textmate.tmbundle"] - path = vendor/packages/puppet-textmate.tmbundle - url = https://github.com/cburyta/puppet-textmate.tmbundle.git -[submodule "vendor/packages/c.tmbundle"] - path = vendor/packages/c.tmbundle - url = https://github.com/textmate/c.tmbundle.git -[submodule "vendor/packages/objective-c.tmbundle"] - path = vendor/packages/objective-c.tmbundle - url = https://github.com/textmate/objective-c.tmbundle.git -[submodule "vendor/packages/git.tmbundle"] - path = vendor/packages/git.tmbundle - url = https://github.com/kevinsawicki/git.tmbundle.git -[submodule "vendor/packages/json.tmbundle"] - path = vendor/packages/json.tmbundle - url = https://github.com/textmate/json.tmbundle.git -[submodule "vendor/packages/shellscript.tmbundle"] - path = vendor/packages/shellscript.tmbundle - url = https://github.com/textmate/shellscript.tmbundle -[submodule "vendor/packages/xml.tmbundle"] - path = vendor/packages/xml.tmbundle - url = https://github.com/textmate/xml.tmbundle.git -[submodule "vendor/packages/property-list.tmbundle"] - path = vendor/packages/property-list.tmbundle - url = https://github.com/textmate/property-list.tmbundle.git -[submodule "vendor/packages/python.tmbundle"] - path = vendor/packages/python.tmbundle - url = https://github.com/textmate/python.tmbundle -[submodule "vendor/packages/clojure.tmbundle"] - path = vendor/packages/clojure.tmbundle - url = https://github.com/mmcgrana/textmate-clojure [submodule "prebuilt-cef"] path = prebuilt-cef url = https://github.com/github/prebuilt-cef -[submodule "vendor/packages/yaml.tmbundle"] - path = vendor/packages/yaml.tmbundle - url = https://github.com/textmate/yaml.tmbundle.git -[submodule "vendor/packages/java.tmbundle"] - path = vendor/packages/java.tmbundle - url = https://github.com/textmate/java.tmbundle.git -[submodule "vendor/packages/php.tmbundle"] - path = vendor/packages/php.tmbundle - url = https://github.com/textmate/php.tmbundle.git -[submodule "vendor/packages/perl.tmbundle"] - path = vendor/packages/perl.tmbundle - url = https://github.com/textmate/perl.tmbundle.git -[submodule "vendor/packages/sass.tmbundle"] - path = vendor/packages/sass.tmbundle - url = https://github.com/alexsancho/SASS.tmbundle.git -[submodule "vendor/packages/less.tmbundle"] - path = vendor/packages/less.tmbundle - url = https://github.com/mathewbyrne/less.tmbundle.git -[submodule "vendor/packages/mustache.tmbundle"] - path = vendor/packages/mustache.tmbundle - url = https://github.com/kevinsawicki/Mustache.tmbundle.git -[submodule "vendor/packages/go.tmbundle"] - path = vendor/packages/go.tmbundle - url = https://github.com/rsms/Go.tmbundle [submodule "vendor/bootstrap"] path = vendor/bootstrap url = https://github.com/twitter/bootstrap -[submodule "vendor/packages/pegjs.tmbundle"] - path = vendor/packages/pegjs.tmbundle - url = https://github.com/alexstrat/PEGjs.tmbundle -[submodule "vendor/packages/sql.tmbundle"] - path = vendor/packages/sql.tmbundle - url = https://github.com/textmate/sql.tmbundle -[submodule "vendor/packages/hyperlink-helper.tmbundle"] - path = vendor/packages/hyperlink-helper.tmbundle - url = https://github.com/textmate/hyperlink-helper.tmbundle [submodule "vendor/apm"] path = vendor/apm url = https://github.com/github/apm.git diff --git a/package.json b/package.json index 8cc60f592..0d683b3b9 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,35 @@ "jqueryui-browser": "1.10.2-1", "season": "0.7.0", "humanize-plus": "1.1.0", - "semver": "1.1.4" + "semver": "1.1.4", + "c-tmbundle": "1.0.0", + "coffee-script-tmbundle": "2.0.0", + "css-tmbundle": "1.0.0", + "git-tmbundle": "1.0.0", + "go-tmbundle": "1.0.0", + "html-tmbundle": "1.0.0", + "hyperlink-helper-tmbundle": "1.0.0", + "java-tmbundle": "1.0.0", + "javascript-tmbundle": "1.0.0", + "json-tmbundle": "1.0.0", + "less-tmbundle": "1.0.0", + "mustache-tmbundle": "1.0.0", + "objective-c-tmbundle": "1.0.0", + "pegjs-tmbundle": "1.0.0", + "perl-tmbundle": "1.0.0", + "php-tmbundle": "1.0.0", + "property-list-tmbundle": "1.0.0", + "puppet-textmate-tmbundle": "1.0.0", + "python-tmbundle": "1.0.0", + "ruby-on-rails-tmbundle": "1.0.0", + "ruby-tmbundle": "1.0.0", + "sass-tmbundle": "1.0.0", + "shellscript-tmbundle": "1.0.0", + "sql-tmbundle": "1.0.0", + "text-tmbundle": "1.0.0", + "textmate-clojure": "1.0.0", + "xml-tmbundle": "1.0.0", + "yaml-tmbundle": "1.0.0" }, "devDependencies": { "biscotto": "0.0.11" diff --git a/script/cibuild b/script/cibuild index dea583466..7f54cd358 100755 --- a/script/cibuild +++ b/script/cibuild @@ -2,4 +2,5 @@ set -ex rm -rf ~/.atom +git clean -df rake clean test diff --git a/vendor/packages/c.tmbundle b/vendor/packages/c.tmbundle deleted file mode 160000 index c8a6516c1..000000000 --- a/vendor/packages/c.tmbundle +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c8a6516c1131055bfcd1bca5e2ee6567c2f50058 diff --git a/vendor/packages/clojure.tmbundle b/vendor/packages/clojure.tmbundle deleted file mode 160000 index 546b39c97..000000000 --- a/vendor/packages/clojure.tmbundle +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 546b39c9725d88f1a0eaf74486ae50ca87ce368f diff --git a/vendor/packages/coffee-script-tmbundle b/vendor/packages/coffee-script-tmbundle deleted file mode 160000 index 32d285247..000000000 --- a/vendor/packages/coffee-script-tmbundle +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 32d2852470da251b19fa324bd69c476f845eaaa2 diff --git a/vendor/packages/css.tmbundle b/vendor/packages/css.tmbundle deleted file mode 160000 index aa549903f..000000000 --- a/vendor/packages/css.tmbundle +++ /dev/null @@ -1 +0,0 @@ -Subproject commit aa549903ff01e9ba7dc0bd83f2cfe7ab54feab2d diff --git a/vendor/packages/git.tmbundle b/vendor/packages/git.tmbundle deleted file mode 160000 index 5117cd42f..000000000 --- a/vendor/packages/git.tmbundle +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5117cd42f1849d3a9b620fbf0b7c7d6d33c97172 diff --git a/vendor/packages/go.tmbundle b/vendor/packages/go.tmbundle deleted file mode 160000 index d6db06051..000000000 --- a/vendor/packages/go.tmbundle +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d6db06051b8dd8683802d57e99bab6541c08f4d7 diff --git a/vendor/packages/html.tmbundle b/vendor/packages/html.tmbundle deleted file mode 160000 index af4fef34e..000000000 --- a/vendor/packages/html.tmbundle +++ /dev/null @@ -1 +0,0 @@ -Subproject commit af4fef34e1df538eda9a166912047b610530ece0 diff --git a/vendor/packages/hyperlink-helper.tmbundle b/vendor/packages/hyperlink-helper.tmbundle deleted file mode 160000 index e37fd810c..000000000 --- a/vendor/packages/hyperlink-helper.tmbundle +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e37fd810cd735032cfc4cae5c102e5a4b27e9a2f diff --git a/vendor/packages/java.tmbundle b/vendor/packages/java.tmbundle deleted file mode 160000 index 1c315ed46..000000000 --- a/vendor/packages/java.tmbundle +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1c315ed46188e02d749939ec64160040d9c03f0b diff --git a/vendor/packages/javascript.tmbundle b/vendor/packages/javascript.tmbundle deleted file mode 160000 index 58e81b0ea..000000000 --- a/vendor/packages/javascript.tmbundle +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 58e81b0eae498c9a4eb6e395368df3b7a01d9851 diff --git a/vendor/packages/json.tmbundle b/vendor/packages/json.tmbundle deleted file mode 160000 index 5765750aa..000000000 --- a/vendor/packages/json.tmbundle +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5765750aa970c72decef3e2fcefec16a0f22e427 diff --git a/vendor/packages/less.tmbundle b/vendor/packages/less.tmbundle deleted file mode 160000 index a202dd994..000000000 --- a/vendor/packages/less.tmbundle +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a202dd9942f96bac0ee3c42552a35480682790c9 diff --git a/vendor/packages/mustache.tmbundle b/vendor/packages/mustache.tmbundle deleted file mode 160000 index 21ed7c4a4..000000000 --- a/vendor/packages/mustache.tmbundle +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 21ed7c4a49989a9bd30da496b083fe74c1c5b699 diff --git a/vendor/packages/objective-c.tmbundle b/vendor/packages/objective-c.tmbundle deleted file mode 160000 index b0826e645..000000000 --- a/vendor/packages/objective-c.tmbundle +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b0826e645a3d8ca37dd625a56935d49cc8eeb9fc diff --git a/vendor/packages/pegjs.tmbundle b/vendor/packages/pegjs.tmbundle deleted file mode 160000 index 8c75a902d..000000000 --- a/vendor/packages/pegjs.tmbundle +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8c75a902d6807d27cc54ffcc7cf7c8cc7c253914 diff --git a/vendor/packages/perl.tmbundle b/vendor/packages/perl.tmbundle deleted file mode 160000 index fccaee006..000000000 --- a/vendor/packages/perl.tmbundle +++ /dev/null @@ -1 +0,0 @@ -Subproject commit fccaee006dbaddbde7ff36ec0b67efc638bbf476 diff --git a/vendor/packages/php.tmbundle b/vendor/packages/php.tmbundle deleted file mode 160000 index bb576b557..000000000 --- a/vendor/packages/php.tmbundle +++ /dev/null @@ -1 +0,0 @@ -Subproject commit bb576b557518802c458d85bc2c0a7430fe90e1a0 diff --git a/vendor/packages/property-list.tmbundle b/vendor/packages/property-list.tmbundle deleted file mode 160000 index 8a2b90aec..000000000 --- a/vendor/packages/property-list.tmbundle +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8a2b90aec0551cd085ecc8a32ecc8a53769b5739 diff --git a/vendor/packages/puppet-textmate.tmbundle b/vendor/packages/puppet-textmate.tmbundle deleted file mode 160000 index 5ef4949b2..000000000 --- a/vendor/packages/puppet-textmate.tmbundle +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5ef4949b2c964bace86782573cb952751ca77f5e diff --git a/vendor/packages/python.tmbundle b/vendor/packages/python.tmbundle deleted file mode 160000 index df88cd66d..000000000 --- a/vendor/packages/python.tmbundle +++ /dev/null @@ -1 +0,0 @@ -Subproject commit df88cd66d00ed44b1d1a212a347334bb8308299c diff --git a/vendor/packages/ruby-on-rails-tmbundle b/vendor/packages/ruby-on-rails-tmbundle deleted file mode 160000 index 683f6e652..000000000 --- a/vendor/packages/ruby-on-rails-tmbundle +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 683f6e652cc467e0007f80aa11f174a4d9189f3c diff --git a/vendor/packages/ruby.tmbundle b/vendor/packages/ruby.tmbundle deleted file mode 160000 index 4b74231cb..000000000 --- a/vendor/packages/ruby.tmbundle +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4b74231cb27d8d6e8e917947c566d21ec9d6e76a diff --git a/vendor/packages/sass.tmbundle b/vendor/packages/sass.tmbundle deleted file mode 160000 index e2bef05af..000000000 --- a/vendor/packages/sass.tmbundle +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e2bef05afac130e4ebd1b2f8991e9563568faa47 diff --git a/vendor/packages/shellscript.tmbundle b/vendor/packages/shellscript.tmbundle deleted file mode 160000 index 02893ae5f..000000000 --- a/vendor/packages/shellscript.tmbundle +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 02893ae5fd12ba723fcf0ea834d3fb076d83e000 diff --git a/vendor/packages/sql.tmbundle b/vendor/packages/sql.tmbundle deleted file mode 160000 index 1e047e07a..000000000 --- a/vendor/packages/sql.tmbundle +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1e047e07ad45d67ee7e747fae17bee896eef638f diff --git a/vendor/packages/text.tmbundle b/vendor/packages/text.tmbundle deleted file mode 160000 index 061224bd7..000000000 --- a/vendor/packages/text.tmbundle +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 061224bd78fd98d02035466cdd959bf29995c2c5 diff --git a/vendor/packages/xml.tmbundle b/vendor/packages/xml.tmbundle deleted file mode 160000 index 9d9446f7d..000000000 --- a/vendor/packages/xml.tmbundle +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9d9446f7da37e259cea0bd4a054796c5f67d5af1 diff --git a/vendor/packages/yaml.tmbundle b/vendor/packages/yaml.tmbundle deleted file mode 160000 index 173808ba4..000000000 --- a/vendor/packages/yaml.tmbundle +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 173808ba47df99b22a43670bf4f8a71370339ae7 From 617af68aeb94463fa1bc93f8a015bea876df31e6 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Fri, 24 May 2013 10:06:58 -0700 Subject: [PATCH 2/4] Upgrade apm --- vendor/apm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/apm b/vendor/apm index 01ded1c72..9ce00a606 160000 --- a/vendor/apm +++ b/vendor/apm @@ -1 +1 @@ -Subproject commit 01ded1c72cb71a0ac85fe267e3dafc370797211f +Subproject commit 9ce00a6063b096aaa94afdf89591d56663abdd02 From e84e13fe3712b19355409d7b424c75b8a7836e7f Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Fri, 24 May 2013 10:21:00 -0700 Subject: [PATCH 3/4] Load internal modules with an atom engines field as packages --- src/app/atom.coffee | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/app/atom.coffee b/src/app/atom.coffee index ff64f51da..b44bc4c95 100644 --- a/src/app/atom.coffee +++ b/src/app/atom.coffee @@ -91,7 +91,15 @@ _.extend atom, resolvePackagePath: (name) -> return name if fsUtils.isDirectory(name) path = fsUtils.resolve(config.packageDirPaths..., name) - path if fsUtils.isDirectory(path) + if fsUtils.isDirectory(path) + path + else + packagePath = fsUtils.join(window.resourcePath, 'node_modules', name) + packagePath if @isInternalPackage(packagePath) + + isInternalPackage: (packagePath) -> + {engines} = Package.loadMetadata(packagePath, true) + return packagePath if engines?.atom? getLoadedPackage: (name) -> @loadedPackages[name] @@ -107,9 +115,14 @@ _.extend atom, getAvailablePackagePaths: -> packagePaths = [] + for packageDirPath in config.packageDirPaths for packagePath in fsUtils.list(packageDirPath) packagePaths.push(packagePath) if fsUtils.isDirectory(packagePath) + + for packagePath in fsUtils.list(fsUtils.join(window.resourcePath, 'node_modules')) + packagePaths.push(packagePath) if @isInternalPackage(packagePath) + _.uniq(packagePaths) getAvailablePackageNames: -> From ea7ff135eea8ec8393f632d2686785b3dee6ddfe Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Tue, 28 May 2013 09:42:20 -0700 Subject: [PATCH 4/4] :lipstick: --- src/app/atom.coffee | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/app/atom.coffee b/src/app/atom.coffee index b44bc4c95..93f2d78bc 100644 --- a/src/app/atom.coffee +++ b/src/app/atom.coffee @@ -90,16 +90,16 @@ _.extend atom, resolvePackagePath: (name) -> return name if fsUtils.isDirectory(name) + path = fsUtils.resolve(config.packageDirPaths..., name) - if fsUtils.isDirectory(path) - path - else - packagePath = fsUtils.join(window.resourcePath, 'node_modules', name) - packagePath if @isInternalPackage(packagePath) + return path if fsUtils.isDirectory(path) + + packagePath = fsUtils.join(window.resourcePath, 'node_modules', name) + return packagePath if @isInternalPackage(packagePath) isInternalPackage: (packagePath) -> {engines} = Package.loadMetadata(packagePath, true) - return packagePath if engines?.atom? + engines?.atom? getLoadedPackage: (name) -> @loadedPackages[name]