From 0688ddf083fb43edd71fca483fabf6a2eff053d2 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Sun, 23 Feb 2014 17:05:26 -0800
Subject: [PATCH 1/5] Remove _ and fs from exports

---
 exports/atom.coffee | 2 --
 1 file changed, 2 deletions(-)

diff --git a/exports/atom.coffee b/exports/atom.coffee
index 3c98e06ae..7e2907485 100644
--- a/exports/atom.coffee
+++ b/exports/atom.coffee
@@ -1,10 +1,8 @@
 {Point, Range} = require 'text-buffer'
 
 module.exports =
-  _: require 'underscore-plus'
   BufferedNodeProcess: require '../src/buffered-node-process'
   BufferedProcess: require '../src/buffered-process'
-  fs: require 'fs-plus'
   Git: require '../src/git'
   Point: Point
   Range: Range

From 189ebc4476bd86ba6a490966de353c054041f738 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Sun, 23 Feb 2014 17:09:05 -0800
Subject: [PATCH 2/5] Remove _/fs from modules directly

---
 spec/display-buffer-spec.coffee      | 2 +-
 spec/pane-container-view-spec.coffee | 2 +-
 spec/project-spec.coffee             | 3 ++-
 spec/spec-helper.coffee              | 4 +++-
 spec/spec-suite.coffee               | 6 ++++--
 spec/time-reporter.coffee            | 2 +-
 spec/tokenized-buffer-spec.coffee    | 2 +-
 7 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/spec/display-buffer-spec.coffee b/spec/display-buffer-spec.coffee
index 6e13ee8f4..08814c5b0 100644
--- a/spec/display-buffer-spec.coffee
+++ b/spec/display-buffer-spec.coffee
@@ -1,5 +1,5 @@
 DisplayBuffer = require '../src/display-buffer'
-{_} = require 'atom'
+_ = require 'underscore-plus'
 
 describe "DisplayBuffer", ->
   [displayBuffer, buffer, changeHandler, tabLength] = []
diff --git a/spec/pane-container-view-spec.coffee b/spec/pane-container-view-spec.coffee
index 149658b0e..618f2e84d 100644
--- a/spec/pane-container-view-spec.coffee
+++ b/spec/pane-container-view-spec.coffee
@@ -2,7 +2,7 @@ path = require 'path'
 temp = require 'temp'
 PaneContainerView = require '../src/pane-container-view'
 PaneView = require '../src/pane-view'
-{_, $, View, $$} = require 'atom'
+{$, View, $$} = require 'atom'
 
 describe "PaneContainerView", ->
   [TestView, container, pane1, pane2, pane3] = []
diff --git a/spec/project-spec.coffee b/spec/project-spec.coffee
index e33413f97..fa26e2754 100644
--- a/spec/project-spec.coffee
+++ b/spec/project-spec.coffee
@@ -1,7 +1,8 @@
 temp = require 'temp'
 fstream = require 'fstream'
 Project = require '../src/project'
-{_, fs} = require 'atom'
+_ = require 'underscore-plus'
+fs = require 'fs-plus'
 path = require 'path'
 platform = require './spec-helper-platform'
 BufferedProcess = require '../src/buffered-process'
diff --git a/spec/spec-helper.coffee b/spec/spec-helper.coffee
index 3c8efb624..81b7dc630 100644
--- a/spec/spec-helper.coffee
+++ b/spec/spec-helper.coffee
@@ -4,7 +4,9 @@ atom.restoreWindowDimensions()
 
 require '../vendor/jasmine-jquery'
 path = require 'path'
-{_, $, WorkspaceView, fs} = require 'atom'
+_ = require 'underscore-plus'
+fs = require 'fs-plus'
+{$, WorkspaceView} = require 'atom'
 Keymap = require '../src/keymap'
 Config = require '../src/config'
 {Point} = require 'text-buffer'
diff --git a/spec/spec-suite.coffee b/spec/spec-suite.coffee
index 6beade358..728014eea 100644
--- a/spec/spec-suite.coffee
+++ b/spec/spec-suite.coffee
@@ -1,6 +1,8 @@
-{_, fs, Git} = require 'atom'
+_ = require 'underscore-plus'
+fs = require 'fs-plus'
+{Git} = require 'atom'
 path = require 'path'
-require './spec-helper'
+require './spec-helper'
 
 requireSpecs = (specDirectory, specType) ->
   for specFilePath in fs.listTreeSync(specDirectory) when /-spec\.coffee$/.test specFilePath
diff --git a/spec/time-reporter.coffee b/spec/time-reporter.coffee
index f244be76c..a02c47286 100644
--- a/spec/time-reporter.coffee
+++ b/spec/time-reporter.coffee
@@ -1,4 +1,4 @@
-{_} = require 'atom'
+_ = require 'underscore-plus'
 
 module.exports =
 class TimeReporter extends jasmine.Reporter
diff --git a/spec/tokenized-buffer-spec.coffee b/spec/tokenized-buffer-spec.coffee
index 2fad95256..d1c619d2c 100644
--- a/spec/tokenized-buffer-spec.coffee
+++ b/spec/tokenized-buffer-spec.coffee
@@ -1,5 +1,5 @@
 TokenizedBuffer = require '../src/tokenized-buffer'
-{_} = require 'atom'
+_ = require 'underscore-plus'
 
 describe "TokenizedBuffer", ->
   [tokenizedBuffer, buffer, changeHandler] = []

From 1131952a544f78f714c1126ea05bc74673a1840f Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Sun, 23 Feb 2014 17:11:38 -0800
Subject: [PATCH 3/5] Remove stray unicode char

---
 spec/spec-suite.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/spec-suite.coffee b/spec/spec-suite.coffee
index 728014eea..c27d82548 100644
--- a/spec/spec-suite.coffee
+++ b/spec/spec-suite.coffee
@@ -2,7 +2,7 @@ _ = require 'underscore-plus'
 fs = require 'fs-plus'
 {Git} = require 'atom'
 path = require 'path'
-require './spec-helper'
+require './spec-helper'
 
 requireSpecs = (specDirectory, specType) ->
   for specFilePath in fs.listTreeSync(specDirectory) when /-spec\.coffee$/.test specFilePath

From a651254e38199d09d86af10eb57f46ae8b113b90 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Sun, 23 Feb 2014 17:19:00 -0800
Subject: [PATCH 4/5] Require fs-plus directly in specs

---
 spec/atom-spec.coffee              | 2 +-
 spec/command-installer-spec.coffee | 2 +-
 spec/config-spec.coffee            | 2 +-
 spec/git-spec.coffee               | 2 +-
 spec/pane-view-spec.coffee         | 3 ++-
 spec/syntax-spec.coffee            | 2 +-
 spec/theme-manager-spec.coffee     | 3 ++-
 spec/window-spec.coffee            | 2 +-
 spec/workspace-view-spec.coffee    | 2 +-
 9 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/spec/atom-spec.coffee b/spec/atom-spec.coffee
index fcd6cf6a2..f9405be57 100644
--- a/spec/atom-spec.coffee
+++ b/spec/atom-spec.coffee
@@ -1,4 +1,4 @@
-{$, $$, fs, WorkspaceView}  = require 'atom'
+{$, $$, WorkspaceView}  = require 'atom'
 Exec = require('child_process').exec
 path = require 'path'
 Package = require '../src/package'
diff --git a/spec/command-installer-spec.coffee b/spec/command-installer-spec.coffee
index e0624b6d3..7a97094f4 100644
--- a/spec/command-installer-spec.coffee
+++ b/spec/command-installer-spec.coffee
@@ -1,5 +1,5 @@
-{fs} = require 'atom'
 path = require 'path'
+fs = require 'fs-plus'
 temp = require 'temp'
 installer = require '../src/command-installer'
 
diff --git a/spec/config-spec.coffee b/spec/config-spec.coffee
index 02ef6d6d8..13d5e5b94 100644
--- a/spec/config-spec.coffee
+++ b/spec/config-spec.coffee
@@ -1,7 +1,7 @@
-{fs} = require 'atom'
 path = require 'path'
 temp = require 'temp'
 CSON = require 'season'
+fs = require 'fs-plus'
 
 describe "Config", ->
   dotAtomPath = path.join(temp.dir, 'dot-atom-dir')
diff --git a/spec/git-spec.coffee b/spec/git-spec.coffee
index 485d4dbbe..66feef000 100644
--- a/spec/git-spec.coffee
+++ b/spec/git-spec.coffee
@@ -1,6 +1,6 @@
 temp = require 'temp'
 Git = require '../src/git'
-{fs} = require 'atom'
+fs = require 'fs-plus'
 path = require 'path'
 Task = require '../src/task'
 
diff --git a/spec/pane-view-spec.coffee b/spec/pane-view-spec.coffee
index 049f15fc8..e86fb750f 100644
--- a/spec/pane-view-spec.coffee
+++ b/spec/pane-view-spec.coffee
@@ -1,6 +1,7 @@
 PaneContainerView = require '../src/pane-container-view'
 PaneView = require '../src/pane-view'
-{fs, $, View} = require 'atom'
+fs = require 'fs-plus'
+{$, View} = require 'atom'
 path = require 'path'
 temp = require 'temp'
 
diff --git a/spec/syntax-spec.coffee b/spec/syntax-spec.coffee
index c39d12152..3b6745155 100644
--- a/spec/syntax-spec.coffee
+++ b/spec/syntax-spec.coffee
@@ -1,5 +1,5 @@
-{fs} = require 'atom'
 path = require 'path'
+fs = require 'fs-plus'
 temp = require 'temp'
 
 describe "the `syntax` global", ->
diff --git a/spec/theme-manager-spec.coffee b/spec/theme-manager-spec.coffee
index 490f1137c..a3a0b399e 100644
--- a/spec/theme-manager-spec.coffee
+++ b/spec/theme-manager-spec.coffee
@@ -1,6 +1,7 @@
 path = require 'path'
 
-{$, $$, fs, WorkspaceView} = require 'atom'
+{$, $$, WorkspaceView} = require 'atom'
+fs = require 'fs-plus'
 temp = require 'temp'
 
 ThemeManager = require '../src/theme-manager'
diff --git a/spec/window-spec.coffee b/spec/window-spec.coffee
index 78f90d3b7..065cb2005 100644
--- a/spec/window-spec.coffee
+++ b/spec/window-spec.coffee
@@ -1,4 +1,4 @@
-{$, $$, fs} = require 'atom'
+{$, $$} = require 'atom'
 path = require 'path'
 Editor = require '../src/editor'
 WindowEventHandler = require '../src/window-event-handler'
diff --git a/spec/workspace-view-spec.coffee b/spec/workspace-view-spec.coffee
index 245666c23..e034d9ed4 100644
--- a/spec/workspace-view-spec.coffee
+++ b/spec/workspace-view-spec.coffee
@@ -1,4 +1,4 @@
-{$, $$, fs, WorkspaceView, View} = require 'atom'
+{$, $$, WorkspaceView, View} = require 'atom'
 Q = require 'q'
 path = require 'path'
 temp = require 'temp'

From 55f4a7b63e65eb39e89d97d98f856b744c791835 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Sun, 23 Feb 2014 17:26:49 -0800
Subject: [PATCH 5/5] Remove unneeded exists checks

---
 spec/config-spec.coffee | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spec/config-spec.coffee b/spec/config-spec.coffee
index 13d5e5b94..0dfe87b60 100644
--- a/spec/config-spec.coffee
+++ b/spec/config-spec.coffee
@@ -217,7 +217,7 @@ describe "Config", ->
       expect(fs.existsSync(atom.config.configDirPath)).toBeFalsy()
 
     afterEach ->
-      fs.removeSync(dotAtomPath) if fs.existsSync(dotAtomPath)
+      fs.removeSync(dotAtomPath)
 
     describe "when the configDirPath doesn't exist", ->
       it "copies the contents of dot-atom to ~/.atom", ->
@@ -243,7 +243,7 @@ describe "Config", ->
       expect(fs.existsSync(atom.config.configDirPath)).toBeFalsy()
 
     afterEach ->
-      fs.removeSync(dotAtomPath) if fs.existsSync(dotAtomPath)
+      fs.removeSync(dotAtomPath)
 
     describe "when the config file contains valid cson", ->
       beforeEach ->
@@ -286,7 +286,7 @@ describe "Config", ->
 
     afterEach ->
       atom.config.unobserveUserConfig()
-      fs.removeSync(dotAtomPath) if fs.existsSync(dotAtomPath)
+      fs.removeSync(dotAtomPath)
 
     describe "when the config file changes to contain valid cson", ->
       it "updates the config data", ->