moving things around to fit the packaging style better

dangoor · Apr 17, 2009 · 61ca7db · 61ca7db
1 parent f9f5d3a
commit 61ca7db
Show file tree

Hide file tree

Showing 22 changed files with 15 additions and 4 deletions.
diff --git a/src/getjs.js → bin/getjs b/src/getjs.js → bin/getjs
@@ -1,3 +1,5 @@
+#!/usr/bin/env narwhal
+
 var cwd = require("file").cwd;
 
 var currentPaths = require.loader.getPaths();

diff --git a/src/getjs/commands.js → lib/getjs/commands.js b/src/getjs/commands.js → lib/getjs/commands.js
diff --git a/src/getjs/exc.js → lib/getjs/exc.js b/src/getjs/exc.js → lib/getjs/exc.js
diff --git a/src/getjs/install.js → lib/getjs/install.js b/src/getjs/install.js → lib/getjs/install.js
@@ -12,7 +12,7 @@ exports.Installer = function(env) {
 exports.Installer.prototype = {
     dontinstall: /^\.getjs/,
 
-    install: function(name) {
+    download: function(name) {
         var repoLocations = this.env.getRepositories();
         var repos = [];
         repoLocations.forEach(function(rl) {
@@ -31,12 +31,16 @@ exports.Installer.prototype = {
                 break;
             }
         }
-
         if (!pack) {
             throw new GetJSError("Could not locate package " + name 
                                   + " in any repository");
         }
 
+        return {pack: pack, packFile: packFile, sourceFile: sourceFile};
+    },
+
+    install: function(pack, packFile, sourceFile) {
+
         this._installPackage(pack, packFile);
 
         this.env.addPackage(sourceFile, pack);

diff --git a/src/getjs/logger.js → lib/getjs/logger.js b/src/getjs/logger.js → lib/getjs/logger.js
diff --git a/src/getjs/main.js → lib/getjs/main.js b/src/getjs/main.js → lib/getjs/main.js
diff --git a/src/getjs/parseargs.js → lib/getjs/parseargs.js b/src/getjs/parseargs.js → lib/getjs/parseargs.js
diff --git a/src/getjs/repo.js → lib/getjs/repo.js b/src/getjs/repo.js → lib/getjs/repo.js
@@ -54,7 +54,9 @@ exports.Repository.prototype = {
             destination.mkdirs();
         }
         var destFile = destination.join(pack['filename']);
-        destFile.write(sourceFile.read());
+        if (destFile != sourceFile) {
+            destFile.write(sourceFile.read());
+        }
         return destFile;
     }
 };
diff --git a/src/getjs/testing.js → lib/getjs/testing.js b/src/getjs/testing.js → lib/getjs/testing.js
diff --git a/src/getjs/tests/packages/Skewer-0.5.jspkg → lib/getjs/tests/packages/Skewer-0.5.jspkg b/src/getjs/tests/packages/Skewer-0.5.jspkg → lib/getjs/tests/packages/Skewer-0.5.jspkg
diff --git a/src/getjs/tests/packages/Skewer-0.6.jspkg → lib/getjs/tests/packages/Skewer-0.6.jspkg b/src/getjs/tests/packages/Skewer-0.6.jspkg → lib/getjs/tests/packages/Skewer-0.6.jspkg
diff --git a/...etjs/tests/packages/Tusker-1.0.0.27.jspkg → ...etjs/tests/packages/Tusker-1.0.0.27.jspkg b/...etjs/tests/packages/Tusker-1.0.0.27.jspkg → ...etjs/tests/packages/Tusker-1.0.0.27.jspkg
diff --git a/src/getjs/tests/packages/index.json → lib/getjs/tests/packages/index.json b/src/getjs/tests/packages/index.json → lib/getjs/tests/packages/index.json
diff --git a/src/getjs/tests/testParseargs.js → lib/getjs/tests/testParseargs.js b/src/getjs/tests/testParseargs.js → lib/getjs/tests/testParseargs.js
diff --git a/src/getjs/tests/test_install.js → lib/getjs/tests/test_install.js b/src/getjs/tests/test_install.js → lib/getjs/tests/test_install.js
@@ -33,7 +33,10 @@ testing.run({
         env.clearRepositories();
         env.addRepository("getjs/tests/packages/index.json");
         var installer = new install.Installer(env);
-        installer.install("skewer");
+        var downloadinfo = installer.download("skewer");
+        installer.install(downloadinfo.pack, 
+                            downloadinfo.packFile,
+                            downloadinfo.sourceFile);
 
         var packfile = testdata.join("build", "Skewer-0.6.jspkg");
         testing.truthy(packfile.exists(), "build/Skewer-0.6.jspkg should exist");

diff --git a/src/getjs/tests/test_repo.js → lib/getjs/tests/test_repo.js b/src/getjs/tests/test_repo.js → lib/getjs/tests/test_repo.js
diff --git a/src/getjs/tests/test_testing.js → lib/getjs/tests/test_testing.js b/src/getjs/tests/test_testing.js → lib/getjs/tests/test_testing.js
diff --git a/src/getjs/tests/test_workingenv.js → lib/getjs/tests/test_workingenv.js b/src/getjs/tests/test_workingenv.js → lib/getjs/tests/test_workingenv.js
diff --git a/src/getjs/tests/test_xmake.js → lib/getjs/tests/test_xmake.js b/src/getjs/tests/test_xmake.js → lib/getjs/tests/test_xmake.js
diff --git a/src/getjs/workingenv.js → lib/getjs/workingenv.js b/src/getjs/workingenv.js → lib/getjs/workingenv.js
diff --git a/src/getjs/xmake.js → lib/getjs/xmake.js b/src/getjs/xmake.js → lib/getjs/xmake.js
diff --git a/src/getjs/zipfile.js → lib/getjs/zipfile.js b/src/getjs/zipfile.js → lib/getjs/zipfile.js