calatrava 0.6.7 → 0.6.8

data/CHANGES.markdown

@@ -1,3 +1,18 @@
+## v0.6.8
+
+New features:
+* Ability to specify js libraries that need to be loaded with js
+  runtime running kernel code.
+  Note: This changes the format of manifest.yml
+
+Bugs Fixed:
+* [Issue #87][i87]: Fixing Calatrava build errors by changing 
+  jasmine-node version number
+* [Issue #86][i86]: Files and folders under asset folders are not
+  copied recursively
+* [Issue #84][i84]: Clean up automation tasks (a sample feature
+  also implemented).
+
 ## v0.6.7
 
 New features:
@@ -182,3 +197,6 @@ Changes that will affect existing projects:
 [i76]: https://github.com/calatrava/calatrava/pull/76
 [i33]: https://github.com/calatrava/calatrava/issues/33
 [i83]: https://github.com/calatrava/calatrava/issues/83
+[i87]: https://github.com/calatrava/calatrava/pull/87
+[i86]: https://github.com/calatrava/calatrava/pull/86
+[i84]: https://github.com/calatrava/calatrava/pull/84

data/lib/calatrava/app_builder.rb

@@ -22,11 +22,27 @@ module Calatrava
       "#{build_scripts_dir}/#{File.basename(cf, '.coffee')}.js"
     end
 
-    def load_instructions
+    def change_path_to_relative files, &change_file_path
       build_path = Pathname.new(File.dirname(build_dir))
-      @manifest.kernel_bootstrap.collect do |cf|
-        Pathname.new(js_file(cf)).relative_path_from(build_path).to_s
-      end.join($/)
+      files.collect do |file_to_add|
+        Pathname.new(change_file_path.call(file_to_add)).relative_path_from(build_path).to_s
+      end
+    end
+
+    def library_files
+      change_path_to_relative @manifest.kernel_libraries do |js_library|
+        "#{build_scripts_dir}/#{File.basename(js_library)}"
+      end
+    end
+
+    def feature_files
+      change_path_to_relative @manifest.kernel_bootstrap do |coffee_file|
+        js_file(coffee_file)
+      end
+    end
+
+    def load_instructions
+      feature_files.concat(library_files).join($/)
     end
 
     def haml_files

data/lib/calatrava/manifest.rb

@@ -8,7 +8,13 @@ module Calatrava
     def initialize(path, app_dir, kernel, shell)
       @path, @kernel, @shell = path, kernel, shell
       @src_file = "#{app_dir}/manifest.yml"
-      @feature_list = YAML.load(IO.read("#{@path}/#{@src_file}"))
+      files_to_load = YAML.load(IO.read("#{@path}/#{@src_file}"))
+      @feature_list = files_to_load["features"]
+      @kernel_libraries = files_to_load["kernel_libs"] || []
+    end
+
+    def kernel_libraries
+      @kernel_libraries
     end
 
     def features

data/lib/calatrava/tasks/assets.rb

@@ -1,5 +1,5 @@
 def cp_ne(source, dest_dir)
-  cp Dir[source], dest_dir
+  cp_r Dir[source], dest_dir, :remove_destination => true
 end
 
 def coffee(in_dir_or_file, out_dir)
@@ -8,4 +8,4 @@ def coffee(in_dir_or_file, out_dir)
     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
+end

data/lib/calatrava/tasks/automation.rb

@@ -1,27 +1,16 @@
+ROOT_DIR ||= ".".freeze
 FEATURES_DIR = File.join('.', 'features').freeze
 FEATURE_RESULTS_DIR = File.join('.', 'results').freeze
 
 namespace :automation do
   namespace :web do
     desc "Runs cucumber tests against the web app"
-    task :features, [:file] => [:create_sim_link, :copy_steps_file, :clean_up_results_dir] do |t, args|
+    task :features, [:file] => [:clean_up_results_dir] do |t, args|
       ENV['PATH'] = "#{ROOT_DIR}/web/features:#{ENV['PATH']}"
       features_to_be_run = args[:file] ? "#{FEATURES_DIR}/#{args[:file]}" : FEATURES_DIR
       sh "cucumber --strict --tags @all,@web --tags ~@wip #{features_to_be_run} --format html --out #{FEATURE_RESULTS_DIR}/report.html --format pretty"
     end
 
-    desc "create sim link for the ios step_definitions and support folder"
-    task :create_sim_link do
-      sh "rm -rf #{FEATURES_DIR}/step_definitions"
-      sh "rm -rf  #{FEATURES_DIR}/support"
-    end
-
-    desc "copy the web_steps file to web_steps.rb"
-    task :copy_steps_file do
-      sh "rm -f #{FEATURES_DIR}/*.rb"
-      sh "cp  #{FEATURES_DIR}/web_steps #{FEATURES_DIR}/web_steps.rb"
-    end
-
     desc "delete and create the results dir"
     task :clean_up_results_dir do
       sh "rm -rf #{FEATURE_RESULTS_DIR}"

data/lib/calatrava/templates/Gemfile.calatrava

@@ -7,3 +7,7 @@ gem "cocoapods", ">= 0.16.0"{{/mac?}}
 
 #auto compile shell and kernel for webapp. If you remove this, it'll stop auto compiling
 gem "filewatcher"
+
+group :test do
+  gem 'rspec'
+end

data/lib/calatrava/templates/droid/manifest.yml

@@ -1 +1,4 @@
-- converter
+features:
+  - converter
+kernel_libs:
+#  - assets/lib/underscore.js

data/lib/calatrava/templates/features/converter.feature

@@ -0,0 +1,10 @@
+Feature: Converter
+  As an international traveller
+  I want to check if I am getting a good exchange rate
+  So that I can haggle and get a better rate
+
+  @web
+  Scenario: Converting to Aussie dollars
+    Given I have 100 USD
+    When I check conversion rate to AUD
+    Then the result should be greater than 100

data/lib/calatrava/templates/features/step_definitions/converter_steps.rb

@@ -0,0 +1,29 @@
+Before do
+  @driver = Selenium::WebDriver.for :firefox
+end
+
+After do
+  @driver.quit
+end
+
+Given(/^I have (\d+) (.*)$/) do |amount, in_currency|
+  @driver.get "http://localhost:8888"
+  in_currency_selector = Selenium::WebDriver::Support::Select.new(@driver.find_element :id => "in_currency")
+  in_currency_selector.select_by :value, in_currency
+  in_amount = @driver.find_element :id => "in_amount"
+  in_amount.clear
+  in_amount.send_keys amount
+end
+
+When(/^I check conversion rate to (.*)$/) do |out_currency|
+  out_currency_selector = Selenium::WebDriver::Support::Select.new(@driver.find_element :id => "out_currency")
+  out_currency_selector.select_by :value, out_currency
+  convert_button = @driver.find_element :id => "convert"
+  convert_button.click
+end
+
+Then(/^the result should be greater than (\d+)$/) do |amount|
+  wait = Selenium::WebDriver::Wait.new(:timeout => 3) # seconds
+  wait.until { @driver.find_element(:id => "out_amount").attribute("value").to_f > 0 }
+  @driver.find_element(:id => "out_amount").attribute("value").to_f.should > amount.to_f
+end

data/lib/calatrava/templates/features/support/env.rb

@@ -0,0 +1,2 @@
+require 'selenium-webdriver'
+require 'rspec-expectations'

data/lib/calatrava/templates/ios/manifest.yml

@@ -1 +1,4 @@
-- converter
+features:
+  - converter
+kernel_libs:
+#  - assets/lib/underscore.js

data/lib/calatrava/templates/package.json

@@ -8,7 +8,7 @@
     , "cucumber"      : "latest"
     , "jsdom"         : "latest"
     , "mime"          : "latest"
-    , "jasmine-node"  : "1.0.26"
+    , "jasmine-node"  : "1.5.0"
     , "should"        : "*"
     , "jasmine-reporters" : "*"
     , "walkdir"       : "*"

data/lib/calatrava/templates/web/manifest.yml

@@ -1 +1,4 @@
-- converter
+features:
+  - converter
+kernel_libs:
+#  - assets/lib/underscore.js

data/lib/calatrava/version.rb

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

data/spec/app_builder_spec.rb

@@ -13,7 +13,8 @@ describe Calatrava::AppBuilder do
   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']) }
+                          :haml_files => ['diff/path/shell.haml'],
+                          :kernel_libraries => ['path/to/external/kernel_lib.js']) }
   
   let(:app) { Calatrava::AppBuilder.new('app', 'app/build', manifest) }
 
@@ -32,9 +33,10 @@ describe Calatrava::AppBuilder do
   end
 
   context '#load_file' do
-    subject { app.load_instructions.lines.to_a }
+    subject { app.load_instructions.lines.to_a.each(&:chomp!) }
     
     it { should include 'build/scripts/kernel.js' }
+    it { should include 'build/scripts/kernel_lib.js' }
     it { should_not include 'build/scripts/shell.js' }
   end
 
@@ -43,4 +45,5 @@ describe Calatrava::AppBuilder do
 
     it { should include 'diff/path/shell.haml' }
   end
+
 end

data/spec/manifest_spec.rb

@@ -6,7 +6,7 @@ describe Calatrava::Manifest do
 
   before(:each) do
     create_dir 'app'
-    write_file 'app/manifest.yml', ['included'].to_yaml
+    write_file 'app/manifest.yml', {'features' => ['included'], 'kernel_libs' => ['kernel_lib.js']}.to_yaml
   end
 
   let(:features) {  }
@@ -59,4 +59,22 @@ describe Calatrava::Manifest do
     it { should_not include 'shell_inc' }
   end
 
+  context '#kernel_libraries' do
+    context "#when present" do
+      subject { manifest.kernel_libraries }
+
+      it { should include 'kernel_lib.js'}
+    end
+
+    context "#when not present" do
+      before do
+        write_file 'app/manifest.yml', {'features' => ['included'], 'kernel_libs' => nil}.to_yaml
+      end
+
+      subject { manifest.kernel_libraries }
+
+      it { should be_empty}
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calatrava
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.6.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-22 00:00:00.000000000 Z
+date: 2013-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -255,6 +255,9 @@ files:
 - lib/calatrava/templates/droid/calatrava/src/com/calatrava/shell/WebViewActivity.java
 - lib/calatrava/templates/droid/calatrava/src/com/calatrava/shell/WebViewPageStateManager.java
 - lib/calatrava/templates/droid/manifest.yml
+- lib/calatrava/templates/features/converter.feature
+- lib/calatrava/templates/features/step_definitions/converter_steps.rb
+- lib/calatrava/templates/features/support/env.rb
 - lib/calatrava/templates/ios/Podfile.calatrava
 - lib/calatrava/templates/ios/manifest.yml
 - lib/calatrava/templates/ios/src/AppDelegate.h