calatrava 0.6.3 → 0.6.4

data/lib/calatrava.rb

@@ -3,6 +3,9 @@ require 'rake/file_list'
 
 require 'calatrava/configuration'
 
+require 'calatrava/tasks/rake'
+
+require 'calatrava/platform'
 require 'calatrava/version'
 require 'calatrava/apache'
 require 'calatrava/app'
@@ -12,6 +15,7 @@ require 'calatrava/ios_app'
 require 'calatrava/kernel'
 require 'calatrava/manifest'
 require 'calatrava/mobile_web_app'
+require 'calatrava/output_file'
 require 'calatrava/project'
 require 'calatrava/project_script'
 require 'calatrava/shell'

data/spec/app_builder_spec.rb

@@ -15,10 +15,10 @@ describe Calatrava::AppBuilder do
                           :kernel_bootstrap => ['path/to/kernel.coffee'],
                           :haml_files => ['diff/path/shell.haml']) }
   
-  let(:app) { Calatrava::AppBuilder.new('app/build', manifest) }
+  let(:app) { Calatrava::AppBuilder.new('app', 'app/build', manifest) }
 
   context '#coffee_files' do
-    subject { app.coffee_files }
+    subject { app.coffee_files.collect { |cf| cf.source_file.to_s } }
     
     it { should include 'path/to/kernel.coffee' }
     it { should include 'diff/path/shell.coffee' }

data/spec/mobile_web_app_spec.rb

@@ -24,7 +24,7 @@ describe Calatrava::MobileWebApp do
   end
 
   context '#coffee_files' do
-    subject { mobile_web.coffee_files }
+    subject { mobile_web.coffee_files.collect { |cf| cf.source_file.to_s } }
 
     it { should include 'path/to/kernel.coffee' }
     it { should include 'diff/path/shell.coffee' }

data/spec/output_file_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe Calatrava::OutputFile do
+  let(:file) { Calatrava::OutputFile.new("output directory", source_file, dependencies) }
+
+  context 'coffee file source' do
+    let(:source_file) { "coffee file.coffee" }
+    let(:dependencies) { [] }
+
+    describe '#output_path' do
+      subject { file.output_path }
+
+      it { should start_with("output directory/") }
+      it { should end_with("coffee file.js") }
+    end
+
+    describe '#dependencies' do
+      subject { file.dependencies }
+
+      it { should have(2).dependencies }
+      it { should include('coffee file.coffee') }
+      it { should include('output directory') }
+
+      context 'with additional' do
+        let(:dependencies) { [:environment] }
+
+        it { should have(3).dependencies }
+        it { should include(:environment) }
+      end
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calatrava
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-18 00:00:00.000000000 Z
+date: 2013-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70114091946480 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70114091946480
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &70114091968780 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,21 +37,31 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70114091968780
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70114091968260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.9.5
   type: :runtime
   prerelease: false
-  version_requirements: *70114091968260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.5
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70114091967760 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +69,15 @@ dependencies:
         version: 0.16.0
   type: :runtime
   prerelease: false
-  version_requirements: *70114091967760
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70114091967300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +85,15 @@ dependencies:
         version: 3.1.7
   type: :runtime
   prerelease: false
-  version_requirements: *70114091967300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.1.7
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &70114091966840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +101,15 @@ dependencies:
         version: 3.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *70114091966840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.3
 - !ruby/object:Gem::Dependency
   name: mustache
-  requirement: &70114091966360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +117,15 @@ dependencies:
         version: 0.99.4
   type: :runtime
   prerelease: false
-  version_requirements: *70114091966360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.99.4
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70114091965860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +133,15 @@ dependencies:
         version: 1.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70114091965860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: watir-webdriver
-  requirement: &70114091965280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,21 +149,31 @@ dependencies:
         version: 0.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *70114091965280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: xcodeproj
-  requirement: &70114091964660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70114091964660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: cocoapods
-  requirement: &70114091963860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,7 +181,12 @@ dependencies:
         version: 0.16.0
   type: :runtime
   prerelease: false
-  version_requirements: *70114091963860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.16.0
 description: A framework to build cross-platform mobile apps with high quality native
   UIs.
 email:
@@ -142,12 +197,16 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- .rvmrc
+- .ruby-gemset
+- .ruby-version
+- .travis.yml
 - CHANGES.markdown
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
+- Vagrantfile
 - bin/calatrava
 - calatrava.gemspec
 - features/cli.feature
@@ -167,6 +226,8 @@ files:
 - lib/calatrava/kernel.rb
 - lib/calatrava/manifest.rb
 - lib/calatrava/mobile_web_app.rb
+- lib/calatrava/output_file.rb
+- lib/calatrava/platform.rb
 - lib/calatrava/project.rb
 - lib/calatrava/project_script.rb
 - lib/calatrava/shell.rb
@@ -177,9 +238,11 @@ files:
 - lib/calatrava/tasks/bootstrap.rb
 - lib/calatrava/tasks/haml.rb
 - lib/calatrava/tasks/precommit.rb
+- lib/calatrava/tasks/rake.rb
 - lib/calatrava/tasks/release.rb
 - lib/calatrava/template.rb
-- lib/calatrava/templates/.rvmrc.calatrava
+- lib/calatrava/templates/.ruby-gemset.calatrava
+- lib/calatrava/templates/.ruby-version
 - lib/calatrava/templates/Gemfile.calatrava
 - lib/calatrava/templates/Rakefile
 - lib/calatrava/templates/assets/lib/ICanHaz.js
@@ -193,8 +256,9 @@ files:
 - lib/calatrava/templates/droid/calatrava/CALATRAVA_TMPL/AndroidManifest.xml.calatrava
 - lib/calatrava/templates/droid/calatrava/CALATRAVA_TMPL/build.xml.calatrava
 - lib/calatrava/templates/droid/calatrava/ant/calatrava.xml
-- lib/calatrava/templates/droid/calatrava/ivy.xml
-- lib/calatrava/templates/droid/calatrava/ivysettings.xml
+- lib/calatrava/templates/droid/calatrava/ivy/ivy.xml
+- lib/calatrava/templates/droid/calatrava/ivy/ivysettings.xml
+- lib/calatrava/templates/droid/calatrava/src/com/CALATRAVA_TMPL/Bootstrap.java.calatrava
 - lib/calatrava/templates/droid/calatrava/src/com/CALATRAVA_TMPL/ConversionForm.java.calatrava
 - lib/calatrava/templates/droid/calatrava/src/com/CALATRAVA_TMPL/Title.java.calatrava
 - lib/calatrava/templates/droid/calatrava/src/com/calatrava/CalatravaPage.java
@@ -203,8 +267,8 @@ files:
 - lib/calatrava/templates/droid/calatrava/src/com/calatrava/bridge/AlertPlugin.java
 - lib/calatrava/templates/droid/calatrava/src/com/calatrava/bridge/AnnotationRegistrar.java
 - lib/calatrava/templates/droid/calatrava/src/com/calatrava/bridge/AssetRepository.java
+- lib/calatrava/templates/droid/calatrava/src/com/calatrava/bridge/CalatravaApplication.java
 - lib/calatrava/templates/droid/calatrava/src/com/calatrava/bridge/KernelBridge.java
-- lib/calatrava/templates/droid/calatrava/src/com/calatrava/bridge/Launcher.java
 - lib/calatrava/templates/droid/calatrava/src/com/calatrava/bridge/PageRegistry.java
 - lib/calatrava/templates/droid/calatrava/src/com/calatrava/bridge/PluginCommand.java
 - lib/calatrava/templates/droid/calatrava/src/com/calatrava/bridge/PluginRegistry.java
@@ -217,8 +281,6 @@ files:
 - lib/calatrava/templates/droid/manifest.yml
 - lib/calatrava/templates/ios/Podfile.calatrava
 - lib/calatrava/templates/ios/manifest.yml
-- lib/calatrava/templates/ios/res/xibs/ProgressViewController.xib
-- lib/calatrava/templates/ios/res/xibs/WebViewController.xib
 - lib/calatrava/templates/ios/src/AppDelegate.h
 - lib/calatrava/templates/ios/src/AppDelegate.m
 - lib/calatrava/templates/ios/src/CALATRAVA_TMPL-Info.plist
@@ -257,13 +319,13 @@ files:
 - lib/calatrava/templates/web/app/source/bridge.coffee
 - lib/calatrava/templates/web/app/source/init.coffee
 - lib/calatrava/templates/web/app/views/index.haml
-- lib/calatrava/templates/web/deploy/instance.sh
 - lib/calatrava/templates/web/manifest.yml
 - lib/calatrava/version.rb
 - spec/app_builder_spec.rb
 - spec/kernel_spec.rb
 - spec/manifest_spec.rb
 - spec/mobile_web_app_spec.rb
+- spec/output_file_spec.rb
 - spec/shell_spec.rb
 - spec/spec_helper.rb
 homepage: http://calatrava.github.com
@@ -278,15 +340,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -275265347738837271
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -275265347738837271
 requirements: []
 rubyforge_project: calatrava
-rubygems_version: 1.8.10
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Cross-platform mobile apps with native UIs
@@ -302,5 +370,6 @@ test_files:
 - spec/kernel_spec.rb
 - spec/manifest_spec.rb
 - spec/mobile_web_app_spec.rb
+- spec/output_file_spec.rb
 - spec/shell_spec.rb
 - spec/spec_helper.rb

data/.rvmrc

@@ -1,2 +0,0 @@
-rvm_install_on_use_flag=1
-rvm --create use ruby-1.9.3@calatrava

data/lib/calatrava/templates/.rvmrc.calatrava

@@ -1,2 +0,0 @@
-rvm_install_on_use_flag=1
-rvm --create use ruby-1.9.3@{{ project_slug }}

data/lib/calatrava/templates/droid/calatrava/src/com/calatrava/bridge/Launcher.java

@@ -1,86 +0,0 @@
-package com.calatrava.bridge;
-
-import android.app.Application;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.ServiceConnection;
-import android.os.IBinder;
-import android.util.Log;
-
-import java.io.IOException;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-
-public class Launcher {
-  private static String TAG = Launcher.class.getSimpleName();
-
-  private static String appName;
-  private static RhinoService rhino;
-  private static Context appContext;
-  private static Application application;
-  private static Runnable startUp;
-
-  static ServiceConnection connection = new ServiceConnection() {
-    public void onServiceConnected(ComponentName componentName, IBinder iBinder)
-    {
-      try
-      {
-        rhino = ((RhinoService.LocalBinder) iBinder).getService();
-        PageRegistry.setSharedRegistry(new PageRegistry(appName, appContext, application, rhino));
-        PluginRegistry.setSharedRegistry(new PluginRegistry(appName, appContext, rhino));
-        AjaxRequestManager.setSharedManager(new AjaxRequestManager(appContext, rhino));
-        initBridge();
-        startUp.run();
-      }
-      catch (Exception e)
-      {
-        Log.e(TAG, "Unable to start.", e);
-      }
-    }
-
-    public void onServiceDisconnected(ComponentName componentName) {
-
-    }
-  };
-
-  public static void launchKernel(String appName,
-                                  Context appContext,
-                                  Application application,
-                                  Runnable startUp) {
-    Launcher.appName = appName;
-    Launcher.appContext = appContext;
-    Launcher.application = application;
-    Launcher.startUp = startUp;
-
-    Intent serviceIntent = new Intent(appContext, RhinoService.class);
-    appContext.bindService(serviceIntent, connection, Context.BIND_AUTO_CREATE);
-  }
-
-  public static void launchFlow(String flow)
-  {
-    rhino.callJsFunction(flow);
-  }
-
-  private static void initBridge() {
-    AssetRepository assets = new AssetRepository(appContext);
-
-    try {
-      Log.d(TAG, "About to prep the rhino");
-      rhino.initRhino();
-
-      Log.d(TAG, "About to load and start kernel");
-      // Load all the application JS
-      KernelBridge bridge = new KernelBridge(assets, rhino);
-      BufferedReader loadFileReader = new BufferedReader(new InputStreamReader(appContext.getAssets().open("calatrava/load_file.txt")), 8192);
-      String line = null;
-      while ((line = loadFileReader.readLine()) != null)
-      {
-        bridge.loadLibrary(line);
-      }
-
-    } catch (IOException e) {
-      Log.d(TAG, "LauncherActivity failed to start: " + e);
-    }
-  }
-}