From 5e6df2a517aeb0fbc218809aca0e6d2aa56453df Mon Sep 17 00:00:00 2001
From: William Hearn <sylus1984@gmail.com>
Date: Tue, 29 May 2012 00:06:08 -0400
Subject: [PATCH 1/2] SASS @IMPORT FIX

The @import declaration for sass was not working this is because the compile.rb command was set to read the directory structure inside jruby.jar for some reason dir.entries has problems doing this. Instead keeping the vendors/ directory during build out and point compile argv(0) to that.
---
 .gitignore                         | 3 ++-
 src/base/build.xml                 | 7 +++----
 src/base/compile.rb                | 4 +++-
 src/grids/build.xml                | 5 ++---
 src/grids/compile.rb               | 4 +++-
 src/js/build.xml                   | 7 +++----
 src/js/compile.rb                  | 4 +++-
 src/theme-gcwu-fegc/build.xml      | 7 +++----
 src/theme-gcwu-fegc/compile.rb     | 4 +++-
 src/theme-gcwu-intranet/build.xml  | 7 +++----
 src/theme-gcwu-intranet/compile.rb | 4 +++-
 11 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/.gitignore b/.gitignore
index 81665d8f4be..19addd70bf7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 nbproject/*
 .sass-cache/
 .DS_Store
-jruby.jar
\ No newline at end of file
+jruby.jar
+build/lib/vendors
\ No newline at end of file
diff --git a/src/base/build.xml b/src/base/build.xml
index 40c2b3448b4..112ad0066a0 100644
--- a/src/base/build.xml
+++ b/src/base/build.xml
@@ -10,7 +10,7 @@
   <!-- Include jruby + gems (compass + sass + zengrids) -->
   <target name="build-jar" depends="jar.check" unless="jar.exists">
     <mkdir dir="${lib.dir}/jruby-compiled" />
-    <get src="http://jruby.org.s3.amazonaws.com/downloads/1.6.7.2/jruby-complete-1.6.7.2.jar" dest="${lib.dir}/jruby.jar"/>
+    <get src="http://jruby.org.s3.amazonaws.com/downloads/1.7.0.preview1/jruby-complete-1.7.0.preview1.jar" dest="${lib.dir}/jruby.jar"/>
     <get src="http://production.cf.rubygems.org/gems/compass-0.12.1.gem" dest="${lib.dir}/jruby-compiled/compass.gem"/>  
     <get src="http://production.cf.rubygems.org/gems/sass-3.1.19.gem" dest="${lib.dir}/jruby-compiled/sass.gem"/>  
     <get src="http://production.cf.rubygems.org/gems/zen-grids-1.2.gem" dest="${lib.dir}/jruby-compiled/zen-grids.gem"/> 
@@ -21,7 +21,6 @@
       <arg line="-uf jruby.jar -C vendors ." />
     </exec>
     <delete dir="${lib.dir}/jruby-compiled" />
-    <delete dir="${lib.dir}/vendors" />
   </target>
   <target name="jar.check">
     <condition property="jar.exists">
@@ -32,7 +31,7 @@
   <!-- Compile all of the SCSS files into their CSS counterparts "ant compile.sass" -->
   <target name="compile.sass">
     <java classname="org.jruby.Main" fork="true" failonerror="true" classpathref="jruby.classpath">
-        <arg line="${src.dir}/compile.rb ${lib.dir}/gems/ compile ${src.dir}"/>
+        <arg line="${src.dir}/compile.rb ${lib.dir}/vendors/gems/ compile ${src.dir}"/>
     </java>
     <echo level="info">
 ---Converted CSS SCSS Files into CSS---
@@ -41,7 +40,7 @@
   <!-- Watch for any polling changes in the SCSS directory "ant watch.sass" -->
   <target name="watch.sass">
     <java classname="org.jruby.Main" fork="true" failonerror="true" classpathref="jruby.classpath">
-        <arg line="${src.dir}/compile.rb ${lib.dir}/gems/ watch ${src.dir}"/>
+        <arg line="${src.dir}/compile.rb ${lib.dir}/jruby.jar/gems/ watch ${src.dir}"/>
     </java>
     <echo level="info">
 ---Watching for SCSS Changes in CSS Directory---
diff --git a/src/base/compile.rb b/src/base/compile.rb
index 3ccac549bd6..c880dd47820 100644
--- a/src/base/compile.rb
+++ b/src/base/compile.rb
@@ -1,5 +1,7 @@
 # Load All of the Gems inside the jRuby jar passed in by first argument 
-$LOAD_PATH.unshift "#{ARGV[0]}"
+Dir.entries(ARGV[0]).each do |lib|  
+    $LOAD_PATH.unshift "#{ARGV[0]}/#{lib}/lib"  
+end 
 
 # Require the following Gems
 require 'rubygems'   
diff --git a/src/grids/build.xml b/src/grids/build.xml
index e3c93cd74ec..b4e2eb69ac1 100644
--- a/src/grids/build.xml
+++ b/src/grids/build.xml
@@ -10,7 +10,7 @@
   <!-- Include jruby + gems (compass + sass + zengrids) -->
   <target name="build-jar" depends="jar.check" unless="jar.exists">
     <mkdir dir="${lib.dir}/jruby-compiled" />
-    <get src="http://jruby.org.s3.amazonaws.com/downloads/1.6.7.2/jruby-complete-1.6.7.2.jar" dest="${lib.dir}/jruby.jar"/>
+    <get src="http://jruby.org.s3.amazonaws.com/downloads/1.7.0.preview1/jruby-complete-1.7.0.preview1.jar" dest="${lib.dir}/jruby.jar"/>
     <get src="http://production.cf.rubygems.org/gems/compass-0.12.1.gem" dest="${lib.dir}/jruby-compiled/compass.gem"/>  
     <get src="http://production.cf.rubygems.org/gems/sass-3.1.19.gem" dest="${lib.dir}/jruby-compiled/sass.gem"/>  
     <get src="http://production.cf.rubygems.org/gems/zen-grids-1.2.gem" dest="${lib.dir}/jruby-compiled/zen-grids.gem"/> 
@@ -21,7 +21,6 @@
       <arg line="-uf jruby.jar -C vendors ." />
     </exec>
     <delete dir="${lib.dir}/jruby-compiled" />
-    <delete dir="${lib.dir}/vendors" />
   </target>
   <target name="jar.check">
     <condition property="jar.exists">
@@ -56,7 +55,7 @@
   <!-- Watch for any polling changes in the SCSS directory "ant watch.sass" -->
   <target name="watch.sass">
     <java classname="org.jruby.Main" fork="true" failonerror="true" classpathref="jruby.classpath">
-        <arg line="${src.dir}/compile.rb ${lib.dir}/gems/ watch ${src.dir}"/>
+        <arg line="${src.dir}/compile.rb ${lib.dir}/vendors/gems/ watch ${src.dir}"/>
     </java>
     <echo level="info">
 ---Watching for SCSS Changes in Grids Directory---
diff --git a/src/grids/compile.rb b/src/grids/compile.rb
index 3ccac549bd6..c880dd47820 100644
--- a/src/grids/compile.rb
+++ b/src/grids/compile.rb
@@ -1,5 +1,7 @@
 # Load All of the Gems inside the jRuby jar passed in by first argument 
-$LOAD_PATH.unshift "#{ARGV[0]}"
+Dir.entries(ARGV[0]).each do |lib|  
+    $LOAD_PATH.unshift "#{ARGV[0]}/#{lib}/lib"  
+end 
 
 # Require the following Gems
 require 'rubygems'   
diff --git a/src/js/build.xml b/src/js/build.xml
index 0fe874d1b9a..e889394f2f6 100644
--- a/src/js/build.xml
+++ b/src/js/build.xml
@@ -10,7 +10,7 @@
   <!-- Include jruby + gems (compass + sass + zengrids) -->
   <target name="build-jar" depends="jar.check" unless="jar.exists">
     <mkdir dir="${lib.dir}/jruby-compiled" />
-    <get src="http://jruby.org.s3.amazonaws.com/downloads/1.6.7.2/jruby-complete-1.6.7.2.jar" dest="${lib.dir}/jruby.jar"/>
+    <get src="http://jruby.org.s3.amazonaws.com/downloads/1.7.0.preview1/jruby-complete-1.7.0.preview1.jar" dest="${lib.dir}/jruby.jar"/>
     <get src="http://production.cf.rubygems.org/gems/compass-0.12.1.gem" dest="${lib.dir}/jruby-compiled/compass.gem"/>  
     <get src="http://production.cf.rubygems.org/gems/sass-3.1.19.gem" dest="${lib.dir}/jruby-compiled/sass.gem"/>  
     <get src="http://production.cf.rubygems.org/gems/zen-grids-1.2.gem" dest="${lib.dir}/jruby-compiled/zen-grids.gem"/> 
@@ -21,7 +21,6 @@
       <arg line="-uf jruby.jar -C vendors ." />
     </exec>
     <delete dir="${lib.dir}/jruby-compiled" />
-    <delete dir="${lib.dir}/vendors" />
   </target>
   <target name="jar.check">
     <condition property="jar.exists">
@@ -47,7 +46,7 @@
   <!-- Compile all of the SCSS files into their CSS counterparts "ant compile.sass" -->
   <target name="compile.sass">
     <java classname="org.jruby.Main" fork="true" failonerror="true" classpathref="jruby.classpath">
-        <arg line="${src.dir}/compile.rb ${lib.dir}/gems/ compile ${src.dir}"/>
+        <arg line="${src.dir}/compile.rb ${lib.dir}/vendors/gems/ compile ${src.dir}"/>
     </java>
     <echo level="info">
 ---Converted JS SCSS Files into CSS---
@@ -56,7 +55,7 @@
   <!-- Watch for any polling changes in the SCSS directory "ant watch.sass" -->
   <target name="watch.sass">
     <java classname="org.jruby.Main" fork="true" failonerror="true" classpathref="jruby.classpath">
-        <arg line="${src.dir}/compile.rb ${lib.dir}/gems/ watch ${src.dir}"/>
+        <arg line="${src.dir}/compile.rb ${lib.dir}/vendors/gems/ watch ${src.dir}"/>
     </java>
     <echo level="info">
 ---Watching for SCSS Changes in JS Directory---
diff --git a/src/js/compile.rb b/src/js/compile.rb
index 3ccac549bd6..c880dd47820 100644
--- a/src/js/compile.rb
+++ b/src/js/compile.rb
@@ -1,5 +1,7 @@
 # Load All of the Gems inside the jRuby jar passed in by first argument 
-$LOAD_PATH.unshift "#{ARGV[0]}"
+Dir.entries(ARGV[0]).each do |lib|  
+    $LOAD_PATH.unshift "#{ARGV[0]}/#{lib}/lib"  
+end 
 
 # Require the following Gems
 require 'rubygems'   
diff --git a/src/theme-gcwu-fegc/build.xml b/src/theme-gcwu-fegc/build.xml
index 09ea7e1b8ad..89d7882cd4f 100644
--- a/src/theme-gcwu-fegc/build.xml
+++ b/src/theme-gcwu-fegc/build.xml
@@ -10,7 +10,7 @@
   <!-- Include jruby + gems (compass + sass + zengrids) -->
   <target name="build-jar" depends="jar.check" unless="jar.exists">
     <mkdir dir="${lib.dir}/jruby-compiled" />
-    <get src="http://jruby.org.s3.amazonaws.com/downloads/1.6.7.2/jruby-complete-1.6.7.2.jar" dest="${lib.dir}/jruby.jar"/>
+    <get src="http://jruby.org.s3.amazonaws.com/downloads/1.7.0.preview1/jruby-complete-1.7.0.preview1.jar" dest="${lib.dir}/jruby.jar"/>
     <get src="http://production.cf.rubygems.org/gems/compass-0.12.1.gem" dest="${lib.dir}/jruby-compiled/compass.gem"/>  
     <get src="http://production.cf.rubygems.org/gems/sass-3.1.19.gem" dest="${lib.dir}/jruby-compiled/sass.gem"/>  
     <get src="http://production.cf.rubygems.org/gems/zen-grids-1.2.gem" dest="${lib.dir}/jruby-compiled/zen-grids.gem"/> 
@@ -21,7 +21,6 @@
       <arg line="-uf jruby.jar -C vendors ." />
     </exec>
     <delete dir="${lib.dir}/jruby-compiled" />
-    <delete dir="${lib.dir}/vendors" />
   </target>
   <target name="jar.check">
     <condition property="jar.exists">
@@ -48,7 +47,7 @@
   <!-- Compile all of the SCSS files into their CSS counterparts "ant compile.sass" -->
   <target name="compile.sass">
     <java classname="org.jruby.Main" fork="true" failonerror="true" classpathref="jruby.classpath">
-        <arg line="${src.dir}/compile.rb ${lib.dir}/gems/ compile ${src.dir}"/>
+        <arg line="${src.dir}/compile.rb ${lib.dir}/vendors/gems/ compile ${src.dir}"/>
     </java>
     <echo level="info">
 ---Converted GCWU SCSS Files into CSS---
@@ -57,7 +56,7 @@
   <!-- Watch for any polling changes in the SCSS directory "ant watch.sass" -->
   <target name="watch.sass">
     <java classname="org.jruby.Main" fork="true" failonerror="true" classpathref="jruby.classpath">
-        <arg line="${src.dir}/compile.rb ${lib.dir}/gems/ watch ${src.dir}"/>
+        <arg line="${src.dir}/compile.rb ${lib.dir}/vendors/gems/ watch ${src.dir}"/>
     </java>
     <echo level="info">
 ---Watching for SCSS Changes in GCWU Directory---
diff --git a/src/theme-gcwu-fegc/compile.rb b/src/theme-gcwu-fegc/compile.rb
index 3ccac549bd6..c880dd47820 100644
--- a/src/theme-gcwu-fegc/compile.rb
+++ b/src/theme-gcwu-fegc/compile.rb
@@ -1,5 +1,7 @@
 # Load All of the Gems inside the jRuby jar passed in by first argument 
-$LOAD_PATH.unshift "#{ARGV[0]}"
+Dir.entries(ARGV[0]).each do |lib|  
+    $LOAD_PATH.unshift "#{ARGV[0]}/#{lib}/lib"  
+end 
 
 # Require the following Gems
 require 'rubygems'   
diff --git a/src/theme-gcwu-intranet/build.xml b/src/theme-gcwu-intranet/build.xml
index 084106f6846..2b2423c100f 100644
--- a/src/theme-gcwu-intranet/build.xml
+++ b/src/theme-gcwu-intranet/build.xml
@@ -10,7 +10,7 @@
   <!-- Include jruby + gems (compass + sass + zengrids) -->
   <target name="build-jar" depends="jar.check" unless="jar.exists">
     <mkdir dir="${lib.dir}/jruby-compiled" />
-    <get src="http://jruby.org.s3.amazonaws.com/downloads/1.6.7.2/jruby-complete-1.6.7.2.jar" dest="${lib.dir}/jruby.jar"/>
+    <get src="http://jruby.org.s3.amazonaws.com/downloads/1.7.0.preview1/jruby-complete-1.7.0.preview1.jar" dest="${lib.dir}/jruby.jar"/>
     <get src="http://production.cf.rubygems.org/gems/compass-0.12.1.gem" dest="${lib.dir}/jruby-compiled/compass.gem"/>  
     <get src="http://production.cf.rubygems.org/gems/sass-3.1.19.gem" dest="${lib.dir}/jruby-compiled/sass.gem"/>  
     <get src="http://production.cf.rubygems.org/gems/zen-grids-1.2.gem" dest="${lib.dir}/jruby-compiled/zen-grids.gem"/> 
@@ -21,7 +21,6 @@
       <arg line="-uf jruby.jar -C vendors ." />
     </exec>
     <delete dir="${lib.dir}/jruby-compiled" />
-    <delete dir="${lib.dir}/vendors" />
   </target>
   <target name="jar.check">
     <condition property="jar.exists">
@@ -32,7 +31,7 @@
   <!-- Compile all of the SCSS files into their CSS counterparts "ant compile.sass" -->
   <target name="compile.sass">
     <java classname="org.jruby.Main" fork="true" failonerror="true" classpathref="jruby.classpath">
-        <arg line="${src.dir}/compile.rb ${lib.dir}/gems/ compile ${src.dir}"/>
+        <arg line="${src.dir}/compile.rb ${lib.dir}/vendors/gems/ compile ${src.dir}"/>
     </java>
     <echo level="info">
 ---Converted Intranet SCSS Files into CSS---
@@ -41,7 +40,7 @@
   <!-- Watch for any polling changes in the SCSS directory "ant watch.sass" -->
   <target name="watch.sass">
     <java classname="org.jruby.Main" fork="true" failonerror="true" classpathref="jruby.classpath">
-        <arg line="${src.dir}/compile.rb ${lib.dir}/gems/ watch ${src.dir}"/>
+        <arg line="${src.dir}/compile.rb ${lib.dir}/vendors/gems/ watch ${src.dir}"/>
     </java>
     <echo level="info">
 ---Watching for SCSS Changes in Intranet Directory---
diff --git a/src/theme-gcwu-intranet/compile.rb b/src/theme-gcwu-intranet/compile.rb
index 3ccac549bd6..c880dd47820 100644
--- a/src/theme-gcwu-intranet/compile.rb
+++ b/src/theme-gcwu-intranet/compile.rb
@@ -1,5 +1,7 @@
 # Load All of the Gems inside the jRuby jar passed in by first argument 
-$LOAD_PATH.unshift "#{ARGV[0]}"
+Dir.entries(ARGV[0]).each do |lib|  
+    $LOAD_PATH.unshift "#{ARGV[0]}/#{lib}/lib"  
+end 
 
 # Require the following Gems
 require 'rubygems'   

From 325c9626d1d3b18fb1ed15389fe8df94b257d09f Mon Sep 17 00:00:00 2001
From: William Hearn <sylus1984@gmail.com>
Date: Tue, 29 May 2012 00:11:18 -0400
Subject: [PATCH 2/2] SASS @IMPORT FIX

Some more minor fixes found during evaluation of SASS import problems
---
 src/base/build.properties                | 2 +-
 src/base/build.xml                       | 2 +-
 src/grids/build.properties               | 2 +-
 src/js/build.properties                  | 2 +-
 src/theme-gcwu-fegc/build.properties     | 2 +-
 src/theme-gcwu-intranet/build.properties | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/base/build.properties b/src/base/build.properties
index fa1a0065efb..c3a348a929e 100644
--- a/src/base/build.properties
+++ b/src/base/build.properties
@@ -16,7 +16,7 @@ antcontribs.jar=${lib.dir}/ant-contrib-1.0b3.jar
 cssurlembed.jar=${lib.dir}/cssembed-0.4.5.jar
 
 #jRuby Properties
-jruby.jar=${lib.dir}/jruby-complete-1.6.7.2.jar
+jruby.jar=${lib.dir}/jruby.jar
 
 #jLESS Properties
 #jless.jar=test.jar
diff --git a/src/base/build.xml b/src/base/build.xml
index 112ad0066a0..ede5d49727e 100644
--- a/src/base/build.xml
+++ b/src/base/build.xml
@@ -40,7 +40,7 @@
   <!-- Watch for any polling changes in the SCSS directory "ant watch.sass" -->
   <target name="watch.sass">
     <java classname="org.jruby.Main" fork="true" failonerror="true" classpathref="jruby.classpath">
-        <arg line="${src.dir}/compile.rb ${lib.dir}/jruby.jar/gems/ watch ${src.dir}"/>
+        <arg line="${src.dir}/compile.rb ${lib.dir}/vendors/gems/ watch ${src.dir}"/>
     </java>
     <echo level="info">
 ---Watching for SCSS Changes in CSS Directory---
diff --git a/src/grids/build.properties b/src/grids/build.properties
index fa1a0065efb..c3a348a929e 100644
--- a/src/grids/build.properties
+++ b/src/grids/build.properties
@@ -16,7 +16,7 @@ antcontribs.jar=${lib.dir}/ant-contrib-1.0b3.jar
 cssurlembed.jar=${lib.dir}/cssembed-0.4.5.jar
 
 #jRuby Properties
-jruby.jar=${lib.dir}/jruby-complete-1.6.7.2.jar
+jruby.jar=${lib.dir}/jruby.jar
 
 #jLESS Properties
 #jless.jar=test.jar
diff --git a/src/js/build.properties b/src/js/build.properties
index 1f27bde46a6..51ead912db4 100644
--- a/src/js/build.properties
+++ b/src/js/build.properties
@@ -23,7 +23,7 @@ cssurlembed.jar=${lib.dir}/cssembed-0.4.5.jar
 #nodecoffeescript.command=-cb
 
 #jRuby Properties
-jruby.jar=${lib.dir}/jruby-complete-1.6.7.2.jar
+jruby.jar=${lib.dir}/jruby.jar
 
 #jLESS Properties
 #jless.jar=test.jar
diff --git a/src/theme-gcwu-fegc/build.properties b/src/theme-gcwu-fegc/build.properties
index 26bcf596f03..c0a7958fcc7 100644
--- a/src/theme-gcwu-fegc/build.properties
+++ b/src/theme-gcwu-fegc/build.properties
@@ -16,4 +16,4 @@ antcontribs.jar=${lib.dir}/ant-contrib-1.0b3.jar
 cssurlembed.jar=${lib.dir}/cssembed-0.4.5.jar
 
 #jRuby Properties
-jruby.jar=${lib.dir}/jruby-complete-1.6.7.2.jar
\ No newline at end of file
+jruby.jar=${lib.dir}/jruby.jar
\ No newline at end of file
diff --git a/src/theme-gcwu-intranet/build.properties b/src/theme-gcwu-intranet/build.properties
index fa1a0065efb..c3a348a929e 100644
--- a/src/theme-gcwu-intranet/build.properties
+++ b/src/theme-gcwu-intranet/build.properties
@@ -16,7 +16,7 @@ antcontribs.jar=${lib.dir}/ant-contrib-1.0b3.jar
 cssurlembed.jar=${lib.dir}/cssembed-0.4.5.jar
 
 #jRuby Properties
-jruby.jar=${lib.dir}/jruby-complete-1.6.7.2.jar
+jruby.jar=${lib.dir}/jruby.jar
 
 #jLESS Properties
 #jless.jar=test.jar