From b862fb76174406e674ad990ed27ef9dd0b75baf6 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Wed, 18 Sep 2013 15:34:04 -0700 Subject: [PATCH 1/3] Use atom-api for requires --- lib/package-generator-view.coffee | 9 ++------- spec/package-generator-spec.coffee | 7 +++---- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/lib/package-generator-view.coffee b/lib/package-generator-view.coffee index 9740f4b..3b360db 100644 --- a/lib/package-generator-view.coffee +++ b/lib/package-generator-view.coffee @@ -1,9 +1,4 @@ -{View} = require 'space-pen' -Editor = require 'editor' -BufferedProcess = require 'buffered-process' -$ = require 'jquery' -_ = require 'underscore' -fsUtils = require 'fs-utils' +{_, $, BufferedProcess, Editor, fs, View} = require 'atom-api' path = require 'path' module.exports = @@ -52,7 +47,7 @@ class PackageGeneratorView extends View path.join(path.dirname(packagePath), packageName) validPackagePath: -> - if fsUtils.exists(@getPackagePath()) + if fs.exists(@getPackagePath()) @error.text("Path already exists at '#{@getPackagePath()}'") @error.show() false diff --git a/spec/package-generator-spec.coffee b/spec/package-generator-spec.coffee index 33c7d27..a0ff58f 100644 --- a/spec/package-generator-spec.coffee +++ b/spec/package-generator-spec.coffee @@ -1,5 +1,4 @@ -RootView = require 'root-view' -fsUtils = require 'fs-utils' +{fs, RootView} = require 'atom-api' path = require 'path' describe 'Package Generator', -> @@ -36,10 +35,10 @@ describe 'Package Generator', -> packageName = "sweet-package-dude" packagePath = "/tmp/atom-packages/#{packageName}" - fsUtils.remove(packagePath) if fsUtils.exists(packagePath) + fs.remove(packagePath) if fs.exists(packagePath) afterEach -> - fsUtils.remove(packagePath) if fsUtils.exists(packagePath) + fs.remove(packagePath) if fs.exists(packagePath) it "forces the package's name to be lowercase with dashes", -> packageName = "CamelCaseIsForTheBirds" From 8608ae2102d5b6a2cb94df1aa84cf1b66aef38ad Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 19 Sep 2013 13:29:41 -0700 Subject: [PATCH 2/3] Rename require from atom-api to atom --- lib/package-generator-view.coffee | 2 +- spec/package-generator-spec.coffee | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/package-generator-view.coffee b/lib/package-generator-view.coffee index 3b360db..a708bd3 100644 --- a/lib/package-generator-view.coffee +++ b/lib/package-generator-view.coffee @@ -1,4 +1,4 @@ -{_, $, BufferedProcess, Editor, fs, View} = require 'atom-api' +{_, $, BufferedProcess, Editor, fs, View} = require 'atom' path = require 'path' module.exports = diff --git a/spec/package-generator-spec.coffee b/spec/package-generator-spec.coffee index a0ff58f..ddbde30 100644 --- a/spec/package-generator-spec.coffee +++ b/spec/package-generator-spec.coffee @@ -1,4 +1,4 @@ -{fs, RootView} = require 'atom-api' +{fs, RootView} = require 'atom' path = require 'path' describe 'Package Generator', -> From cfa65da9ec824968402912b310918a8b7d5b7b94 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 19 Sep 2013 14:31:30 -0700 Subject: [PATCH 3/3] Replace fsUtils with fs --- spec/package-generator-spec.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/package-generator-spec.coffee b/spec/package-generator-spec.coffee index ddbde30..29feaad 100644 --- a/spec/package-generator-spec.coffee +++ b/spec/package-generator-spec.coffee @@ -83,7 +83,7 @@ describe 'Package Generator', -> it "displays an error when the package path already exists", -> rootView.attachToDom() - fsUtils.makeTree(packagePath) + fs.makeTree(packagePath) rootView.trigger("package-generator:generate-package") packageGeneratorView = rootView.find(".package-generator").view()