calatrava 0.6.3 → 0.6.4

data/.gitignore

@@ -1,9 +1,9 @@
 *.gem
 .bundle
-Gemfile.lock
 pkg/*
 .DS_Store
 /lib/calatrava/templates/ios/App/App.xcodeproj/project.xcworkspace/xcuserdata/*
 tmp/*
 test/*
 currencyConverter/*
+/.rake

data/.ruby-gemset

@@ -0,0 +1 @@
+calatrava

data/.ruby-version

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

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm: 1.9.3
+script: 
+  - bundle exec rake test:rspec test:features:travis

data/CHANGES.markdown

@@ -1,3 +1,50 @@
+## v0.6.4
+
+New features:
+* All app types are now optional: disable app types with `--no-web`,
+  `--no-droid` and `--no-ios` when creating your Calatrava project.
+* You can specify the Android API version when creating a project with
+  `--android-api <version>`. It currently defaults to API 17.
+
+Minor improvements:
+* The `stubView` for stubbing pages when testing controllers now
+  provides more direct access to the last render view message.
+* Android dependencies are resolved during bootstrap, and then
+  externally to the `ant` build to avoid `CLASSPATH` issues.
+* Fail the build if a CoffeeScript file fails to compile.
+
+Bugs fixed:
+* [Issue #28][i28]: Support Linux for creating projects and running
+  the build.
+* [Issue #35][i35]: Allow app specific environment keys.
+* [Issue #31][i31]: Working with image assets will break the
+  web:apache:start task. Now creates the `images` output directory as
+  required.
+* [Issue #26][i26]: Empty JS strings passed to JS functions are not
+  escaped properly.
+* [iOS Issue #3][ios-i3]: Prevent app from crashing when invoking
+  plugin callback.
+* [Issue #34][i34]: [web] Custom headers are not propagated to the
+  ajax request.
+* [Issue #32][i32]: calatrava.bridge.request() seems to require an
+  optional "body" under iOS. One of `contentType` or `customHeaders`
+  was also required, this too has been fixed.
+* [Issue #39][i39]: [ios] Network activity spinner
+* [Issue #40][i40]: calatrava.bridge.request() seems to require a
+  "failure" callback in the browser, although documented as "optional"
+* [Issue #42][i42]: Fixes the MobileWeb app loading issue. Pages were
+  hidden by default, but the `show` and `hide` implementations for the
+  converter page were incomplete.
+* [Issue #43][i43]: Close the load_file.txt reader after loading
+  files, on Android.
+* [iOS Issue #1][ios-i1]: Don't trigger all JS file loads at the same
+  time as this can fail to load some files in large sets.
+* [iOS Issue #4][ios-i4]: Calatrava apps should be able to open URLs
+  using other apps on iOS.
+* [Issue #25][i25]: Recreate `load_file.txt` during the build, if new
+  files have been added. Also will re-copy configuration files if you
+  change environments.
+
 ## v0.6.3
 
 Bugs fixed:
@@ -52,8 +99,15 @@ Changes that will affect existing projects:
 
 ## Contributors:
 * [Giles Alexander](https://github.com/gga)
+* [Pete Hodgson](https://github.com/moredip)
 * [Vivek Jain](https://github.com/vivekjain10)
 * [Renaud Tircher](https://github.com/rtircher)
+* [Marcin Kwiatkowski](https://github.com/marcinkwiatkowski)
+* [Pat Kua](https://github.com/thekua)
+* [Maria Gomez](https://github.com/mariagomez)
+* [Kalyan Akella](https://github.com/KalyanAkella)
+* [Filipe Esperandio](https://github.com/filipesperandio)
+* [Christoph Burgmer](https://github.com/cburgmer)
 
 [i5]: https://github.com/calatrava/calatrava/issues/5
 [i12]: https://github.com/calatrava/calatrava/issues/12
@@ -64,3 +118,16 @@ Changes that will affect existing projects:
 [i23]: https://github.com/calatrava/calatrava/issues/23
 [i24]: https://github.com/calatrava/calatrava/issues/24
 [i25]: https://github.com/calatrava/calatrava/issues/25
+[i28]: https://github.com/calatrava/calatrava/pull/28
+[i35]: https://github.com/calatrava/calatrava/pull/35
+[i31]: https://github.com/calatrava/calatrava/issues/31
+[i26]: https://github.com/calatrava/calatrava/issues/26
+[ios-i3]: https://github.com/calatrava/calatrava-ios/pull/3
+[i34]: https://github.com/calatrava/calatrava/issues/34
+[i32]: https://github.com/calatrava/calatrava/issues/32
+[i39]: https://github.com/calatrava/calatrava/issues/39
+[i40]: https://github.com/calatrava/calatrava/issues/40
+[i42]: https://github.com/calatrava/calatrava/issues/42
+[i43]: https://github.com/calatrava/calatrava/issues/43
+[ios-i1]: https://github.com/calatrava/calatrava-ios/issues/1
+[ios-i4]: https://github.com/calatrava/calatrava-ios/pull/4

data/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 
 # Specify your gem's dependencies in calatrava.gemspec
 gemspec

data/Gemfile.lock

@@ -0,0 +1,100 @@
+PATH
+  remote: .
+  specs:
+    calatrava (0.6.4)
+      cocoapods (~> 0.16.0)
+      cucumber (~> 1.2.1)
+      haml (~> 3.1.7)
+      mustache (~> 0.99.4)
+      rake (>= 0.9.5)
+      sass (~> 3.2.3)
+      thor (~> 0.16.0)
+      watir-webdriver (~> 0.6.1)
+      xcodeproj (>= 0.4.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
+      multi_json (~> 1.0)
+    addressable (2.3.4)
+    aruba (0.5.1)
+      childprocess (~> 0.3.6)
+      cucumber (>= 1.1.1)
+      rspec-expectations (>= 2.7.0)
+    builder (3.1.4)
+    childprocess (0.3.6)
+      ffi (~> 1.0, >= 1.0.6)
+    cocoapods (0.16.4)
+      activesupport (~> 3.2.6)
+      colored (~> 1.2)
+      escape (~> 0.0.4)
+      faraday (~> 0.8.1)
+      json (~> 1.7.3)
+      octokit (~> 1.7)
+      open4 (~> 1.3.0)
+      rake (~> 10.0.0)
+      xcodeproj (~> 0.5.0)
+    colored (1.2)
+    cucumber (1.2.1)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.11.0)
+      json (>= 1.4.6)
+    diff-lcs (1.1.3)
+    escape (0.0.4)
+    faraday (0.8.7)
+      multipart-post (~> 1.1)
+    faraday_middleware (0.9.0)
+      faraday (>= 0.7.4, < 0.9)
+    ffi (1.2.0)
+    gherkin (2.11.5)
+      json (>= 1.4.6)
+    haml (3.1.8)
+    hashie (2.0.4)
+    i18n (0.6.1)
+    json (1.7.5)
+    multi_json (1.7.2)
+    multipart-post (1.2.0)
+    mustache (0.99.4)
+    netrc (0.7.7)
+    octokit (1.24.0)
+      addressable (~> 2.2)
+      faraday (~> 0.8)
+      faraday_middleware (~> 0.9)
+      hashie (~> 2.0)
+      multi_json (~> 1.3)
+      netrc (~> 0.7.7)
+    open4 (1.3.0)
+    rake (10.0.4)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.0)
+    rspec-expectations (2.12.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.12.0)
+    rubyzip (0.9.9)
+    sass (3.2.8)
+    selenium-webdriver (2.32.1)
+      childprocess (>= 0.2.5)
+      multi_json (~> 1.0)
+      rubyzip
+      websocket (~> 1.0.4)
+    thor (0.16.0)
+    watir-webdriver (0.6.3)
+      selenium-webdriver (>= 2.18.0)
+    websocket (1.0.7)
+    xcodeproj (0.5.5)
+      activesupport (~> 3.2.13)
+      colored (~> 1.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  aruba
+  calatrava!
+  rspec

data/README.md

@@ -1,14 +1,18 @@
+[![Build Status](https://travis-ci.org/calatrava/calatrava.png)](https://travis-ci.org/calatrava/calatrava)
+
 # Dependencies
 
 It should be as easy to get started with Calatrava as
 possible. However, there are still a small number of dependencies that
 need to be installed beforehand.
 
-*Note*: Currently, Calatrava only supports development on Macs. this
- will probably always be the case for iOS apps, but there are plans to
- at least support Linux for Android and Mobile Web. Windows is a
+*Note*: Currently, Calatrava only supports fully-featured development
+ on Macs. This will probably always be the case for iOS apps. Linux
+ support for Android and Mobile Web is in progress. Windows is a
  little further off. Pull requests welcomed.
 
+## Mac dependencies  
+
 1. [rvm](http://rvm.io). Calatrava projects are configured to use
    `rvm` by default. You could use Calatrava without it, but you will
    then need to make sure you have Ruby 1.9.3 installed however you
@@ -32,6 +36,37 @@ need to be installed beforehand.
 5. [Node.js](http://nodejs.org/). Only used to run tests, not part of
    any production code. Again, if you're on a Mac I recommend
    installing using homebrew.
+   
+## Linux
+
+*Note:* Support for Linux is limited to running the Android and Mobile
+ Web builds. Please note the following restrictions:
+
+* If you generate a new project using calatrava, the iOS part will not
+  be generated.
+* Only the `web:\*` and `droid:\*` and `kernel:\*` tasks will work.
+
+Here are the dependencies for Linux:
+
+1. [rvm](http://rvm.io). Calatrava projects are configured to use
+   `rvm` by default. You could use Calatrava without it, but you will
+   then need to make sure you have Ruby 1.9.3 installed however you
+   prefer.
+   
+2. [bundler](http://gembundler.com/). Install in either your `rvm`
+   global gemset, or wherever else makes sense for your setup.
+   
+4. [Android SDK](http://developer.android.com/sdk/index.html) —
+   the `android` command is expected to be on the path.
+   
+5. [Node.js](http://nodejs.org/) and [NPM](https://npmjs.org/). Only
+   used to run tests, not part of any production code.
+   
+6. [Apache2](http://httpd.apache.org/). Used for hosting the mobile
+   web versions. Some flavours of Linux will not come with this
+   shipped. On Ubuntu systems, this can be installed with the
+   following command: `sudo apt-get install apache2` (from
+   [this page](https://help.ubuntu.com/10.04/serverguide/httpd.html))
 
 # Getting Started
 
@@ -76,3 +111,4 @@ mobile app.
 The `--dev` switch will create a new project that refers to the
 `calatrava` gem as a path on disk. This is much more convenient if
 you're experimenting with Calatrava, or working on it.
+

data/Rakefile

@@ -16,6 +16,10 @@ namespace :test do
     Cucumber::Rake::Task.new(:wip) do |t|
       t.cucumber_opts = "features --format pretty --tags @wip --wip"
     end
+
+    Cucumber::Rake::Task.new(:travis) do |t|
+      t.cucumber_opts = "features --format pretty --tags @travis"
+    end
   end
 end
 

data/Vagrantfile

@@ -0,0 +1,106 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+Vagrant.configure("2") do |config|
+  config.vm.box = "quantal64"
+
+  # The url from where the 'config.vm.box' box will be fetched if it
+  # doesn't already exist on the user's system.
+  config.vm.box_url = "http://cloud-images.ubuntu.com/vagrant/quantal/current/quantal-server-cloudimg-amd64-vagrant-disk1.box"
+
+  # Create a forwarded port mapping which allows access to a specific port
+  # within the machine from a port on the host machine. In the example below,
+  # accessing "localhost:8080" will access port 80 on the guest machine.
+  # config.vm.network :forwarded_port, guest: 80, host: 8080
+
+  # Create a private network, which allows host-only access to the machine
+  # using a specific IP.
+  # config.vm.network :private_network, ip: "192.168.33.10"
+
+  # Create a public network, which generally matched to bridged network.
+  # Bridged networks make the machine appear as another physical device on
+  # your network.
+  # config.vm.network :public_network
+
+  # Share an additional folder to the guest VM. The first argument is
+  # the path on the host to the actual folder. The second argument is
+  # the path on the guest to mount the folder. And the optional third
+  # argument is a set of non-required options.
+  # config.vm.synced_folder "../data", "/vagrant_data"
+
+  # Provider-specific configuration so you can fine-tune various
+  # backing providers for Vagrant. These expose provider-specific options.
+  # Example for VirtualBox:
+  #
+  # config.vm.provider :virtualbox do |vb|
+  #   # Don't boot with headless mode
+  #   vb.gui = true
+  #
+  #   # Use VBoxManage to customize the VM. For example to change memory:
+  #   vb.customize ["modifyvm", :id, "--memory", "1024"]
+  # end
+  #
+  # View the documentation for the provider you're using for more
+  # information on available options.
+
+  # Enable provisioning with Puppet stand alone.  Puppet manifests
+  # are contained in a directory path relative to this Vagrantfile.
+  # You will need to create the manifests directory and a manifest in
+  # the file base.pp in the manifests_path directory.
+  #
+  # An example Puppet manifest to provision the message of the day:
+  #
+  # # group { "puppet":
+  # #   ensure => "present",
+  # # }
+  # #
+  # # File { owner => 0, group => 0, mode => 0644 }
+  # #
+  # # file { '/etc/motd':
+  # #   content => "Welcome to your Vagrant-built virtual machine!
+  # #               Managed by Puppet.\n"
+  # # }
+  #
+  # config.vm.provision :puppet do |puppet|
+  #   puppet.manifests_path = "manifests"
+  #   puppet.manifest_file  = "init.pp"
+  # end
+
+  # Enable provisioning with chef solo, specifying a cookbooks path, roles
+  # path, and data_bags path (all relative to this Vagrantfile), and adding
+  # some recipes and/or roles.
+  #
+  # config.vm.provision :chef_solo do |chef|
+  #   chef.cookbooks_path = "../my-recipes/cookbooks"
+  #   chef.roles_path = "../my-recipes/roles"
+  #   chef.data_bags_path = "../my-recipes/data_bags"
+  #   chef.add_recipe "mysql"
+  #   chef.add_role "web"
+  #
+  #   # You may also specify custom JSON attributes:
+  #   chef.json = { :mysql_password => "foo" }
+  # end
+
+  # Enable provisioning with chef server, specifying the chef server URL,
+  # and the path to the validation key (relative to this Vagrantfile).
+  #
+  # The Opscode Platform uses HTTPS. Substitute your organization for
+  # ORGNAME in the URL and validation key.
+  #
+  # If you have your own Chef Server, use the appropriate URL, which may be
+  # HTTP instead of HTTPS depending on your configuration. Also change the
+  # validation key to validation.pem.
+  #
+  # config.vm.provision :chef_client do |chef|
+  #   chef.chef_server_url = "https://api.opscode.com/organizations/ORGNAME"
+  #   chef.validation_key_path = "ORGNAME-validator.pem"
+  # end
+  #
+  # If you're using the Opscode platform, your validator client is
+  # ORGNAME-validator, replacing ORGNAME with your organization name.
+  #
+  # If you have your own Chef Server, the default validation client name is
+  # chef-validator, unless you changed the configuration.
+  #
+  #   chef.validation_client_name = "ORGNAME-validator"
+end

data/calatrava.gemspec

@@ -1,6 +1,7 @@
-# -*- encoding: utf-8 -*-
+# -*- encoding: utf-8; mode: ruby -*-
 $:.push File.expand_path("../lib", __FILE__)
 require "calatrava/version"
+require "calatrava/platform"
 
 Gem::Specification.new do |s|
   s.name        = "calatrava"
@@ -21,13 +22,17 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec"
   s.add_development_dependency "aruba"
 
-  s.add_runtime_dependency "rake", "~> 0.9.5"
+  s.add_runtime_dependency "rake", ">= 0.9.5"
+  
   s.add_runtime_dependency "thor", "~> 0.16.0"
   s.add_runtime_dependency "haml", "~> 3.1.7"
   s.add_runtime_dependency "sass", "~> 3.2.3"
   s.add_runtime_dependency "mustache", "~> 0.99.4"
   s.add_runtime_dependency "cucumber", "~> 1.2.1"
   s.add_runtime_dependency "watir-webdriver", "~> 0.6.1"
-  s.add_runtime_dependency "xcodeproj", "~> 0.4.0"
-  s.add_runtime_dependency "cocoapods", "~> 0.16.0"
+
+  if Calatrava.platform == :mac
+    s.add_runtime_dependency "xcodeproj", ">= 0.4.0" 
+    s.add_runtime_dependency "cocoapods", "~> 0.16.0"
+  end
 end

data/features/cli.feature

@@ -12,3 +12,12 @@ Feature: Command line interface
     Given an empty file named "alt-template-file"
     When I run `calatrava create project --template alt-template-file`
     Then the output should contain "template must be a directory"
+
+  Scenario: Android command-line parameters
+    When I run `calatrava create droid_test --android-api 17`
+    Then the exit status should be 0
+    And  a file named "droid_test/droid/droid_test/project.properties" should exist
+    And  the file "droid_test/droid/droid_test/project.properties" should contain:
+    """
+    target=android-17
+    """

data/features/project.feature

@@ -11,13 +11,24 @@ Feature: Projects
       | simple          |
       | simple/config   |
       | simple/droid    |
-      | simple/features |
       | simple/ios      |
       | simple/kernel   |
       | simple/shell    |
       | simple/web      |
     And  the file "simple/calatrava.yml" should contain "project_name: simple"
 
+  Scenario Outline: Should allow app types to be excluded
+    When I run `calatrava create simple --no-<app>`
+    Then the exit status should be 0
+    And  a directory named "simple/<app>" should not exist
+
+    Examples:
+     | app   |
+     | ios   |
+     | droid |
+     | web   |
+
+  @travis
   Scenario: Templates can have deeply nested directories and files
     Given the following directories exist:
       | nested         |
@@ -27,7 +38,7 @@ Feature: Projects
       | nested/sample          |
       | nested/.config         |
       | nested/dir/sub/sample2 |
-    When  I run `calatrava create proj --template nested`
+    When  I run `calatrava create proj --template nested --no-droid --no-ios`
     Then  the following directories should exist:
       | proj         |
       | proj/dir     |
@@ -37,12 +48,13 @@ Feature: Projects
       | proj/.config         |
       | proj/dir/sub/sample2 |
 
+  @travis
   Scenario: Template files can themselves be templates
     Given a directory named "template"
     And   a file named "template/.tmpl.calatrava" with:
       """
       Sample {{ project_name }}
       """
-    When  I run `calatrava create templatized --template template`
+    When  I run `calatrava create templatized --template template --no-droid --no-ios`
     Then  a file named "templatized/.tmpl" should exist
     And   the file "templatized/.tmpl" should contain "Sample templatized"

data/features/sample_app.feature

@@ -4,6 +4,7 @@ Feature: Sample App
   As a new calatrava user
   I want a new Calatrava project to contain a working sample app
 
+  @travis
   Scenario: Create a sample project
     When I create an app named "sample"
     And  I cd to "sample"
@@ -11,6 +12,7 @@ Feature: Sample App
     And  I run `rake bootstrap`
     Then the exit status should be 0
 
+  @travis
   Scenario: Sample app kernel
     When I create an app named "sample"
     And  I cd to "sample"
@@ -19,9 +21,11 @@ Feature: Sample App
     And  I run `rake kernel:spec`
     Then the exit status should be 0
 
+  @travis
   Scenario: Mobile web sample app
     When I create an app named "sample"
     And  I cd to "sample"
     And  I run `bundle install`
     And  I run `rake bootstrap`
-    And  I start apache
+    And  I run `rake web:build`
+    Then the exit status should be 0

data/features/support/calatrava_app.rb

@@ -7,7 +7,7 @@ class CalatravaApp
 
   def initialize(name)
     @name = name
-    run_simple("calatrava create #{@name}")
+    run_simple("calatrava create #{@name} --no-droid --no-ios")
   end
 
   def start_apache

data/features/support/env.rb

@@ -5,7 +5,7 @@ ENV['PATH'] = "#{File.expand_path(File.dirname(__FILE__) + '/../../bin')}#{File:
 ENV['RUBYLIB'] = "#{File.expand_path(File.dirname(__FILE__) + '/../../lib')}#{File::PATH_SEPARATOR}#{ENV['RUBYLIB']}"
 
 Before do
-  @aruba_timeout_seconds = 20
+  @aruba_timeout_seconds = 80
 end
 
 class CalatravaWorld

data/lib/calatrava/apache.rb

@@ -18,21 +18,10 @@ module Calatrava
       end
     end
     
-    def apache_dir
-      "web/apache"
-    end
-
-    def apache_public_dir
-      "#{apache_dir}/public"
-    end
-
-    def apache_logs_dir
-      "#{apache_dir}/logs"
-    end
-
-    def apache_conf_dir
-      "#{apache_dir}/conf"
-    end
+    def apache_dir ; "web/apache" ; end
+    def apache_public_dir ; "#{apache_dir}/public" ; end
+    def apache_logs_dir ; "#{apache_dir}/logs" ; end
+    def apache_conf_dir ; "#{apache_dir}/conf"; end
 
     def httpd(command, opts = {})
       ensure_httpd
@@ -47,19 +36,7 @@ module Calatrava
       end
     end
 
-    def configure_apache
-      cp Calatrava::Project.current.config.path("httpd.conf"), apache_conf_dir
-    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
 
@@ -93,14 +70,16 @@ module Calatrava
         end
       end
 
+      file "#{apache_conf_dir}/httpd.conf" => 'configure:calatrava_env' do
+        cp Calatrava::Project.current.config.path("httpd.conf"), apache_conf_dir
+      end
+
       desc "launch a non-daemon apache instance on port 8888 which will serve our local app and also proxy to backend services"
-      task :start => ['web:build', apache_public_dir, apache_logs_dir] do
-        configure_apache
+      task :start => ['web:build', apache_public_dir, apache_logs_dir, "#{apache_conf_dir}/httpd.conf"] do
         launch_apache
       end
 
-      task :background => ['web:build', apache_public_dir, apache_logs_dir] do
-        configure_apache
+      task :background => ['web:build', apache_public_dir, apache_logs_dir, "#{apache_conf_dir}/httpd.conf"] do
         launch_apache :background => true
       end
 

data/lib/calatrava/app.rb

@@ -5,13 +5,17 @@ module Calatrava
   class App < Thor
 
     desc "create <project-name>", "creates a new calatrava app project"
-    method_options :template => File.join(File.dirname(__FILE__), 'templates'), :dev => false
+    method_options :template => File.join(File.dirname(__FILE__), 'templates'),
+                   :dev => false,
+                   :'no-ios' => false,
+                   :'no-droid' => false,
+                   :'no-web' => false,
+                   :'android-api' => '17'
     def create(project_name)
       die "template must exist" unless File.exist?(options[:template])
       die "template must be a directory" unless File.directory?(options[:template])
 
-      proj = ProjectScript.new(project_name,
-                               :is_dev => options.dev?)
+      proj = ProjectScript.new(project_name, options)
       proj.create(Template.new(options[:template]))
     end