calatrava 0.6.8 → 0.6.9

data/.gitignore

@@ -9,3 +9,4 @@ currencyConverter/*
 /.rake
 /.vagrant
 /.idea
+Gemfile.lock

data/.gitmodules

@@ -0,0 +1,18 @@
+[submodule "puppet/modules/rvm"]
+	path = puppet/modules/rvm
+	url = git://github.com/blt04/puppet-rvm.git
+[submodule "puppet/modules/stdlib"]
+	path = puppet/modules/stdlib
+	url = git://github.com/puppetlabs/puppetlabs-stdlib.git
+[submodule "puppet/modules/android"]
+	path = puppet/modules/android
+	url = git://github.com/maestrodev/puppet-android.git
+[submodule "puppet/modules/wget"]
+	path = puppet/modules/wget
+	url = git://github.com/maestrodev/puppet-wget.git
+[submodule "puppet/modules/java"]
+	path = puppet/modules/java
+	url = git://github.com/puppetlabs/puppetlabs-java.git
+[submodule "puppet/modules/nodejs"]
+	path = puppet/modules/nodejs
+	url = git://github.com/willdurand/puppet-nodejs.git

data/.ruby-version

@@ -1 +1 @@
-ruby-1.9.3-p392
+ruby-1.9.3-p448

data/CHANGES.markdown

@@ -1,3 +1,15 @@
+## v0.6.9
+
+Bugs Fixed:
+* [Issue #58][i58]: Sass/Scss Partials shouldn't be compiled, and
+  sub-directories should be preserved
+* [Issue #96][i96]: Android Plugin callback handle is overridden
+  on quick successive calls to plugin
+* [Issue #94][i94]: Android Plugin callback errors out if returned
+  data is null
+* [Issue #100][i100]: Avoid closing a null ProgressDialog object
+* Handle the API changes in the latest versions of xcodeproj.
+
 ## v0.6.8
 
 New features:
@@ -200,3 +212,7 @@ Changes that will affect existing projects:
 [i87]: https://github.com/calatrava/calatrava/pull/87
 [i86]: https://github.com/calatrava/calatrava/pull/86
 [i84]: https://github.com/calatrava/calatrava/pull/84
+[i58]: https://github.com/calatrava/calatrava/issues/58
+[i96]: https://github.com/calatrava/calatrava/issues/96
+[i94]: https://github.com/calatrava/calatrava/issues/94
+[i100]: https://github.com/calatrava/calatrava/pull/100

data/Vagrantfile

@@ -1,106 +1,21 @@
 # -*- 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"
+Vagrant.configure('2') do |config|
+  config.vm.box = 'precise64-ubuntu-12.04LTS'
+  config.vm.box_url = 'http://cloud-images.ubuntu.com/precise/current/precise-server-cloudimg-vagrant-amd64-disk1.box'
+
+  config.vm.provider :virtualbox do |vb|
+    vb.customize ['modifyvm', :id, '--natdnshostresolver1', 'on'] # Host OS's resolve. Includes /etc/hosts entries
+    vb.customize ['modifyvm', :id, '--memory', '1024']
+  end
+
+  config.vm.network :private_network, ip: '172.16.1.1'
+  config.vm.network :forwarded_port, guest: 8888, host: 8888
+
+  config.vm.provision :puppet do |puppet|
+    puppet.manifests_path = 'puppet/manifests'
+    puppet.module_path    = 'puppet/modules'
+    puppet.manifest_file  = 'init.pp'
+  end
 end

data/lib/calatrava/manifest.rb

@@ -39,8 +39,12 @@ module Calatrava
       @shell.css_files
     end
 
-    def css_tasks(output_dir)
+    def css_tasks(base_output_dir)
       css_files.collect do |style_file|
+        #drop shell/stylesheets in order to preserve sub-directories 
+        sub_path = style_file.split("/")[2..-2].join("/")
+        output_dir = "#{base_output_dir}/#{sub_path}"
+        directory output_dir
         file "#{output_dir}/#{File.basename(style_file, '.*')}.css" => [output_dir, style_file] do |t|
           if style_file =~ /\.css$/
             cp style_file, output_dir

data/lib/calatrava/project_script.rb

@@ -106,8 +106,8 @@ module Calatrava
       end
     end
 
-    def create_ios_project
-      Xcodeproj::Project.new
+    def create_ios_project(path)
+      Xcodeproj::Project.new(path)
     end
 
     def create_ios_project_groups(base_dir, proj, target)
@@ -182,14 +182,14 @@ module Calatrava
     end
 
     def create_ios_tree(template)
-      proj = create_ios_project
       base_dir = Pathname.new(@name) + "ios"
+      proj = create_ios_project((base_dir + "#{@name}.xcodeproj").to_s)
 
       target = create_ios_project_target(proj)
       create_ios_project_groups(base_dir, proj, target)
       create_ios_folder_references(base_dir, proj, target)
 
-      proj.save_as (base_dir + "#{@name}.xcodeproj").to_s
+      proj.save
     end
   end
 

data/lib/calatrava/shell.rb

@@ -20,7 +20,7 @@ module Calatrava
     def css_files
       Dir.chdir @path do
         ["sass", "scss", "css"].collect do |ext|
-          Dir["shell/stylesheets/*.#{ext}"]
+          Dir["shell/stylesheets/**/[^_]*.#{ext}"]
         end.flatten
       end
     end

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

@@ -1 +1 @@
-ruby-1.9.3
+ruby-1.9.3-p448

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

@@ -14,7 +14,6 @@ public class AlertPlugin implements RegisteredPlugin
 {
   private PluginRegistry registry;
   private Context ctxt;
-  private String currentOkCallbackHandle;
   
   public void setContext(PluginRegistry registry, Context ctxt)
   {
@@ -24,6 +23,7 @@ public class AlertPlugin implements RegisteredPlugin
         @Override
         public void execute(Intent action, RegisteredActivity frontmost)
         {
+          final String currentOkCallbackHandle = action.getExtras().getString("okCallbackHandle");
           AlertDialog.Builder builder = new AlertDialog.Builder(frontmost);
           final boolean isConfirmDialog = action.getExtras().getString("method").equals("displayConfirm");
           builder.setMessage(action.getExtras().getString("message"))
@@ -53,9 +53,9 @@ public class AlertPlugin implements RegisteredPlugin
   
   public void call(String method, Map<String, Object> args)
   {
-    currentOkCallbackHandle = (String)args.get("okHandler");
     ctxt.sendBroadcast(registry.pluginCommand("alert")
                        .putExtra("method", method)
-                       .putExtra("message", (String)args.get("message")));
+                       .putExtra("message", (String)args.get("message"))
+                       .putExtra("okCallbackHandle", (String)args.get("okHandler")));
   }
 }

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

@@ -104,7 +104,8 @@ public class PluginRegistry {
 
   public void invokeCallback(String callbackHandle, Object data)
   {
-    rhino.callJsFunction("calatrava.inbound.invokePluginCallback", new String[] {callbackHandle, data.toString()});
+    String callbackData = data == null ? null : data.toString();
+    rhino.callJsFunction("calatrava.inbound.invokePluginCallback", new String[] {callbackHandle, callbackData});
   }
 
   public void updateContext(Context activityContext)

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

@@ -1,9 +1,7 @@
 package com.calatrava.bridge;
 
 import android.app.Activity;
-import android.app.ActivityManager;
 import android.app.ProgressDialog;
-import android.content.Context;
 import android.util.Log;
 
 public class RequestLoader {
@@ -26,6 +24,6 @@ public class RequestLoader {
   }
   
   public void onLoadingFinish() {
-    dialog.hide();
+    if(dialog != null) dialog.hide();
   }
 }

data/lib/calatrava/templates/package.json

@@ -4,15 +4,9 @@
   , "private": true
   , "dependencies" : {
       "coffee-script" : "1.2.0"
-    , "sinon"         : "*"
-    , "cucumber"      : "latest"
-    , "jsdom"         : "latest"
-    , "mime"          : "latest"
+    , "sinon"         : "1.7.3"
+    , "cucumber"      : "0.3.1"
     , "jasmine-node"  : "1.5.0"
-    , "should"        : "*"
-    , "jasmine-reporters" : "*"
-    , "walkdir"       : "*"
-    , "request"       : "*"
-    , "cssom"       : "*"
+    , "should"        : "1.2.2"
   }
 }

data/lib/calatrava/version.rb

@@ -1,3 +1,3 @@
 module Calatrava
-  Version = "0.6.8"
+  Version = "0.6.9"
 end

data/puppet/manifests/init.pp

@@ -0,0 +1,49 @@
+
+stage { 'req-install': before => Stage['rvm-install'] }
+
+class requirements {
+  exec { "apt-update":
+    command => "/usr/bin/apt-get -y update"
+  }
+  include java
+  package { ["ant", "apache2"]:
+    ensure => installed,
+    require => Exec['apt-update']
+  }
+}
+
+class installrvm {
+  include rvm
+  rvm::system_user { vagrant: ; }
+
+  rvm_system_ruby {
+    'ruby-1.9.3-p448':
+      ensure => 'present',
+      default_use => false;
+  }
+}
+
+class installandroid {
+  class {'android': user => 'vagrant'}
+
+  android::platform { 'android-17': }
+
+  file {"/home/vagrant/.bash_profile":
+    owner   => vagrant,
+    group   => vagrant,
+    mode    => 0644,
+    content => template("/vagrant/puppet/templates/.bash_profile"),
+    require => Class['android'],
+  }
+}
+
+class doinstall {
+  class { requirements:
+    stage => "req-install"
+  }
+  include installrvm
+  include nodejs
+  include installandroid
+}
+
+include doinstall

data/puppet/templates/.bash_profile

@@ -0,0 +1,2 @@
+export ANDROID_HOME=/usr/local/android/android-sdk-linux
+export PATH=$PATH:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calatrava
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.6.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-21 00:00:00.000000000 Z
+date: 2013-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -166,12 +166,12 @@ extensions:
 extra_rdoc_files: []
 files:
 - .gitignore
+- .gitmodules
 - .ruby-gemset
 - .ruby-version
 - .travis.yml
 - CHANGES.markdown
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -302,6 +302,8 @@ files:
 - lib/calatrava/templates/web/app/views/index.haml
 - lib/calatrava/templates/web/manifest.yml
 - lib/calatrava/version.rb
+- puppet/manifests/init.pp
+- puppet/templates/.bash_profile
 - spec/app_builder_spec.rb
 - spec/kernel_spec.rb
 - spec/manifest_spec.rb
@@ -322,15 +324,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3050607410502594598
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3050607410502594598
 requirements: []
 rubyforge_project: calatrava
-rubygems_version: 1.8.25
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Cross-platform mobile apps with native UIs

data/Gemfile.lock

@@ -1,108 +0,0 @@
-PATH
-  remote: .
-  specs:
-    calatrava (0.6.6)
-      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)
-
-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)
-    claide (0.2.0)
-    cocoapods (0.19.1)
-      activesupport (~> 3.2.13)
-      claide (~> 0.2.0)
-      cocoapods-core (= 0.19.1)
-      cocoapods-downloader (~> 0.1.0)
-      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.5)
-    cocoapods-core (0.19.1)
-      activesupport (~> 3.2.13)
-      rake (~> 10.0.0)
-    cocoapods-downloader (0.1.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.5)
-    i18n (0.6.1)
-    json (1.7.5)
-    multi_json (1.7.3)
-    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.9)
-    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.4)
-      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!
-  cocoapods
-  rspec
-  xcodeproj