ti 0.1.5 → 0.1.8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ti (0.1.3)
+    ti (0.1.5)
       coffee-script (~> 2.2.0)
       colored (~> 1.2)
       erubis (~> 2.7.0)

data/lib/ti.rb

@@ -8,7 +8,6 @@ require 'colored'
 require 'rocco'
 require 'thor'
 require 'erubis'
-require 'rbconfig'
 require 'nokogiri'
 
 module Ti
@@ -20,12 +19,18 @@ module Ti
   OSX_TITANIUM      = "/Library/Application\\ Support/Titanium/mobilesdk/osx/#{::Ti::TITANIUM_VERSION}/titanium.py"
   LINUX_TITANIUM    = "$HOME/.titanium/mobilesdk/linux/#{::Ti::TITANIUM_VERSION}/titanium.py"
   
+  autoload  :VERSION,       'ti/version.rb'
   autoload  :CLI,           'ti/cli.rb'
   autoload  :Logger,        "ti/logger.rb"
   autoload  :Utils,         "ti/utils.rb"
   
   module Compiler
     autoload :CoffeeScripts,  'ti/compiler/coffee_scripts.rb'
+    autoload :SASSScripts,    'ti/compiler/sass_scripts.rb'
+  end
+
+  module Builder
+    autoload :Titanium,     "ti/builder/titanium.rb"
   end
   
   module Generate
@@ -35,4 +40,8 @@ module Ti
     autoload  :Controller,  "ti/generate/controller.rb"
   end
   
+  def self.root
+    @root ||= Pathname(__FILE__).dirname.expand_path
+  end
+  
 end

data/lib/ti/builder/titanium.rb

@@ -0,0 +1,19 @@
+module Ti
+  module Builder
+    class Titanium
+      class << self
+        require 'rake'
+        include ::Ti::Utils
+
+        # TODO: This should be loaded properly
+        load 'config/config.rb'
+        include Config
+
+        def build(platform)
+          log "Building with Titanium... DEVICE_TYPE: #{platform}"
+          sh %Q{bash -c "#{TI_BUILD} run #{PROJECT_ROOT}/ #{IPHONE_SDK_VERSION} #{APP_ID} #{APP_NAME} #{APP_DEVICE}" | perl -pe 's/^\\[DEBUG\\].*$/\\e[35m$&\\e[0m/g;s/^\\[INFO\\].*$/\\e[36m$&\\e[0m/g;s/^\\[WARN\\].*$/\\e[33m$&\\e[0m/g;s/^\\[ERROR\\].*$/\\e[31m$&\\e[0m/g;'}
+        end
+      end
+    end
+  end
+end

data/lib/ti/cli.rb

@@ -24,6 +24,7 @@ module Ti
       say "Version #{::Ti::VERSION}"
     end
     
+    map %(n) => 'new'
     desc "new <name> <id> <platform>", "generates a new Titanium project."
     long_desc "Generates a new Titanium project. See 'ti help new' for more information.
               \n\nExamples:
@@ -67,9 +68,23 @@ module Ti
           :name     => name })
     end
     
-    desc "compile", "compiles all CoffeeScripts"
-    def compile
-      ::Ti::Compiler::CoffeeScripts.compile_all!
+    desc "compile <all/coffee/sass>", "compiles all CoffeeScripts"
+    def compile(type)
+      case
+      when type =~ /all/i
+        ::Ti::Compiler::CoffeeScripts.compile_all!
+        ::Ti::Compiler::SASSScripts.compile
+      when type =~ /coffee/i
+        ::Ti::Compiler::CoffeeScripts.compile_all!
+      when type =~ /sass/i
+        ::Ti::Compiler::SASSScripts.compile
+      end
+    end
+
+    map %w(b) => 'build'
+    desc "build <all/iphone/android/ipad/desktop/>", "Build the project using Titanium"
+    def build(platform)
+      ::Ti::Builder::Titanium.build platform
     end
 
   end

data/lib/ti/compiler/coffee_scripts.rb

@@ -7,21 +7,26 @@ module Ti
         
         def compile_all!
           coffeefile  = File.read(base_location.join('Coffeefile')).split("\n").compact.delete_if { |l| l.include?("#") }
-          files       = coffeefile.collect { |a| Dir.glob(coffeefile) }.flatten!
+          files       = coffeefile.collect { |a| Dir.glob(coffeefile) }.flatten!.uniq
           if files.nil?
             log "There are no files to compile."
             exit(0)
           end
-          @contents   = ''
-          files.uniq!.each { |f| @contents << File.read(f) }
+          
+          compile_main
           compile_location = "Resources/#{underscore(get_app_name).downcase}.js"
-          compile(@contents, base_location.join(compile_location))
-          log "Your CoffeeScripts have been compiled to: #{compile_location}"
+          compile(files.join(' '), base_location.join(compile_location), :join => true, :bare => true)
+        end
+
+        def compile_main
+          compile("app/app.coffee", base_location.join("Resources/app.js"), :bare => true)
         end
         
-        def compile(contents, compile_to_location)
-          coffeescript  = ::CoffeeScript.compile(contents, :no_wrap => false)
-          File.open(compile_to_location, 'w') { |f| f.write(coffeescript) }
+        def compile(files, compile_to_location, options={})
+          coffee_options  = []
+          options.each { |k,v| coffee_options << "--#{k.to_s}" if v} unless options.empty?
+          system("coffee -p #{coffee_options.join(' ')} #{files} > #{compile_to_location}")
+          log "Your CoffeeScripts have been compiled to: #{compile_to_location}"
         end
         
       end

data/lib/ti/compiler/sass_scripts.rb

@@ -0,0 +1,16 @@
+require 'sass'
+module Ti
+  module Compiler
+    class SASSScripts
+      class << self
+        include ::Ti::Utils
+
+        # def compile(contents, compile_to_location)
+        def compile
+          system "sass --compass -C -t expand app/#{underscore(get_app_name)}/stylesheets/app.sass > Resources/app.jss"
+          log "Your SASS have been compiled to: Resources/app.jss"
+        end
+      end
+    end
+  end
+end

data/lib/ti/generate/controller.rb

@@ -27,6 +27,7 @@ module Ti
           File.open(location.join(filename), 'w') { |f| f.write(contents) }
 
           create_new_file("spec/controllers/#{name}_spec.coffee", templates("specs/app_spec.coffee"))
+          append_to_router(name, 'controllers')
         end
         
 

data/lib/ti/generate/model.rb

@@ -17,6 +17,8 @@ module Ti
 
           create_new_file("#{model_directory}/#{name}.coffee")
           create_new_file("spec/models/#{name}_spec.coffee", templates("specs/app_spec.coffee"))
+          
+          append_to_router(name, 'models')
         end
         
       end

data/lib/ti/generate/project.rb

@@ -31,9 +31,10 @@ module Ti
         def generate_files
           create_project_directory
           touch('Readme.mkd')
-          full_app_hash     = {:app_name => @project_name, :app_name_underscore => underscore(@project_name)}
+          full_app_hash = {:app_name => @project_name.capitalize, :app_name_underscore => underscore(@project_name), :platform => @device_platform}
           create_with_template('app/app.coffee', 'app/app.coffee', full_app_hash)
           create_with_template("app/#{underscore(@project_name)}/app.coffee", 'app/app_project.coffee', full_app_hash)
+          create_with_template("app/#{underscore(@project_name)}/api.coffee", 'app/api.coffee', full_app_hash)
 
           create_new_file(".gitignore",             templates('gitignore'))
           create_new_file("spec/app_spec.coffee",   templates('specs/app_spec.coffee'))
@@ -58,9 +59,11 @@ module Ti
             'config', 
             'docs', 
             "app/#{underscore(@project_name)}/models", 
+            "app/#{underscore(@project_name)}/helpers",
             "app/#{underscore(@project_name)}/views", 
             "app/#{underscore(@project_name)}/stylesheets", 
-            'spec/models', 'spec/views') 
+            "app/#{underscore(@project_name)}/stylesheets/partials",
+            'spec/models', 'spec/views', 'spec/helpers') 
         end
         
         def remove_old_files

data/lib/ti/generate/view.rb

@@ -37,6 +37,7 @@ module Ti
 
           create_new_file("spec/views/#{name}_spec.coffee", templates("specs/app_spec.coffee"))
           create_new_file("app/#{underscore(app_name)}/stylesheets/_#{(context[:domain] || '').downcase}.sass", templates("app/stylesheets/sample.sass"))
+          append_to_router(context[:domain].capitalize, 'views')
         end
 
       end

data/lib/ti/templates/app/api.coffee.erb

@@ -0,0 +1,61 @@
+class <%= app_name %>.API
+
+  constructor: (@login, @password) ->
+
+  requestURI: (path, query={}) ->
+    # NOTE: Setup your own API endpoint, as below
+    <%= app_name %>.API_ENDPOINT = "http://<%= app_name.downcase %>.com/api/v1"
+
+    uri = "#{<%= app_name %>.API_ENDPOINT}#{path}.json?"
+    for own key, value of query
+      uri += "#{ key }=#{ escape(value) }&"
+
+    uri = uri.replace(/^(&)/g, '')
+    uri
+  
+  request: (path, options, authenticated=true) ->
+    options.method  ?= 'GET'
+    options.query   ?= {}
+    options.success ?= -> Ti.API.info
+    options.error   ?= -> Ti.API.error
+
+    xhr = Ti.Network.createHTTPClient()
+    xhr.onreadystatechange = (e) ->
+      if this.readyState == 4
+        try
+          data = JSON.parse(this.responseText)
+          if data.error?
+            options.error(data)
+          else
+            options.success(data)
+        catch exception
+          options.error(exception)
+    uri = @requestURI(path, options.query)
+    xhr.open(options.method, uri)
+    xhr.setRequestHeader 'Authorization', 'Basic ' + Ti.Utils.base64encode(@login+':'+@password) if authenticated  
+    
+    message = "Executing "
+    message += if authenticated then "Authenticated " else "Unauthenticated "
+    message += "#{options.method} #{uri}"
+    Ti.API.debug(message) if options.debug
+    
+    if options.body?
+      xhr.setRequestHeader('Accept', 'application/json')
+      xhr.setRequestHeader('Content-Type', 'application/json')
+      data = JSON.stringify(options.body)
+      Ti.API.debug(data) if options.debug
+      xhr.send(data)
+    else
+      xhr.send()
+
+  # High level method for GET requests
+  get: (path, options, authenticated=true) ->
+    options.method = 'GET'
+    @request path, options, authenticated
+
+  # High level method for POST requests
+  post: (path, options, authenticated=true) ->
+    options.method = 'POST'
+    @request path, options, authenticated
+
+# Add your API endpoints below

data/lib/ti/templates/app/app.coffee.erb

@@ -2,10 +2,22 @@
 # tab windows.
 # The `<%= app_name %>` object provides common access to app data, API wrapper and UI utilities
 
-# ## ShwinkersMobile ##
+# ## <%= app_name %> ##
 <%= app_name %> =
-  Views:
+  Models:   {}
+  Helpers:  {}
+  Views:    {}
+
+# Include your libraries like:
+# Ti.include('vendor/date.js')
+# Ti.include('vendor/underscore.js')
+# Ti.include('vendor/backbone.js')
 
 Ti.include('<%= app_name_underscore %>.js')
 
-<%= app_name %>.App.init()
+# Alias, so you could do $.App.init() below. If you have an API class, 
+# make sure to either use the full app name or declare the below at the top
+# and use $.API for the class name. Uncomment to use.
+# $ = <%= app_name %>
+
+<%= app_name %>.App.init()

data/lib/ti/templates/app/app_project.coffee.erb

@@ -1,111 +1,111 @@
 <%= app_name %>.App =
-  init: ->
-    # This sets the background color of the master UIView
-    Ti.UI.iPhone.statusBarStyle = Titanium.UI.iPhone.StatusBar.OPAQUE_BLACK
-
-    # Return the currently logged in user from App persisted properties
-    currentUser: ->
-      userData = Ti.App.Properties.getString('user')
-      if userData?
-        user = JSON.parse(userData)
-        return user
-      else
-        null
 
-    # Authenticate a user
-    authenticate: (login, password) ->
-      Ti.API.debug('<%= app_name %>.App.authenticate')
+  currentUser: ->
+    userData = Ti.App.Properties.getString('user')
+    if userData?
+      user = JSON.parse(userData)
+      return user
+    else
+      null
+
+  # Attempt to log in with saved creds
+  hasCurrentSession: ->
+    login     = Ti.App.Properties.getString 'login'
+    password  = Ti.App.Properties.getString 'password'
+    if login? and password?
+      Ti.API.debug "Found current session with login: #{login} and password: #{password}"
       this.api = new <%= app_name %>.API(login, password)
-      this.api.authenticate
-        success: (user) ->
-          # Stash the user for `.currentUser()`
-          Ti.App.Properties.setString('user', JSON.stringify(user))
-          # Stash the username/password for the user later
-          Ti.App.Properties.setString 'login', login
-          Ti.App.Properties.setString 'password', password
-          # Call any other callbacks
-          Ti.App.fireEvent 'login:success', user.username
-        error: (e) ->
-          Ti.API.error(e)
+    else
+      Ti.API.debug "No current session found", login, password
+    login? and password?
+
+  getCurrentLocation: (options) ->
+    options.success  ?= ->
+    options.error    ?= ->
+    Ti.Geolocation.purpose = "Find something near you"
+    Ti.Geolocation.accuracy = Ti.Geolocation.ACCURACY_KILOMETER
+    Ti.Geolocation.getCurrentPosition (e) ->
+      if !e.success || e.error
+        Ti.API.error e.error
+        options.error e.error
+      options.success e.coords if e.success
+      
+  
+  # Authenticate a user
+  authenticate: (login, password) ->
+    Ti.API.debug('<%= app_name %>.App.authenticate')
+    @api = new <%= app_name %>.API(login, password)
+    @api.authenticate
+      success: (user) ->
+        Ti.App.Properties.setString('user', JSON.stringify(user))
+        Ti.App.Properties.setString('login', login)
+        Ti.App.Properties.setString('password', password)
+        Ti.App.fireEvent 'login:success', user.username
+      error: (e) ->
+        Ti.API.error(e)
+
+  # Registers a new user
+  register: (options) ->
+    api = new <%= app_name %>.API
+    api.register options
+  
+  signOut: ->
+    Ti.App.Properties.removeProperty 'user'
+    Ti.App.Properties.removeProperty 'login'
+    Ti.App.Properties.removeProperty 'password'
+    Ti.App.fireEvent 'logout'
 
-    # Attempt to login with saved credentials
-    hasCurrentSession: ->
-      login = Ti.App.Properties.getString 'login'
-      password = Ti.App.Properties.getString 'password'
-      if login? and password?
-        Ti.API.debug "Found current session with login: #{login}"
-        this.api = new <%= app_name %>.API(login, password)
-      else
-        Ti.API.debug "No current session found", login, password
-      login? and password?
-
-    # Clears the current session by removing the persisted property for user
-    signOut: ->
-      Ti.App.Properties.removeProperty 'user'
-      Ti.App.Properties.removeProperty 'login'
-      Ti.App.Properties.removeProperty 'password'
-      Ti.App.fireEvent 'logout'
+  init: ->
+    Ti.UI.setBackgroundColor '#000'
+    Ti.UI.iPhone.statusBarStyle = Ti.UI.iPhone.StatusBar.OPAQUE_BLACK
 
-    # A function to open the login window
     showLogin = () ->
-      login = <%= app_name %>.Views.createLoginWindow
-        title: 'Login'
-        id: 'loginWindow'
-
-      # Open the login window modally with no nav bar
-      login.open
-        modal: true
-        navBarHidden: true
-
-    <%= app_name %>.App.initTabGroup()
+      rootWindow  = Ti.UI.createWindow()
+      login       = <%= app_name %>.Views.Account.createLoginWindow
+        title:  'Login'
+        id:     'loginWindow'
+      <%= app_name %>.App.sessionNavGroup = Ti.UI.iPhone.createNavigationGroup
+        window: login
+      rootWindow.add <%= app_name %>.App.sessionNavGroup
+      Ti.App.addEventListener 'login:success', (e) ->
+        rootWindow.close()
+      rootWindow.open()
+      
+    loggedIn = <%= app_name %>.App.hasCurrentSession()
+
+    if loggedIn
+      <%= app_name %>.App.initTabGroup()
+    else
+      showLogin() unless loggedIn
+
+    # Listen to an app-wide `logout` event and show the login again
+    Ti.App.addEventListener 'logout', (e) ->
+      showLogin()
+
+    Ti.App.addEventListener 'login:success', (e) ->
+      <%= app_name %>.App.initTabGroup()
 
   initTabGroup: ->
-    # # Create a new TabGroup to manage tabs
     <%= app_name %>.App.tabGroup = Ti.UI.createTabGroup()
 
-    # ### Set up the **sampleWindow**
+    # Sample Tab
     sampleWindow = <%= app_name %>.Views.Sample.createMainWindow
-      title: 'Sample'
-      id: 'sampleWindow'
-
-      # Titanium magic to handle orientation changes
-      orientationModes: [
-        Ti.UI.PORTRAIT
-        Ti.UI.UPSIDE_PORTRAIT
-        Ti.UI.LANDSCAPE_LEFT
-        Ti.UI.LANDSCAPE_RIGHT
-      ]
-
-    # ### Set up the Sample Window
-    <%= app_name %>.App.sampleTab = Ti.UI.createTab
-      id: 'sampleTab'
-      className: 'tabElement'
-      title: 'sample'
-      window: sampleWindow
-
-    <%= app_name %>.App.tabGroup.addTab <%= app_name %>.App.sampleTab
-
-    # ### Set up the ***Settings Window***
-    settingsWindow = <%= app_name %>.Views.Settings.createMainWindow
-      title: 'Settings'
-      id: 'settingsWindow'
-
-      # Titanium magic to handle orientation changes
-      orientationModes: [
-        Ti.UI.PORTRAIT
-        Ti.UI.UPSIDE_PORTRAIT
-        Ti.UI.LANDSCAPE_LEFT
-        Ti.UI.LANDSCAPE_RIGHT
-      ]
-
-    <%= app_name %>.App.settingsTab = Ti.UI.createTab
-      id: 'settingsTab'
-      className: 'tabElement'
-      title: 'settings'
-      window: settingsWindow
-
-    <%= app_name %>.App.tabGroup.addTab <%= app_name %>.App.settingsTab
-
-    # Open the TabGroup and first window via selecte tab
-    <%= app_name %>.App.tabGroup.open()
-
+      title:            'Sample'
+      id:               'sampleWindow'
+      orientationModes: <%= app_name %>.Helpers.Application.createOrientiationModes
+    <%= app_name %>.App.sampleWindow = Ti.UI.createTab
+      id:               'sampleTab'
+      className:        'tabElement'
+      title:            'Sample'
+      window:           sampleWindow
+    
+    
+    # Bottom Tab Loader
+    <%= app_name %>.App.tabGroup.addTab <%= app_name %>.App.sampleWindow
+    
+    <%= app_name %>.App.tabGroup.addEventListener 'focus', (e) ->
+      <%= app_name %>.App.currentTab = e.tab
+      Ti.API.info(<%= app_name %>.App.currentTab)
+    
+    # Open Tabs
+    <%= app_name %>.App.tabGroup.open()

data/lib/ti/templates/app/helpers/application.coffee.erb

@@ -0,0 +1,10 @@
+<%= app_name %>.Helpers.Application =
+  
+  createOrientiationModes: ->
+    modes = [
+      Titanium.UI.PORTRAIT
+      Titanium.UI.UPSIDE_PORTRAIT
+      Titanium.UI.LANDSCAPE_LEFT
+      Titanium.UI.LANDSCAPE_RIGHT
+    ]
+    modes

data/lib/ti/templates/app/helpers/date_format.coffee.erb

@@ -0,0 +1,22 @@
+<%= app_name %>.DateFormat =
+
+  relativeDate: (olderDate, newerDate) ->
+    olderDate = new Date(olderDate) if (typeof olderDate == "string")
+    newerDate = new Date(newerDate) if (typeof newerDate == "string")
+
+    milliseconds = newerDate - olderDate
+
+    conversions = [
+      ["years", 31518720000]
+      ["months", 2626560000]
+      ["days", 86400000]
+      ["hours", 3600000]
+      ["minutes", 60000]
+      ["seconds", 1000]
+    ]
+
+    for conversion in conversions
+      result = Math.floor(milliseconds / conversion[1])
+      return result + " " + conversion[0] + " ago" if result >= 2
+
+    return "1 second ago"

data/lib/ti/templates/defaults/Coffeefile.erb

@@ -1,16 +1,19 @@
 # Coffeefile for Compiling CoffeeScripts
 #
 # Compiled top down. First listed is the first to be added for compiling. You can
-# specify specific files to be loaded first and then use the generic wildcard to 
+# specify which files to be loaded first and then use a wildcard to 
 # add the rest of the files that don't require specific loading. 
 #
 # Example
+#   app/dailyfocus/app.coffee
 #   app/dailyfocus/models/user.coffee
 #   app/dailyfocus/models/task.coffee
 #   app/dailyfocus/models/**/*.coffee
 #   app/dailyfocus/controllers/**/*.coffee
 #   app/dailyfocus/views/**/*.coffee
 #
-app/<%= app_name %>/models/**/*.coffee
-app/<%= app_name %>/controllers/**/*.coffee
-app/<%= app_name %>/views/**/*.coffee
+app/<%= app_name_underscore %>/app.coffee
+app/<%= app_name_underscore %>/models/**/*.coffee
+app/<%= app_name_underscore %>/helpers/*.coffee
+app/<%= app_name_underscore %>/controllers/**/*.coffee
+app/<%= app_name_underscore %>/views/**/*.coffee

data/lib/ti/templates/defaults/Rakefile.erb

@@ -3,23 +3,8 @@ require 'nokogiri'
 require 'colored'
 require 'betabuilder'
 
-PROJECT_NAME = "<%= app_name %>"
-PROJECT_ROOT = File.dirname(__FILE__)
-
-IPHONE_SDK_VERSION = "4.3"
-TI_SDK_VERSION = "1.6.2"
-TI_DIR = '/Library/Application\ Support/Titanium'
-TI_ASSET_DIR = "#{TI_DIR}/mobilesdk/osx/#{TI_SDK_VERSION}"
-TI_IPHONE_DIR = "#{TI_ASSET_DIR}/iphone"
-TI_BUILD = "#{TI_IPHONE_DIR}/builder.py"
-APP_DEVICE = "iphone"
-
-# Get APP parameters from current tiapp.xml
-config = File.open("tiapp.xml")
-doc = Nokogiri::XML(config)
-config.close
-APP_ID = doc.xpath('ti:app/id').text
-APP_NAME = doc.xpath('ti:app/name').text
+require File.expand_path(File.join(Dir.pwd, 'config/config.rb'))
+include Config
 
 BetaBuilder::Tasks.new do |config|
   # App Name

data/lib/ti/templates/defaults/Readme.mkd.erb

@@ -1 +1 @@
-# <%= app_name %> - Generated by Ti
+# <%= app_name %> - Created with Ti, the rapid development framework.

data/lib/ti/templates/defaults/config.erb

@@ -1,17 +1,24 @@
+require 'fileutils'
+# TODO: remove
 require 'nokogiri'
 
 module Config
+  # TODO: These need to be removed.
   config  = File.open('tiapp.xml')
   doc     = Nokogiri::XML(config)
   config.close
 
+  # TODO: Project name and root don't have any meaning once building of the devise is within ti core.
   PROJECT_NAME        = "<%= app_name %>"
-  PROJECT_ROOT        = File.dirname(__FILE__)
+  PROJECT_ROOT        = FileUtils.pwd()
   PROJECT_VERSION     = "0.0.1"
 
   IPHONE_SDK_VERSION  = "4.3"
   ANDROID_SDK_VERSION = ""
 
+  # TODO: In Ti itself, we have the sdk version and the ti directory locations. We should use this configuration instead of
+  #       the one within Ti itself. This will allow the user to decide if they're building on a different version or have
+  #       Titanium in a different location.
   TI_SDK_VERSION      = "1.6.2"
   TI_DIR              = "/Library/Application\\ Support/Titanium"
 
@@ -21,7 +28,8 @@ module Config
   TI_BUILD            = "#{TI_IPHONE_DIR}/builder.py"
 
   # Application
+  # TODO: No reason for having APP_ID or APP_NAME. Still thinking through APP_DEVISE.
   APP_ID              = doc.xpath('ti:app/id').text
   APP_NAME            = doc.xpath('ti:app/name').text
-  APP_DEVICE          = "iphone"
+  APP_DEVICE          = "<%= platform %>"
 end

data/lib/ti/utils.rb

@@ -4,7 +4,9 @@ module Ti
     def create_new_file(name, file=nil)
       log "Creating #{name}"
       contents = file.nil? ? '' : File.read(file)
-      File.open(location.join(name), 'w') { |f| f.write(contents) }
+      unless File.file?(location.join(name))
+        File.open(location.join(name), 'w') { |f| f.write(contents) }
+      end
     end
     
     def get_app_name
@@ -52,9 +54,20 @@ module Ti
       File.open(location.join(name.gsub(/^\//, '')), 'w') { |f| f.write(eruby.result(contents))}
     end
     
+    def append_to_router(name, type)
+      router_contents = File.read(location.join("app/app.coffee"))
+      
+      if router_contents.include?(type.capitalize)
+        contents = router_contents.sub( "#{type.capitalize}:", "#{type.capitalize}:\n    #{name.capitalize}: {}" )
+      else
+        contents = router_contents.sub("#{get_app_name} =", "#{get_app_name} =\n\t#{type.capitalize}:\n    #{name.capitalize}: {}\n")
+      end
+      File.open(location.join("app/app.coffee"), 'w') { |f| f.write(contents) }
+    end 
+    
     
     def templates(path)
-      ::Ti::ROOT_PATH.join('ti/templates').join(path)
+      ::Ti.root.join('ti/templates').join(path)
     end
     
     

data/lib/ti/version.rb

@@ -1,3 +1,3 @@
 module Ti
-  VERSION = "0.1.5"
+  VERSION = "0.1.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ti
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -16,7 +16,7 @@ date: 2011-05-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &2158422720 !ruby/object:Gem::Requirement
+  requirement: &2153826940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -24,10 +24,10 @@ dependencies:
         version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *2158422720
+  version_requirements: *2153826940
 - !ruby/object:Gem::Dependency
   name: guard-sass
-  requirement: &2158422200 !ruby/object:Gem::Requirement
+  requirement: &2153826380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -35,10 +35,10 @@ dependencies:
         version: 0.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *2158422200
+  version_requirements: *2153826380
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &2158421720 !ruby/object:Gem::Requirement
+  requirement: &2153825860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -46,10 +46,10 @@ dependencies:
         version: 0.3.4
   type: :runtime
   prerelease: false
-  version_requirements: *2158421720
+  version_requirements: *2153825860
 - !ruby/object:Gem::Dependency
   name: guard-coffeescript
-  requirement: &2158421240 !ruby/object:Gem::Requirement
+  requirement: &2153825340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -57,10 +57,10 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *2158421240
+  version_requirements: *2153825340
 - !ruby/object:Gem::Dependency
   name: guard-livereload
-  requirement: &2158420760 !ruby/object:Gem::Requirement
+  requirement: &2153824840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -68,10 +68,10 @@ dependencies:
         version: 0.1.10
   type: :runtime
   prerelease: false
-  version_requirements: *2158420760
+  version_requirements: *2153824840
 - !ruby/object:Gem::Dependency
   name: jasmine
-  requirement: &2158420280 !ruby/object:Gem::Requirement
+  requirement: &2153824320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -79,10 +79,10 @@ dependencies:
         version: 1.0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *2158420280
+  version_requirements: *2153824320
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &2158419800 !ruby/object:Gem::Requirement
+  requirement: &2153823800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -90,10 +90,10 @@ dependencies:
         version: 2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *2158419800
+  version_requirements: *2153823800
 - !ruby/object:Gem::Dependency
   name: colored
-  requirement: &2158419320 !ruby/object:Gem::Requirement
+  requirement: &2153823300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -101,10 +101,10 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *2158419320
+  version_requirements: *2153823300
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2158418840 !ruby/object:Gem::Requirement
+  requirement: &2153822780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -112,10 +112,10 @@ dependencies:
         version: 0.8.7
   type: :runtime
   prerelease: false
-  version_requirements: *2158418840
+  version_requirements: *2153822780
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2158412200 !ruby/object:Gem::Requirement
+  requirement: &2153822260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -123,10 +123,10 @@ dependencies:
         version: 1.4.4
   type: :runtime
   prerelease: false
-  version_requirements: *2158412200
+  version_requirements: *2153822260
 - !ruby/object:Gem::Dependency
   name: erubis
-  requirement: &2158411700 !ruby/object:Gem::Requirement
+  requirement: &2153821740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -134,10 +134,10 @@ dependencies:
         version: 2.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *2158411700
+  version_requirements: *2153821740
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2158411180 !ruby/object:Gem::Requirement
+  requirement: &2153821240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -145,10 +145,10 @@ dependencies:
         version: 1.0.10
   type: :development
   prerelease: false
-  version_requirements: *2158411180
+  version_requirements: *2153821240
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2158410660 !ruby/object:Gem::Requirement
+  requirement: &2153820720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -156,10 +156,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *2158410660
+  version_requirements: *2153820720
 - !ruby/object:Gem::Dependency
   name: rocco
-  requirement: &2158410160 !ruby/object:Gem::Requirement
+  requirement: &2153820200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -167,7 +167,7 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *2158410160
+  version_requirements: *2153820200
 description: Titanium Rapid Development Framework
 email: robert@codewranglers.org
 executables:
@@ -187,19 +187,24 @@ files:
 - TODO.mkd
 - bin/ti
 - lib/ti.rb
+- lib/ti/builder/titanium.rb
 - lib/ti/cli.rb
 - lib/ti/compiler/coffee_scripts.rb
+- lib/ti/compiler/sass_scripts.rb
 - lib/ti/config.rb
 - lib/ti/generate/controller.rb
 - lib/ti/generate/model.rb
 - lib/ti/generate/project.rb
 - lib/ti/generate/view.rb
 - lib/ti/logger.rb
+- lib/ti/templates/app/api.coffee.erb
 - lib/ti/templates/app/app.coffee
 - lib/ti/templates/app/app.coffee.erb
 - lib/ti/templates/app/app_project.coffee.erb
 - lib/ti/templates/app/controllers/controller.erb
 - lib/ti/templates/app/controllers/window.erb
+- lib/ti/templates/app/helpers/application.coffee.erb
+- lib/ti/templates/app/helpers/date_format.coffee.erb
 - lib/ti/templates/app/stylesheets/app.sass
 - lib/ti/templates/app/stylesheets/sample.sass
 - lib/ti/templates/app/views/generic.erb