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

---
 lib/archive-edit-session.coffee | 6 ++----
 lib/archive-view.coffee         | 6 +++---
 lib/directory-view.coffee       | 2 +-
 lib/file-view.coffee            | 6 ++----
 spec/archive-view-spec.coffee   | 3 +--
 5 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/lib/archive-edit-session.coffee b/lib/archive-edit-session.coffee
index a804e57..ded8ae9 100644
--- a/lib/archive-edit-session.coffee
+++ b/lib/archive-edit-session.coffee
@@ -3,8 +3,7 @@ path = require 'path'
 archive = require 'ls-archive'
 telepath = require 'telepath'
 
-fsUtils = require 'fs-utils'
-File = require 'file'
+{File, fs} = require 'atom-api'
 
 module.exports=
 class ArchiveEditSession
@@ -13,8 +12,7 @@ class ArchiveEditSession
   @version: 1
 
   @activate: ->
-    Project = require 'project'
-    Project.registerOpener (filePath) ->
+    project.registerOpener (filePath) ->
       new ArchiveEditSession(path: filePath) if archive.isPathSupported(filePath)
 
   @deserialize: (state) ->
diff --git a/lib/archive-view.coffee b/lib/archive-view.coffee
index 46a689f..e9a93dd 100644
--- a/lib/archive-view.coffee
+++ b/lib/archive-view.coffee
@@ -1,9 +1,9 @@
-ScrollView = require 'scroll-view'
+{fs, ScrollView} = require 'atom-api'
+humanize = require 'humanize-plus'
 archive = require 'ls-archive'
+
 FileView = require './file-view'
 DirectoryView = require './directory-view'
-fs = require 'fs'
-humanize = require 'humanize-plus'
 
 module.exports =
 class ArchiveView extends ScrollView
diff --git a/lib/directory-view.coffee b/lib/directory-view.coffee
index b65f0cd..7132b3c 100644
--- a/lib/directory-view.coffee
+++ b/lib/directory-view.coffee
@@ -1,4 +1,4 @@
-{View} = require 'space-pen'
+{View} = require 'atom-api'
 FileView = require './file-view'
 
 module.exports =
diff --git a/lib/file-view.coffee b/lib/file-view.coffee
index c61a0a5..9caf9fb 100644
--- a/lib/file-view.coffee
+++ b/lib/file-view.coffee
@@ -1,6 +1,4 @@
-{View} = require 'space-pen'
-$ = require 'jquery'
-fsUtils = require 'fs-utils'
+{$, fs, View} = require 'atom-api'
 path = require 'path'
 temp = require 'temp'
 archive = require 'ls-archive'
@@ -49,7 +47,7 @@ class FileView extends View
             @logError("Error creating temp directory: #{tempDirPath}", error)
           else
             tempFilePath = path.join(tempDirPath, path.basename(@archivePath), @entry.getName())
-            fsUtils.write tempFilePath, contents, (error) =>
+            fs.write tempFilePath, contents, (error) =>
               if error?
                 @logError("Error writing to #{tempFilePath}", error)
               else
diff --git a/spec/archive-view-spec.coffee b/spec/archive-view-spec.coffee
index 30a85c3..4f2fdac 100644
--- a/spec/archive-view-spec.coffee
+++ b/spec/archive-view-spec.coffee
@@ -1,5 +1,4 @@
-RootView = require 'root-view'
-fsUtils = require 'fs-utils'
+{fs, RootView} = require 'atom-api'
 
 describe "Archive viewer", ->
   beforeEach ->

From c38843766958e79025ecb9cf40a06e30f915516d Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Thu, 19 Sep 2013 11:53:01 -0700
Subject: [PATCH 2/2] Rename require from atom-api to atom

---
 lib/archive-edit-session.coffee | 2 +-
 lib/archive-view.coffee         | 2 +-
 lib/directory-view.coffee       | 2 +-
 lib/file-view.coffee            | 2 +-
 spec/archive-view-spec.coffee   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/archive-edit-session.coffee b/lib/archive-edit-session.coffee
index ded8ae9..87519c0 100644
--- a/lib/archive-edit-session.coffee
+++ b/lib/archive-edit-session.coffee
@@ -3,7 +3,7 @@ path = require 'path'
 archive = require 'ls-archive'
 telepath = require 'telepath'
 
-{File, fs} = require 'atom-api'
+{File, fs} = require 'atom'
 
 module.exports=
 class ArchiveEditSession
diff --git a/lib/archive-view.coffee b/lib/archive-view.coffee
index e9a93dd..078dabc 100644
--- a/lib/archive-view.coffee
+++ b/lib/archive-view.coffee
@@ -1,4 +1,4 @@
-{fs, ScrollView} = require 'atom-api'
+{fs, ScrollView} = require 'atom'
 humanize = require 'humanize-plus'
 archive = require 'ls-archive'
 
diff --git a/lib/directory-view.coffee b/lib/directory-view.coffee
index 7132b3c..0ea5663 100644
--- a/lib/directory-view.coffee
+++ b/lib/directory-view.coffee
@@ -1,4 +1,4 @@
-{View} = require 'atom-api'
+{View} = require 'atom'
 FileView = require './file-view'
 
 module.exports =
diff --git a/lib/file-view.coffee b/lib/file-view.coffee
index 9caf9fb..95e76b9 100644
--- a/lib/file-view.coffee
+++ b/lib/file-view.coffee
@@ -1,4 +1,4 @@
-{$, fs, View} = require 'atom-api'
+{$, fs, View} = require 'atom'
 path = require 'path'
 temp = require 'temp'
 archive = require 'ls-archive'
diff --git a/spec/archive-view-spec.coffee b/spec/archive-view-spec.coffee
index 4f2fdac..ded9f01 100644
--- a/spec/archive-view-spec.coffee
+++ b/spec/archive-view-spec.coffee
@@ -1,4 +1,4 @@
-{fs, RootView} = require 'atom-api'
+{fs, RootView} = require 'atom'
 
 describe "Archive viewer", ->
   beforeEach ->