mongo3 0.0.9 → 0.1.0

data/lib/views/collections/_search_form.erb

@@ -4,7 +4,7 @@
   <fieldset>
     <input id="search" type="text" name="search" class="search" value="<%=@query%>"/>
     <button type="submit" id="submit_button" class="button search" style="display:none">search</button>
-    <img id="search_load" src="/images/loading.gif" style="width:25px;height:25px;vertical-align:sub;display:none"></img>
+    <img id="search_load" src="/images/loading.gif" style="width:25px;height:25px;vertical-align:sub;display:none"/>
   </fieldset>  
 </form>
 

data/lib/views/collections/blee.erb

@@ -0,0 +1,20 @@
+<div class="borders" style="padding:10px;font-size:0.4em">
+  <div id="tree">
+    <ul>
+    	<li id="phtml_1" class="open"><a href="#"><ins> </ins>Root node 1</a>
+    		<ul>
+    			<li id="phtml_2"><a href="#"><ins> </ins>Child node 1</a></li>
+    			<li id="phtml_3"><a href="#"><ins> </ins>Child node 2</a></li>
+    			<li id="phtml_4"><a href="#"><ins> </ins>Some other child node with longer text</a></li>
+    		</ul>
+    	</li>
+    	<li id="phtml_5"><a href="#"><ins> </ins>Root node 2</a></li>
+    </ul>
+  </div>
+</div>
+
+<script>
+  $( function() {
+  	$('div#tree').tree( { ui: { theme_name: 'apple', theme_path: '/javascripts/themes/apple/style.css'} });
+  });
+</script>

data/lib/views/collections/list.erb

@@ -6,7 +6,7 @@
   <div class="title"><%=title_for( session[:path_names] )%></div>
     
   <div id="mgmt_actions">
-    <img id="action_load" src="/images/loading.gif" style="width:25px;height:25px;vertical-align:sub;display:none"></img>        
+    <img id="action_load" src="/images/loading.gif" style="width:25px;height:25px;vertical-align:sub;display:none"/>
     <button class="action clear" rel="#confirm_clear" title="Delete all records from collection">clear</button>
     <button class="action drop" rel="#confirm_drop" title="Drop the entire collection">drop</button>
   </div>

data/lib/views/collections/update.js.erb

@@ -1,3 +1,3 @@
 <%= erb :'shared/flash.js', :layout => false %>
 
-$('div.table').html( "<%=escape_javascript(partial(:'collections/rows'))%>" );
+$('div.table').html( "<%=escape_javascript(partial(:'collections/rows_tree'))%>" );

data/lib/views/databases/_results.erb

@@ -6,18 +6,20 @@
   <div class="borders" style="padding:10px">
     <table id="cltn" class="cltn" border="0" cellpadding="10" cellspacing="20">
       <thead>
-        <th width="2%">&nbsp;</th>
-        <% cols = @cltns.first.keys %>
-        <% cols.each do |col| %>
-          <th align="<%=align_for( @cltns.first[col] )%>"><%=col%></th>
-        <% end %>
+        <tr>
+          <th width="3%">&nbsp;</th>
+          <% cols = @cltns.first.keys %>
+          <% cols.each do |col| %>
+            <th align="<%=align_for( @cltns.first[col] )%>"><%=col%></th>
+          <% end %>
+        </tr>
       </thead>
       <tbody>
         <% count = 0; @cltns.each do |cltn| %>
           <tr id="<%=count%>" valign="top">
             <td id="<%=count%>">
               <img rel="div#confirm_drop" class="drop" id="<%=cltn[:name]%>" rel="<%=count%>" src="/images/delete.png" title="drop this collection" style="display:none"/>
-              <img class="wait" id="wait_<%=count%>" src="/images/loading.gif"></img>
+              <img class="wait" id="wait_<%=count%>" src="/images/loading.gif"/>
             </td>
             <td><a href="/databases/collection/<%=cltn[:name]%>/"><%= cltn[:name] %></a></td>
             <td align="<%=align_for( cltn[:count] )%>"><%= format_number(cltn[:count]) %></td>
@@ -43,7 +45,7 @@
 
 <script>
   $( function() {
-    $("table#cltn tr" ).hover( 
+    $("table#cltn tbody tr" ).hover( 
       function() { 
         $(this).addClass( 'highlight' );
         $("td#" + $(this).attr('id') + " img.drop" ).show();

data/lib/views/explore/_node_info.erb

@@ -25,9 +25,16 @@
         <% unless zone_path?( session[:path_names] ) %>
           <img id="<%=count%>" rel="div#confirm_drop" class="drop" href="/explore/database/<%=node.oid%>/<%=node.name%>/drop" title="drop <%=legend%>..." src="/images/delete.png"/>
         <% end %> 
-        <p rel="div#details" href="/explore/show/<%=CGI.escape(node.data[:path_ids])%>/<%=CGI.escape(node.data[:path_names])%>" class="info">
-          <%=truncate(node.name, 30)%>
-        </p>
+        <% if zone_path?( session[:path_names] ) %>
+          <p rel="#details" href="/explore/info/<%=CGI.escape(node.data[:path_ids])%>/<%=CGI.escape(node.data[:path_names])%>" class="info" title="<%=node.name%>">
+            <%=truncate(node.name, 30)%>
+          </p>        
+        <% else %>
+          <p href="/explore/show/<%=CGI.escape(node.data[:path_ids])%>/<%=CGI.escape(node.data[:path_names])%>" class="show" title="<%=node.name%>">
+            <%=truncate(node.name, 30)%>
+          </p>
+          <img class="info" rel="#details" id="<%=count%>" href="/explore/info/<%=CGI.escape(node.data[:path_ids])%>/<%=CGI.escape(node.data[:path_names])%>" title="info for <%=legend%>..." src="/images/information.png"/>  
+        <% end %>
       </div>
     <% count+=1; end %>
   </div>
@@ -43,6 +50,8 @@
 
 <script>
   $( function() {
+    $( ".[title]").tipTip( {maxWidth:'auto', edgeOffset:5} );
+    
     $("div.scrollable").scrollable({ 
         vertical:true,  
         size:    13,
@@ -80,7 +89,15 @@
       }); 
     });
     
-    $('div.item p[rel]').overlay( {
+    $('div.item p.show').click( function() {
+      $.ajax( {
+        dataType: 'script',
+        type:     'get',
+        url:      $(this).attr('href') } );
+      return false;
+    });
+    
+    $('div.item .info[rel]').overlay( {
       top:          '15%',
       expose:       '#1c1c1c',
       onBeforeLoad: function() {

data/lib/views/explore/explore.erb

@@ -90,6 +90,11 @@
       onCreateLabel: function(domElement, node){
         domElement.innerHTML = truncate( unescape(node.name), 15 );
         
+        $(domElement).attr('title', node.name );
+        $(domElement).css('z-index', 10 );            
+        $(domElement).tipTip( {maxWidth:'auto', edgeOffset:5} );
+        
+        
         addEvent(domElement, 'click', function () {
           var children_count = 0;
           for( var i in node.adjacencies )
@@ -128,7 +133,12 @@
                   } });
               }
               else {
-                Log.write( "no more data" );
+                Log.write( "loading collection..." );
+                 $.ajax( {
+                    dataType: 'script', 
+                    type:     'GET', 
+                    url:      "/explore/show/" + escape(node.data.path_ids) + "/" + escape(node.data.path_names)
+                 });
               }
            }
       });

data/lib/views/explore/load_collection.js.erb

@@ -0,0 +1 @@
+window.location = "/collections/1";

data/lib/views/explore/load_database.js.erb

@@ -0,0 +1 @@
+window.location = "/databases/1";

data/lib/views/layout.erb

@@ -3,24 +3,30 @@
   <head>
     <title>M O N G O 3</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />    
-    <link rel="icon" href="/favicon.ico" type="image/x-icon"/>
-    <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon"/>    
+    <link rel="icon" href="/images/favicon.png" type="image/x-icon"/>
+    <link rel="shortcut icon" href="/images/favicon.png" type="image/x-icon"/>
     <%= stylesheets %w[mongo3] %>
-    <%= javascripts %w[jquery_min jquery_ui_min jquery.tools.min application jit.min] %>
+    <%= javascripts %w[jquery_min jquery_ui_min jquery.tools.min application jit.min jquery.tree.min jquery.tiptip.min] %>
   </head>
 
   <body id="body">
     <div id="overall">
       <div id="logo">
         <a href="/explore" style="float:left">
-          <img src='/images/mongo3.png' style="border:none"/>
-          <span id="version"><%=Mongo3.version%></span>
+          <img id="logo" src='/images/mongo3.png'/>
+          <div id="version"><%=Mongo3.version%></div>
         </a>
-        <div class="flash">Hello World</div>
+        <div class="flash"></div>
       </div>      
       <div id="main">
         <%= yield %>
       </div>
     </div>      
   </body>
-</html>
+</html>
+
+<script>
+  $( function() {
+    $( "[title]").tipTip( {maxWidth:'auto', edgeOffset:5} );
+  });
+</script>

data/lib/views/users/_results.erb

@@ -8,7 +8,7 @@
   <div class="borders" style="padding:10px">
     <table id="cltn" class="cltn" border="0" cellpadding="10" cellspacing="20">
       <thead>
-        <th width="2%">&nbsp;</th>
+        <th width="3%">&nbsp;</th>
         <th>Id</th>
         <th>Name</th>
       </thead>
@@ -43,7 +43,7 @@
 
 <script>
   $( function() {
-    $("table#cltn tr" ).hover( 
+    $("table#cltn tbody tr" ).hover( 
       function() { 
         $(this).addClass( 'highlight' );
         $("td#" + $(this).attr('id') + " img.drop" ).show();

data/spec/configs/crap.yml

@@ -0,0 +1,20 @@
+test1:
+  host: nowhere
+  port: 12345
+  
+test2:
+  host:     localhost
+  port:     007
+  user:     "admin"
+  password: "admin"
+  
+nowhere:
+  host: funky_town
+  port: 007
+  
+bozo:
+  more_crap: 10
+  
+blee:
+  host: nowhere
+  portola: 10

data/spec/configs/hosed.yml

@@ -0,0 +1,4 @@
+crap:
+  
+  
+shit:

data/spec/configs/landscape.yml

@@ -0,0 +1,9 @@
+test:
+  host: localhost
+  port: 12345
+  
+admin:
+  host:     localhost
+  port:     12345
+  user:     "admin"
+  password: "admin"

data/spec/mongo3/connection_spec.rb

@@ -7,7 +7,7 @@ describe Mongo3::Connection do
   before( :all ) do
     @con    = Mongo::Connection.new( 'localhost', 12345 )
     @db     = @con.db( 'mongo3_test_db', :strict => true )
-    @mongo3 = Mongo3::Connection.new( File.join(File.dirname(__FILE__), %w[.. landscape.yml]) )    
+    @mongo3 = Mongo3::Connection.new( File.join(File.dirname(__FILE__), %w[.. configs landscape.yml]) )    
   end
   
   before( :each ) do    
@@ -31,6 +31,63 @@ describe Mongo3::Connection do
       @cltn2.insert( {:name => "test_#{i}", :value => i } )
     end
   end
+
+  describe "configs" do
+    before( :all ) do
+      @crapola = Mongo3::Connection.new( File.join(File.dirname(__FILE__), %w[.. configs crap.yml]) )
+    end
+
+    it "should raise an error on bogus yml" do
+      lambda {
+        con = Mongo3::Connection.new( File.join(File.dirname(__FILE__), %w[.. configs hosed.yml]) )
+        con.send( :config )
+      }.should raise_error( /Unable to grok yaml landscape file/ )
+    end
+    
+    it "should crap out if the zone host is missing correctly" do
+      lambda {
+        @crapola.send( :connect_for, "bozo" )
+      }.should raise_error( /Unable to find `host/ )
+    end    
+    
+    it "should crap out if the zone port is missing correctly" do
+      lambda {
+        @crapola.send( :connect_for, "blee" )
+      }.should raise_error( /Unable to find `port/ )
+    end    
+    
+    it "should crap out if the zone is not correctly configured" do
+      lambda {
+        @crapola.send( :connect_for, "nowhere" )
+      }.should raise_error( /MongoDB connection failed for `"funky_town"/ )
+    end    
+  end
+  
+  describe "zones" do
+    it "should crap out if the zone does not exist" do
+      lambda {
+        @mongo3.send( :connect_for, "shit for brains" )
+      }.should raise_error( /Unable to find zone/ )
+    end
+    
+    it "should connect to a zone with auth correctly" do
+      @mongo3.send( :connect_for, "admin" ) do |con|
+        con.should_not be_nil
+      end
+    end    
+  end
+  
+  describe "drop database" do  
+    it "should drop a database correctly" do
+      dbs = @con.database_names
+      # Quirk? a db does not really exists unless it has a collection
+      db = @con.db( "dead_meat" )
+      db.create_collection( "dead_weight" )
+      @con.database_names.should have( dbs.size + 1 ).items
+      @mongo3.drop_db( "home|test|dead_meat" )
+      @con.database_names.should have( dbs.size ).items    
+    end
+  end
   
   it "should clear out a cltn correctly" do
     @mongo3.clear_cltn( "home|test|mongo3_test_db|test1_cltn" )
@@ -49,13 +106,7 @@ describe Mongo3::Connection do
     @mongo3.drop_cltn( "home|test|mongo3_test_db|test1_cltn" )
     lambda { @db['test1_cltn'] }.should raise_error( /Collection test1_cltn/ )
   end
-  
-  it "should drop a db correctly" do
-    @mongo3.drop_db( "home|test|mongo3_test_db" )
-    @con.database_names.include?( 'mongo3_test_db' ).should == false
-    @db = @con.db( 'mongo3_test_db', :strict => true )    
-  end
-  
+    
   it "should load a landscape file correctly" do
     test = @mongo3.landscape['test']
         
@@ -72,10 +123,13 @@ describe Mongo3::Connection do
     root.data[:path_names].should == 'home'
     
     children = root.children
-    children.should have(1).item
-    children.first.name.should == 'test'
-    children.first.oid.should  == 'test'
-    children.first.children.should be_empty
+    children.should have(2).item
+    children.first.name.should  == 'admin'
+    
+    test = children.last
+    test.name.should == 'test'
+    test.oid.should  == 'test'
+    test.children.should be_empty
   end
   
   describe "#show" do
@@ -144,8 +198,31 @@ describe Mongo3::Connection do
       rows.size.should == 4
       rows.total_entries.should == 4
     end    
+    
+    it "should paginate db with regex q correctly" do
+      pending do
+        rows = @mongo3.paginate_cltn( "home|test|mongo3_test_db|test1_cltn", [{"name"=>"\/test_*\/", "value"=>{"$gt"=>5}}, []] )
+        rows.size.should == 4
+        rows.total_entries.should == 4
+      end
+    end    
+    
   end  
   
+  describe "slaves" do
+    it "should differentiate with a zone path" do
+      @mongo3.send( :slave_zone?, %w[home test] ).should == false
+    end
+
+    it "should differentiate with a db path" do
+      @mongo3.send( :slave_zone?, %w[home test fred] ).should == false
+    end
+
+    it "should detect a slave zone correctly" do
+      @mongo3.send( :slave_zone?, %w[home test test] ).should == true
+    end
+  end
+  
   describe "indexes" do
     it "should list indexes correctly" do
       indexes = @mongo3.indexes_for( "home|test|mongo3_test_db|test1_cltn" )
@@ -178,4 +255,20 @@ describe Mongo3::Connection do
       indexes.size.should == before - 1      
     end
   end
+  
+  it "should detect a collection correctly" do
+    @mongo3.send( :cltn_request?, %w[blee duh] ).should == false
+    @mongo3.send( :cltn_request?, %w[blee duh fred] ).should == true
+  end
+  
+  describe "#zone_for" do
+    it "should find a zone correctly" do
+      @mongo3.send( :zone_for, "localhost", "12345" ).should == "admin"
+    end
+    
+    it "should fail if a zone does not exist" do
+      @mongo3.send( :zone_for, "ghost", 27017 ).should be_nil
+      @mongo3.send( :zone_for, "localhost", 8888 ).should be_nil      
+    end
+  end
 end

data/spec/mongo3/node_spec.rb

@@ -99,4 +99,42 @@ describe Mongo3::Node do
     # @dbs.first.to_adjacencies.should   == 
     # [{:adjacencies=>[102, 103, 104, 105], :name=>"db_0", :id=>102, :data=>{:path_ids=>"0|100|102", :path_names=>"root|env_0|db_0"}}, {:adjacencies=>[], :name=>"cltn_0", :id=>102, :data=>{:path_ids=>"0|100|102|102", :path_names=>"root|env_0|db_0|cltn_0"}}, {:adjacencies=>[], :name=>"cltn_1", :id=>103, :data=>{:path_ids=>"0|100|102|103", :path_names=>"root|env_0|db_0|cltn_1"}}, {:adjacencies=>[], :name=>"cltn_2", :id=>104, :data=>{:path_ids=>"0|100|102|104", :path_names=>"root|env_0|db_0|cltn_2"}}, {:adjacencies=>[], :name=>"cltn_3", :id=>105, :data=>{:path_ids=>"0|100|102|105", :path_names=>"root|env_0|db_0|cltn_3"}}]
   end
+  
+  describe "slave node" do
+    before :all do
+      @node = Mongo3::Node.make_node( "fred" )
+    end
+    
+    it "should mark a slave node correctly" do  
+      @node.mark_slave!
+      @node.data.has_key?( :master ).should == false      
+      @node.data[:slave].should             == true
+      @node.data['$dim'].should             == 15
+      @node.data['$lineWidth'].should       == 3
+      @node.data['$color'].should           == "#434343"
+    end
+
+    it "should detect a slave node correctly" do
+      @node.should be_slave
+    end
+  end
+  
+  describe "master node" do  
+    before :all do
+      @node = Mongo3::Node.make_node( "fred" )
+    end
+    
+    it "should mark a master not correctly" do
+      @node.mark_master!
+      @node.data.has_key?( :slave ).should == false
+      @node.data[:master].should           == true
+      @node.data['$dim'].should            == 15
+      @node.data['$lineWidth'].should      == 3
+      @node.data['$color'].should          == "#92b948"    
+    end
+    
+    it "should detect a master node correctly" do
+      @node.should be_master      
+    end      
+  end
 end

data/spec/mongo3/user_spec.rb

@@ -0,0 +1,72 @@
+require File.expand_path( File.join( File.dirname(__FILE__), %w[.. spec_helper] ) )
+require 'ostruct'
+require 'mongo'
+
+describe Mongo3::User do
+  
+  before( :each ) do
+    @users = Mongo3::User.new( File.join(File.dirname(__FILE__), %w[.. configs landscape.yml] ) )
+    @users.clear!( "home|test" )
+    @users.list( "home|test", 1 ).should have(0).items
+  end
+  
+  describe "#add" do
+    it "should add users correctly" do
+      result = @users.add( "home|test", "fred", "blee" )
+      result.should_not                    be_nil    
+      @users.list( "home|test", 1 ).should have(1).item      
+    end
+    
+    it "should crap out if a user exists" do
+      result = @users.add( "home|test", "fred", "blee" )
+      result.should_not                          be_nil    
+      @users.list( "home|test", 1 ).should have(1).item      
+      lambda {
+        @users.add( "home|test", "fred", "blee" )
+      }.should raise_error( /User fred already exists!/ )
+    end    
+  end
+    
+  it "should clear out users correctly" do
+    10.times { |i| @users.add( "home|test", "fred_#{i}", "secret" ) }
+    @users.list( "home|test", 1 ).should have(10).items
+    @users.clear!( "home|test" )
+    @users.list( "home|test", 1 ).should have(0).item
+  end
+  
+  describe "#delete" do
+    it "should delete a user correctly" do
+      user_ids = []
+      10.times { |i| user_ids << @users.add( "home|test", "fred_#{i}", "secret" ) }
+      
+      count = 1
+      user_ids.each do |id|
+        result = @users.delete( "home|test", id.to_s )
+        result.should_not be_nil
+        @users.list( "home|test", 1 ).should have(10-count).items
+        count += 1
+      end
+    end
+  end
+  
+  describe "#list" do
+    it "should list users correctly" do
+      users = @users.list( "home|test", 1 )
+      users.should have(0).items
+    end
+    
+    it "should paginate users correctly" do
+      10.times { |i| @users.add( "home|test", "fred_#{i}", "secret" ) }      
+      users = @users.list( "home|test", 1, 2 )
+      users.should have(2).items
+      users.total_pages.should == 5
+      users.total_entries.should == 10
+    end    
+  end  
+  
+  it "it should rename a user correctly" do
+    pending do
+      @users.rename( "home|test", "fred", "blee" )
+    end
+  end
+end

data/spec/mongo3/zone_spec.rb

@@ -0,0 +1,69 @@
+require File.expand_path( File.join( File.dirname(__FILE__), %w[.. spec_helper] ) )
+require 'ostruct'
+require 'mongo'
+
+describe Mongo3::Zone do
+  
+  before( :each ) do
+    @zones = Mongo3::Zone.new( File.join(File.dirname(__FILE__), %w[.. configs landscape.yml] ) )
+  end
+  
+  describe "#connect_for" do
+    it "should connect to a zone correctly" do
+      @zones.send( :connect_for, "home|test" ) do |con|
+        con.should_not be_nil
+      end
+    end
+    
+    it "should connect to an admin zone correctly" do
+      @zones.send( :connect_for, "home|admin" ) do |con|
+        con.should_not be_nil
+      end
+    end    
+  end
+  
+  describe "#zone_for" do
+    it "should find a zone correctly" do
+      @zones.send( :zone_for, "localhost", "12345" ).should == "admin"
+    end
+    
+    it "should fail if a zone does not exist" do
+      @zones.send( :zone_for, "ghost", 27017 ).should be_nil
+      @zones.send( :zone_for, "localhost", 8888 ).should be_nil      
+    end
+  end
+  
+  describe "configs" do
+    before( :all ) do
+      @crapola = Mongo3::Zone.new( File.join(File.dirname(__FILE__), %w[.. configs crap.yml]) )
+    end
+
+    it "should raise an error on bogus yml" do
+      lambda {
+        con = Mongo3::Zone.new( File.join(File.dirname(__FILE__), %w[.. configs hosed.yml]) )
+        con.send( :config )
+      }.should raise_error( /Unable to grok yaml landscape file/ )
+    end
+    
+    it "should crap out if the zone host is missing correctly" do
+      lambda {
+        @crapola.send( :connect_for, "home|bozo" )
+      }.should raise_error( /Unable to find `host/ )
+    end    
+    
+    it "should crap out if the zone port is missing correctly" do
+      lambda {
+        @crapola.send( :connect_for, "home|blee" )
+      }.should raise_error( /Unable to find `port/ )
+    end    
+    
+    it "should crap out if the zone is not correctly configured" do
+      lambda {
+        @crapola.send( :connect_for, "home|nowhere" )
+      }.should raise_error( /MongoDB connection failed for `funky_town/ )
+    end
+    
+  end
+  
+end
+  

data/spec/mongo3_spec.rb

@@ -0,0 +1,20 @@
+require File.join(File.dirname(__FILE__), %w[spec_helper])
+
+describe Mongo3 do
+ before( :all ) do
+    @root = ::File.expand_path( ::File.join(::File.dirname(__FILE__), ".." ) )
+  end
+
+  it "is versioned" do
+    Mongo3.version.should =~ /\d+\.\d+\.\d+/
+  end
+
+  it "generates a correct path relative to root" do
+    Mongo3.path( "mongo3.rb" ).should == ::File.join(@root, "mongo3.rb" )
+  end
+
+  it "generates a correct path relative to lib" do
+    Mongo3.libpath(%w[ mongo3 node.rb]).should == ::File.join( @root, "lib", "mongo3", "node.rb" )
+  end
+
+end

data/spec/spec_helper.rb

@@ -7,5 +7,18 @@ require 'will_paginate/collection'
 
 require File.expand_path( File.join( File.dirname(__FILE__), %w[.. lib mongo3] ) )
 
+  begin
+    Mongo::Connection.new( 'localhost', 12345 )
+  rescue => boom
+    puts "\n"*3
+    puts "<OH SNAP!!>"
+    puts ""
+    puts "To run the tests you need to a local instance of mongodb on port 12345"
+    puts ""
+    puts "> mongodb --dbpath /data/db/mongo3 --port 12345"
+    puts "\n"*3
+    raise "Bailing out"
+  end  
+
 Spec::Runner.configure do |config|
 end

data/tasks/setup.rb

@@ -21,7 +21,7 @@ PROJ = OpenStruct.new(
   :email => nil,
   :url => "\000",
   :version => ENV['VERSION'] || '0.0.0',
-  :exclude => %w(tmp$ bak$ ~$ CVS \.svn/ \.git/ ^pkg/),
+  :exclude => %w(tmp$ bak$ ~$ CVS \.svn/ \.git/ ^pkg/ exps/* \.psd ),
   :release_name => ENV['RELEASE'],
 
   # System Defaults