gokart 0.0.4 → 0.0.5

data/assets/tasks/server.rake

@@ -17,7 +17,7 @@ namespace :app do
 
     desc 'Builds the existing source'
     task :build => [:init] do
-      `GOPATH="#{ROOT}" go install #{GO_APP_NAME} 1>&2`
+      `GOPATH="#{ROOT}:$GOPATH" go install #{GO_APP_NAME} 1>&2`
     end
 
     desc 'Cleans the build path'
@@ -36,19 +36,19 @@ namespace :app do
 
     desc 'Runs the test units for the source files'
     task :test => [:build] do
-    	`GOPATH="#{ROOT}" go test #{GO_APP_NAME} 1>&2`
+    	`GOPATH="#{ROOT}:$GOPATH" go test #{GO_APP_NAME} 1>&2`
     end
 
-    desc 'Runs the server, killing old instance if there was one.'
-    task :start, [:port, :static] => [:stop] do |t, args|
-      args.with_defaults(:port => 8080, :static => :true)
-      `./bin/#{GO_APP_NAME} -port=#{args[:port]} -static=#{args[:static]} -tmpl="#{TMPL_BUILD_PATH}" -www="#{MIN_WWW_PATH}"`
+    desc 'Runs the server'
+    task :start, [:config] => [:stop] do |t, args|
+      args.with_defaults(:config => "./config/config-release.json")
+      `./bin/#{GO_APP_NAME} -config="#{args[:config]}"`
     end
 
-    desc 'Runs the server, killing old instance if there was one.'
+    desc 'Runs the server in debug mode'
     task :startdebug, [:port] => [:stop] do |t, args|
-      args.with_defaults(:port => 8080, :static => :true)
-      `./bin/#{GO_APP_NAME} -port=#{args[:port]} -debug=true -static=true -tmpl="#{TMPL_BUILD_PATH}" -www="#{DEBUG_WWW_PATH}"`
+      args.with_defaults(:config => "./config/config-debug.json")
+      `./bin/#{GO_APP_NAME} -config="#{args[:config]}"`
     end
 
     desc 'Stops the server if it was running'

data/assets/tasks/www.rake

@@ -31,11 +31,9 @@ namespace :app do
       paths << MIN_WWW_PATH.join('js')
       paths << MIN_WWW_PATH.join('css')
       paths << MIN_WWW_PATH.join('images')
-      paths << MIN_WWW_PATH.join('partials')
       paths << DEBUG_WWW_PATH.join('js')
       paths << DEBUG_WWW_PATH.join('css')
       paths << DEBUG_WWW_PATH.join('images')
-      paths << DEBUG_WWW_PATH.join('partials')
       paths << TMPL_BUILD_PATH
 
       paths.each do |path|
@@ -53,12 +51,8 @@ namespace :app do
 
       Dir.glob(in_dir.join('**', '*')).each do |file|
         out_file = File.join(out_dir, file.partition(in_dir.to_s)[2])
-        next if (out_file.empty?)
-
-        if FileTest::directory?(file)
-          next
-        end
 
+        next if out_file.empty? || FileTest::directory?(file)
         FileUtils::mkdir_p(File.dirname(out_file)) if (!FileTest::directory?(File.dirname(out_file)))
 
         begin
@@ -88,16 +82,6 @@ namespace :app do
       end
     end
 
-    task :partials do
-      from = WWW_SRC_APP_PATH.join('partials')
-      to   = DEBUG_WWW_PATH
-      begin
-        FileUtils::cp_r from, to
-      rescue
-        puts "Failed to copy directory #{from} to #{to}"
-      end
-    end
-
     task :vendor do
       from = "#{WWW_SRC_VENDOR_PATH}/images"
       to   = DEBUG_WWW_PATH.join('vendor', 'images')
@@ -152,7 +136,7 @@ namespace :app do
     end
 
     desc 'Builds the existing source'
-    task :build => [:init,:compile,:compile_templates,:spec,:images,:partials]
+    task :build => [:init,:compile,:compile_templates,:spec,:images]
 
     desc 'Cleans the build path'
     task :clean do

data/bin/gokart

@@ -26,3 +26,10 @@ Open3.popen3('bundle install') do | i, o, e |
   	$stderr.puts err unless err.nil?
   end
 end
+
+Open3.popen3('GOPATH=./:$GOPATH go get github.com/jasondelponte/golib') do | i, o, e |
+  while (out = o.gets || err = e.gets) 
+  	$stdout.puts out unless out.nil?
+  	$stderr.puts err unless err.nil?
+  end
+end

data/lib/gokart/base.rb

@@ -42,7 +42,7 @@ module Gokart
     end
 
     def copy_files
-        Dir.glob(@assets_path.join("**","*")).each() do | inFile |
+        Dir.glob(@assets_path.join("**","*"), File::FNM_DOTMATCH).each() do | inFile |
           begin
             outFile = File.join(@app_base_path.to_s(), inFile.partition(@assets_path.to_s)[2])
 

data/lib/gokart/environment.rb

@@ -16,7 +16,33 @@ module Gokart
   	end
 
     def directories
-      paths = []
+      paths = [
+        File.join(@app_name,'bin'),
+        File.join(@app_name,'config'),
+        File.join(@app_name,'lib'),
+        File.join(@app_name,'pkg'),
+        File.join(@app_name,'spec'),
+        File.join(@app_name,'src','server','config'),
+        File.join(@app_name,'src','server','controller'),
+        File.join(@app_name,'src','server','view'),
+        File.join(@app_name,'src','www','app','erb_helpers'),
+        File.join(@app_name,'src','www','app','images'),
+        File.join(@app_name,'src','www','app','sass'),
+        File.join(@app_name,'src','www','app','scripts','controllers'),
+        File.join(@app_name,'src','www','app','scripts','models'),
+        File.join(@app_name,'src','www','app','scripts','pages'),
+        File.join(@app_name,'src','www','app','scripts','utilities'),
+        File.join(@app_name,'src','www','app','scripts','views'),
+        File.join(@app_name,'src','www','app','templates','pages'),
+        File.join(@app_name,'src','www','app','templates','partials'),
+        File.join(@app_name,'src','www','spec','helpers'),
+        File.join(@app_name,'src','www','spec','support'),
+        File.join(@app_name,'src','www','spec','utilities'),
+        File.join(@app_name,'src','www','vendor','css'),
+        File.join(@app_name,'src','www','vendor','images'),
+        File.join(@app_name,'src','www','vendor','js'),
+        File.join(@app_name,'tasks'),
+      ]
     end
   end
 end

data/lib/gokart/version.rb

@@ -1,3 +1,3 @@
 module Gokart
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gokart
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-18 00:00:00.000000000 Z
+date: 2012-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &11201640 !ruby/object:Gem::Requirement
+  requirement: &16254360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11201640
+  version_requirements: *16254360
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &11577680 !ruby/object:Gem::Requirement
+  requirement: &16253320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11577680
+  version_requirements: *16253320
 - !ruby/object:Gem::Dependency
   name: therubyracer
-  requirement: &11678820 !ruby/object:Gem::Requirement
+  requirement: &16251740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11678820
+  version_requirements: *16251740
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: &11674040 !ruby/object:Gem::Requirement
+  requirement: &16250780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11674040
+  version_requirements: *16250780
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &11760580 !ruby/object:Gem::Requirement
+  requirement: &16249200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11760580
+  version_requirements: *16249200
 - !ruby/object:Gem::Dependency
   name: guard-coffeescript
-  requirement: &11756840 !ruby/object:Gem::Requirement
+  requirement: &16262620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11756840
+  version_requirements: *16262620
 - !ruby/object:Gem::Dependency
   name: guard-jasmine
-  requirement: &11825320 !ruby/object:Gem::Requirement
+  requirement: &16261560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11825320
+  version_requirements: *16261560
 - !ruby/object:Gem::Dependency
   name: guard-sass
-  requirement: &11824320 !ruby/object:Gem::Requirement
+  requirement: &16260020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11824320
+  version_requirements: *16260020
 - !ruby/object:Gem::Dependency
   name: guard-rake
-  requirement: &11823860 !ruby/object:Gem::Requirement
+  requirement: &16258640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11823860
+  version_requirements: *16258640
 - !ruby/object:Gem::Dependency
   name: guard-livereload
-  requirement: &11823340 !ruby/object:Gem::Requirement
+  requirement: &16257540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11823340
+  version_requirements: *16257540
 - !ruby/object:Gem::Dependency
   name: guard-shell
-  requirement: &11822380 !ruby/object:Gem::Requirement
+  requirement: &16255780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11822380
+  version_requirements: *16255780
 - !ruby/object:Gem::Dependency
   name: jasmine
-  requirement: &11820360 !ruby/object:Gem::Requirement
+  requirement: &16284840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11820360
+  version_requirements: *16284840
 - !ruby/object:Gem::Dependency
   name: yui-compressor
-  requirement: &11884300 !ruby/object:Gem::Requirement
+  requirement: &16281600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11884300
+  version_requirements: *16281600
 - !ruby/object:Gem::Dependency
   name: uglifier
-  requirement: &11880760 !ruby/object:Gem::Requirement
+  requirement: &16280260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11880760
+  version_requirements: *16280260
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &11895480 !ruby/object:Gem::Requirement
+  requirement: &16278840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,7 +175,7 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *11895480
+  version_requirements: *16278840
 description: Combination of tooks which will make developing webapps using go easier.  The
   gokart gem by default combines SASS, Coffee Script, Rake, and Sprokets with Go to
   provide a great development environment.  This environment supports test driven
@@ -194,12 +194,19 @@ files:
 - lib/gokart/environment.rb
 - lib/gokart/version.rb
 - assets/Guardfile
+- assets/config/config-debug.json
+- assets/config/config-release.json
 - assets/config.rb
-- assets/src/server/http_handler.go
-- assets/src/server/templates.go
-- assets/src/server/my_test.go
+- assets/src/server/controller/static_assets.go
+- assets/src/server/controller/home.go
+- assets/src/server/config/config.go
 - assets/src/server/main.go
+- assets/src/server/view/home.go
 - assets/src/www/vendor/js/backbone-min.js
+- assets/src/www/vendor/js/underscore-min.js
+- assets/src/www/vendor/js/backbone.js
+- assets/src/www/vendor/js/mustache.js
+- assets/src/www/vendor/js/underscore.js
 - assets/src/www/spec/helpers/mocks.coffee
 - assets/src/www/spec/all-spec.js
 - assets/src/www/spec/utilities/test-spec.js
@@ -209,16 +216,20 @@ files:
 - assets/src/www/spec/support/jasmine.yml
 - assets/src/www/spec/support/jasmine_config.rb
 - assets/src/www/app/erb_helpers/erb_helper.rb
-- assets/src/www/app/scripts/main.js.coffee
+- assets/src/www/app/scripts/vendor_wrapper.js
 - assets/src/www/app/scripts/application.js.coffee
 - assets/src/www/app/scripts/utilities/properties.js.coffee
 - assets/src/www/app/scripts/utilities/logger.js.coffee
 - assets/src/www/app/scripts/utilities/deferred.js.coffee
 - assets/src/www/app/scripts/utilities/require.js
-- assets/src/www/app/partials/index.html
-- assets/src/www/app/templates/home.gotmpl
+- assets/src/www/app/scripts/pages/home.js
 - assets/src/www/app/templates/base.gotmpl.erb
+- assets/src/www/app/templates/partials/test.gotmpl
+- assets/src/www/app/templates/partials/test2.gotmpl
+- assets/src/www/app/templates/partials_start.gotmpl
+- assets/src/www/app/templates/partials_end.gotmpl
 - assets/src/www/app/templates/application.gotmpl
+- assets/src/www/app/templates/pages/home.gotmpl
 - assets/src/www/app/sass/application.css.scss
 - assets/tasks/app.rake
 - assets/tasks/server.rake

data/assets/src/server/http_handler.go

@@ -1,139 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"log"
-	"net/http"
-	"os"
-	"regexp"
-	"strings"
-)
-
-// HTTP Error Enumerables
-type HttpError struct {
-	ErrorString string
-	CodeNum     int
-}
-
-func (h HttpError) Error() string                { return h.ErrorString }
-func (h HttpError) Code() int                    { return h.CodeNum }
-func (h HttpError) Report(w http.ResponseWriter) { http.Error(w, h.ErrorString, h.CodeNum) }
-
-var (
-	ErrHttpResourceNotFound = &HttpError{ErrorString: "Not found", CodeNum: 404}
-	ErrHttpMethodNotAllowed = &HttpError{ErrorString: "Method not allowed", CodeNum: 405}
-	ErrHttpBadRequeset      = &HttpError{ErrorString: "Bad request", CodeNum: 400}
-	ErrHttpInternalError    = &HttpError{ErrorString: "Internal failure", CodeNum: 500}
-)
-
-type HttpHandler struct {
-	RootURLPath    string
-	TmplPath       string
-	WwwPath        string
-	Addr           string
-	Port           uint
-	Debug          bool
-	ServStatic     bool
-	templates      *Templates
-	rootURLPathLen int
-	wwwURLPathLen  int
-}
-
-// Load all the temmplates into memeory
-func (h *HttpHandler) loadTemplates() {
-	h.templates = &Templates{}
-	h.templates.LoadTemplates(h.TmplPath)
-}
-
-// Configures the http connection and starts the listender
-func (h *HttpHandler) HandleHttpConnection() {
-	h.rootURLPathLen = len(h.RootURLPath + "/")
-	h.wwwURLPathLen = len(h.RootURLPath + "/assets/")
-
-	h.loadTemplates()
-
-	h.initServeHomeHndlr(h.RootURLPath + "/")
-	if h.Debug || h.ServStatic {
-		h.initServeStaticHndlr(h.RootURLPath + "/assets/")
-	}
-
-	// Build the address with port if it's provided
-	address := h.Addr
-	if h.Port != 0 {
-		address = fmt.Sprintf("%s:%d", h.Addr, h.Port)
-	}
-
-	err := http.ListenAndServe(address, nil)
-	if err != nil {
-		log.Fatal("ListenAndServe: ", err)
-	}
-}
-
-// Network event handler for HTTP trafic. Serves up the 
-// home.html file which will allow connection to the websocket
-func (h *HttpHandler) initServeHomeHndlr(path string) {
-	regProps := &CommonProps{
-		Title:   "Go + WWW + Rake test app",
-		Debug:   h.Debug,
-		RootURL: h.RootURLPath,
-		Host:    "",
-	}
-
-	hostPortRep := regexp.MustCompile(":\\d+$")
-
-	http.HandleFunc(path, func(w http.ResponseWriter, r *http.Request) {
-		if r.URL.Path != h.RootURLPath+"/" {
-			ErrHttpResourceNotFound.Report(w)
-			return
-		}
-		if r.Method != "GET" {
-			ErrHttpMethodNotAllowed.Report(w)
-			return
-		}
-		w.Header().Set("Content-Type", "text/html; charset=utf-8")
-
-		// Normalalize http host
-		if len(regProps.Host) == 0 {
-			regProps.Host = r.Host
-			if (h.Debug || h.ServStatic) && h.Port != 0 {
-				if strings.Contains(r.Host, ":") {
-					regProps.Host = hostPortRep.ReplaceAllString(r.Host, fmt.Sprintf(":%d", h.Port))
-				} else {
-					regProps.Host = fmt.Sprintf("%s:%d", r.Host, h.Port)
-				}
-			}
-		}
-
-		if h.Debug { // Force reloading of the template for each request in debug mode
-			h.loadTemplates()
-		}
-
-		b, err := h.templates.Render("home", regProps, nil)
-		if err != nil {
-			log.Println("Failed to render template, home")
-			return
-		}
-
-		w.Write(b)
-	})
-}
-
-// Simple handler for serving static files
-func (h *HttpHandler) initServeStaticHndlr(path string) {
-	http.HandleFunc(path, func(w http.ResponseWriter, r *http.Request) {
-		asset := r.URL.Path[h.wwwURLPathLen:]
-		fullAssetPath := h.WwwPath + "/" + asset
-
-		file, err := os.Open(fullAssetPath)
-		if err != nil {
-			ErrHttpResourceNotFound.Report(w)
-			return
-		}
-		stat, err := file.Stat()
-		if err != nil {
-			ErrHttpInternalError.Report(w)
-			return
-		}
-		http.ServeContent(w, r, asset, stat.ModTime(), file)
-	})
-}

data/assets/src/server/my_test.go

@@ -1,13 +0,0 @@
-package main
-
-import (
-	"testing"
-)
-
-func Test_Add2Plus1(t *testing.T) {
-	if 2+1 != 3 {
-		t.Error("Adding 2+1 didn't work as expected")
-	} else {
-		t.Log("2+1 test passed.")
-	}
-}

data/assets/src/server/templates.go

@@ -1,42 +0,0 @@
-package main
-
-import (
-	"bytes"
-	"html/template"
-	"log"
-)
-
-type Templates struct {
-	tmpls *template.Template
-}
-
-// Object defining what all template data will use
-type TmplProps struct {
-	Common   *CommonProps
-	Contents interface{}
-}
-
-// Generic properties shared by all templates
-type CommonProps struct {
-	Title   string
-	Debug   bool
-	RootURL string
-	Host    string
-}
-
-// Loads the templates from disk and returns them loaded
-// into memory.
-func (t *Templates) LoadTemplates(path string) {
-	t.tmpls = template.Must(template.ParseGlob(path + "/*.gotmpl"))
-}
-
-// Renders a template and returns the byte array for it
-func (t *Templates) Render(tmplName string, common *CommonProps, contents interface{}) ([]byte, error) {
-	buf := bytes.NewBuffer(nil)
-	err := t.tmpls.ExecuteTemplate(buf, tmplName, &TmplProps{Common: common, Contents: contents})
-	if err != nil {
-		log.Println("Error: failed to execute template", tmplName, ", because", err)
-	}
-
-	return buf.Bytes(), err
-}