Merge pull request #150 from Polymer/init

Fixups for github hosted templates
Polymer · May 17, 2016 · f028cbc · f028cbc
2 parents 0ee46db + 4b5ac98
commit f028cbc
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 15 deletions.
diff --git a/src/commands/init.ts b/src/commands/init.ts
@@ -49,22 +49,24 @@ export class InitCommand implements Command {
       let templateDescriptions = {
         'application': "Application-style project",
         'element': "Reusable element-style project",
-        'shop': "shop demo app",
-        'prpl-demo': "PRPL demo app",
+        'shop': "The Shop PRPL demo application",
+        'app-drawer-template':
+            "Application template that demonstrates the PRPL pattern",
       };
 
       env.registerStub(ElementGenerator, 'polymer-init-element:app');
       env.registerStub(ApplicationGenerator, 'polymer-init-application:app');
       let shopGenerator = createGithubGenerator({
-        owner: 'PolymerLabs',
-        repo: 'polykart',
+        owner: 'Polymer',
+        repo: 'shop',
       });
       env.registerStub(shopGenerator, 'polymer-init-shop:app');
-      let prplGenerator = createGithubGenerator({
-        owner: 'PolymerLabs',
-        repo: 'prpl-demo',
+      let appDrawerGenerator = createGithubGenerator({
+        owner: 'Polymer',
+        repo: 'app-drawer-template',
       });
-      env.registerStub(prplGenerator, 'polymer-init-prpl-demo:app');
+      env.registerStub(appDrawerGenerator,
+          'polymer-init-app-drawer-template:app');
 
       env.lookup(() => {
         let generators = env.getGeneratorsMeta();

diff --git a/src/github/github.ts b/src/github/github.ts
@@ -32,10 +32,13 @@ export class Github {
   private _repo: string;
 
   static tokenFromFile(filename: string): string {
-    return fs.readFileSync(filename, 'utf8').trim();
+    try {
+      return fs.readFileSync(filename, 'utf8').trim();
+    } catch (e) {
+      return null;
+    }
   }
 
-
   constructor(opts: GithubOpts) {
     this._token = opts.githubToken || Github.tokenFromFile('token');
     this._owner = opts.owner;
@@ -44,10 +47,12 @@ export class Github {
       version: '3.0.0',
       protocol: 'https',
     });
-    this._github.authenticate({
-      type: 'oauth',
-      token: this._token,
-    });
+    if (this._token != null) {
+      this._github.authenticate({
+        type: 'oauth',
+        token: this._token,
+      });
+    }
     this._request = opts.requestApi || request;
   }
 

diff --git a/src/init/github.ts b/src/init/github.ts
@@ -59,7 +59,9 @@ export function createGithubGenerator(githubOptions: GithubGeneratorOptions) {
     }
 
     install() {
-      this.installDependencies();
+      this.installDependencies({
+        npm: false,
+      });
     }
   }
 }