calatrava 0.5.0 → 0.6.0

data/spec/app_builder_spec.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+
+describe Calatrava::AppBuilder do
+  include Aruba::Api
+
+  before(:each) do
+    create_dir 'app'
+
+    proj = double('current project', :config => double('cfg', :path => 'env.coffee'))
+    Calatrava::Project.stub(:current).and_return(proj)
+  end
+
+  let(:manifest) { double('web mf',
+                          :coffee_files => ['path/to/kernel.coffee', 'diff/path/shell.coffee'],
+                          :kernel_bootstrap => ['path/to/kernel.coffee'],
+                          :haml_files => ['diff/path/shell.haml']) }
+  
+  let(:app) { Calatrava::AppBuilder.new('app/build', manifest) }
+
+  context '#coffee_files' do
+    subject { app.coffee_files }
+    
+    it { should include 'path/to/kernel.coffee' }
+    it { should include 'diff/path/shell.coffee' }
+    it { should include 'env.coffee' }
+  end
+
+  context '#js_file' do
+    subject { app.js_file('path/to/sample.coffee') }
+
+    it { should == 'app/build/scripts/sample.js' }
+  end
+
+  context '#load_file' do
+    subject { app.load_instructions.lines.to_a }
+    
+    it { should include 'build/scripts/kernel.js' }
+    it { should_not include 'build/scripts/shell.js' }
+  end
+
+  context '#haml_files' do
+    subject { app.haml_files }
+
+    it { should include 'diff/path/shell.haml' }
+  end
+end

data/spec/kernel_spec.rb

@@ -0,0 +1,51 @@
+require 'spec_helper'
+
+describe Calatrava::Kernel do
+  include Aruba::Api
+
+  before(:each) do
+    create_dir 'kernel'
+    create_dir 'kernel/app'
+    write_file 'kernel/app/support.coffee', ''
+
+    create_dir 'kernel/app/mod1'
+    write_file 'kernel/app/mod1/first.coffee', ''
+
+    create_dir 'kernel/plugins'
+    write_file 'kernel/plugins/plugin.one.coffee', ''
+    write_file 'kernel/plugins/two.coffee', ''
+  end
+
+  let(:kernel) { Calatrava::Kernel.new(current_dir) }
+
+  context '#features' do
+    subject { kernel.features }
+
+    it { should have(1).features }
+
+    context 'a single feature' do
+      subject { kernel.features[0] }
+
+      it { should include :name => 'mod1' }
+      it { should include :coffee => ['kernel/app/mod1/first.coffee'] }
+    end
+  end
+
+  context '#coffee_files' do
+    subject { kernel.coffee_files }
+
+    it { should have(3).files }
+    it { should include 'kernel/app/support.coffee' }
+    it { should include 'kernel/plugins/plugin.one.coffee' }
+    it { should include 'kernel/plugins/two.coffee' }
+  end
+
+  context '#coffee_path' do
+    subject { kernel.coffee_path }
+
+    it { should include 'app:' }
+    it { should include 'app/mod1' }
+    it { should include 'app/plugins' }
+  end
+
+end

data/spec/manifest_spec.rb

@@ -0,0 +1,62 @@
+require 'spec_helper'
+require 'yaml'
+
+describe Calatrava::Manifest do
+  include Aruba::Api
+
+  before(:each) do
+    create_dir 'app'
+    write_file 'app/manifest.yml', ['included'].to_yaml
+  end
+
+  let(:features) {  }
+  let(:kernel) { double('kernel',
+                        :coffee_files => ['kernel_everywhere'],
+                        :features => [{:name => 'included', :coffee => 'k_inc', :haml => 'inc'},
+                                      {:name => 'excluded', :coffee => 'k_exc', :haml => 'exc'}]) }
+  let(:shell) { double('shell',
+                       :coffee_files => ['shell_everywhere'],
+                       :haml_files => ['fragment'],
+                       :css_files => ['styles'],
+                       :features => [{:name => 'included', :coffee => 'shell_inc', :haml => 'inc'},
+                                     {:name => 'excluded', :coffee => 'shell_exc', :haml => 'exc'}]) }
+  let(:manifest) { Calatrava::Manifest.new(current_dir, 'app', kernel, shell) }
+
+  context 'coffee files' do
+    subject { manifest.coffee_files }
+
+    it { should include 'kernel_everywhere' }
+    it { should include 'shell_everywhere' }
+
+    it { should include 'k_inc' }
+    it { should_not include 'k_exc' }
+    it { should include 'shell_inc' }
+    it { should_not include 'shell_exc' }
+  end
+
+  context 'haml files' do
+    subject { manifest.haml_files }
+
+    it { should include 'fragment' }
+    it { should include 'inc' }
+    it { should_not include 'exc' }
+  end
+
+  context '#css_files' do
+    subject { manifest.css_files }
+
+    it { should include 'styles' }
+  end
+
+  context '#kernel_bootstrap' do
+    subject { manifest.kernel_bootstrap }
+
+    it { should include 'k_inc' }
+    it { should include 'kernel_everywhere' }
+
+    it { should_not include 'k_exc' }
+    it { should_not include 'shell_everywhere' }
+    it { should_not include 'shell_inc' }
+  end
+
+end

data/spec/mobile_web_app_spec.rb

@@ -0,0 +1,49 @@
+require 'spec_helper'
+
+describe Calatrava::MobileWebApp do
+  include Aruba::Api
+
+  before(:each) do
+    create_dir 'web'
+    create_dir 'web/app/source'
+    write_file 'web/app/source/support.coffee', ''
+
+    proj = double('current project', :config => double('cfg', :path => 'env.coffee'))
+    Calatrava::Project.stub(:current).and_return(proj)
+  end
+
+  let(:manifest) { double('web mf',
+                          :coffee_files => ['path/to/kernel.coffee', 'diff/path/shell.coffee'],
+                          :haml_files => ['diff/path/shell.haml']) }
+
+  let(:mobile_web) { Calatrava::MobileWebApp.new(current_dir, manifest) }
+
+  it 'should define the correct output directories' do
+    mobile_web.build_dir.should match %r{web/public$}
+    mobile_web.scripts_build_dir.should match %r{web/public/scripts$}
+  end
+
+  context '#coffee_files' do
+    subject { mobile_web.coffee_files }
+
+    it { should include 'path/to/kernel.coffee' }
+    it { should include 'diff/path/shell.coffee' }
+    it { should include 'web/app/source/support.coffee' }
+    it { should include 'env.coffee' }
+  end
+
+  context '#scripts' do
+    subject { mobile_web.scripts }
+
+    it { should include 'scripts/kernel.js' }
+    it { should include 'scripts/shell.js' }
+    it { should include 'scripts/support.js' }
+  end
+
+  context '#haml_files' do
+    subject { mobile_web.haml_files }
+
+    it { should include 'diff/path/shell.haml' }
+  end
+
+end

data/spec/shell_spec.rb

@@ -0,0 +1,54 @@
+require 'spec_helper'
+
+describe Calatrava::Shell do
+  include Aruba::Api
+
+  let(:shell) { Calatrava::Shell.new(current_dir) }
+
+  before(:each) do
+    create_dir 'shell/support'
+    write_file 'shell/support/shell.coffee', ''
+    write_file 'shell/support/fragment.haml', ''
+    create_dir 'shell/pages/example'
+    write_file 'shell/pages/example/page.coffee', ''
+    write_file 'shell/pages/example/page.haml', ''
+
+    create_dir 'shell/stylesheets'
+    write_file 'shell/stylesheets/shell.css', ''
+    write_file 'shell/stylesheets/template.sass', ''
+  end
+
+  context 'coffee files' do
+    subject { shell.coffee_files }
+
+    it { should include 'shell/support/shell.coffee' }
+  end
+
+  context 'haml files' do
+    subject { shell.haml_files }
+
+    it { should include 'shell/support/fragment.haml' }
+  end
+
+  context 'css files' do
+    subject { shell.css_files }
+    
+    it { should include 'shell/stylesheets/shell.css' }
+    it { should include 'shell/stylesheets/template.sass' }
+  end
+
+  context 'features' do
+    subject { shell.features }
+
+    it { should have(1).feature }
+
+    context 'a single feature' do
+      subject { shell.features[0] }
+
+      it { should include :name => 'example' }
+      it { should include :coffee => ['shell/pages/example/page.coffee'] }
+      it { should include :haml => ['shell/pages/example/page.haml'] }
+    end
+  end
+  
+end

data/spec/spec_helper.rb

@@ -0,0 +1,4 @@
+$: << File.join(File.dirname(__FILE__), '..', 'lib')
+
+require 'aruba/api'
+require 'calatrava'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calatrava
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-02 00:00:00.000000000 Z
+date: 2012-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70314197260240 !ruby/object:Gem::Requirement
+  requirement: &70224599001040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70314197260240
+  version_requirements: *70224599001040
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &70314197259820 !ruby/object:Gem::Requirement
+  requirement: &70224599000620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70314197259820
+  version_requirements: *70224599000620
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70314197259400 !ruby/object:Gem::Requirement
+  requirement: &70224599000200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70314197259400
+  version_requirements: *70224599000200
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70314197258980 !ruby/object:Gem::Requirement
+  requirement: &70224598999780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70314197258980
+  version_requirements: *70224598999780
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70314197258560 !ruby/object:Gem::Requirement
+  requirement: &70224598999360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70314197258560
+  version_requirements: *70224598999360
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &70314197258140 !ruby/object:Gem::Requirement
+  requirement: &70224598998940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70314197258140
+  version_requirements: *70224598998940
 - !ruby/object:Gem::Dependency
   name: mustache
-  requirement: &70314197257720 !ruby/object:Gem::Requirement
+  requirement: &70224598998520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,21 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70314197257720
+  version_requirements: *70224598998520
 - !ruby/object:Gem::Dependency
-  name: xcoder
-  requirement: &70314197257300 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70314197257300
-- !ruby/object:Gem::Dependency
-  name: xcodeproj
-  requirement: &70314197256880 !ruby/object:Gem::Requirement
+  name: cucumber
+  requirement: &70224598998100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70314197256880
+  version_requirements: *70224598998100
 - !ruby/object:Gem::Dependency
-  name: cucumber
-  requirement: &70314197256460 !ruby/object:Gem::Requirement
+  name: watir-webdriver
+  requirement: &70224598997680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70314197256460
+  version_requirements: *70224598997680
 - !ruby/object:Gem::Dependency
   name: frank-cucumber
-  requirement: &70314197256040 !ruby/object:Gem::Requirement
+  requirement: &70224598997260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70314197256040
+  version_requirements: *70224598997260
 - !ruby/object:Gem::Dependency
-  name: watir-webdriver
-  requirement: &70314197255620 !ruby/object:Gem::Requirement
+  name: xcodeproj
+  requirement: &70224598996840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70314197255620
+  version_requirements: *70224598996840
 - !ruby/object:Gem::Dependency
   name: cocoapods
-  requirement: &70314197255200 !ruby/object:Gem::Requirement
+  requirement: &70224598996420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,7 +142,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70314197255200
+  version_requirements: *70224598996420
 description: A framework to build cross-platform mobile apps with high quality native
   UIs.
 email:
@@ -165,9 +154,9 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rvmrc
+- CHANGES.markdown
 - Gemfile
 - LICENSE.txt
-- Plans.md
 - README.md
 - Rakefile
 - bin/calatrava
@@ -180,26 +169,27 @@ files:
 - features/support/calatrava_app.rb
 - features/support/env.rb
 - lib/calatrava.rb
+- lib/calatrava/apache.rb
 - lib/calatrava/app.rb
+- lib/calatrava/app_builder.rb
+- lib/calatrava/configuration.rb
+- lib/calatrava/droid_app.rb
+- lib/calatrava/ios_app.rb
+- lib/calatrava/kernel.rb
 - lib/calatrava/manifest.rb
+- lib/calatrava/mobile_web_app.rb
 - lib/calatrava/project.rb
+- lib/calatrava/project_script.rb
 - lib/calatrava/resources_build_phase.rb
+- lib/calatrava/shell.rb
 - lib/calatrava/tasks.rb
-- lib/calatrava/tasks/apache.rb
 - lib/calatrava/tasks/artifact.rb
 - lib/calatrava/tasks/assets.rb
 - lib/calatrava/tasks/automation.rb
 - lib/calatrava/tasks/bootstrap.rb
-- lib/calatrava/tasks/build.rb
-- lib/calatrava/tasks/configuration.rb
-- lib/calatrava/tasks/droid.rb
 - lib/calatrava/tasks/haml.rb
-- lib/calatrava/tasks/ios.rb
-- lib/calatrava/tasks/kernel.rb
 - lib/calatrava/tasks/precommit.rb
 - lib/calatrava/tasks/release.rb
-- lib/calatrava/tasks/shell.rb
-- lib/calatrava/tasks/web.rb
 - lib/calatrava/template.rb
 - lib/calatrava/templates/.rvmrc.calatrava
 - lib/calatrava/templates/Gemfile.calatrava
@@ -220,12 +210,19 @@ files:
 - 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
+- lib/calatrava/templates/droid/calatrava/src/com/calatrava/CalatravaPlugin.java
 - lib/calatrava/templates/droid/calatrava/src/com/calatrava/bridge/AjaxRequestManager.java
+- 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/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
 - lib/calatrava/templates/droid/calatrava/src/com/calatrava/bridge/RegisteredActivity.java
+- lib/calatrava/templates/droid/calatrava/src/com/calatrava/bridge/RegisteredPlugin.java
+- lib/calatrava/templates/droid/calatrava/src/com/calatrava/bridge/Registration.java
 - lib/calatrava/templates/droid/calatrava/src/com/calatrava/bridge/RequestLoader.java
 - lib/calatrava/templates/droid/calatrava/src/com/calatrava/bridge/RhinoService.java
 - lib/calatrava/templates/droid/calatrava/src/com/calatrava/shell/WebViewActivity.java
@@ -255,6 +252,7 @@ files:
 - lib/calatrava/templates/kernel/app/pageHelper.coffee
 - lib/calatrava/templates/kernel/features/support/bridge.coffee
 - lib/calatrava/templates/kernel/features/support/spec_helper.js
+- lib/calatrava/templates/kernel/plugins/alert.coffee
 - lib/calatrava/templates/kernel/spec/converter/controller.converter.spec.coffee
 - lib/calatrava/templates/kernel/spec/environment.spec_helper.coffee
 - lib/calatrava/templates/kernel/spec/spec_helper.js
@@ -267,12 +265,19 @@ files:
 - lib/calatrava/templates/shell/stylesheets/shell.scss
 - lib/calatrava/templates/shell/support/shell.coffee
 - lib/calatrava/templates/web/apache/conf/mime.types
+- lib/calatrava/templates/web/app/source/alert.web.coffee
 - 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/shell_spec.rb
+- spec/spec_helper.rb
 homepage: http://calatrava.github.com
 licenses: []
 post_install_message: 
@@ -305,3 +310,9 @@ test_files:
 - features/step_definitions/template_steps.rb
 - features/support/calatrava_app.rb
 - features/support/env.rb
+- spec/app_builder_spec.rb
+- spec/kernel_spec.rb
+- spec/manifest_spec.rb
+- spec/mobile_web_app_spec.rb
+- spec/shell_spec.rb
+- spec/spec_helper.rb

data/Plans.md

@@ -1,20 +0,0 @@
-Calatrava will be a Ruby gem that you use to create projects. Running
-`calatrava <app>` will create a directory for a new app.
-
-This directory will contain the recommended directory tree, and a
-Rakefile that uses the Calatrava build tasks.
-
-The directory tree will contain the following directories:
-
-* `kernel`: the shared logic re-used across all platforms.
-* `shell`: the HTML UI that may be shared across many platforms.
-* `ios`: a directory containing an Xcode project for the iOS app.
-* `droid`: a directory containing the Android project.
-* `web`: a directory containing a single-page JavaScript application
-  built from the `kernel` and `shell`.
-* `features`: a directory to put your cucumber features in.
-
-The rake tasks will be responsible for building the kernel and shell,
-and it's expected that these tasks will be used to build the other
-applications.
-

data/lib/calatrava/tasks/apache.rb

@@ -1,54 +0,0 @@
-require 'erb'
-
-directory APACHE_LOGS_DIR
-
-if `uname -a`.chomp["amzn1"]
-  HTTPD = "httpd"
-  MODULES_PATH = "/usr/lib64/httpd/modules"
-  LOAD_LOG_MODULE = true
-elsif `uname`.chomp == "Linux"
-  HTTPD = "apache2"
-  MODULES_PATH = "/usr/lib/apache2/modules"
-  LOAD_LOG_MODULE = false
-else
-  HTTPD = "httpd"
-  MODULES_PATH = "/usr/libexec/apache2"
-  LOAD_LOG_MODULE = true
-end
-
-def httpd(command, opts = {})
-  cmd = %Q{#{HTTPD} -d #{APACHE_DIR} -f conf/httpd.conf -e DEBUG -k #{command} -DNO_DETACH -DFOREGROUND}
-  puts cmd
-  if opts[:background]
-    fork do
-      exec cmd
-    end
-  else
-    exec cmd
-  end
-end
-
-def configure_apache
-  cp config_path("httpd.conf"), File.join(APACHE_DIR, 'conf')
-end
-
-def launch_apache(opts = {})
-  if !opts[:background]
-    puts
-    puts "\t\t" + "*"*40
-    puts "\t\t" + "***   STARTING APACHE ON PORT 8888   ***"
-    puts "\t\t" + "*"*40
-    puts
-  end
-
-  httpd :start, opts
-end
-
-def stop_apache
-  httpd 'graceful-stop'
-end
-
-def reload_apache
-  httpd :restart
-end
-

data/lib/calatrava/tasks/build.rb

@@ -1 +0,0 @@
-task :build => ['web:build', 'ios:build', 'droid:build']

data/lib/calatrava/tasks/configuration.rb

@@ -1,41 +0,0 @@
-def config_for(environment)
-  YAML::load(File.open(CONFIG_YAML))[environment]
-end
-
-def evaluate_template(template_path, configuration)
-  file_path = File.join(CONFIG_RESULT_DIR, File.basename(template_path).gsub(".erb", ''))
-  puts "Config: #{File.basename(template_path)} -> #{File.basename(file_path)}"
-  result = ERB.new(IO.read(template_path)).result(binding)
-  IO.write(file_path, result)
-end
-
-def config_path(file)
-  env = ENV['CALATRAVA_ENV'] || "development"
-  puts "CALATRAVA_ENV = '#{env}'"
-  full_path = artifact_path(File.join(env, file))
-  fail "Could not find '#{file}' in environment '#{env}'" unless File.exists? full_path
-  full_path
-end
-
-def app_name
-end
-
-TEMPLATES = FileList["#{CONFIG_TEMPLATE_DIR}/*.erb"]
-
-namespace :configure do
-
-  %w{local development test automation production}.each do |environment|
-    desc "Create config files for #{environment} environment"
-    task environment.to_sym => [:clean, CONFIG_RESULT_DIR] do
-      configuration = config_for(environment)
-      TEMPLATES.each do |template|
-        evaluate_template(template, configuration)
-      end
-      artifact_dir(CONFIG_RESULT_DIR, environment)
-    end
-  end
-
-  task :clean do
-    rm_rf CONFIG_RESULT_DIR
-  end
-end