From eb571d72a0bad19e4d183bd967aac3fbef3b8d40 Mon Sep 17 00:00:00 2001
From: Bryan Matsuo <bryan dot matsuo at gmail dot com>
Date: Fri, 21 Jun 2013 21:57:41 -0700
Subject: [PATCH] fix import path bug

---
 gonew_main.go      |  6 ------
 project/project.go | 19 ++++++++++++++-----
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/gonew_main.go b/gonew_main.go
index 3072229..d38b706 100644
--- a/gonew_main.go
+++ b/gonew_main.go
@@ -163,12 +163,6 @@ func parseOptions() *options {
 	}
 	if opts.pkg == "" {
 		opts.pkg = opts.target
-		if strings.HasPrefix(opts.pkg, "go-") {
-			opts.pkg = opts.pkg[3:]
-		}
-		if strings.HasSuffix(opts.pkg, ".go") {
-			opts.pkg = opts.pkg[:len(opts.pkg)-3]
-		}
 	}
 
 	return opts
diff --git a/project/project.go b/project/project.go
index 186992e..4f9a058 100644
--- a/project/project.go
+++ b/project/project.go
@@ -7,11 +7,12 @@ package project
 /*  Filename:    project.go
  *  Author:      Bryan Matsuo <bryan.matsuo [at] gmail.com>
  *  Created:     2012-07-06 23:08:16.03525 -0700 PDT
- *  Description: 
+ *  Description:
  */
 
 import (
 	"path"
+	"strings"
 
 	"github.com/bmatsuo/gonew/config"
 	"github.com/bmatsuo/gonew/extension"
@@ -58,8 +59,16 @@ type project struct {
 	env  *config.Environment
 }
 
-func (p *project) Name() string             { return p.name }
-func (p *project) Prefix() string           { return "./" + p.name } // XXX could be smarter
-func (p *project) Package() string          { return p.pkg }
-func (p *project) Import() string           { return importPath(p.Package()) }
+func (p *project) Name() string   { return p.name }
+func (p *project) Prefix() string { return "./" + p.name } // XXX could be smarter
+func (p *project) Package() string {
+	if strings.HasPrefix(p.pkg, "go-") {
+		return p.pkg[3:]
+	}
+	if strings.HasSuffix(p.pkg, ".go") {
+		return p.pkg[:len(p.pkg)-3]
+	}
+	return p.pkg
+}
+func (p *project) Import() string           { return importPath(p.pkg) }
 func (p *project) Env() *config.Environment { return p.env }