eris 0.0.8 → 0.0.10

data/lib/eris/js/jasmineEnyoBootstrap.js

@@ -1,5 +1,6 @@
 var jasmineEnyoBootstrap = jasmineEnyoBootstrap || {};
 
+// exposure for testing
 jasmineEnyoBootstrap.getXhr = function() {
   try {
     return new XMLHttpRequest();
@@ -16,29 +17,61 @@ jasmineEnyoBootstrap.getXhr = function() {
   return null;
 };
 
-jasmineEnyoBootstrap.setLaunchParams = function() {
+// exposure for testing
+jasmineEnyoBootstrap.getDocument = function() {
+  return document;
+};
+
 
+function ErisConfig() {
   var xhr = jasmineEnyoBootstrap.getXhr();
-  xhr.open("GET", "eris_config.json", false);
-  xhr.send();
 
-  if (xhr.status != 200) {
-    return;
-  }
+  var config;
 
-  var launchParams = JSON.parse(xhr.responseText).enyoLaunchParams;
+  var self = this;
 
-  if (!launchParams) {
-    return;
-  }
+  self.load = function() {
+    xhr.open("GET", "eris_config.json", false);
+    xhr.send();
 
-  window.history.pushState({}, "Jasmine Suite", "http://localhost:8888?" + buildQueryString());
+    if (xhr.status != 200) {
+      config = {};
+    } else {
+      config = JSON.parse(xhr.responseText);
+    }
+  };
 
-  function buildQueryString() {
-    return Object.keys(launchParams).map(function(key) {
-      return encodeURIComponent(key) + '=' + encodeURIComponent(launchParams[key]);
-    }).join('&');
-  }
-};
+  self.enyoPath = function() {
+    var version = config["enyoVersion"] || "0.10";
+
+    return  "/usr/palm/frameworks/enyo/" + version + "/framework/enyo.js";
+  };
+
+  self.launchParams = function() {
+    if (!config.enyoLaunchParams) {
+      return [];
+    }
 
-jasmineEnyoBootstrap.setLaunchParams();
+    return Object.keys(config.enyoLaunchParams).filter(function(key) {
+      return config.enyoLaunchParams[key];
+    });
+  };
+
+  return self;
+}
+
+jasmineEnyoBootstrap.setEnyoArgs = function() {
+
+  window.enyo = {
+    args: {}
+  };
+
+  var config = new ErisConfig();
+  config.load();
+
+  var launchParams = config.launchParams();
+
+  launchParams.forEach(function(p) {
+    enyo.args[p] = true;
+  });
+};

data/lib/eris/js/jasmineEnyoLoader.js

@@ -0,0 +1 @@
+jasmineEnyoBootstrap.setEnyoArgs();

data/lib/eris/lib/eris_config.rb

@@ -20,9 +20,11 @@ class ErisConfig
     end
   end
 
-  def enyo_js_path
-    version = @config_hash['enyoVersion'] || "0.10"
+  def enyo_version
+    @config_hash['enyoVersion'] || "0.10"
+  end
 
-    "usr/palm/frameworks/enyo/#{version}/framework/enyo.js"
+  def enyo_js_path
+    "usr/palm/frameworks/enyo/#{enyo_version}/framework/enyo.js"
   end
 end

data/lib/eris/lib/jasmine_config_overrides.rb

@@ -5,7 +5,7 @@ module Jasmine
     def src_files
       eris_config = ErisConfig.new(:config_path => 'eris_config.json', :app_root => project_root)
 
-      files = ["__ERIS_RESOURCES__/jasmineEnyoBootstrap.js", eris_config.enyo_js_path]
+      files = ["__ERIS_RESOURCES__/jasmineEnyoBootstrap.js","__ERIS_RESOURCES__/jasmineEnyoLoader.js", eris_config.enyo_js_path]
       files += match_files(src_dir, simple_config['src_files']) if simple_config['src_files']
       files
     end
@@ -16,6 +16,25 @@ module Jasmine
   end
 end
 
+
+# This exists in order to allow enyo.args to be initialized outside the Enyo loader's closure, only for
+# when specs are running. We've asked for this line to be added to the Enyo loader. This code is harmless
+# when the line gets added and can be removed from Eris once it is
+module Rack
+  class EnyoJs
+    def initialize(enyo_js_path)
+      @enyo_js_path = "/#{enyo_js_path}"
+    end
+
+    def call(env)
+      enyo_js = ::File.read(@enyo_js_path).gsub(/enyo\.args = \{\};/, "enyo.args = enyo.args || {};")
+      [200,
+       { "Content-Type"   => 'application/javascript' },
+       [enyo_js]]
+    end
+  end
+end
+
 module Jasmine
   def self.app(config)
     Rack::Builder.app do
@@ -29,6 +48,7 @@ module Jasmine
       map(config.root_path)    { run Rack::File.new(config.project_root) }
 
       eris_config = ErisConfig.new(:config_path => 'eris_config.json', :app_root => config.project_root)
+      map("/#{eris_config.enyo_js_path}") { run Rack::EnyoJs.new(eris_config.enyo_js_path) }
       map("/usr/palm/frameworks") { run Rack::File.new(eris_config.enyo_root) }
 
       map("/__ERIS_RESOURCES__") { run Rack::File.new(File.expand_path(File.join(File.dirname(__FILE__), '/../js'))) }

data/lib/eris/tasks/generate.rb

@@ -4,16 +4,18 @@ module Eris
   class Tasks < Thor
     desc "generate", "generate an enyo application"
     def generate
-      template "lib/eris/templates/Gemfile",'Gemfile'
-      template "lib/eris/templates/Rakefile",'Rakefile'
-      template "lib/eris/templates/jasmine.yml", "spec/unit/support/jasmine.yml"
-      template "lib/eris/templates/sampleSpec.js", "spec/unit/source/sampleSpec.js"
+      #template "lib/eris/templates/Gemfile",'Gemfile'
+      #template "lib/eris/templates/Rakefile",'Rakefile'
+      #template "lib/eris/templates/jasmine.yml", "spec/unit/support/jasmine.yml"
+      #template "lib/eris/templates/sampleSpec.js", "spec/unit/source/sampleSpec.js"
+      directory "lib/eris/templates/sample_app", "."
       create_file ".rvmrc", "rvm use ruby-1.9.2-p180@palm"
-      template "lib/eris/templates/ci_build.sh", "ci_build.sh"
+      #template "lib/eris/templates/ci_build.sh", "ci_build.sh"
       chmod "ci_build.sh", 0755
-      template "lib/eris/templates/eris_config.json", "eris_config.json"
+      #template "lib/eris/templates/eris_config.json", "eris_config.json"
       empty_directory "spec/unit/source/mock"
-      template "lib/eris/templates/specHelper.js", "spec/unit/specHelper.js"
+      empty_directory "spec/helpers/testResponses"
+      #template "lib/eris/templates/specHelper.js", "spec/unit/specHelper.js"
     end
   end
 end

data/lib/eris/templates/sample_app/spec/helpers/testResponses.js

@@ -0,0 +1 @@
+var testResponses = {};

data/lib/eris/version.rb

@@ -1,3 +1,3 @@
 module Eris
-  Eris::VERSION = "0.0.8"
+  Eris::VERSION = "0.0.10"
 end

data/spec/fixtures/sample_app/eris_config_with_launch_params.json

@@ -2,7 +2,7 @@
     "localEnyoRoot": "../",
     "ciEnyoRoot": "../ciboxenyo",
     "enyoLaunchParams": {
-        "foo": "bar baz",
-        "zip": 12
+        "foo": true,
+        "bar": false
     }
 }

data/spec/javascripts/EnyoLoaderSpec.js

@@ -0,0 +1,50 @@
+describe("setEnyoArgs", function () {
+  var enyoTag, fakeXhr, fakeResponse, fakeDocument;
+
+  beforeEach(function() {
+    enyo = {};
+    fakeXhr = {
+      open: function() {
+      },
+      send: function() {
+        fakeXhr.status = fakeResponse.status;
+        fakeXhr.responseText = fakeResponse.responseText;
+      },
+      responseText: null
+    };
+
+    fakeDocument = document.createElement('div');
+    fakeDocument.setAttribute('class', 'fake doc');
+    fakeDocument.appendChild(document.createElement('head'));
+
+    spyOn(jasmineEnyoBootstrap, 'getXhr').andReturn(fakeXhr);
+  });
+
+
+  describe("with defaults", function () {
+    beforeEach(function() {
+      fakeResponse = testResponses.erisConfig.withDefaults.success;
+
+      jasmineEnyoBootstrap.setEnyoArgs();
+    });
+
+    it("should give enyo no launch params", function() {
+      expect(enyo.args).toEqual({})
+    });
+  });
+
+  describe("with overrides", function () {
+    beforeEach(function() {
+      fakeResponse = testResponses.erisConfig.withOverrides.success;
+
+      jasmineEnyoBootstrap.setEnyoArgs();
+    });
+
+    it("should give enyo the requested launch params", function() {
+      expect(enyo.args).toBeDefined();
+      expect(enyo.args.foo).toBeTruthy();
+      expect(enyo.args.baz).toBeTruthy();
+    });
+  });
+
+});

data/spec/javascripts/ErisConfigSpec.js

@@ -0,0 +1,69 @@
+describe("ErisConfig", function () {
+  var erisConfig, fakeXhr, fakeResponse;
+
+  beforeEach(function() {
+
+    fakeXhr = {
+      open: function() {
+      },
+      send: function() {
+        fakeXhr.status = fakeResponse.status;
+        fakeXhr.responseText = fakeResponse.responseText;
+      },
+      responseText: null
+    };
+    spyOn(jasmineEnyoBootstrap, 'getXhr').andReturn(fakeXhr);
+
+    erisConfig = new ErisConfig();
+  });
+
+  describe("#enyoPath", function () {
+
+    describe("with defaults", function () {
+      beforeEach(function() {
+        fakeResponse = testResponses.erisConfig.withDefaults.success;
+        erisConfig.load();
+      });
+
+      it("should return a path to the default version", function() {
+        expect(erisConfig.enyoPath()).toEqual('/usr/palm/frameworks/enyo/0.10/framework/enyo.js');
+      });
+    });
+
+    describe("with overrides", function () {
+      beforeEach(function() {
+        fakeResponse = testResponses.erisConfig.withOverrides.success;
+        erisConfig.load();
+      });
+
+      it("should return a path to the default version", function() {
+        expect(erisConfig.enyoPath()).toEqual('/usr/palm/frameworks/enyo/19/framework/enyo.js');
+      });
+    });
+  });
+
+  describe("#launchParams", function () {
+
+    describe("when no launch parameters are specified", function () {
+      beforeEach(function() {
+        fakeResponse = testResponses.erisConfig.withDefaults.success;
+        erisConfig.load();
+      });
+
+      it("should return an empty array", function() {
+        expect(erisConfig.launchParams()).toEqual([]);
+      });
+    });
+
+    describe("when launch parameters are specified", function () {
+      beforeEach(function() {
+        fakeResponse = testResponses.erisConfig.withOverrides.success;
+        erisConfig.load();
+      });
+
+      it("should return a comma-delimited list of truthy keys", function() {
+        expect(erisConfig.launchParams()).toEqual(["foo","baz"]);
+      });
+    });
+  });
+});

data/spec/javascripts/helpers/TestResponses.js

@@ -1,7 +1,7 @@
 testResponses = {};
 
 testResponses.erisConfig = {
-  noLaunchParams: {
+  withDefaults: {
     success: {
       status: 200,
       responseText: JSON.stringify({
@@ -12,15 +12,17 @@ testResponses.erisConfig = {
     }
   },
 
-  withLaunchParams: {
+  withOverrides: {
     success: {
       status: 200,
       responseText: JSON.stringify({
           "localEnyoRoot": "../",
           "ciEnyoRoot": "../ciboxenyo",
+          "enyoVersion": "19",
           "enyoLaunchParams": {
-            "foo": "bar baz",
-            "zip": 12
+            "foo": true,
+            "bar": false,
+            "baz": true
           }
         }
       )

data/spec/javascripts/support/jasmine.yml

@@ -11,7 +11,7 @@
 #   - dist/**/*.js
 #
 src_files:
-    - lib/eris/js/**/*.js
+    - lib/eris/js/**/jasmineEnyoBootstrap.js
 
 # stylesheets
 #

data/spec/lib/eris/tasks/generator_integration_spec.rb

@@ -11,30 +11,32 @@ describe Eris do
 
   describe "generate command" do
     before :each do
-      # capture_output do
+      capture_output do
         Dir.chdir @tmp_dir do
           @thor.invoke Eris::Tasks, "generate"
         end
-      # end
+      end
     end
 
     it "should run jasmine:ci" do
       Bundler.with_clean_env do
         gem_dir = File.expand_path('../../../../', File.dirname(__FILE__))
-        system! "cd #{gem_dir} && bundle exec rake build"
-        system! "mkdir -p #{@tmp_dir}/vendor/cache/"
-        system! "cp #{gem_dir}/pkg/eris-#{Eris::VERSION}.gem #{@tmp_dir}/vendor/cache/"
-        system "cd #{@tmp_dir} && rvm-exec ruby-1.9.2-p180@palm-test bash -c 'gem uninstall -aIx eris'"
-        system! "cd #{@tmp_dir} && rvm-exec ruby-1.9.2-p180@palm-test bash -c 'gem list | grep bundler || gem install bundler'"
-        system! "cd #{@tmp_dir} && rvm-exec ruby-1.9.2-p180@palm-test bash -c 'bundle install'"
-        system! "cd #{@tmp_dir} && rvm-exec ruby-1.9.2-p180@palm-test bash -c 'bundle exec gem list | grep eris'"
-        system! "cd #{@tmp_dir} && rvm-exec ruby-1.9.2-p180@palm-test bash -c 'bundle exec gem list | grep jasmine'"
-        system "cd #{@tmp_dir} && rvm-exec ruby-1.9.2-p180@palm-test bash -c 'bundle show jasmine'"
+        gemfile_location = "#{@tmp_dir}/Gemfile"
+        gemfile_contents = File.read(gemfile_location).gsub(%Q{gem "eris"}, %Q{gem "eris", :path => "#{gem_dir}"})
+
+        File.open(gemfile_location, 'w') { |file| file << gemfile_contents }
+        system("echo 'rvm use ruby-1.9.2-p180@palm-test' > #{@tmp_dir}/.rvmrc")
+        system "cd #{@tmp_dir} && gem uninstall -aIx eris"
+        system! "cd #{@tmp_dir} && gem list | grep bundler || gem install bundler"
+        system! "cd #{@tmp_dir} && bundle install"
+        system! "cd #{@tmp_dir} && bundle exec gem list | grep eris"
+        system! "cd #{@tmp_dir} && bundle exec gem list | grep jasmine"
+        system "cd #{@tmp_dir} && bundle show jasmine"
         eris_config_location = "#{@tmp_dir}eris_config.json"
         eris_config = File.read(eris_config_location)
         eris_config.gsub!("../../", "/usr/palm/frameworks/")
         File.open(eris_config_location, 'w') {|f| f.write(eris_config) }
-        system("cd #{@tmp_dir} && rvm-exec ruby-1.9.2-p180@palm-test bash -c 'bundle exec rake jasmine:ci'").should be_true
+        system("cd #{@tmp_dir} && bundle exec rake jasmine:ci").should be_true
       end
     end
   end

data/spec/lib/eris/tasks/generator_spec.rb

@@ -46,6 +46,18 @@ describe Eris do
         rakefile_contents.should include('describe')
       end
     end
+
+    it "should generate a testResponses directory" do
+      Dir.chdir @tmp_dir do
+        File.exists?('spec/helpers/testResponses').should be_true
+      end
+    end
+
+    it "should generate a testResponses.js file" do
+      Dir.chdir @tmp_dir do
+        File.exists?('spec/helpers/testResponses.js').should be_true
+      end
+    end
     
     it "should generate a spec/unit/source/mock" do
       Dir.chdir @tmp_dir do
@@ -55,7 +67,7 @@ describe Eris do
 
     it "should generate a spec/unit/specHelper.js" do
       Dir.chdir @tmp_dir do
-        rakefile_contents = File.read("spec/unit/specHelper.js")
+        rakefile_contents = File.read("spec/helpers/specHelper.js")
         rakefile_contents.should include('getJson')
       end
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: eris
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 0
-  - 8
-  version: 0.0.8
+  - 10
+  version: 0.0.10
 platform: ruby
 authors: 
 - HP webOS
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-08 00:00:00 -07:00
+date: 2011-08-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -224,6 +224,7 @@ files:
 - lib/eris.rb
 - lib/eris/eris.ru
 - lib/eris/js/jasmineEnyoBootstrap.js
+- lib/eris/js/jasmineEnyoLoader.js
 - lib/eris/lib/eris_config.rb
 - lib/eris/lib/jasmine_config_overrides.rb
 - lib/eris/lib/jasmine_rspec_runner.rb
@@ -232,13 +233,14 @@ files:
 - lib/eris/lib/server.rb
 - lib/eris/tasks/generate.rb
 - lib/eris/tasks/server.rb
-- lib/eris/templates/Gemfile
-- lib/eris/templates/Rakefile
-- lib/eris/templates/ci_build.sh
-- lib/eris/templates/eris_config.json
-- lib/eris/templates/jasmine.yml
-- lib/eris/templates/sampleSpec.js
-- lib/eris/templates/specHelper.js
+- lib/eris/templates/sample_app/Gemfile
+- lib/eris/templates/sample_app/Rakefile
+- lib/eris/templates/sample_app/ci_build.sh
+- lib/eris/templates/sample_app/eris_config.json
+- lib/eris/templates/sample_app/spec/helpers/specHelper.js
+- lib/eris/templates/sample_app/spec/helpers/testResponses.js
+- lib/eris/templates/sample_app/spec/unit/source/sampleSpec.js
+- lib/eris/templates/sample_app/spec/unit/support/jasmine.yml
 - lib/eris/version.rb
 - spec/fixtures/enyo/0.10/framework/enyo.js
 - spec/fixtures/sample_app/app/models/foo.js
@@ -250,7 +252,8 @@ files:
 - spec/fixtures/sample_app/spec/acceptance/helpers/AppHelper.js
 - spec/fixtures/vcr_cassettes/failure.yml
 - spec/fixtures/vcr_cassettes/success.yml
-- spec/javascripts/SetLaunchParamsSpec.js
+- spec/javascripts/EnyoLoaderSpec.js
+- spec/javascripts/ErisConfigSpec.js
 - spec/javascripts/helpers/TestResponses.js
 - spec/javascripts/helpers/specHelper.js
 - spec/javascripts/support/jasmine.yml
@@ -310,7 +313,8 @@ test_files:
 - spec/fixtures/sample_app/spec/acceptance/helpers/AppHelper.js
 - spec/fixtures/vcr_cassettes/failure.yml
 - spec/fixtures/vcr_cassettes/success.yml
-- spec/javascripts/SetLaunchParamsSpec.js
+- spec/javascripts/EnyoLoaderSpec.js
+- spec/javascripts/ErisConfigSpec.js
 - spec/javascripts/helpers/TestResponses.js
 - spec/javascripts/helpers/specHelper.js
 - spec/javascripts/support/jasmine.yml

data/spec/javascripts/SetLaunchParamsSpec.js

@@ -1,37 +0,0 @@
-describe("setLaunchParams", function () {
-  var fakeXhr, fakeResponse;
-  beforeEach(function() {
-    window.history.pushState({}, "Jasmine Suite", "http://localhost:8888/");
-    fakeXhr = {
-      open: function() {},
-      send: function() {
-        fakeXhr.status = fakeResponse.status;
-       fakeXhr.responseText = fakeResponse.responseText;
-      },
-      responseText: null
-    };
-    spyOn(jasmineEnyoBootstrap, 'getXhr').andReturn(fakeXhr);
-  });
-
-  describe("when no launch parameters are specified", function () {
-    beforeEach(function() {
-      fakeResponse = testResponses.erisConfig.noLaunchParams.success;
-      jasmineEnyoBootstrap.setLaunchParams();
-    });
-
-    it("should not put any params onto the window's query string", function() {
-      expect(window.location.search).toEqual("");
-    });
-  });
-
-  describe("when launch parameters are specified", function () {
-    beforeEach(function() {
-      fakeResponse = testResponses.erisConfig.withLaunchParams.success;
-      jasmineEnyoBootstrap.setLaunchParams();
-    });
-
-    it("should put any params from eris_config.json onto the window", function() {
-      expect(window.location.search).toEqual("?foo=bar%20baz&zip=12");
-    });
-  });
-});