calatrava 0.6.3 → 0.6.4

data/lib/calatrava/app_builder.rb

@@ -3,8 +3,8 @@ module Calatrava
   class AppBuilder
     include Rake::DSL
 
-    def initialize(output_dir, manifest)
-      @output_dir, @manifest = output_dir, manifest
+    def initialize(platform, output_dir, manifest)
+      @platform, @output_dir, @manifest = platform, output_dir, manifest
     end
 
     def build_dir ; @output_dir ; end
@@ -14,7 +14,8 @@ module Calatrava
     def build_styles_dir ; "#{build_dir}/styles" ; end
 
     def coffee_files
-      @manifest.coffee_files + [Calatrava::Project.current.config.path('env.coffee')]
+      env_file = OutputFile.new(build_scripts_dir, Calatrava::Project.current.config.path('env.coffee'), ['configure:calatrava_env'])
+      @manifest.coffee_files.collect { |cf| OutputFile.new(build_scripts_dir, cf) } + [env_file]
     end
 
     def js_file(cf)
@@ -40,25 +41,23 @@ module Calatrava
 
       app_files = haml_files.collect do |hf|
         file "#{build_html_dir}/#{File.basename(hf, '.haml')}.html" => [build_html_dir, hf] do
-          HamlSupport::compile_hybrid_page hf, build_html_dir, :platform => 'ios'
-        end
-      end
-
-      app_files += coffee_files.collect do |cf|
-        file js_file(cf) => [build_scripts_dir, cf] do
-          coffee cf, build_scripts_dir
+          HamlSupport::compile_hybrid_page hf, build_html_dir, :platform => @platform
         end
       end
 
+      app_files += coffee_files.collect { |cf| cf.to_task }
       app_files += @manifest.css_tasks(build_styles_dir)
-      app_files << file("#{build_dir}/load_file.txt" => [build_dir, @manifest.src_file]) do |t|
+      app_files << file("#{build_dir}/load_file.txt" => [build_dir,
+                                                         @manifest.src_file,
+                                                         transient("#{@platform}_coffee", @manifest.kernel_bootstrap)
+                                                        ]) do |t|
         File.open(t.name, "w+") { |f| f.puts load_instructions }
       end
 
       task :shared => [build_images_dir, build_scripts_dir] do
         cp_ne "assets/images/*", build_images_dir
         cp_ne "assets/lib/*.js", build_scripts_dir
-        cp_ne "ios/res/js/*.js", build_scripts_dir
+        cp_ne "#{@platform}/res/js/*.js", build_scripts_dir
       end
 
       task :app => [:shared] + app_files

data/lib/calatrava/configuration.rb

@@ -6,10 +6,16 @@ module Calatrava
     include Rake::DSL
 
     @@extras = []
+    @@env = ENV['CALATRAVA_ENV'] || 'development'
+
     def self.extra(&configurator)
       @@extras << configurator
     end
 
+    def self.env
+      @@env
+    end
+
     def initialize
       @runtime = {}
     end
@@ -17,19 +23,30 @@ module Calatrava
     def config_result_dir
       "config/result"
     end
+
     def config_yaml
       "config/environments.yml"
     end
+
     def config_template_dir
       "config/templates"
     end
+
     def templates
       Rake::FileList["#{config_template_dir}/*.erb"]
     end
 
     def config_for(environment)
       @@extras.each { |e| e.call(self) }
-      @runtime.merge(YAML::load(File.open(config_yaml))[environment])
+      @runtime.merge(environments_yml[environment])
+    end
+
+    def environment_names
+      environments_yml.keys
+    end
+
+    def environments_yml
+      @environments_yml ||= YAML::load(File.open(config_yaml))
     end
 
     def runtime(key, value)
@@ -44,16 +61,16 @@ module Calatrava
     end
 
     def path(file)
-      env = ENV['CALATRAVA_ENV'] || "development"
-      puts "CALATRAVA_ENV = '#{env}'"
-      full_path = artifact_path(File.join(env, file))
-      full_path
+      artifact_path(File.join(Configuration.env, file))
     end
 
     def install_tasks
       directory config_result_dir
 
-      %w{local development test automation production}.each do |environment|
+      puts "CALATRAVA_ENV = '#{Configuration.env}'"
+      transient :calatrava_env, Configuration.env
+
+      environment_names.each do |environment|
         desc "Create config files for #{environment} environment"
         task environment.to_sym => [:clean, config_result_dir] do
           configuration = config_for(environment)

data/lib/calatrava/droid_app.rb

@@ -5,7 +5,7 @@ module Calatrava
 
     def initialize(path, proj_name, manifest)
       @path, @proj_name, @manifest = path, proj_name, manifest
-      @app_builder = AppBuilder.new("droid/#{@proj_name}/assets/calatrava", @manifest)
+      @app_builder = AppBuilder.new('droid', "droid/#{@proj_name}/assets/calatrava", @manifest)
     end
 
     def install_tasks
@@ -15,8 +15,17 @@ module Calatrava
         coffee 'droid/app/bridge.coffee', @app_builder.build_scripts_dir
       end
 
+      task :resolve => "droid/#{@proj_name}/ivy/ivy.xml" do
+        cd "droid/#{@proj_name}" do
+          sh "ant -f ant/calatrava.xml resolve"
+        end
+      end
+
+      desc "Bootstraps the Droid app"
+      task :bootstrap => :resolve
+
       desc "Builds the Android app"
-      task :build => app_task do
+      task :build => [:resolve, app_task] do
         cd "droid/#{@proj_name}" do
           sh "ant clean debug"
         end

data/lib/calatrava/ios_app.rb

@@ -5,7 +5,7 @@ module Calatrava
 
     def initialize(path, manifest)
       @path, @manifest = path, manifest
-      @app_builder = AppBuilder.new('ios/public', @manifest)
+      @app_builder = AppBuilder.new('ios', 'ios/public', @manifest)
     end
 
     def install_tasks
@@ -20,6 +20,13 @@ module Calatrava
         end
       end
 
+      desc "Bootstraps the iOS app"
+      task :bootstrap do
+        cd "ios" do
+          sh "pod install" if Calatrava.platform == :mac
+        end
+      end
+
       desc "Clean ios public directory"
       task :clean do
         sh "rm -rf #{@app_builder.build_dir}"

data/lib/calatrava/manifest.rb

@@ -15,17 +15,6 @@ module Calatrava
       @feature_list
     end
 
-    def load_file(target_dir, js_load_path, options)
-      File.open("#{target_dir}/load_file.#{options[:type]}", "w+") do |f|
-        @feature_list.each do |feature|
-          coffee_files(feature, :include_pages => options[:include_pages]).each do |coffee_file|
-            js_src = File.join(js_load_path, File.basename(coffee_file, '.coffee') + ".js")
-            f.puts self.send(options[:type], js_src)
-          end
-        end
-      end
-    end
-
     def coffee_files
       [@shell, @kernel].collect do |src|
         src.coffee_files + feature_files(src, :coffee)
@@ -45,7 +34,6 @@ module Calatrava
     end
 
     def css_tasks(output_dir)
-      mkdir_p output_dir
       css_files.collect do |style_file|
         file "#{output_dir}/#{File.basename(style_file, '.*')}.css" => [output_dir, style_file] do |t|
           if style_file =~ /\.css$/
@@ -60,14 +48,6 @@ module Calatrava
     def feature_files(source, type)
       source.features.select { |f| @feature_list.include?(f[:name]) }.collect { |f| f[type] }.flatten
     end
-
-    def haml(js_src)
-      %{%script(type="text/javascript" src="#{js_src}")}
-    end
-
-    def text(js_src)
-      js_src
-    end
   end
 
 end

data/lib/calatrava/mobile_web_app.rb

@@ -11,6 +11,7 @@ module Calatrava
     def build_dir ; "#{@path}/web/public" ; end
     def scripts_build_dir ; "#{build_dir}/scripts" ; end
     def styles_build_dir ; "#{build_dir}/styles" ; end
+    def images_build_dir ; "#{build_dir}/images" ; end
 
     def coffee_files
       Dir.chdir @path do
@@ -18,7 +19,8 @@ module Calatrava
         core_coffee += @manifest.coffee_files.select { |cf| cf =~ /calatrava.coffee$/ }
         web_coffee = Dir['web/app/source/*.coffee'] - core_coffee
         mf_coffee = @manifest.coffee_files.reject { |cf| cf =~ /calatrava.coffee$/ }
-        core_coffee + web_coffee + [Calatrava::Project.current.config.path('env.coffee')] + mf_coffee
+        env_file = OutputFile.new(scripts_build_dir, Calatrava::Project.current.config.path('env.coffee'), ['configure:calatrava_env'])
+        (core_coffee + web_coffee + mf_coffee).collect { |cf| OutputFile.new(scripts_build_dir, cf) } + [env_file]
       end
     end
 
@@ -27,27 +29,29 @@ module Calatrava
     end
 
     def scripts
-      coffee_files.collect { |cf| "scripts/#{File.basename(cf, '.coffee')}.js" }
+      coffee_files.collect do |cf|
+        cf.output_path.gsub("#{build_dir}/", "")
+      end
     end
 
     def install_tasks
       directory build_dir
       directory scripts_build_dir
       directory styles_build_dir
+      directory images_build_dir
 
-      app_files = coffee_files.collect do |cf|
-        file "#{scripts_build_dir}/#{File.basename(cf, '.coffee')}.js" => [scripts_build_dir, cf] do
-          coffee cf, scripts_build_dir
-        end
-      end
+      app_files = coffee_files.collect { |cf| cf.to_task }
 
-      app_files << file("#{build_dir}/index.html" => [@manifest.src_file, "web/app/views/index.haml"] + haml_files) do
+      app_files << file("#{build_dir}/index.html" => [@manifest.src_file,
+                                                      "web/app/views/index.haml",
+                                                      transient('web_coffee', coffee_files),
+                                                      transient('web_haml', haml_files)] + haml_files) do
         HamlSupport::compile "web/app/views/index.haml", build_dir
       end
 
       app_files += @manifest.css_tasks(styles_build_dir)
 
-      task :shared do
+      task :shared => [images_build_dir, scripts_build_dir] do
         cp_ne "assets/images/*", File.join(build_dir, 'images')
         cp_ne "assets/lib/*.js", scripts_build_dir
       end        

data/lib/calatrava/output_file.rb

@@ -0,0 +1,53 @@
+require 'pathname'
+
+module Calatrava
+  
+  class OutputFile
+    @@rules = {}
+
+    def self.rule(opts, &action)
+      start_ext = opts.keys[0]
+      @@rules[start_ext] = {:target => opts[start_ext], :action => action}
+    end
+
+    def self.target_file(file_name)
+      start_ext = file_name.extname
+      Pathname.new(file_name.basename(start_ext).to_s + rule_for(start_ext)[:target])
+    end
+
+    def self.action(file_name)
+      rule_for(file_name.extname)[:action]
+    end
+
+    def self.rule_for(ext)
+      @@rules[ext]
+    end
+
+    include Rake::DSL
+    attr_reader :source_file, :dependencies
+
+    def initialize(output_dir, source_file, dependencies = [])
+      @output_dir = Pathname.new(output_dir)
+      @source_file = Pathname.new(source_file)
+
+      @dependencies = [@source_file.to_s, @output_dir.to_s]
+      @dependencies += dependencies if dependencies
+    end
+
+    def output_path
+      (@output_dir + OutputFile.target_file(@source_file)).to_s
+    end
+    alias :to_s :output_path
+
+    def to_task
+      file(output_path => @dependencies) do
+        OutputFile.action(@source_file).call(output_path.to_s, @source_file.to_s)
+      end
+    end
+  end
+
+  OutputFile.rule '.coffee' => '.js' do |target, source|
+    coffee source, File.dirname(target)
+  end
+
+end

data/lib/calatrava/platform.rb

@@ -0,0 +1,12 @@
+module Calatrava
+  def self.platform
+    case RbConfig::CONFIG['host_os']
+    when /darwin/
+      :mac
+    when /linux/
+      :linux
+    else
+      raise "Unsupported OS"
+    end
+  end
+end

data/lib/calatrava/project.rb

@@ -1,6 +1,7 @@
 module Calatrava
 
   class Project
+    include Rake::DSL
 
     def self.here(directory)
       @@current = Project.new(directory)
@@ -27,9 +28,36 @@ module Calatrava
       @config = Configuration.new
       @kernel = Kernel.new(@path)
       @shell = Shell.new(@path)
-      @mobile_web = MobileWebApp.new(@path, Manifest.new(@path, 'web', @kernel, @shell))
-      @ios = IosApp.new(@path, Manifest.new(@path, 'ios', @kernel, @shell))
-      @droid = DroidApp.new(@path, @name, Manifest.new(@path, 'droid', @kernel, @shell))
+      if platform? 'web'
+        @mobile_web = MobileWebApp.new(@path, Manifest.new(@path, 'web', @kernel, @shell))
+      end
+      if platform? 'ios'
+        @ios = IosApp.new(@path, Manifest.new(@path, 'ios', @kernel, @shell))
+      end
+      if platform? 'droid'
+        @droid = DroidApp.new(@path, @name, Manifest.new(@path, 'droid', @kernel, @shell))
+      end
+    end
+
+    def install_tasks
+      namespace(:kernel)    { kernel.install_tasks }
+      namespace(:configure) { config.install_tasks }
+
+      namespace(:droid)     { droid.install_tasks }      if platform?('droid')
+      namespace(:ios)       { ios.install_tasks }        if platform?('ios')
+      namespace(:web)       { mobile_web.install_tasks } if platform?('web')
+
+      desc "Clean all apps"
+      task :clean => tasks_for_platforms(:clean)
+      task :build => tasks_for_platforms(:build)
+    end
+
+    def platform?(p)
+      @options[:platforms].include? p
+    end
+
+    def tasks_for_platforms(task)
+      @options[:platforms].collect { |p| "#{p}:#{task}" }
     end
 
   end

data/lib/calatrava/project_script.rb

@@ -1,6 +1,6 @@
 require 'mustache'
 require 'yaml'
-require 'xcodeproj'
+require 'xcodeproj' if Calatrava.platform == :mac
 
 module Calatrava
 
@@ -13,6 +13,11 @@ module Calatrava
       @slug = name.gsub(" ", "_").downcase
       @title = @name[0..0].upcase + @name[1..-1]
       @options = overrides
+      puts @options
+
+      @platforms = ['ios', 'droid', 'web'].select do |platform|
+        !@options["no-#{platform}"]
+      end
     end
 
     def sh(cmd)
@@ -21,7 +26,7 @@ module Calatrava
     end
 
     def dev?
-      @options[:is_dev]
+      @options.dev?
     end
 
     def create(template)
@@ -29,14 +34,18 @@ module Calatrava
       create_directory_tree(template)
       create_files(template)
 
-      create_android_tree(template)
-      create_ios_tree(template)
+      create_android_tree(template) if @platforms.include?('droid')
+      create_ios_tree(template) if Calatrava.platform == :mac && @platforms.include?('ios')
+
+      ['droid', 'ios', 'web'].each do |app|
+        FileUtils.rm_rf(File.join(@name, app)) unless @platforms.include?(app)
+      end
     end
 
     def create_project(template)
       FileUtils.mkdir_p @name
       File.open(File.join(@name, 'calatrava.yml'), "w+") do |f|
-        f.print({:project_name => @name}.to_yaml)
+        f.print({project_name: @name, platforms: @platforms}.to_yaml)
       end
     end
 
@@ -70,7 +79,7 @@ module Calatrava
 
     def create_android_tree(template)
       Dir.chdir(File.join(@name, "droid")) do
-        sh "android create project --name '#{@slug}' --path '#{@name}' --package com.#{@slug} --target android-10 --activity #{@title}"
+        sh "android create project --name '#{@slug}' --path '#{@name}' --package com.#{@slug} --target android-#{@options[:'android-api']} --activity #{@title}"
 
         Dir.walk("calatrava") do |item|
           target_item = item.sub('calatrava', @name)

data/lib/calatrava/tasks/assets.rb

@@ -5,6 +5,7 @@ end
 def coffee(in_dir_or_file, out_dir)
   if !Dir["#{in_dir_or_file}/**/*.coffee"].empty? || File.exists?(in_dir_or_file)
     $stdout.puts "coffee #{in_dir_or_file} -> #{out_dir}"
-    sh "node_modules/coffee-script/bin/coffee --compile --output #{out_dir} #{in_dir_or_file}"
+    ok = system "node_modules/coffee-script/bin/coffee --compile --output #{out_dir} #{in_dir_or_file}"
+    fail "Error compiling CoffeeScript: '#{in_dir_or_file}'" if !ok
   end
 end

data/lib/calatrava/tasks/bootstrap.rb

@@ -2,9 +2,8 @@ desc "Installs all required Ruby gems and Node.js packages for your new Calatrav
 task :bootstrap do
   sh "bundle install"
   sh "npm install"
-  cd "ios" do
-    sh "pod install"
-  end
+  Rake::Task['ios:bootstrap'].invoke if Rake::Task.task_defined? 'ios:bootstrap'
+  Rake::Task['droid:bootstrap'].invoke if Rake::Task.task_defined? 'droid:bootstrap'
 
   Rake::Task['configure:development'].invoke
 end

data/lib/calatrava/tasks/rake.rb

@@ -0,0 +1,24 @@
+require 'digest/sha1'
+
+module Rake
+  module DSL
+
+    def transient(name, value)
+      transients = File.join('.rake', 'transients')
+      FileUtils.mkdir_p transients
+      value_file = File.join(transients, name.to_s)
+      value_hash = Digest::SHA1.hexdigest(value.to_s)
+      if File.exists? value_file
+        previous_hash = IO.read(value_file)
+        FileUtils.rm value_file if previous_hash != value_hash
+      end
+
+      file value_file do
+        File.open(value_file, "w+") { |f| f.print value_hash }
+      end
+      task name => value_file
+    end
+
+  end
+
+end

data/lib/calatrava/tasks.rb

@@ -5,13 +5,5 @@ Calatrava::Project.here('.')
 
 Dir["#{File.join(File.dirname(__FILE__), 'tasks')}/*.rb"].each { |t| require t }
 
-namespace(:kernel)    { Calatrava::Project.current.kernel.install_tasks }
-namespace(:configure) { Calatrava::Project.current.config.install_tasks }
-namespace(:droid)     { Calatrava::Project.current.droid.install_tasks }
-namespace(:ios)       { Calatrava::Project.current.ios.install_tasks }
-namespace(:web)       { Calatrava::Project.current.mobile_web.install_tasks }
+Calatrava::Project.current.install_tasks
 
-desc "Clean all apps"
-task :clean => ['web:clean', 'ios:clean', 'droid:clean']
-
-task :build => ['web:build', 'ios:build', 'droid:build']

data/lib/calatrava/templates/.ruby-gemset.calatrava

@@ -0,0 +1 @@
+{{ project_slug }}

data/lib/calatrava/templates/.ruby-version

@@ -0,0 +1 @@
+ruby-1.9.3

data/lib/calatrava/templates/droid/app/bridge.coffee

@@ -27,7 +27,7 @@ calatrava.bridge.runtime = (() ->
       options.url,
       options.method,
       options.body,
-      options.headers)
+      JSON.stringify(options.headers))
 
   callPlugin: (plugin, method, args) ->
     pluginRegistry.call(plugin, method, JSON.stringify(args))

data/lib/calatrava/templates/droid/calatrava/CALATRAVA_TMPL/AndroidManifest.xml.calatrava

@@ -3,8 +3,9 @@
       package="com.{{ project_slug }}"
       android:versionCode="1"
       android:versionName="1.0">
-    <application android:label="@string/app_name" >
-        <activity android:name="com.{{ project_slug }}.{{ project_title }}"
+    <application android:label="@string/app_name"
+                 android:name="{{ project_title }}">
+        <activity android:name=".Bootstrap"
                   android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -14,7 +15,5 @@
         <activity android:name=".ConversionForm"
                   android:label="@string/app_name">
         </activity>
-        <service android:enabled="true"
-                 android:name="com.calatrava.bridge.RhinoService"/>
     </application>
 </manifest> 

data/lib/calatrava/templates/droid/calatrava/CALATRAVA_TMPL/build.xml.calatrava

@@ -50,10 +50,6 @@
     <!-- Load the calatrava additions -->
     <import file="ant/calatrava.xml" />
 
-    <!-- Calatrava configuration -->
-    <target name="-pre-build" depends="resolve">
-    </target>
-
 <!-- extension targets. Uncomment the ones where you want to do custom work
      in between standard targets -->
 <!--

data/lib/calatrava/templates/droid/calatrava/ant/calatrava.xml

@@ -3,8 +3,12 @@
   <!-- here is the version of ivy we will use. change this property to try a newer 
          version if you want -->
   <property name="ivy.install.version" value="2.3.0-rc1" />
-  <property name="ivy.jar.dir" value="${basedir}/ivy" />
-  <property name="ivy.jar.file" value="${ivy.jar.dir}/ivy.jar" />
+
+  <!-- Paths to various ivy pieces. You probably don't need to change these -->
+  <property name="ivy.jar.dir"         value="${basedir}/../ivy" />
+  <property name="ivy.jar.file"        value="${ivy.jar.dir}/ivy.jar" />
+  <property name="ivy.dep.file"        value="${ivy.jar.dir}/ivy.xml" />
+  <property name="ivy.settings.file"   value="${ivy.jar.dir}/ivysettings.xml" />
 
   <property name="build.dir" value="build" />
   <property name="src.dir" value="src" />
@@ -34,7 +38,7 @@
 
     <ivy:report />
     
-    <ivy:retrieve pattern="libs/[artifact]-[revision](-[classifier]).[ext]" conf="${ivy.configurations}" />
+    <ivy:retrieve pattern="../libs/[artifact]-[revision](-[classifier]).[ext]" conf="${ivy.configurations}" />
 	</target>
 
   <target name="clean-ivy" description="--> clean the ivy installation">

data/lib/calatrava/templates/droid/calatrava/src/com/CALATRAVA_TMPL/Bootstrap.java.calatrava

@@ -0,0 +1,21 @@
+package com.{{ project_slug }};
+
+import android.app.Activity;
+import android.os.Bundle;
+
+import com.calatrava.bridge.CalatravaApplication;
+
+public class Bootstrap extends Activity
+{
+  @Override
+  public void onCreate(Bundle savedInstanceState)
+  {
+    super.onCreate(savedInstanceState);
+    setContentView(R.layout.main);
+
+    ((CalatravaApplication)getApplication()).provideActivityContext(this);
+
+    // And then start your first feature
+    launchFlow("example.converter.start");
+  }
+}

data/lib/calatrava/templates/droid/calatrava/src/com/CALATRAVA_TMPL/Title.java.calatrava

@@ -3,21 +3,14 @@ package com.{{ project_slug }};
 import android.app.Activity;
 import android.os.Bundle;
 
-import com.calatrava.bridge.Launcher;
+import com.calatrava.bridge.CalatravaApplication;
 
-public class {{ project_title }} extends Activity
+public class {{ project_title }} extends CalatravaApplication
 {
-    /** Called when the activity is first created. */
-    @Override
-    public void onCreate(Bundle savedInstanceState)
-    {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.main);
-
-        Launcher.launchKernel("com.{{ project_slug }}", this, getApplication(), new Runnable() {
-          public void run() {
-            Launcher.launchFlow("example.converter.start");
-          }
-        });
-    }
+  @Override
+  public void onCreate()
+  {
+    // Call this to start Calatrava
+    bootCalatrava("com.{{ project_slug }}");
+  }
 }