<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>mack-active_record/lib/gems.rb</filename>
    </added>
    <added>
      <filename>mack-asset_packager/lib/gems.rb</filename>
    </added>
    <added>
      <filename>mack-caching/lib/gems.rb</filename>
    </added>
    <added>
      <filename>mack-data_factory/lib/gems.rb</filename>
    </added>
    <added>
      <filename>mack-data_mapper/lib/gems.rb</filename>
    </added>
    <added>
      <filename>mack-distributed/lib/gems.rb</filename>
    </added>
    <added>
      <filename>mack-encryption/lib/gems.rb</filename>
    </added>
    <added>
      <filename>mack-facets/lib/gems.rb</filename>
    </added>
    <added>
      <filename>mack-haml/lib/gems.rb</filename>
    </added>
    <added>
      <filename>mack-javascript/lib/gems.rb</filename>
    </added>
    <added>
      <filename>mack-localization/lib/gems.rb</filename>
    </added>
    <added>
      <filename>mack-markaby/lib/gems.rb</filename>
    </added>
    <added>
      <filename>mack-more/lib/gems.rb</filename>
    </added>
    <added>
      <filename>mack-notifier/lib/gems.rb</filename>
    </added>
    <added>
      <filename>mack-orm/lib/gems.rb</filename>
    </added>
    <added>
      <filename>mack-pdf_writer/lib/gems.rb</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -2,25 +2,25 @@
 require 'rubygems'
 
 begin
-  gem 'builder', '~&gt; 2.1.2'
+  gem 'builder', '&gt;= 2.1.2'
 rescue Gem::LoadError
   $:.unshift &quot;#{File.dirname(__FILE__)}/vendor/builder-2.1.2&quot;
 end
 
 begin
-  gem 'xml-simple', '~&gt; 1.0.11'
+  gem 'xml-simple', '&gt;= 1.0.11'
 rescue Gem::LoadError
   $:.unshift &quot;#{File.dirname(__FILE__)}/vendor/xml-simple-1.0.11&quot;
 end
 
 begin
-  gem 'memcache-client', '~&gt; 1.5.0'
+  gem 'memcache-client', '&gt;= 1.5.0'
 rescue Gem::LoadError
   $:.unshift &quot;#{File.dirname(__FILE__)}/vendor/memcache-client-1.5.0&quot;
 end
 
 begin
-  gem 'tzinfo', '~&gt; 0.3.8'
+  gem 'tzinfo', '&gt;= 0.3.8'
 rescue Gem::LoadError
   $:.unshift &quot;#{File.dirname(__FILE__)}/vendor/tzinfo-0.3.8&quot;
 end
\ No newline at end of file</diff>
      <filename>mack-active_record/lib/gems/activesupport-2.1.0/lib/active_support/vendor.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,5 +1,7 @@
 puts &quot;***** #{File.basename(__FILE__)} ****&quot;
-add_gem_path(File.expand_path(File.join(File.dirname(__FILE__), 'gems')))
+# add_gem_path(File.expand_path(File.join(File.dirname(__FILE__), 'gems')))
+
+require File.join(File.dirname(__FILE__), 'gems')
 
 # require 'rubygems'
 require 'genosaurus'</diff>
      <filename>mack-active_record/lib/mack-active_record.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,5 +1,7 @@
 puts &quot;***** #{File.basename(__FILE__)} ****&quot;
-add_gem_path(File.expand_path(File.join(File.dirname(__FILE__), 'gems')))
+# add_gem_path(File.expand_path(File.join(File.dirname(__FILE__), 'gems')))
+
+require File.join(File.dirname(__FILE__), 'gems')
 
 require 'mack-orm_tasks'
 Dir.glob(File.join(File.dirname(__FILE__), &quot;mack-active_record&quot;, &quot;tasks&quot;, &quot;*.rake&quot;)).each do |f|</diff>
      <filename>mack-active_record/lib/mack-active_record_tasks.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,11 +1,13 @@
 development:
-  adapter: sqlite3
-  database: &lt;%= Mack::Paths.db(&quot;fake_application.db&quot;) %&gt;
-
+  adapter: mysql
+  database: foo_development
+  host: localhost
+  username: root
+  password: 
+    
 test:
-  adapter: sqlite3
-  database: &lt;%= Mack::Paths.db(&quot;fake_application.db&quot;) %&gt;
-
-production:
-  adapter: sqlite3
-  database: &lt;%= Mack::Paths.db(&quot;fake_application.db&quot;) %&gt;
\ No newline at end of file
+  adapter: mysql
+  database: foo_test
+  host: localhost
+  username: root
+  password:</diff>
      <filename>mack-active_record/spec/fake_application/config/database.yml</filename>
    </modified>
    <modified>
      <diff>@@ -1,5 +1,7 @@
 puts &quot;***** #{File.basename(__FILE__)} ****&quot;
-add_gem_path(File.expand_path(File.join(File.dirname(__FILE__), 'gems')))
+# add_gem_path(File.expand_path(File.join(File.dirname(__FILE__), 'gems')))
+
+require File.join(File.dirname(__FILE__), 'gems')
 
 fl = File.join(File.dirname(__FILE__), &quot;mack-asset_packager&quot;)
 </diff>
      <filename>mack-asset_packager/lib/mack-asset_packager.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,5 +1,7 @@
 puts &quot;***** #{File.basename(__FILE__)} ****&quot;
-add_gem_path(File.expand_path(File.join(File.dirname(__FILE__), 'gems')))
+# add_gem_path(File.expand_path(File.join(File.dirname(__FILE__), 'gems')))
+
+require File.join(File.dirname(__FILE__), 'gems')
 
 Dir.glob(File.join(File.dirname(__FILE__), &quot;mack-asset_packager&quot;, &quot;tasks&quot;, &quot;*.rake&quot;)).each do |f|
   load(f)</diff>
      <filename>mack-asset_packager/lib/mack-asset_packager_tasks.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,5 +1,7 @@
 puts &quot;***** #{File.basename(__FILE__)} ****&quot;
-add_gem_path(File.expand_path(File.join(File.dirname(__FILE__), 'gems')))
+# add_gem_path(File.expand_path(File.join(File.dirname(__FILE__), 'gems')))
+
+require File.join(File.dirname(__FILE__), 'gems')
 
 require 'cachetastic'
 </diff>
      <filename>mack-caching/lib/mack-caching.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,5 +1,7 @@
 puts &quot;***** #{File.basename(__FILE__)} ****&quot;
-add_gem_path(File.expand_path(File.join(File.dirname(__FILE__), 'gems')))
+# add_gem_path(File.expand_path(File.join(File.dirname(__FILE__), 'gems')))
+
+require File.join(File.dirname(__FILE__), 'gems')
 
 # load tasks
 Dir.glob(File.join(File.dirname(__FILE__), &quot;mack-caching&quot;, &quot;tasks&quot;, &quot;*.rake&quot;)).each do |f|</diff>
      <filename>mack-caching/lib/mack-caching_tasks.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,5 +1,7 @@
 puts &quot;***** #{File.basename(__FILE__)} ****&quot;
-add_gem_path(File.expand_path(File.join(File.dirname(__FILE__), 'gems')))
+# add_gem_path(File.expand_path(File.join(File.dirname(__FILE__), 'gems')))
+
+require File.join(File.dirname(__FILE__), 'gems')
 
 
 fl = File.dirname(__FILE__)</diff>
      <filename>mack-data_factory/lib/mack-data_factory.rb</filename>
    </modified>
    <modified>
      <diff>@@ -3324,7 +3324,7 @@ Object.extend(Selector, {
 
   findChildElements: function(element, expressions) {
     var exprs = expressions.join(','), expressions = [];
-    exprs.scan(/(([\w#:.~&gt;+()\s-]+|\*|\[.*?\])+)\s*(,|$)/, function(m) {
+    exprs.scan(/(([\w#:.&gt;=+()\s-]+|\*|\[.*?\])+)\s*(,|$)/, function(m) {
       expressions.push(m[1].strip());
     });
     var results = [], h = Selector.handlers;</diff>
      <filename>mack-data_mapper/lib/gems/json_pure-1.1.3/data/prototype.js</filename>
    </modified>
    <modified>
      <diff>@@ -1122,7 +1122,7 @@ static char * json_xpm[] = {
 &quot;'&gt;	c #FE5447&quot;,
 &quot;)&gt;	c #FD5246&quot;,
 &quot;!&gt;	c #FB503F&quot;,
-&quot;~&gt;	c #FA543D&quot;,
+&quot;&gt;=	c #FA543D&quot;,
 &quot;{&gt;	c #9B3D3B&quot;,
 &quot;]&gt;	c #A3433B&quot;,
 &quot;^&gt;	c #F9683D&quot;,
@@ -1479,7 +1479,7 @@ static char * json_xpm[] = {
 &quot;                R-S-T-U-V-W-X-Y-Z-`- ;.;+;@;#;$;%;&amp;;*;=;-;-;;;&gt;;,;';);!;~;{;];^;/;(;_;:;&lt;;[;};                                  &quot;,
 &quot;                |;1;2;3;4;5;6;7;8;9;0;a;b;c;d;e;f;g;h;i;j;j;k;k;l;m;n;o;p;q;r;s;t;u;v;w;x;y;                                    &quot;,
 &quot;                z;A;B;C;D;E;F;G;H;I;J;K;L;M;N;O;P;Q;R;S;T;U;V;W;X;k;Y;Z;`; &gt;r;.&gt;+&gt;@&gt;#&gt;$&gt;                                        &quot;,
-&quot;                %&gt;&amp;&gt;*&gt;=&gt;-&gt;;&gt;&gt;&gt;,&gt;'&gt;,&gt;)&gt;F;8;!&gt;~&gt;{&gt;]&gt;^&gt;/&gt;(&gt;_&gt;:&gt;i;&lt;&gt;[&gt;X;}&gt;i;|&gt;1&gt;q;2&gt;3&gt;4&gt;5&gt;6&gt;                                        &quot;,
+&quot;                %&gt;&amp;&gt;*&gt;=&gt;-&gt;;&gt;&gt;&gt;,&gt;'&gt;,&gt;)&gt;F;8;!&gt;&gt;={&gt;]&gt;^&gt;/&gt;(&gt;_&gt;:&gt;i;&lt;&gt;[&gt;X;}&gt;i;|&gt;1&gt;q;2&gt;3&gt;4&gt;5&gt;6&gt;                                        &quot;,
 &quot;                7&gt;8&gt;=&gt;9&gt;0&gt;a&gt;b&gt;c&gt;d&gt;,&gt;e&gt;e&gt;f&gt;g&gt;h&gt;i&gt;j&gt;k&gt;l&gt;m&gt;n&gt;:&gt;i;o&gt;p&gt;q&gt;W;r&gt;s&gt;t&gt;p;u&gt;v&gt;w&gt;x&gt;y&gt;                                        &quot;,
 &quot;                z&gt;A&gt;9&gt;0&gt;B&gt;C&gt;c&gt;D&gt;E&gt;F&gt;G&gt;G&gt;F&gt;H&gt;I&gt;J&gt;K&gt;L&gt;M&gt;N&gt;O&gt;P&gt;Q&gt;R&gt;o&gt;R&gt;T;s&gt;S&gt;S&gt;S&gt;t&gt;1&gt;T&gt;U&gt;V&gt;W&gt;X&gt;Y&gt;                                  &quot;,
 &quot;                Z&gt;`&gt; ,9&gt;B&gt;.,D&gt;+,@,#,$,%,$,&amp;,*,=,-,;,&gt;,,,',),P&gt;!,!,_&gt;~,t&gt;s&gt;{,],{,],^,/,(,_,:,&lt;,[,},                              &quot;,</diff>
      <filename>mack-data_mapper/lib/gems/json_pure-1.1.3/lib/json/json.xpm</filename>
    </modified>
    <modified>
      <diff>@@ -1,5 +1,7 @@
 puts &quot;***** #{File.basename(__FILE__)} ****&quot;
-add_gem_path(File.expand_path(File.join(File.dirname(__FILE__), 'gems')))
+# add_gem_path(File.expand_path(File.join(File.dirname(__FILE__), 'gems')))
+
+require File.join(File.dirname(__FILE__), 'gems')
 
 # require 'rubygems'
 require 'genosaurus'
@@ -17,7 +19,6 @@ fl = File.join(File.dirname(__FILE__), &quot;mack-data_mapper&quot;)
 $: &lt;&lt; File.expand_path(File.join(fl, &quot;dm_patches&quot;))
 
 [:core, :aggregates, :migrations, :serializer, :timestamps, :validations, :observer, :types].each do |g|
-  # gem &quot;dm-#{g}&quot;, &quot;0.9.6&quot;
   require &quot;dm-#{g}&quot; unless g == :types
 end
 </diff>
      <filename>mack-data_mapper/lib/mack-data_mapper.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,5 +1,11 @@
 puts &quot;***** #{File.basename(__FILE__)} ****&quot;
-add_gem_path(File.expand_path(File.join(File.dirname(__FILE__), 'gems')))
+# add_gem_path(File.expand_path(File.join(File.dirname(__FILE__), 'gems')))
+
+require File.join(File.dirname(__FILE__), 'gems')
+
+[:core, :aggregates, :migrations, :serializer, :timestamps, :validations, :observer, :types].each do |g|
+  require &quot;dm-#{g}&quot; unless g == :types
+end
 
 require 'mack-orm_tasks'
 Dir.glob(File.join(File.dirname(__FILE__), &quot;mack-data_mapper&quot;, &quot;tasks&quot;, &quot;*.rake&quot;)).each do |f|</diff>
      <filename>mack-data_mapper/lib/mack-data_mapper_tasks.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,6 +1,7 @@
 puts &quot;***** #{File.basename(__FILE__)} ****&quot;
-add_gem_path(File.expand_path(File.join(File.dirname(__FILE__), 'gems')))
+# add_gem_path(File.expand_path(File.join(File.dirname(__FILE__), 'gems')))
 
+require File.join(File.dirname(__FILE__), 'gems')
 
 require 'drb/acl'
 require 'addressable/uri'</diff>
      <filename>mack-distributed/lib/mack-distributed.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,5 +1,7 @@
 puts &quot;***** #{File.basename(__FILE__)} ****&quot;
-add_gem_path(File.expand_path(File.join(File.dirname(__FILE__), 'gems')))
+# add_gem_path(File.expand_path(File.join(File.dirname(__FILE__), 'gems')))
+
+require File.join(File.dirname(__FILE__), 'gems')
 
 # load tasks
 Dir.glob(File.join(File.dirname(__FILE__), 'mack-distributed', 'tasks', '*.rake')).each do |f|</diff>
      <filename>mack-distributed/lib/mack-distributed_tasks.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,7 +1,10 @@
 puts &quot;***** #{File.basename(__FILE__)} ****&quot;
-add_gem_path(File.expand_path(File.join(File.dirname(__FILE__), 'gems')))
+# add_gem_path(File.expand_path(File.join(File.dirname(__FILE__), 'gems')))
 
 require 'singleton'
+
+require File.join(File.dirname(__FILE__), 'gems')
+
 require 'ezcrypto'
 
 base = File.join(File.dirname(__FILE__), &quot;mack-encryption&quot;)</diff>
      <filename>mack-encryption/lib/mack-encryption.rb</filename>
    </modified>
    <modified>
      <diff>@@ -196,7 +196,7 @@ public
     0
   end
 
-  # For pessimistic constraint (like '~&gt;' in gems)
+  # For pessimistic constraint (like '&gt;=' in gems)
   def =~( other )
     other = other.to_t
     upver = other.dup
@@ -267,10 +267,10 @@ public
 
     def parse_constraint( constraint, &amp;yld )
       constraint = constraint.strip
-      re = %r{^(=~|~&gt;|&lt;=|&gt;=|==|=|&lt;|&gt;)?\s*(\d+(:?[-.]\d+)*)$}
+      re = %r{^(=~|&gt;=|&lt;=|&gt;=|==|=|&lt;|&gt;)?\s*(\d+(:?[-.]\d+)*)$}
       if md = re.match( constraint )
         if op = md[1]
-          op = '=~' if op == '~&gt;'
+          op = '=~' if op == '&gt;='
           op = '==' if op == '='
           val = cast_from_string( md[2], &amp;yld ) #instance( md[2] )
         else</diff>
      <filename>mack-facets/lib/gems/facets-2.4.4/lib/more/facets/tuple.rb</filename>
    </modified>
    <modified>
      <diff>@@ -67,7 +67,7 @@ class VersionNumber #&lt; Tuple
     0
   end
 
-  # For pessimistic constraint (like '~&gt;' in gems)
+  # For pessimistic constraint (like '&gt;=' in gems)
 
   def =~( other )
     #other = other.to_t
@@ -117,10 +117,10 @@ class VersionNumber #&lt; Tuple
 
   def self.parse_constraint( constraint )
     constraint = constraint.strip
-    re = %r{^(=~|~&gt;|&lt;=|&gt;=|==|=|&lt;|&gt;)?\s*(\d+(:?[-.]\d+)*)$}
+    re = %r{^(=~|&gt;=|&lt;=|&gt;=|==|=|&lt;|&gt;)?\s*(\d+(:?[-.]\d+)*)$}
     if md = re.match( constraint )
       if op = md[1]
-        op = '=~' if op == '~&gt;'
+        op = '=~' if op == '&gt;='
         op = '==' if op == '='
         val = new( *md[2].split(/\W+/) )
       else</diff>
      <filename>mack-facets/lib/gems/facets-2.4.4/lib/more/facets/version.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,5 +1,22 @@
 puts &quot;***** #{File.basename(__FILE__)} ****&quot;
-add_gem_path(File.expand_path(File.join(File.dirname(__FILE__), 'gems')))
+# gem_path = File.expand_path(File.join(File.dirname(__FILE__), 'gems'))
+# add_gem_path(gem_path)
+# 
+# Dir.glob(File.join(gem_path, 'facets-*', 'lib', '*')).each do |g|
+#   add_gem_path(File.expand_path(g))
+# end
+
+require File.join(File.dirname(__FILE__), 'gems')
+
+begin
+  gem 'facets', '&gt;= 2.4.4'
+rescue Gem::LoadError
+  $:.unshift(File.expand_path(File.join(File.dirname(__FILE__), 'gems', 'facets-2.4.4')))
+  $:.unshift(File.expand_path(File.join(File.dirname(__FILE__), 'gems', 'facets-2.4.4', 'lib', 'core')))
+  $:.unshift(File.expand_path(File.join(File.dirname(__FILE__), 'gems', 'facets-2.4.4', 'lib', 'more')))
+  $:.unshift(File.expand_path(File.join(File.dirname(__FILE__), 'gems', 'facets-2.4.4', 'lib', 'lore')))
+end
+
 
 fl = File.join(File.dirname(__FILE__), &quot;mack-facets&quot;)
 # require 'rubygems'</diff>
      <filename>mack-facets/lib/mack-facets.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,5 +1,6 @@
 puts &quot;***** #{File.basename(__FILE__)} ****&quot;
-add_gem_path(File.expand_path(File.join(File.dirname(__FILE__), 'gems')))
+# add_gem_path(File.expand_path(File.join(File.dirname(__FILE__), 'gems')))
 
+require File.join(File.dirname(__FILE__), 'gems')
 require 'haml'
 require File.join(File.dirname(__FILE__), &quot;mack-haml&quot;, 'haml_engine')</diff>
      <filename>mack-haml/lib/mack-haml.rb</filename>
    </modified>
    <modified>
      <diff>@@ -3324,7 +3324,7 @@ Object.extend(Selector, {
 
   findChildElements: function(element, expressions) {
     var exprs = expressions.join(','), expressions = [];
-    exprs.scan(/(([\w#:.~&gt;+()\s-]+|\*|\[.*?\])+)\s*(,|$)/, function(m) {
+    exprs.scan(/(([\w#:.&gt;=+()\s-]+|\*|\[.*?\])+)\s*(,|$)/, function(m) {
       expressions.push(m[1].strip());
     });
     var results = [], h = Selector.handlers;</diff>
      <filename>mack-javascript/lib/gems/json_pure-1.1.3/data/prototype.js</filename>
    </modified>
    <modified>
      <diff>@@ -1122,7 +1122,7 @@ static char * json_xpm[] = {
 &quot;'&gt;	c #FE5447&quot;,
 &quot;)&gt;	c #FD5246&quot;,
 &quot;!&gt;	c #FB503F&quot;,
-&quot;~&gt;	c #FA543D&quot;,
+&quot;&gt;=	c #FA543D&quot;,
 &quot;{&gt;	c #9B3D3B&quot;,
 &quot;]&gt;	c #A3433B&quot;,
 &quot;^&gt;	c #F9683D&quot;,
@@ -1479,7 +1479,7 @@ static char * json_xpm[] = {
 &quot;                R-S-T-U-V-W-X-Y-Z-`- ;.;+;@;#;$;%;&amp;;*;=;-;-;;;&gt;;,;';);!;~;{;];^;/;(;_;:;&lt;;[;};                                  &quot;,
 &quot;                |;1;2;3;4;5;6;7;8;9;0;a;b;c;d;e;f;g;h;i;j;j;k;k;l;m;n;o;p;q;r;s;t;u;v;w;x;y;                                    &quot;,
 &quot;                z;A;B;C;D;E;F;G;H;I;J;K;L;M;N;O;P;Q;R;S;T;U;V;W;X;k;Y;Z;`; &gt;r;.&gt;+&gt;@&gt;#&gt;$&gt;                                        &quot;,
-&quot;                %&gt;&amp;&gt;*&gt;=&gt;-&gt;;&gt;&gt;&gt;,&gt;'&gt;,&gt;)&gt;F;8;!&gt;~&gt;{&gt;]&gt;^&gt;/&gt;(&gt;_&gt;:&gt;i;&lt;&gt;[&gt;X;}&gt;i;|&gt;1&gt;q;2&gt;3&gt;4&gt;5&gt;6&gt;                                        &quot;,
+&quot;                %&gt;&amp;&gt;*&gt;=&gt;-&gt;;&gt;&gt;&gt;,&gt;'&gt;,&gt;)&gt;F;8;!&gt;&gt;={&gt;]&gt;^&gt;/&gt;(&gt;_&gt;:&gt;i;&lt;&gt;[&gt;X;}&gt;i;|&gt;1&gt;q;2&gt;3&gt;4&gt;5&gt;6&gt;                                        &quot;,
 &quot;                7&gt;8&gt;=&gt;9&gt;0&gt;a&gt;b&gt;c&gt;d&gt;,&gt;e&gt;e&gt;f&gt;g&gt;h&gt;i&gt;j&gt;k&gt;l&gt;m&gt;n&gt;:&gt;i;o&gt;p&gt;q&gt;W;r&gt;s&gt;t&gt;p;u&gt;v&gt;w&gt;x&gt;y&gt;                                        &quot;,
 &quot;                z&gt;A&gt;9&gt;0&gt;B&gt;C&gt;c&gt;D&gt;E&gt;F&gt;G&gt;G&gt;F&gt;H&gt;I&gt;J&gt;K&gt;L&gt;M&gt;N&gt;O&gt;P&gt;Q&gt;R&gt;o&gt;R&gt;T;s&gt;S&gt;S&gt;S&gt;t&gt;1&gt;T&gt;U&gt;V&gt;W&gt;X&gt;Y&gt;                                  &quot;,
 &quot;                Z&gt;`&gt; ,9&gt;B&gt;.,D&gt;+,@,#,$,%,$,&amp;,*,=,-,;,&gt;,,,',),P&gt;!,!,_&gt;~,t&gt;s&gt;{,],{,],^,/,(,_,:,&lt;,[,},                              &quot;,</diff>
      <filename>mack-javascript/lib/gems/json_pure-1.1.3/lib/json/json.xpm</filename>
    </modified>
    <modified>
      <diff>@@ -1,6 +1,6 @@
 puts &quot;***** #{File.basename(__FILE__)} ****&quot;
-add_gem_path(File.expand_path(File.join(File.dirname(__FILE__), 'gems')))
-
+# add_gem_path(File.expand_path(File.join(File.dirname(__FILE__), 'gems')))
+require File.join(File.dirname(__FILE__), 'gems')
 
 # require all supporting files
 fl = File.join(File.dirname(__FILE__), &quot;mack-javascript&quot;)</diff>
      <filename>mack-javascript/lib/mack-javascript.rb</filename>
    </modified>
    <modified>
      <diff>@@ -3353,7 +3353,7 @@ Object.extend(Selector, {
   findChildElements: function(element, expressions) {
     var exprs = expressions.join(',');
     expressions = [];
-    exprs.scan(/(([\w#:.~&gt;+()\s-]+|\*|\[.*?\])+)\s*(,|$)/, function(m) {
+    exprs.scan(/(([\w#:.&gt;=+()\s-]+|\*|\[.*?\])+)\s*(,|$)/, function(m) {
       expressions.push(m[1].strip());
     });
     var results = [], h = Selector.handlers;</diff>
      <filename>mack-javascript/lib/mack-javascript/generators/templates/javascripts/prototype.js.template</filename>
    </modified>
    <modified>
      <diff>@@ -1,6 +1,7 @@
 puts &quot;***** #{File.basename(__FILE__)} ****&quot;
-add_gem_path(File.expand_path(File.join(File.dirname(__FILE__), 'gems')))
+# add_gem_path(File.expand_path(File.join(File.dirname(__FILE__), 'gems')))
 
+require File.join(File.dirname(__FILE__), 'gems')
 
 require 'mack-caching'
 def undef_const(klass, k)</diff>
      <filename>mack-localization/lib/mack-localization.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,5 +1,7 @@
 puts &quot;***** #{File.basename(__FILE__)} ****&quot;
-add_gem_path(File.expand_path(File.join(File.dirname(__FILE__), 'gems')))
+# add_gem_path(File.expand_path(File.join(File.dirname(__FILE__), 'gems')))
+
+require File.join(File.dirname(__FILE__), 'gems')
 
 require 'markaby'
 require File.join(File.dirname(__FILE__), &quot;mack-markaby&quot;, 'markaby_engine')</diff>
      <filename>mack-markaby/lib/mack-markaby.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,11 +1,11 @@
 puts &quot;***** #{File.basename(__FILE__)} ****&quot;
-add_gem_path(File.expand_path(File.join(File.dirname(__FILE__), 'gems')))
+# add_gem_path(File.expand_path(File.join(File.dirname(__FILE__), 'gems')))
 
 # require 'rubygems'
+
+require File.join(File.dirname(__FILE__), 'gems')
 require 'validatable'
 require 'tmail'
-# require 'xmpp4r/client'
-# require 'xmpp4r/roster'
 require 'xmpp4r-simple'
 
 fl = File.join(File.dirname(__FILE__), &quot;mack-notifier&quot;)</diff>
      <filename>mack-notifier/lib/mack-notifier.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,5 +1,6 @@
 puts &quot;***** #{File.basename(__FILE__)} ****&quot;
-add_gem_path(File.expand_path(File.join(File.dirname(__FILE__), 'gems')))
+# add_gem_path(File.expand_path(File.join(File.dirname(__FILE__), 'gems')))
+require File.join(File.dirname(__FILE__), 'gems')
 
 configatron.mack.set_default(:disable_transactional_tests, false)
 configatron.mack.database.pagination.set_default(:results_per_page, 10)</diff>
      <filename>mack-orm/lib/mack-orm.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,5 +1,6 @@
 puts &quot;***** #{File.basename(__FILE__)} ****&quot;
-add_gem_path(File.expand_path(File.join(File.dirname(__FILE__), 'gems')))
+# add_gem_path(File.expand_path(File.join(File.dirname(__FILE__), 'gems')))
+require File.join(File.dirname(__FILE__), 'gems')
 
 Dir.glob(File.join(File.dirname(__FILE__), &quot;mack-orm&quot;, &quot;tasks&quot;, &quot;*.rake&quot;)).each do |f|
   load(f)</diff>
      <filename>mack-orm/lib/mack-orm_tasks.rb</filename>
    </modified>
    <modified>
      <diff>@@ -38,7 +38,7 @@ Hoe.new PKG_NAME, PKG_VERSION do |p|
   p.changes         = p.paragraphs_of(&quot;History.txt&quot;, 0..1).join(&quot;\n\n&quot;)
   p.description     = p.paragraphs_of(&quot;Readme.txt&quot;, 1..1).join(&quot;\n\n&quot;)
 
-  p.extra_deps      &lt;&lt; [ &quot;archive-tar-minitar&quot;, &quot;~&gt;0.5.1&quot; ]
+  p.extra_deps      &lt;&lt; [ &quot;archive-tar-minitar&quot;, &quot;&gt;=0.5.1&quot; ]
 
   p.clean_globs     &lt;&lt; &quot;coverage&quot;
 </diff>
      <filename>mack-pdf_writer/lib/gems/color-1.4.0/Rakefile</filename>
    </modified>
    <modified>
      <diff>@@ -1,5 +1,7 @@
 puts &quot;***** #{File.basename(__FILE__)} ****&quot;
-add_gem_path(File.expand_path(File.join(File.dirname(__FILE__), 'gems')))
+# add_gem_path(File.expand_path(File.join(File.dirname(__FILE__), 'gems')))
+
+require File.join(File.dirname(__FILE__), 'gems')
 
 require 'pdf/writer'
 require File.join(File.dirname(__FILE__), &quot;mack-pdf_writer&quot;, 'pdf_engine')</diff>
      <filename>mack-pdf_writer/lib/mack-pdf_writer.rb</filename>
    </modified>
  </modified>
  <removed type="array">
    <removed>
      <filename>mack-data_mapper/lib/gems/extlib-0.9.8/LICENSE</filename>
    </removed>
    <removed>
      <filename>mack-data_mapper/lib/gems/extlib-0.9.8/README.txt</filename>
    </removed>
    <removed>
      <filename>mack-data_mapper/lib/gems/extlib-0.9.8/Rakefile</filename>
    </removed>
    <removed>
      <filename>mack-data_mapper/lib/gems/extlib-0.9.8/lib/extlib.rb</filename>
    </removed>
    <removed>
      <filename>mack-data_mapper/lib/gems/extlib-0.9.8/lib/extlib/assertions.rb</filename>
    </removed>
    <removed>
      <filename>mack-data_mapper/lib/gems/extlib-0.9.8/lib/extlib/blank.rb</filename>
    </removed>
    <removed>
      <filename>mack-data_mapper/lib/gems/extlib-0.9.8/lib/extlib/boolean.rb</filename>
    </removed>
    <removed>
      <filename>mack-data_mapper/lib/gems/extlib-0.9.8/lib/extlib/class.rb</filename>
    </removed>
    <removed>
      <filename>mack-data_mapper/lib/gems/extlib-0.9.8/lib/extlib/datetime.rb</filename>
    </removed>
    <removed>
      <filename>mack-data_mapper/lib/gems/extlib-0.9.8/lib/extlib/dictionary.rb</filename>
    </removed>
    <removed>
      <filename>mack-data_mapper/lib/gems/extlib-0.9.8/lib/extlib/hash.rb</filename>
    </removed>
    <removed>
      <filename>mack-data_mapper/lib/gems/extlib-0.9.8/lib/extlib/hook.rb</filename>
    </removed>
    <removed>
      <filename>mack-data_mapper/lib/gems/extlib-0.9.8/lib/extlib/inflection.rb</filename>
    </removed>
    <removed>
      <filename>mack-data_mapper/lib/gems/extlib-0.9.8/lib/extlib/lazy_array.rb</filename>
    </removed>
    <removed>
      <filename>mack-data_mapper/lib/gems/extlib-0.9.8/lib/extlib/logger.rb</filename>
    </removed>
    <removed>
      <filename>mack-data_mapper/lib/gems/extlib-0.9.8/lib/extlib/mash.rb</filename>
    </removed>
    <removed>
      <filename>mack-data_mapper/lib/gems/extlib-0.9.8/lib/extlib/module.rb</filename>
    </removed>
    <removed>
      <filename>mack-data_mapper/lib/gems/extlib-0.9.8/lib/extlib/nil.rb</filename>
    </removed>
    <removed>
      <filename>mack-data_mapper/lib/gems/extlib-0.9.8/lib/extlib/numeric.rb</filename>
    </removed>
    <removed>
      <filename>mack-data_mapper/lib/gems/extlib-0.9.8/lib/extlib/object.rb</filename>
    </removed>
    <removed>
      <filename>mack-data_mapper/lib/gems/extlib-0.9.8/lib/extlib/object_space.rb</filename>
    </removed>
    <removed>
      <filename>mack-data_mapper/lib/gems/extlib-0.9.8/lib/extlib/pathname.rb</filename>
    </removed>
    <removed>
      <filename>mack-data_mapper/lib/gems/extlib-0.9.8/lib/extlib/pooling.rb</filename>
    </removed>
    <removed>
      <filename>mack-data_mapper/lib/gems/extlib-0.9.8/lib/extlib/rubygems.rb</filename>
    </removed>
    <removed>
      <filename>mack-data_mapper/lib/gems/extlib-0.9.8/lib/extlib/simple_set.rb</filename>
    </removed>
    <removed>
      <filename>mack-data_mapper/lib/gems/extlib-0.9.8/lib/extlib/string.rb</filename>
    </removed>
    <removed>
      <filename>mack-data_mapper/lib/gems/extlib-0.9.8/lib/extlib/struct.rb</filename>
    </removed>
    <removed>
      <filename>mack-data_mapper/lib/gems/extlib-0.9.8/lib/extlib/symbol.rb</filename>
    </removed>
    <removed>
      <filename>mack-data_mapper/lib/gems/extlib-0.9.8/lib/extlib/tasks/release.rb</filename>
    </removed>
    <removed>
      <filename>mack-data_mapper/lib/gems/extlib-0.9.8/lib/extlib/time.rb</filename>
    </removed>
    <removed>
      <filename>mack-data_mapper/lib/gems/extlib-0.9.8/lib/extlib/version.rb</filename>
    </removed>
    <removed>
      <filename>mack-data_mapper/lib/gems/extlib-0.9.8/lib/extlib/virtual_file.rb</filename>
    </removed>
    <removed>
      <filename>mack-markaby/lib/gems/builder-2.1.2/CHANGES</filename>
    </removed>
    <removed>
      <filename>mack-markaby/lib/gems/builder-2.1.2/README</filename>
    </removed>
    <removed>
      <filename>mack-markaby/lib/gems/builder-2.1.2/Rakefile</filename>
    </removed>
    <removed>
      <filename>mack-markaby/lib/gems/builder-2.1.2/lib/blankslate.rb</filename>
    </removed>
    <removed>
      <filename>mack-markaby/lib/gems/builder-2.1.2/lib/builder.rb</filename>
    </removed>
    <removed>
      <filename>mack-markaby/lib/gems/builder-2.1.2/lib/builder/blankslate.rb</filename>
    </removed>
    <removed>
      <filename>mack-markaby/lib/gems/builder-2.1.2/lib/builder/xchar.rb</filename>
    </removed>
    <removed>
      <filename>mack-markaby/lib/gems/builder-2.1.2/lib/builder/xmlbase.rb</filename>
    </removed>
    <removed>
      <filename>mack-markaby/lib/gems/builder-2.1.2/lib/builder/xmlevents.rb</filename>
    </removed>
    <removed>
      <filename>mack-markaby/lib/gems/builder-2.1.2/lib/builder/xmlmarkup.rb</filename>
    </removed>
    <removed>
      <filename>mack-markaby/lib/gems/builder-2.1.2/scripts/publish.rb</filename>
    </removed>
    <removed>
      <filename>mack-markaby/lib/gems/builder-2.1.2/test/performance.rb</filename>
    </removed>
    <removed>
      <filename>mack-markaby/lib/gems/builder-2.1.2/test/preload.rb</filename>
    </removed>
    <removed>
      <filename>mack-markaby/lib/gems/builder-2.1.2/test/test_xchar.rb</filename>
    </removed>
    <removed>
      <filename>mack-markaby/lib/gems/builder-2.1.2/test/testblankslate.rb</filename>
    </removed>
    <removed>
      <filename>mack-markaby/lib/gems/builder-2.1.2/test/testeventbuilder.rb</filename>
    </removed>
    <removed>
      <filename>mack-markaby/lib/gems/builder-2.1.2/test/testmarkupbuilder.rb</filename>
    </removed>
  </removed>
  <parents type="array">
    <parent>
      <id>43783f4d05abb140dfb2e11ddec33fdf6e03e9e2</id>
    </parent>
  </parents>
  <author>
    <name>Mark Bates</name>
    <email>mark@mackframework.com</email>
  </author>
  <url>http://github.com/markbates/mack-more/commit/10feccaacbb01bd9d566fa3d099ebd78a3457b23</url>
  <id>10feccaacbb01bd9d566fa3d099ebd78a3457b23</id>
  <committed-date>2008-11-11T18:22:33-08:00</committed-date>
  <authored-date>2008-11-11T18:22:33-08:00</authored-date>
  <message>bundling gems is hard work! [#226]</message>
  <tree>e3948a5d2aa331d2da36eabdfeafb9b3f185ad5d</tree>
  <committer>
    <name>Mark Bates</name>
    <email>mark@mackframework.com</email>
  </committer>
</commit>
