From 4dac8c6649aacbeeace9730c807b525641701abc Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Wed, 18 Sep 2013 10:11:24 -0700
Subject: [PATCH 1/4] Use atom-api for requires

---
 lib/general-panel.coffee       | 6 +-----
 lib/index.coffee               | 5 ++---
 lib/package-manager.coffee     | 2 +-
 lib/package-panel.coffee       | 4 +---
 lib/package-view.coffee        | 8 +++-----
 lib/settings-view.coffee       | 6 +-----
 lib/theme-panel.coffee         | 4 +---
 spec/general-panel-spec.coffee | 1 -
 spec/package-panel-spec.coffee | 2 +-
 spec/settings-view-spec.coffee | 2 +-
 spec/theme-panel-spec.coffee   | 2 +-
 11 files changed, 13 insertions(+), 29 deletions(-)

diff --git a/lib/general-panel.coffee b/lib/general-panel.coffee
index e3d1d52d..c06d8676 100644
--- a/lib/general-panel.coffee
+++ b/lib/general-panel.coffee
@@ -1,9 +1,5 @@
-{$$, View} = require 'space-pen'
-$ = require 'jquery'
-_ = require 'underscore'
+{_, $, $$, Editor, View} = require 'atom-api'
 async = require 'async'
-AtomPackage = require 'atom-package'
-Editor = require 'editor'
 
 ###
 # Internal #
diff --git a/lib/index.coffee b/lib/index.coffee
index 38fc3798..315c64e9 100644
--- a/lib/index.coffee
+++ b/lib/index.coffee
@@ -1,7 +1,6 @@
-_ = require 'underscore'
+{_} = require 'atom-api'
 telepath = require 'telepath'
 
-Project = require 'project'
 SettingsView = null
 
 configUri = 'atom://config'
@@ -22,7 +21,7 @@ registerDeserializer(deserializer)
 
 module.exports =
   activate: ->
-    Project.registerOpener (filePath) ->
+    project.registerOpener (filePath) ->
       createSettingsView({uri: configUri}) if filePath is configUri
 
     rootView.command 'settings-view:toggle', -> rootView.open(configUri)
diff --git a/lib/package-manager.coffee b/lib/package-manager.coffee
index f2c9e825..54065eb8 100644
--- a/lib/package-manager.coffee
+++ b/lib/package-manager.coffee
@@ -1,4 +1,4 @@
-BufferedNodeProcess = require 'buffered-node-process'
+{BufferedNodeProcess} = require 'atom-api'
 roaster = require 'roaster'
 async = require 'async'
 
diff --git a/lib/package-panel.coffee b/lib/package-panel.coffee
index ca4f8a09..025dc031 100644
--- a/lib/package-panel.coffee
+++ b/lib/package-panel.coffee
@@ -1,6 +1,4 @@
-$ = require 'jquery'
-_ = require 'underscore'
-{View, $$} = require 'space-pen'
+{_, $, $$, View} = require 'atom-api'
 EventEmitter = require 'event-emitter'
 Editor = require 'editor'
 PackageView = require './package-view'
diff --git a/lib/package-view.coffee b/lib/package-view.coffee
index e38b9ddc..4af76bc5 100644
--- a/lib/package-view.coffee
+++ b/lib/package-view.coffee
@@ -1,10 +1,8 @@
 url = require 'url'
-Package = require 'package'
 semver = require 'semver'
 packageManager = require './package-manager'
-_ = require 'underscore'
-{$$, View} = require 'space-pen'
-requireWithGlobals 'bootstrap/js/dropdown', jQuery: require 'jquery'
+{_, $, $$, View} = require 'atom-api'
+requireWithGlobals 'bootstrap/js/dropdown', jQuery: $
 
 ### Internal ###
 module.exports =
@@ -39,7 +37,7 @@ class PackageView extends View
   updateAvailable: false
 
   initialize: (pack, @packageEventEmitter) ->
-    if pack instanceof Package
+    if pack?.metadata?
       @pack = pack
       @metadata = @pack.metadata
     else
diff --git a/lib/settings-view.coffee b/lib/settings-view.coffee
index 5a659915..b5f49356 100644
--- a/lib/settings-view.coffee
+++ b/lib/settings-view.coffee
@@ -1,13 +1,9 @@
-{$$} = require 'space-pen'
-ScrollView = require 'scroll-view'
-$ = require 'jquery'
-_ = require 'underscore'
+{_, $, $$, ScrollView} = require 'atom-api'
 telepath = require 'telepath'
 
 GeneralPanel = require './general-panel'
 ThemePanel = require './theme-panel'
 PackagePanel = require './package-panel'
-Project = require 'project'
 
 ###
 # Internal #
diff --git a/lib/theme-panel.coffee b/lib/theme-panel.coffee
index 8fa4c57f..6a08379f 100644
--- a/lib/theme-panel.coffee
+++ b/lib/theme-panel.coffee
@@ -1,6 +1,4 @@
-{View, $$} = require 'space-pen'
-$ = require 'jquery'
-_ = require 'underscore'
+{_, $, $$, View} = require 'atom-api'
 
 ###
 # Internal #
diff --git a/spec/general-panel-spec.coffee b/spec/general-panel-spec.coffee
index bfb578a9..f91e86b1 100644
--- a/spec/general-panel-spec.coffee
+++ b/spec/general-panel-spec.coffee
@@ -1,5 +1,4 @@
 GeneralPanel = require '../lib/general-panel'
-Editor = require 'editor'
 
 describe "GeneralPanel", ->
   panel = null
diff --git a/spec/package-panel-spec.coffee b/spec/package-panel-spec.coffee
index 0169851a..68216aa8 100644
--- a/spec/package-panel-spec.coffee
+++ b/spec/package-panel-spec.coffee
@@ -1,6 +1,6 @@
 PackagePanel = require '../lib/package-panel'
 packageManager = require '../lib/package-manager'
-_ = require 'underscore'
+{_} = require 'atom-api'
 
 describe "PackagePanel", ->
   [panel, configObserver] = []
diff --git a/spec/settings-view-spec.coffee b/spec/settings-view-spec.coffee
index ce248017..f7bdead6 100644
--- a/spec/settings-view-spec.coffee
+++ b/spec/settings-view-spec.coffee
@@ -1,5 +1,5 @@
 SettingsView = require '../lib/settings-view'
-{$$} = require 'space-pen'
+{$$} = require 'atom-api'
 
 describe "SettingsView", ->
   settingsView = null
diff --git a/spec/theme-panel-spec.coffee b/spec/theme-panel-spec.coffee
index 433be07e..3d23cca9 100644
--- a/spec/theme-panel-spec.coffee
+++ b/spec/theme-panel-spec.coffee
@@ -1,4 +1,4 @@
-$ = require 'jquery'
+{$} = require 'atom-api'
 ThemePanel = require '../lib/theme-panel'
 
 describe "ThemePanel", ->

From 3e74501cd1f6c6ce38e605ae1cd1ce138cad514d Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Wed, 18 Sep 2013 10:11:35 -0700
Subject: [PATCH 2/4] Add missing async dependency

---
 package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3c166bfc..42ea2a9d 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,8 @@
   "description": "GUI pane for Atom settings",
   "dependencies": {
     "jqueryui-browser": "~1.10.2-1",
-    "roaster": "0.0.7"
+    "roaster": "0.0.7",
+    "async": "~0.2.9"
   },
   "repository": {
     "type": "git",

From 04a9628223de67539f3b5503130d936745eda8fc Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Wed, 18 Sep 2013 15:55:03 -0700
Subject: [PATCH 3/4] Use stringscore, Editor, and EventEmitter from atom-api

---
 lib/package-panel.coffee | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/lib/package-panel.coffee b/lib/package-panel.coffee
index 025dc031..225f9bbc 100644
--- a/lib/package-panel.coffee
+++ b/lib/package-panel.coffee
@@ -1,9 +1,6 @@
-{_, $, $$, View} = require 'atom-api'
-EventEmitter = require 'event-emitter'
-Editor = require 'editor'
+{_, $, $$, Editor, EventEmitter, stringscore, View} = require 'atom-api'
 PackageView = require './package-view'
 packageManager = require './package-manager'
-stringScore = require 'stringscore'
 
 
 ### Internal ###

From c7f8b27401c3f7a5d632d3f9a6d8ab769c96d8de Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Thu, 19 Sep 2013 13:31:05 -0700
Subject: [PATCH 4/4] Rename require from atom-api to atom

---
 lib/general-panel.coffee       | 2 +-
 lib/index.coffee               | 2 +-
 lib/package-manager.coffee     | 8 ++++----
 lib/package-panel.coffee       | 2 +-
 lib/package-view.coffee        | 2 +-
 lib/settings-view.coffee       | 2 +-
 lib/theme-panel.coffee         | 2 +-
 spec/package-panel-spec.coffee | 2 +-
 spec/settings-view-spec.coffee | 2 +-
 spec/theme-panel-spec.coffee   | 2 +-
 10 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/lib/general-panel.coffee b/lib/general-panel.coffee
index c06d8676..f1dc29dd 100644
--- a/lib/general-panel.coffee
+++ b/lib/general-panel.coffee
@@ -1,4 +1,4 @@
-{_, $, $$, Editor, View} = require 'atom-api'
+{_, $, $$, Editor, View} = require 'atom'
 async = require 'async'
 
 ###
diff --git a/lib/index.coffee b/lib/index.coffee
index 315c64e9..d85e44af 100644
--- a/lib/index.coffee
+++ b/lib/index.coffee
@@ -1,4 +1,4 @@
-{_} = require 'atom-api'
+{_} = require 'atom'
 telepath = require 'telepath'
 
 SettingsView = null
diff --git a/lib/package-manager.coffee b/lib/package-manager.coffee
index 54065eb8..4fdb0e47 100644
--- a/lib/package-manager.coffee
+++ b/lib/package-manager.coffee
@@ -1,4 +1,4 @@
-{BufferedNodeProcess} = require 'atom-api'
+{BufferedNodeProcess} = require 'atom'
 roaster = require 'roaster'
 async = require 'async'
 
@@ -22,7 +22,7 @@ renderMarkdownInMetadata = (packages, callback) ->
   queue.drain = callback
 
 getAvailable = (callback) ->
-  command = require.resolve '.bin/apm'
+  command = require.resolve 'atom-package-manager/bin/apm'
   args = ['available', '--json']
   output = []
   stdout = (lines) -> output.push(lines)
@@ -49,7 +49,7 @@ install = ({name, version}, callback) ->
   atom.deactivatePackage(name) if atom.isPackageActive(name)
   atom.unloadPackage(name) if atom.isPackageLoaded(name)
 
-  command = require.resolve '.bin/apm'
+  command = require.resolve 'atom-package-manager/bin/apm'
   args = ['install', "#{name}@#{version}"]
   outputLines = []
   stdout = (lines) -> outputLines.push(lines)
@@ -71,7 +71,7 @@ install = ({name, version}, callback) ->
 uninstall = ({name}, callback) ->
   atom.deactivatePackage(name) if atom.isPackageActive(name)
 
-  command = require.resolve '.bin/apm'
+  command = require.resolve 'atom-package-manager/bin/apm'
   args = ['uninstall', name]
   outputLines = []
   stdout = (lines) -> outputLines.push(lines)
diff --git a/lib/package-panel.coffee b/lib/package-panel.coffee
index 225f9bbc..1575c174 100644
--- a/lib/package-panel.coffee
+++ b/lib/package-panel.coffee
@@ -1,4 +1,4 @@
-{_, $, $$, Editor, EventEmitter, stringscore, View} = require 'atom-api'
+{_, $, $$, Editor, EventEmitter, stringscore, View} = require 'atom'
 PackageView = require './package-view'
 packageManager = require './package-manager'
 
diff --git a/lib/package-view.coffee b/lib/package-view.coffee
index 4af76bc5..d34dd4c4 100644
--- a/lib/package-view.coffee
+++ b/lib/package-view.coffee
@@ -1,7 +1,7 @@
 url = require 'url'
 semver = require 'semver'
 packageManager = require './package-manager'
-{_, $, $$, View} = require 'atom-api'
+{_, $, $$, View} = require 'atom'
 requireWithGlobals 'bootstrap/js/dropdown', jQuery: $
 
 ### Internal ###
diff --git a/lib/settings-view.coffee b/lib/settings-view.coffee
index b5f49356..1203c003 100644
--- a/lib/settings-view.coffee
+++ b/lib/settings-view.coffee
@@ -1,4 +1,4 @@
-{_, $, $$, ScrollView} = require 'atom-api'
+{_, $, $$, ScrollView} = require 'atom'
 telepath = require 'telepath'
 
 GeneralPanel = require './general-panel'
diff --git a/lib/theme-panel.coffee b/lib/theme-panel.coffee
index 6a08379f..115971aa 100644
--- a/lib/theme-panel.coffee
+++ b/lib/theme-panel.coffee
@@ -1,4 +1,4 @@
-{_, $, $$, View} = require 'atom-api'
+{_, $, $$, View} = require 'atom'
 
 ###
 # Internal #
diff --git a/spec/package-panel-spec.coffee b/spec/package-panel-spec.coffee
index 68216aa8..79007f35 100644
--- a/spec/package-panel-spec.coffee
+++ b/spec/package-panel-spec.coffee
@@ -1,6 +1,6 @@
 PackagePanel = require '../lib/package-panel'
 packageManager = require '../lib/package-manager'
-{_} = require 'atom-api'
+{_} = require 'atom'
 
 describe "PackagePanel", ->
   [panel, configObserver] = []
diff --git a/spec/settings-view-spec.coffee b/spec/settings-view-spec.coffee
index f7bdead6..0a970250 100644
--- a/spec/settings-view-spec.coffee
+++ b/spec/settings-view-spec.coffee
@@ -1,5 +1,5 @@
 SettingsView = require '../lib/settings-view'
-{$$} = require 'atom-api'
+{$$} = require 'atom'
 
 describe "SettingsView", ->
   settingsView = null
diff --git a/spec/theme-panel-spec.coffee b/spec/theme-panel-spec.coffee
index 3d23cca9..a4c68a8d 100644
--- a/spec/theme-panel-spec.coffee
+++ b/spec/theme-panel-spec.coffee
@@ -1,4 +1,4 @@
-{$} = require 'atom-api'
+{$} = require 'atom'
 ThemePanel = require '../lib/theme-panel'
 
 describe "ThemePanel", ->