ti 0.1.9 → 0.2.0

data/Gemfile.lock

@@ -1,91 +1,62 @@
 PATH
   remote: .
   specs:
-    ti (0.1.5)
+    ti (0.2.0)
       coffee-script (~> 2.2.0)
       colored (~> 1.2)
+      compass (~> 0.7)
       erubis (~> 2.7.0)
-      guard (~> 0.3.4)
-      guard-coffeescript (~> 0.2.0)
-      guard-livereload (~> 0.1.10)
-      guard-sass (~> 0.0.6)
-      jasmine (~> 1.0.2.0)
       nokogiri (~> 1.4.4)
-      rake (~> 0.8.7)
-      sass (~> 3.1.1)
+      rake (~> 0.9.2)
+      rocco (~> 0.7)
+      rocco (~> 0.7)
+      session (~> 3.1)
+      thor (~> 0.14.6)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.2.5)
-    childprocess (0.1.8)
-      ffi (~> 1.0.6)
+    chunky_png (1.2.5)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.1.0)
+    coffee-script-source (1.2.0)
     colored (1.2)
-    diff-lcs (1.1.2)
-    em-websocket (0.2.1)
-      addressable (>= 2.1.1)
-      eventmachine (>= 0.12.9)
+    compass (0.11.7)
+      chunky_png (~> 1.2)
+      fssm (>= 0.2.7)
+      sass (~> 3.1)
+    diff-lcs (1.1.3)
     erubis (2.7.0)
-    eventmachine (0.12.10)
-    execjs (0.3.3)
+    execjs (1.3.0)
       multi_json (~> 1.0)
-    ffi (1.0.7)
-      rake (>= 0.8.7)
-    guard (0.3.4)
-      thor (~> 0.14.6)
-    guard-coffeescript (0.2.0)
-      coffee-script (~> 2.2.0)
-      guard (~> 0.3.0)
-    guard-livereload (0.1.11)
-      em-websocket (~> 0.2.0)
-      guard (>= 0.2.2)
-      json (~> 1.5.1)
-    guard-sass (0.0.6)
-      guard (>= 0.2.1)
-      haml (~> 3.0.0)
-    haml (3.0.25)
-    jasmine (1.0.2.0)
-      json_pure (>= 1.4.3)
-      rack (>= 1.1)
-      rspec (>= 1.3.1)
-      selenium-webdriver (>= 0.1.3)
-    json (1.5.1)
-    json_pure (1.5.1)
-    multi_json (1.0.1)
-    mustache (0.99.3)
-    nokogiri (1.4.4)
-    rack (1.2.2)
-    rake (0.8.7)
-    rdiscount (1.6.8)
-    rocco (0.6)
+    fattr (2.2.0)
+    fssm (0.2.8.1)
+    multi_json (1.0.4)
+    mustache (0.99.4)
+    nokogiri (1.4.7)
+    rake (0.9.2)
+    redcarpet (2.1.0)
+    rocco (0.8.2)
       mustache
-      rdiscount
-    rspec (2.5.0)
-      rspec-core (~> 2.5.0)
-      rspec-expectations (~> 2.5.0)
-      rspec-mocks (~> 2.5.0)
-    rspec-core (2.5.2)
-    rspec-expectations (2.5.0)
+      redcarpet
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.5.0)
-    rubyzip (0.9.4)
-    sass (3.1.1)
-    selenium-webdriver (0.2.0)
-      childprocess (>= 0.1.7)
-      ffi (>= 1.0.7)
-      json_pure
-      rubyzip
+    rspec-mocks (2.6.0)
+    sass (3.1.12)
+    session (3.1.0)
+      fattr
     thor (0.14.6)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.10)
-  rocco (~> 0.6)
-  rspec (~> 2.5.0)
+  bundler (~> 1.1.pre.10)
+  rspec (~> 2.6.0)
   ti!

data/README.rdoc

@@ -1,58 +1,69 @@
 = Ti
 
-Titanium Application Generator. Uses CoffeeScript for writing your JavaScript, Jasmine and Guard for testing. 
-
-Just playing with some ideas.
+A rapid development framework for titanium.
 
 == Requirements
- 
+
 * ruby 1.9.2
-* Titanium Developer Mobile SDK 1.6.2
+* Titanium Developer Mobile SDK
 * CoffeeScript
 * libffi `brew install libffi`
 
 == Sample App
 
+Set an alias for titanium's command line interface to your /.bash_profile
+
+=== OS X
+  
+  alias titanium="$HOME/Library/Application\ Support/Titanium/mobilesdk/osx/<VERSION>/titanium.py"
+  
+=== Linux
+  
+  alias titanium=$HOME/.titanium/mobilesdk/linux/<VERSION>/titanium.py
+
 Install the gem
 
   gem install ti
 
-
 Create a new Project
 
-  ti new HelloTi com.yourdomain.helloti iphone `
+  ti new HelloTi com.yourdomain.helloti iphone
 
 
 Create your views
 
-  ti s window Sample main  
-  ti s window Settings main  
+  ti s window Sample main
+  ti s window Settings main
 
 
 Update your `app/app.coffee` to define the newly created Views
 
-  HelloTi =  
-    Views:  
-      Sample: {}  
-      Settings: {}  
+  HelloTi =
+    Views:
+      Sample: {}
+      Settings: {}
 
 
 Update your `app/hello_ti/stylesheets/app.sass` to include the generated sass
 
-  @import 'sample'  
-  @import 'settings'  
+  @import 'sample'
+  @import 'settings'
+
 
+Run it using `rake`
 
-Run it!
+  rake
 
-  rake  
+Or run it using `ti`
+
+  ti compile all && ti build iphone
 
 
 You can now start adding components. Enjoy!
 
 
 == Contributing to Ti
- 
+
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
 * Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
 * Fork the project
@@ -61,8 +72,14 @@ You can now start adding components. Enjoy!
 * Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
 * Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
 
+
+== Contributions
+
+* Julius Francisco (tons of code, ideas, patterns, tests, time, and all around good guy)
+* Wynn Netherland  (sass, initial patterns & and help with preliminary architectural design)
+* Rupak Ganguly    (initial cli, removal of jeweler, tests)
+
 == Copyright
 
-Copyright (c) 2011 Code Wranglers Inc, Robert R Evans. See LICENSE.txt for
-further details.
+Copyright (c) 2011 Code Wranglers Inc, Robert R Evans. See LICENSE.txt for further details.
 

data/lib/ti.rb

@@ -12,18 +12,12 @@ require 'nokogiri'
 
 module Ti
   ROOT_PATH         = Pathname(__FILE__).dirname.expand_path
-  TITANIUM_VERSION  = '1.6.2'
-  
-  # TODO: Need to support those how have install Titanium in their $HOME dir.
-  OSX_TITANIUM_HOME = "$HOME/Library/Application\\ Support/Titanium/mobilesdk/osx/#{::Ti::TITANIUM_VERSION}/titanium.py"
-  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'
@@ -32,16 +26,16 @@ module Ti
   module Builder
     autoload :Titanium,     "ti/builder/titanium.rb"
   end
-  
+
   module Generate
     autoload  :Project,     "ti/generate/project.rb"
     autoload  :Model,       "ti/generate/model.rb"
     autoload  :View,        "ti/generate/view.rb"
     autoload  :Controller,  "ti/generate/controller.rb"
   end
-  
+
   def self.root
     @root ||= Pathname(__FILE__).dirname.expand_path
   end
-  
+
 end

data/lib/ti/builder/titanium.rb

@@ -11,7 +11,17 @@ module Ti
 
         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;'}
+		  
+		  if platform == "android"
+			sdk = ANDROID_SDK_VERSION
+			builder = "#{TI_ANDROID_DIR}/builder.py"
+		  elsif platform == "iphone" || platform == "ipad"
+			sdk = IPHONE_SDK_VERSION
+			builder = "#{TI_IPHONE_DIR}/builder.py"
+		  end
+		  
+		  builder = "#{TI_ASSETS_DIR}/#{platform}/builder.py"
+          sh %Q{bash -c "#{builder} run #{PROJECT_ROOT}/ #{sdk} #{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

data/lib/ti/cli.rb

@@ -23,7 +23,7 @@ module Ti
     def info
       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.
@@ -34,7 +34,7 @@ module Ti
     def new(name, device_id='org.mycompany.demo', platform='iphone')
       ::Ti::Generate::Project.create(name, device_id, platform)
     end
-    
+
     map %w(g) => 'generate'
     desc "generate <model/controller/view> <name>", "generate a new model or view with jasmine specs."
     def generate(type, name)
@@ -48,8 +48,6 @@ module Ti
       end
     end
 
-
-
     map %w(s) => 'scaffold'
     desc "scaffold <window/tabgroup/view> <domain> <name>", "generate a scaffold for Titanium elements."
     def scaffold(ti_type, domain, name)
@@ -67,7 +65,7 @@ module Ti
           :app_name => get_app_name, 
           :name     => name })
     end
-    
+
     desc "compile <all/coffee/sass>", "compiles all CoffeeScripts"
     def compile(type)
       case

data/lib/ti/generate/project.rb

@@ -1,3 +1,4 @@
+require 'session'
 module Ti
   module Generate
     class Project
@@ -10,7 +11,8 @@ module Ti
           @project_name    = name
           @device_platform = platform
           @app_id          = id
-          if system(generate_titanium_project)
+          
+          if generate_titanium_project
             create_directories('tmp')
             copy_defaults
             remove_old_files
@@ -26,20 +28,20 @@ module Ti
           FileUtils.cp(location.join("Resources/KS_nav_ui.png"),    "/tmp/")
           FileUtils.cp(location.join("Resources/KS_nav_views.png"), "/tmp/")
         end
-        
+
 
         def generate_files
           create_project_directory
-          full_app_hash = {:app_name => @project_name.capitalize, :app_name_underscore => underscore(@project_name), :platform => @device_platform}
+          full_app_hash = {:app_name => @project_name, :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_with_template('.gitignore', 'defaults/gitignore', full_app_hash)
-          
+
           create_new_file("spec/app_spec.coffee",   templates('specs/app_spec.coffee'))
           create_new_file("app/#{underscore(@project_name)}/stylesheets/app.sass",   templates('app/stylesheets/app.sass'))
-          
+
           create_with_template('config/config.rb', 'defaults/config', full_app_hash)
           create_with_template("app/#{underscore(@project_name)}/helpers/application.coffee", 'app/helpers/application.coffee', full_app_hash)
 
@@ -47,25 +49,25 @@ module Ti
           default_templates.each do |tempfile|
             create_with_template(tempfile, "defaults/#{tempfile}", full_app_hash)
           end
-          
+
           # load default images
           FileUtils.cp("/tmp/KS_nav_ui.png",    location.join("Resources/images/"))
           FileUtils.cp("/tmp/KS_nav_views.png", location.join("Resources/images/"))
         end
-        
-        
+
+
         def create_project_directory
           create_directories('Resources', 'Resources/images', 'Resources/vendor', 
-            'config', 
-            'docs', 
-            "app/#{underscore(@project_name)}/models", 
-            "app/#{underscore(@project_name)}/helpers",
-            "app/#{underscore(@project_name)}/views", 
-            "app/#{underscore(@project_name)}/stylesheets", 
-            "app/#{underscore(@project_name)}/stylesheets/partials",
-            'spec/models', 'spec/views', 'spec/helpers') 
+                             'config', 
+                             'docs', 
+                             "app/#{underscore(@project_name)}/models", 
+          "app/#{underscore(@project_name)}/helpers",
+          "app/#{underscore(@project_name)}/views", 
+          "app/#{underscore(@project_name)}/stylesheets", 
+          "app/#{underscore(@project_name)}/stylesheets/partials",
+          'spec/models', 'spec/views', 'spec/helpers') 
         end
-        
+
         def remove_old_files
           remove_files('README')          
           remove_directories('Resources')
@@ -75,22 +77,20 @@ module Ti
           base_location.join(@project_name)
         end
 
-
         def generate_titanium_project
-          titanium_platform = case ::Config::CONFIG['host_os']
-          when /linux/i
-            ::Ti::LINUX_TITANIUM
-          when /darwin/i
-            File.exists?(::Ti::OSX_TITANIUM.gsub('\\', '')) ? ::Ti::OSX_TITANIUM : ::Ti::OSX_TITANIUM_HOME
+          platform = ::Config::CONFIG['host_os']
+          if platform =~ /linux/i || platform =~ /darwin/i
+            cmd = "titanium create --name=#{@project_name} --platform=#{@device_platform} --id=#{@app_id}"
+            # We need to use the session gem so that we can access the user's aliases
+            bash = Session::Bash::new 'program' => 'bash --login -i'
+            bash.execute(cmd) { |out, err| puts out }
           else
-            error("Currently, your OS (#{::Config::CONFIG['host_os']}) is not supported.")
-            exit(0)
+             error("Currently, your OS (#{::Config::CONFIG['host_os']}) is not supported.")
+             exit(0)
           end
-          
-          "#{titanium_platform} create --name=#{@project_name} --platform=#{@device_platform} --id=#{@app_id}"
         end
 
       end
     end
   end
-end
+end

data/lib/ti/logger.rb

@@ -1,6 +1,6 @@
 module Ti
   class Logger
-    
+
     def self.report(msg)
       $stdout.puts(msg.green.bold)
     end
@@ -8,6 +8,6 @@ module Ti
     def self.error(msg)
       $stderr.puts(msg.red.bold)
     end
-      
+
   end
-end
+end

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

@@ -4,13 +4,12 @@ class <%= app_name %>.API
 
   requestURI: (path, query={}) ->
     # NOTE: Setup your own API endpoint, as below
-    <%= app_name %>.API_ENDPOINT = "http://<%= app_name_underscore %>.com/api/v1"
+    <%= app_name %>.API_ENDPOINT = "http://<%= app_name_underscore %>.com/api"
 
     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) ->
@@ -32,7 +31,7 @@ class <%= app_name %>.API
           options.error(exception)
     uri = @requestURI(path, options.query)
     xhr.open(options.method, uri)
-    xhr.setRequestHeader 'Authorization', 'Basic ' + Ti.Utils.base64encode(@login+':'+@password) if authenticated  
+    xhr.setRequestHeader 'Authorization', 'Basic ' + Ti.Utils.base64encode(@login+':'+@password) if authenticated
     
     message = "Executing "
     message += if authenticated then "Authenticated " else "Unauthenticated "
@@ -58,4 +57,12 @@ class <%= app_name %>.API
     options.method = 'POST'
     @request path, options, authenticated
 
-# Add your API endpoints below
+  put: (path, options, authenticated=true) ->
+    options.method = 'PUT'
+    @request path, options, authenticated
+
+  delete: (path, options, authenticated=true) ->
+    options.method = 'DELETE'
+    @request path, options, authenticated
+
+# Add your API endpoints below

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

@@ -6,7 +6,7 @@
 <%= app_name %> =
   Models:   {}
   Helpers:  {}
-  Views:    {}
+  Views: {}
 
 # Include your libraries like:
 # Ti.include('vendor/date.js')
@@ -20,4 +20,4 @@ Ti.include('<%= app_name_underscore %>.js')
 # and use $.API for the class name. Uncomment to use.
 # $ = <%= app_name %>
 
-<%= app_name %>.App.init()
+<%= app_name %>.App.initTabGroup()

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

@@ -1,90 +1,5 @@
 <%= app_name %>.App =
 
-  currentUser: ->
-    userData = Ti.App.Properties.getString('user')
-    if userData?
-      user = JSON.parse(userData)
-      return user
-    else
-      null
-
-  # Attempt to log in 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} and password: #{password}"
-      this.api = new <%= app_name %>.API(login, password)
-    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'
-
-  init: ->
-    Ti.UI.setBackgroundColor '#000'
-    Ti.UI.iPhone.statusBarStyle = Ti.UI.iPhone.StatusBar.OPAQUE_BLACK
-
-    showLogin = () ->
-      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: ->
     <%= app_name %>.App.tabGroup = Ti.UI.createTabGroup()
 
@@ -93,19 +8,33 @@
       title:            'Sample'
       id:               'sampleWindow'
       orientationModes: <%= app_name %>.Helpers.Application.createOrientiationModes
-    <%= app_name %>.App.sampleWindow = Ti.UI.createTab
+    <%= app_name %>.App.sampleTab = 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.addTab <%= app_name %>.App.sampleTab
+
+    # Settings Tab
+    settingsWindow = <%= app_name %>.Views.Settings.createMainWindow
+      title:            'Settings'
+      id:               'settingsWindow'
+      orientationModes: <%= app_name %>.Helpers.Application.createOrientiationModes
+
+    <%= app_name %>.App.settingsTab = Ti.UI.createTab
+      id:               'settingsTab'
+      className:        'tabElement'
+      title:            'Settings'
+      window:           settingsWindow
+
+    # Bottom Tab Loader
+    <%= app_name %>.App.tabGroup.addTab <%= app_name %>.App.settingsTab
+
     <%= 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()
+    <%= app_name %>.App.tabGroup.open()

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

@@ -63,6 +63,18 @@ namespace :build do
   task :iphone do
     build
   end
+
+  desc "Build the app for Android"
+  task :android do
+	build({ :device => 'android' })
+  end
+
+  desc "Recreate build folder"
+  task :new do
+    system "rm -rf build"
+    system "mkdir -p build/iphone"
+    Rake::Task["setup:all"].invoke
+  end
 end
 
 def compile
@@ -111,7 +123,7 @@ def compile_coffee
   puts "Compiling CoffeeScript".blue
   paths = `find app/<%= app_name_underscore %> -name '*.coffee'`.split("\n")
   compilation = (
-  system "coffee -p --join --bare #{paths.join(' ')} > Resources/<%= app_name_underscore%>.js" and
+  system "coffee -c -b --join Resources/<%= app_name_underscore %>.js -c -b #{paths.join(' ')}" and
   system "coffee -p --bare app/app.coffee > Resources/app.js"
   )
 
@@ -125,9 +137,16 @@ def compile_coffee
 end
 
 def build(options={})
-  return unless compile
+  return "Broken" unless compile
   options[:device] ||= 'iphone'
+  if options[:device] == 'android'
+	sdk = ANDROID_SDK_VERSION
+	builder = "#{TI_ANDROID_DIR}/builder.py"
+  elsif options[:device].match /^i/
+	sdk = IPHONE_SDK_VERSION
+	builder = "#{TI_IPHONE_DIR}/builder.py"
+  end
   puts "Building with Titanium... (DEVICE_TYPE: #{options[:device]})".blue
-  sh %Q{bash -c "#{TI_BUILD} run #{PROJECT_ROOT}/ #{IPHONE_SDK_VERSION} #{APP_ID} #{APP_NAME} #{APP_DEVICE} " \
+  sh %Q{bash -c "#{builder} run #{PROJECT_ROOT}/ #{sdk} #{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

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

@@ -13,13 +13,13 @@ module Config
   PROJECT_ROOT        = FileUtils.pwd()
   PROJECT_VERSION     = "0.0.1"
 
-  IPHONE_SDK_VERSION  = "4.3"
+  IPHONE_SDK_VERSION  = "5.0"
   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_SDK_VERSION      = "1.8.0.1"
   TI_DIR              = "/Library/Application\\ Support/Titanium"
 
   TI_ASSETS_DIR       = "#{TI_DIR}/mobilesdk/osx/#{TI_SDK_VERSION}"

data/lib/ti/templates/rakefile

@@ -40,6 +40,18 @@ namespace :build do
   task :iphone do
     build
   end
+  
+  desc "Build the app for Android"
+  task :android do
+	build({ :device => 'android' })
+  end
+
+  desc "Recreate build folder"
+  task :new do
+    system "rm -rf build"
+    system "mkdir -p build/iphone"
+    Rake::Task["setup:all"].invoke
+  end
 end
 
 def compile
@@ -57,20 +69,34 @@ def compile_coffee
   paths = [
     "app/#{APP_NAME}.coffee",
     "app/models/*.coffee",
-    "app/views/*.coffee"
+      "app/views/*.coffee"
   ]
 
   puts "PATHS: #{paths.join(' ')} ".yellow
 
-  `coffee -p --join --bare #{paths.join(' ')} > Resources/#{APP_NAME}.js`
-  `coffee -p --bare src/app.coffee > Resources/app.js`
+  compilation = (
+    system "coffee -c -b --join Resources/#{APP_NAME}.js -c -b #{paths.join(' ')}" and
+    system "coffee -p --bare src/app.coffee > Resources/app.js"
+  )
+
+  if compilation
+    puts "Successfully compiled CoffeeScript".green
+  else
+    puts "Error compiling CoffeeScript".red
+  end
 end
 
 def build(options={})
-  compile
+  return "Broken" unless compile
   options[:device] ||= 'iphone'
-  puts "Building with Titanium with Ti... (DEVICE_TYPE:#{options[:device]})"
-  FileUtils.mkdir_p "#{PROJECT_ROOT}/#{PROJECT_NAME}/build/iphone/"
-  sh %Q{bash -c "#{TI_BUILD} run #{PROJECT_ROOT}/ #{IPHONE_SDK_VERSION} #{APP_ID} #{APP_NAME} #{APP_DEVICE}" \
+  if options[:device] == 'android'
+	sdk = ANDROID_SDK_VERSION
+	builder = "#{TI_ANDROID_DIR}/builder.py"
+  elsif options[:device].match /^i/
+	sdk = IPHONE_SDK_VERSION
+	builder = "#{TI_IPHONE_DIR}/builder.py"
+  end
+  puts "Building with Titanium... (DEVICE_TYPE: #{options[:device]})".blue
+  sh %Q{bash -c "#{builder} run #{PROJECT_ROOT}/ #{sdk} #{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

data/lib/ti/utils.rb

@@ -1,6 +1,6 @@
 module Ti
   module Utils
-        
+
     def create_new_file(name, file=nil)
       log "Creating #{name}"
       contents = file.nil? ? '' : File.read(file)
@@ -8,38 +8,38 @@ module Ti
         File.open(location.join(name), 'w') { |f| f.write(contents) }
       end
     end
-    
+
     def get_app_name
       config  = File.open("tiapp.xml")
       doc     = ::Nokogiri::XML(config)
       config.close
       doc.xpath('ti:app/name').text
     end
-    
+
     def remove_files(*files)
       files.each do |file|
         log "Removing #{file} file."
         FileUtils.rm(location.join(file))
       end
     end
-    
-  
+
+
     def touch(*filenames)
       filenames.each do |filename|
         log "Creating #{filename} file."
         FileUtils.touch(location.join(filename))
       end
     end
-    
-  
+
+
     def create_directories(*dirs)
       dirs.each do |dir|
         log "Creating the #{dir} directory."
         FileUtils.mkdir_p(location.join(dir))
       end
     end
-  
-    
+
+
     def remove_directories(*names)
       names.each do |name|
         log "Removing #{name} directory."
@@ -47,16 +47,16 @@ module Ti
       end
     end
 
-    
+
     def create_with_template(name, template_location, contents={})
       template    = templates("#{template_location}.erb")
       eruby       = Erubis::Eruby.new(File.read(template))
       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
@@ -64,27 +64,27 @@ module Ti
       end
       File.open(location.join("app/app.coffee"), 'w') { |f| f.write(contents) }
     end 
-    
-    
+
+
     def templates(path)
       ::Ti.root.join('ti/templates').join(path)
     end
-    
-    
+
+
     def log(msg)
       ::Ti::Logger.report(msg)
     end
-    
+
     def error(msg)
       ::Ti::Logger.error(msg)
     end
-    
+
     def base_location
       @location ||= Pathname.new(Dir.pwd)
     end
     alias_method :location, :base_location
-    
-    
+
+
     def underscore(string)
       string.gsub(/::/, '/').
         gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
@@ -92,6 +92,6 @@ module Ti
         tr("-", "_").
         downcase
     end
-    
+
   end
 end

data/lib/ti/version.rb

@@ -1,3 +1,3 @@
 module Ti
-  VERSION = "0.1.9"
+  VERSION = "0.2.0"
 end

data/spec/cli/command_spec.rb

@@ -56,7 +56,7 @@ describe "Ti Generator Commands" do
       context "with custom name (ti new Demo)" do
         it "should generate new project \"Demo\"" do
           response, status = capture_with_status(:stdout){ Ti::CLI.start(['new', 'Demo']) }
-          response.should eql("\e[1m\e[32mCreating the tmp directory.\e[0m\e[0m\n\e[1m\e[32mRemoving README file.\e[0m\e[0m\n\e[1m\e[32mRemoving Resources directory.\e[0m\e[0m\n\e[1m\e[32mCreating the Resources directory.\e[0m\e[0m\n\e[1m\e[32mCreating the Resources/images directory.\e[0m\e[0m\n\e[1m\e[32mCreating the Resources/vendor directory.\e[0m\e[0m\n\e[1m\e[32mCreating the config directory.\e[0m\e[0m\n\e[1m\e[32mCreating the docs directory.\e[0m\e[0m\n\e[1m\e[32mCreating the app/demo/models directory.\e[0m\e[0m\n\e[1m\e[32mCreating the app/demo/views directory.\e[0m\e[0m\n\e[1m\e[32mCreating the app/demo/stylesheets directory.\e[0m\e[0m\n\e[1m\e[32mCreating the spec/models directory.\e[0m\e[0m\n\e[1m\e[32mCreating the spec/views directory.\e[0m\e[0m\n\e[1m\e[32mCreating Readme.mkd file.\e[0m\e[0m\n\e[1m\e[32mCreating app/app.coffee\e[0m\e[0m\n\e[1m\e[32mCreating .gitignore\e[0m\e[0m\n\e[1m\e[32mCreating spec/app_spec.coffee\e[0m\e[0m\n\e[1m\e[32mYour Titanium project is ready for you to get rockin!\e[0m\e[0m\n")
+		  response.should eql("\n\n\e]0;~/Workspace/ruby/Ti\aCreated iphone application project\n\n\n\e]0;~/Workspace/ruby/Ti\a\e]0;~/Workspace/ruby/Ti\a\e]0;~/Workspace/ruby/Ti\a\n\e[1m\e[32mCreating the tmp directory.\e[0m\e[0m\n\e[1m\e[32mRemoving README file.\e[0m\e[0m\n\e[1m\e[32mRemoving Resources directory.\e[0m\e[0m\n\e[1m\e[32mCreating the Resources directory.\e[0m\e[0m\n\e[1m\e[32mCreating the Resources/images directory.\e[0m\e[0m\n\e[1m\e[32mCreating the Resources/vendor directory.\e[0m\e[0m\n\e[1m\e[32mCreating the config directory.\e[0m\e[0m\n\e[1m\e[32mCreating the docs directory.\e[0m\e[0m\n\e[1m\e[32mCreating the app/demo/models directory.\e[0m\e[0m\n\e[1m\e[32mCreating the app/demo/helpers directory.\e[0m\e[0m\n\e[1m\e[32mCreating the app/demo/views directory.\e[0m\e[0m\n\e[1m\e[32mCreating the app/demo/stylesheets directory.\e[0m\e[0m\n\e[1m\e[32mCreating the app/demo/stylesheets/partials directory.\e[0m\e[0m\n\e[1m\e[32mCreating the spec/models directory.\e[0m\e[0m\n\e[1m\e[32mCreating the spec/views directory.\e[0m\e[0m\n\e[1m\e[32mCreating the spec/helpers directory.\e[0m\e[0m\n\e[1m\e[32mCreating spec/app_spec.coffee\e[0m\e[0m\n\e[1m\e[32mCreating app/demo/stylesheets/app.sass\e[0m\e[0m\n\e[1m\e[32mYour Titanium project is ready for you to get coding!\e[0m\e[0m\n")		  
           status.should eql(Ti::CLI::STATUS_TYPES[:success])
         end
         after (:all) do
@@ -66,8 +66,8 @@ describe "Ti Generator Commands" do
       context "with custom name and id (ti new Demo com.mycompany.demo)" do
         it "should generate new project \"Demo\" with id \"com.mycompany.demo\"" do
           response, status = capture_with_status(:stdout){ Ti::CLI.start(['new', 'Demo', 'com.mycompany.demo']) }
-          response.should eql("\e[1m\e[32mCreating the tmp directory.\e[0m\e[0m\n\e[1m\e[32mRemoving README file.\e[0m\e[0m\n\e[1m\e[32mRemoving Resources directory.\e[0m\e[0m\n\e[1m\e[32mCreating the Resources directory.\e[0m\e[0m\n\e[1m\e[32mCreating the Resources/images directory.\e[0m\e[0m\n\e[1m\e[32mCreating the Resources/vendor directory.\e[0m\e[0m\n\e[1m\e[32mCreating the config directory.\e[0m\e[0m\n\e[1m\e[32mCreating the docs directory.\e[0m\e[0m\n\e[1m\e[32mCreating the app/demo/models directory.\e[0m\e[0m\n\e[1m\e[32mCreating the app/demo/views directory.\e[0m\e[0m\n\e[1m\e[32mCreating the app/demo/stylesheets directory.\e[0m\e[0m\n\e[1m\e[32mCreating the spec/models directory.\e[0m\e[0m\n\e[1m\e[32mCreating the spec/views directory.\e[0m\e[0m\n\e[1m\e[32mCreating Readme.mkd file.\e[0m\e[0m\n\e[1m\e[32mCreating app/app.coffee\e[0m\e[0m\n\e[1m\e[32mCreating .gitignore\e[0m\e[0m\n\e[1m\e[32mCreating spec/app_spec.coffee\e[0m\e[0m\n\e[1m\e[32mYour Titanium project is ready for you to get rockin!\e[0m\e[0m\n")
-          status.should eql(Ti::CLI::STATUS_TYPES[:success])
+		  response.should eql("\n\n\e]0;~/Workspace/ruby/Ti\aCreated iphone application project\n\n\n\e]0;~/Workspace/ruby/Ti\a\e]0;~/Workspace/ruby/Ti\a\e]0;~/Workspace/ruby/Ti\a\n\e[1m\e[32mCreating the tmp directory.\e[0m\e[0m\n\e[1m\e[32mRemoving README file.\e[0m\e[0m\n\e[1m\e[32mRemoving Resources directory.\e[0m\e[0m\n\e[1m\e[32mCreating the Resources directory.\e[0m\e[0m\n\e[1m\e[32mCreating the Resources/images directory.\e[0m\e[0m\n\e[1m\e[32mCreating the Resources/vendor directory.\e[0m\e[0m\n\e[1m\e[32mCreating the config directory.\e[0m\e[0m\n\e[1m\e[32mCreating the docs directory.\e[0m\e[0m\n\e[1m\e[32mCreating the app/demo/models directory.\e[0m\e[0m\n\e[1m\e[32mCreating the app/demo/helpers directory.\e[0m\e[0m\n\e[1m\e[32mCreating the app/demo/views directory.\e[0m\e[0m\n\e[1m\e[32mCreating the app/demo/stylesheets directory.\e[0m\e[0m\n\e[1m\e[32mCreating the app/demo/stylesheets/partials directory.\e[0m\e[0m\n\e[1m\e[32mCreating the spec/models directory.\e[0m\e[0m\n\e[1m\e[32mCreating the spec/views directory.\e[0m\e[0m\n\e[1m\e[32mCreating the spec/helpers directory.\e[0m\e[0m\n\e[1m\e[32mCreating spec/app_spec.coffee\e[0m\e[0m\n\e[1m\e[32mCreating app/demo/stylesheets/app.sass\e[0m\e[0m\n\e[1m\e[32mYour Titanium project is ready for you to get coding!\e[0m\e[0m\n")
+		  status.should eql(Ti::CLI::STATUS_TYPES[:success])
         end
         after (:all) do
           remove_directories("Demo")
@@ -76,8 +76,8 @@ describe "Ti Generator Commands" do
       context "with custom name, id and platform (ti new Demo com.mycompany.demo ipad)" do
         it "should generate new project \"Demo\" with id \"com.mycompany.demo\" and for platform \"ipad\"" do
           response, status = capture_with_status(:stdout){ Ti::CLI.start(['new', 'Demo', 'com.mycompany.demo']) }
-          response.should eql("\e[1m\e[32mCreating the tmp directory.\e[0m\e[0m\n\e[1m\e[32mRemoving README file.\e[0m\e[0m\n\e[1m\e[32mRemoving Resources directory.\e[0m\e[0m\n\e[1m\e[32mCreating the Resources directory.\e[0m\e[0m\n\e[1m\e[32mCreating the Resources/images directory.\e[0m\e[0m\n\e[1m\e[32mCreating the Resources/vendor directory.\e[0m\e[0m\n\e[1m\e[32mCreating the config directory.\e[0m\e[0m\n\e[1m\e[32mCreating the docs directory.\e[0m\e[0m\n\e[1m\e[32mCreating the app/demo/models directory.\e[0m\e[0m\n\e[1m\e[32mCreating the app/demo/views directory.\e[0m\e[0m\n\e[1m\e[32mCreating the app/demo/stylesheets directory.\e[0m\e[0m\n\e[1m\e[32mCreating the spec/models directory.\e[0m\e[0m\n\e[1m\e[32mCreating the spec/views directory.\e[0m\e[0m\n\e[1m\e[32mCreating Readme.mkd file.\e[0m\e[0m\n\e[1m\e[32mCreating app/app.coffee\e[0m\e[0m\n\e[1m\e[32mCreating .gitignore\e[0m\e[0m\n\e[1m\e[32mCreating spec/app_spec.coffee\e[0m\e[0m\n\e[1m\e[32mYour Titanium project is ready for you to get rockin!\e[0m\e[0m\n")
-          status.should eql(Ti::CLI::STATUS_TYPES[:success])
+          response.should eql("\n\n\e]0;~/Workspace/ruby/Ti\aCreated iphone application project\n\n\n\e]0;~/Workspace/ruby/Ti\a\e]0;~/Workspace/ruby/Ti\a\e]0;~/Workspace/ruby/Ti\a\n\e[1m\e[32mCreating the tmp directory.\e[0m\e[0m\n\e[1m\e[32mRemoving README file.\e[0m\e[0m\n\e[1m\e[32mRemoving Resources directory.\e[0m\e[0m\n\e[1m\e[32mCreating the Resources directory.\e[0m\e[0m\n\e[1m\e[32mCreating the Resources/images directory.\e[0m\e[0m\n\e[1m\e[32mCreating the Resources/vendor directory.\e[0m\e[0m\n\e[1m\e[32mCreating the config directory.\e[0m\e[0m\n\e[1m\e[32mCreating the docs directory.\e[0m\e[0m\n\e[1m\e[32mCreating the app/demo/models directory.\e[0m\e[0m\n\e[1m\e[32mCreating the app/demo/helpers directory.\e[0m\e[0m\n\e[1m\e[32mCreating the app/demo/views directory.\e[0m\e[0m\n\e[1m\e[32mCreating the app/demo/stylesheets directory.\e[0m\e[0m\n\e[1m\e[32mCreating the app/demo/stylesheets/partials directory.\e[0m\e[0m\n\e[1m\e[32mCreating the spec/models directory.\e[0m\e[0m\n\e[1m\e[32mCreating the spec/views directory.\e[0m\e[0m\n\e[1m\e[32mCreating the spec/helpers directory.\e[0m\e[0m\n\e[1m\e[32mCreating spec/app_spec.coffee\e[0m\e[0m\n\e[1m\e[32mCreating app/demo/stylesheets/app.sass\e[0m\e[0m\n\e[1m\e[32mYour Titanium project is ready for you to get coding!\e[0m\e[0m\n")
+		  status.should eql(Ti::CLI::STATUS_TYPES[:success])
         end
         after (:all) do
           remove_directories("Demo")
@@ -85,4 +85,4 @@ describe "Ti Generator Commands" do
       end
     end
   end
-end
+end

data/ti.gemspec

@@ -4,36 +4,37 @@ require "ti/version"
 
 Gem::Specification.new do |s|
   s.name          = %q{ti}
-  s.version       = Ti::VERSION
+  s.version       = '0.2.0'
   s.platform      = Gem::Platform::RUBY
   s.authors       = ["Robert R Evans", "Julius Francisco", "Wynn Netherland", "Rupak Ganguly"]
   s.date          = %q{2011-05-23}
   s.email         = %q{robert@codewranglers.org}
-  s.homepage      = %q{http://github.com/codewranglers/ti}
-  s.summary       = %q{Ti - Titanium Project Generator}
+  s.homepage      = %q{http://github.com/revans/Ti}
+  s.summary       = %q{Ti - A Titanium Rapid Development Framework}
   s.description   = %q{Titanium Rapid Development Framework}
   s.license       = "MIT"
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  
 
-  s.add_runtime_dependency(%q<sass>,                ["~> 3.1.1"])
-  s.add_runtime_dependency(%q<guard-sass>,          ["~> 0.0.6"])
-  s.add_runtime_dependency(%q<guard>,               ["~> 0.3.4"])
-  s.add_runtime_dependency(%q<guard-coffeescript>,  ["~> 0.2.0"])
-  s.add_runtime_dependency(%q<guard-livereload>,    ["~> 0.1.10"])
-  s.add_runtime_dependency(%q<jasmine>,             ["~> 1.0.2.0"])
+  # Currently we're not using these. However, I'd prefer to use these instead of
+  # using the system command
+  # s.add_runtime_dependency(%q<sass>,                ["~> 3.1.2"])
   s.add_runtime_dependency(%q<coffee-script>,       ["~> 2.2.0"])
+
   s.add_runtime_dependency(%q<colored>,             ["~> 1.2"])
-  s.add_runtime_dependency(%q<rake>,                ["~> 0.8.7"])
+  s.add_runtime_dependency(%q<rake>,                ["~> 0.9.2"])
   s.add_runtime_dependency(%q<nokogiri>,            ["~> 1.4.4"])
   s.add_runtime_dependency(%q<erubis>,              ["~> 2.7.0"])
-  # s.add_runtime_dependency(%q<betabuilder>,         ["~> 0.4.1"])
-  
-  s.add_development_dependency(%q<bundler>,         ["~> 1.0.10"])
-  s.add_development_dependency(%q<rspec>,           ["~> 2.5.0"])
-  s.add_development_dependency(%q<rocco>,           ["~> 0.6"])
+  s.add_runtime_dependency(%q<rocco>,               ["~> 0.7"])
+  s.add_runtime_dependency(%q<thor>,                ["~> 0.14.6"])
+  s.add_runtime_dependency(%q<rocco>,               ["~> 0.7"])
+  s.add_runtime_dependency(%q<compass>,             ["~> 0.7"])
+  s.add_runtime_dependency(%q<session>,             ["~> 3.1"])
+
+  # s.add_development_dependency(%q<bundler>,         ["~> 1.0.14"])
+  s.add_development_dependency(%q<bundler>,         ["~> 1.1.pre.10"])
+  s.add_development_dependency(%q<rspec>,           ["~> 2.6.0"])
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ti
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -15,159 +15,137 @@ cert_chain: []
 date: 2011-05-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: sass
-  requirement: &2157524040 !ruby/object:Gem::Requirement
+  name: coffee-script
+  requirement: &70300038671460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *2157524040
+  version_requirements: *70300038671460
 - !ruby/object:Gem::Dependency
-  name: guard-sass
-  requirement: &2157523380 !ruby/object:Gem::Requirement
+  name: colored
+  requirement: &70300038669280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *2157523380
+  version_requirements: *70300038669280
 - !ruby/object:Gem::Dependency
-  name: guard
-  requirement: &2157522680 !ruby/object:Gem::Requirement
+  name: rake
+  requirement: &70300038667360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.9.2
   type: :runtime
   prerelease: false
-  version_requirements: *2157522680
+  version_requirements: *70300038667360
 - !ruby/object:Gem::Dependency
-  name: guard-coffeescript
-  requirement: &2157521940 !ruby/object:Gem::Requirement
+  name: nokogiri
+  requirement: &70300038665700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 1.4.4
   type: :runtime
   prerelease: false
-  version_requirements: *2157521940
+  version_requirements: *70300038665700
 - !ruby/object:Gem::Dependency
-  name: guard-livereload
-  requirement: &2157521460 !ruby/object:Gem::Requirement
+  name: erubis
+  requirement: &70300038664120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.10
+        version: 2.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *2157521460
+  version_requirements: *70300038664120
 - !ruby/object:Gem::Dependency
-  name: jasmine
-  requirement: &2157520980 !ruby/object:Gem::Requirement
+  name: rocco
+  requirement: &70300038662940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.2.0
+        version: '0.7'
   type: :runtime
   prerelease: false
-  version_requirements: *2157520980
+  version_requirements: *70300038662940
 - !ruby/object:Gem::Dependency
-  name: coffee-script
-  requirement: &2157520480 !ruby/object:Gem::Requirement
+  name: thor
+  requirement: &70300038662260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *2157520480
+  version_requirements: *70300038662260
 - !ruby/object:Gem::Dependency
-  name: colored
-  requirement: &2157520000 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: *2157520000
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &2157519520 !ruby/object:Gem::Requirement
+  name: rocco
+  requirement: &70300038660760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: '0.7'
   type: :runtime
   prerelease: false
-  version_requirements: *2157519520
+  version_requirements: *70300038660760
 - !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: &2157519020 !ruby/object:Gem::Requirement
+  name: compass
+  requirement: &70300038658860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.4
+        version: '0.7'
   type: :runtime
   prerelease: false
-  version_requirements: *2157519020
+  version_requirements: *70300038658860
 - !ruby/object:Gem::Dependency
-  name: erubis
-  requirement: &2157518540 !ruby/object:Gem::Requirement
+  name: session
+  requirement: &70300038656760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *2157518540
+  version_requirements: *70300038656760
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2157518060 !ruby/object:Gem::Requirement
+  requirement: &70300038655160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.10
+        version: 1.1.pre.10
   type: :development
   prerelease: false
-  version_requirements: *2157518060
+  version_requirements: *70300038655160
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2157517580 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.5.0
-  type: :development
-  prerelease: false
-  version_requirements: *2157517580
-- !ruby/object:Gem::Dependency
-  name: rocco
-  requirement: &2157512960 !ruby/object:Gem::Requirement
+  requirement: &70300038652380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2157512960
+  version_requirements: *70300038652380
 description: Titanium Rapid Development Framework
 email: robert@codewranglers.org
 executables:
@@ -233,7 +211,7 @@ files:
 - spec/ti/logger_spec.rb
 - spec/ti/utils_spec.rb
 - ti.gemspec
-homepage: http://github.com/codewranglers/ti
+homepage: http://github.com/revans/Ti
 licenses:
 - MIT
 post_install_message: 
@@ -254,10 +232,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: Ti - Titanium Project Generator
+summary: Ti - A Titanium Rapid Development Framework
 test_files:
 - spec/cli/command_spec.rb
 - spec/fixtures/Coffeefile