From 2945576cb77c209563da085649f2ece97cb81e17 Mon Sep 17 00:00:00 2001 From: Corey Johnson & Nathan Sobo Date: Wed, 8 Aug 2012 14:14:20 -0700 Subject: [PATCH 1/2] Include themes directory in bundle --- Rakefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Rakefile b/Rakefile index 3c5dc6cb0..4394e6a8d 100644 --- a/Rakefile +++ b/Rakefile @@ -71,13 +71,12 @@ task :"copy-files-to-bundle" => :"verify-prerequisites" do sh "coffee -c -o #{dest}/src/stdlib src/stdlib/require.coffee" cp "src/stdlib/onig-reg-exp-extension.js", "#{dest}/src/stdlib" unless ENV['LOAD_RESOURCES_FROM_DIR'] - %w(src static vendor spec benchmark).each do |dir| + %w(src static vendor spec benchmark bundles themes).each do |dir| rm_rf File.join(dest, dir) cp_r dir, File.join(dest, dir) end sh "coffee -c #{dest}/src #{dest}/vendor #{dest}/spec #{dest}/benchmark" - cp_r "bundles", "#{dest}/bundles" end end From a8c19b169221b99f048ae9d8b763e1fec46ad1b9 Mon Sep 17 00:00:00 2001 From: Corey Johnson & Nathan Sobo Date: Wed, 8 Aug 2012 14:14:40 -0700 Subject: [PATCH 2/2] Fix OnigRegExp spec --- spec/stdlib/onig-reg-exp-spec.coffee | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/spec/stdlib/onig-reg-exp-spec.coffee b/spec/stdlib/onig-reg-exp-spec.coffee index 5cb805f0f..3b34f157f 100644 --- a/spec/stdlib/onig-reg-exp-spec.coffee +++ b/spec/stdlib/onig-reg-exp-spec.coffee @@ -15,12 +15,15 @@ describe "OnigRegExp", -> describe ".getCaptureTree(string, index)", -> it "returns match with nested capture groups organized into a tree", -> regex = new OnigRegExp("a((bc)d)e(f(g)(h))(?=ij)") - tree = regex.getCaptureTree("abcdefghij") + tree = regex.getCaptureIndices("abcdefghij") expect(tree).toEqual [ 0, 0, 8 - [1, 1, 4, [2, 1, 3]], - [3, 5, 8, [4, 6, 7], [5, 7, 8]] + 1, 1, 4, + 2, 1, 3, + 3, 5, 8, + 4, 6, 7, + 5, 7, 8 ] it "returns undefined if there was no match", ->