Merge pull request #1099 from atom/win-package-specs

Get bundled package specs passing on windows, fixes #1097
This commit is contained in:
Matt Colyer 2013-11-12 16:07:34 -08:00
commit 3720f0fb8f
3 changed files with 14 additions and 12 deletions

View File

@ -18,26 +18,26 @@
"coffeestack": "0.6.0",
"emissary": "0.9.0",
"first-mate": "0.5.0",
"fs-plus": "0.7.0",
"fs-plus": "0.9.0",
"fuzzaldrin": "0.1.0",
"git-utils": "0.29.0",
"guid": "0.0.10",
"jasmine-focused": "~0.15.0",
"mkdirp": "0.3.5",
"less-cache": "0.9.0",
"less-cache": "0.10.0",
"nslog": "0.1.0",
"oniguruma": "0.24.0",
"optimist": "0.4.0",
"pathwatcher": "0.9.0",
"pegjs": "0.7.0",
"q": "0.9.7",
"scandal": "0.7.0",
"scandal": "0.8.0",
"season": "0.14.0",
"semver": "1.1.4",
"space-pen": "2.0.0",
"telepath": "0.23.0",
"temp": "0.5.0",
"underscore-plus": "0.2.0"
"underscore-plus": "0.3.0"
},
"devDependencies": {
"biscotto": "0.0.17",
@ -79,11 +79,11 @@
"bracket-matcher": "0.10.0",
"command-logger": "0.6.0",
"command-palette": "0.7.0",
"dev-live-reload": "0.14.0",
"dev-live-reload": "0.15.0",
"editor-stats": "0.5.0",
"exception-reporting": "0.5.0",
"find-and-replace": "0.39.0",
"fuzzy-finder": "0.19.0",
"find-and-replace": "0.40.0",
"fuzzy-finder": "0.20.0",
"gists": "0.6.0",
"git-diff": "0.13.0",
"github-sign-in": "0.9.0",
@ -97,15 +97,15 @@
"release-notes": "0.11.0",
"settings-view": "0.38.0",
"snippets": "0.13.0",
"spell-check": "0.11.0",
"status-bar": "0.15.1",
"spell-check": "0.13.0",
"status-bar": "0.16.0",
"styleguide": "0.9.0",
"symbols-view": "0.18.0",
"tabs": "0.8.0",
"terminal": "0.15.0",
"timecop": "0.9.0",
"to-the-hubs": "0.8.0",
"tree-view": "0.28.0",
"to-the-hubs": "0.9.0",
"tree-view": "0.30.0",
"visual-bell": "0.3.0",
"whitespace": "0.8.0",
"wrap-guide": "0.5.0",

View File

@ -216,7 +216,8 @@ class Git
#
# Returns a Number representing the status.
getDirectoryStatus: (directoryPath) ->
directoryPath = "#{directoryPath}/"
{sep} = require 'path'
directoryPath = "#{directoryPath}#{sep}"
directoryStatus = 0
for path, status of @statuses
directoryStatus |= status if path.indexOf(directoryPath) is 0

View File

@ -165,6 +165,7 @@ class Project
# Public: Make the given path relative to the project directory.
relativize: (fullPath) ->
return fullPath if fullPath?.match(/[A-Za-z0-9+-.]+:\/\//) # leave path alone if it has a scheme
@rootDirectory?.relativize(fullPath) ? fullPath
# Public: Returns whether the given path is inside this project.