amp 0.5.0 → 0.5.1

data/MANIFESTO

@@ -1,7 +1,8 @@
-We want a piece of software that's:
-  1) Free of religious devotion to one VCS
-  2) Let's us customize how we interact with it. If we want git's commands because i used it the longest, let us use them with a fucking mercurial repo.
+We want a piece of software that:
+  1) Is Free of religious devotion to one VCS
+  2) Lets us customize how we interact with it. If we want git's commands because i used it the longest, let us use them with a fucking mercurial repo.
   3) We want the extension we wrote for the dartmouth review repo, which is HG, to work on my github project too. because they're both DVCS, damnit.
   4) We want to be able to directly modify the commands they give us. git's remove command is `git rm`. it should be dead simple to make `git remove` map directly to that, and we mean less than 1 minute of thought/work.
   5) We want to prove ruby is viable for large-scale applications, not just web frameworks. can you think of any non-trivial actual applications written in ruby?
-  6) We want to discover where the limits are on Ruby for use in large applications. Where is the language slow? Where is it fast? What techniques are effective? Too many people opine about proper Ruby code, then provide 10 lines of code to illustrate their point. We wrote 15,000 and hope to write many more: what can we learn from that?
+  6) We want to discover where the limits are on Ruby for use in large applications. Where is the language slow? Where is it fast? What techniques are effective? Too many people opine about proper Ruby code, then provide 10 lines of code to illustrate their point. We wrote 15,000 and hope to write many more: what can we learn from that?
+  7) We want to be an example of proper documentation.

data/README.md

@@ -78,38 +78,38 @@ Nothing really changes from using the hg command. There are a few differences
 here and there (see `amp help [COMMAND]`), but really, it's pretty much the same.
   
 Using amp as a library:
-  
-  require "amp"
-  include Amp
-  
-  repo = Repositories::pick "/Users/ari/src/amp.code"
-  remote = Repositories::pick "https://user:password@bitbucket.org/carbonica/amp"
-  
+    
+    require "amp"
+    include Amp
+    
+    repo = Repositories::pick "/Users/ari/src/amp.code"
+    remote = Repositories::pick "https://user:password@bitbucket.org/carbonica/amp"
+    
 make a file...
-
-  Dir.chdir "/Users/ari/src/amp.code/"
-  open "test.txt", "w" {|f| f.puts "hello, world!" }
-  
+    
+    Dir.chdir "/Users/ari/src/amp.code/"
+    open "test.txt", "w" {|f| f.puts "hello, world!" }
+    
 and add it to the repo!
-
-  repo.add "test.txt"
-  
+    
+    repo.add "test.txt"
+    
 commit
-
-  repo.commit :message => 'blah'
-  
+    
+    repo.commit :message => 'blah'
+    
 do some more things, pull and update...
-
-  result = repo.pull remote
-  result = repo.update if result.success?
-  
-  (puts "You need to fix things!"; new_irb_session binding) unless result.success?
-  # type result[:unresolved] to get a list of conflicts
-  
+    
+    result = repo.pull remote
+    result = repo.update if result.success?
+    
+    (puts "You need to fix things!"; new_irb_session binding) unless result.success?
+    # type result[:unresolved] to get a list of conflicts
+    
 and push!
-
-  repo.push remote
-  
+    
+    repo.push remote
+    
 Everything here is really straight forward. Plus, if it's not, we've taken
 the liberty to document as much as possible.
   

data/ampfile.rb

@@ -24,6 +24,20 @@ template :silly, <<-EOF
 <%= change_node.inspect %> <%= revision %>
 EOF
 
+command "stats" do |c|
+  c.workflow :hg
+  c.desc "Prints how many commits each user has contributed"
+  c.on_run do |opts, args|
+    repo = opts[:repository]
+    users = Hash.new {|h, k| h[k] = 0}
+    repo.each do |changeset|
+      users[changeset.user.split("@").first] += 1 #
+    end
+    users.to_a.sort {|a,b| b[1] <=> a[1]}.each do |u,c|
+      puts "#{u}: #{c}"
+    end
+  end
+end
 
 namespace :docs do
   

data/ext/amp/bz2/bz2.c

@@ -1,7 +1,11 @@
 #include <ruby.h>
-#include <rubyio.h>
+#ifdef RUBY_19
+    #include <ruby/io.h>
+#else
+    #include <rubyio.h>
+#endif
+
 #include <bzlib.h>
-#include <version.h>
 
 static VALUE bz_cWriter, bz_cReader, bz_cInternal;
 static VALUE bz_eError, bz_eConfigError, bz_eEOZError;
@@ -82,7 +86,7 @@ bz_raise(error)
 	msg = "unknown error";
 	exc = bz_eError;
     }
-    rb_raise(exc, msg);
+    rb_raise(exc, "%s", msg);
 }
     
 static void
@@ -108,25 +112,26 @@ bz_find_struct(obj, ptr, posp)
 {
     struct bz_iv *bziv;
     int i;
-
+    
     for (i = 0; i < RARRAY_LEN(bz_internal_ary); i++) {
-	Data_Get_Struct(RARRAY_PTR(bz_internal_ary)[i], struct bz_iv, bziv);
-	if (ptr) {
-	    if (TYPE(bziv->io) == T_FILE && 
-		RFILE(bziv->io)->fptr == (OpenFile *)ptr) {
-		if (posp) *posp = i;
-		return bziv;
-	    }
-	    else if (TYPE(bziv->io) == T_DATA &&
-		     DATA_PTR(bziv->io) == ptr) {
-		if (posp) *posp = i;
-		return bziv;
+	    Data_Get_Struct(RARRAY_PTR(bz_internal_ary)[i], struct bz_iv, bziv);
+	    if (ptr) {
+	        if (TYPE(bziv->io) == T_FILE && RFILE(bziv->io)->fptr == ptr) { // ptr is OpenFile * or rb_io_t*
+	    	    if (posp) 
+	    	        *posp = i;
+	    	    return bziv;
+	        } else {
+	            if (TYPE(bziv->io) == T_DATA && DATA_PTR(bziv->io) == ptr) {
+	    	        if (posp) 
+	    	            *posp = i;
+	    	        return bziv;
+	            }
+	        }
+	    } else if (bziv->io == obj) {
+	        if (posp) 
+	            *posp = i;
+	        return bziv;
 	    }
-	}
-	else if (bziv->io == obj) {
-	    if (posp) *posp = i;
-	    return bziv;
-	}
     }
     if (posp) *posp = -1;
     return 0;
@@ -214,27 +219,26 @@ bz_internal_finalize(ary, obj)
     int closed, i;
     struct bz_iv *bziv;
     struct bz_file *bzf;
-
-    for (i = 0; i < RARRAY_LEN(bz_internal_ary); i++) {
-	elem = RARRAY_PTR(bz_internal_ary)[i];
-	Data_Get_Struct(elem, struct bz_iv, bziv);
-	if (bziv->bz2) {
-	    RDATA(bziv->bz2)->dfree = ruby_xfree;
-	    if (TYPE(bziv->io) == T_FILE) {
-		RFILE(bziv->io)->fptr->finalize = bziv->finalize;
+    for (i = 0; i < RARRAY_LEN(ary); i++) {
+	    elem = RARRAY_PTR(ary)[i];
+	    Data_Get_Struct(elem, struct bz_iv, bziv);
+	    if (bziv->bz2) {
+	        RDATA(bziv->bz2)->dfree = ruby_xfree;
+	        if (TYPE(bziv->io) == T_FILE) {
+	    	    RFILE(bziv->io)->fptr->finalize = bziv->finalize;
+	        }
+	        else if (TYPE(bziv->io) == T_DATA) {
+	    	    RDATA(bziv->io)->dfree = bziv->finalize;
+	        }
+	        Data_Get_Struct(bziv->bz2, struct bz_file, bzf);
+	        closed = bz_writer_internal_flush(bzf);
+	        if (bzf->flags & BZ2_RB_CLOSE) {
+	    	    bzf->flags &= ~BZ2_RB_CLOSE;
+	    	    if (!closed && rb_respond_to(bzf->io, id_close)) {
+	    	        rb_funcall2(bzf->io, id_close, 0, 0);
+	    	    }
+	        }
 	    }
-	    else if (TYPE(bziv->io) == T_DATA) {
-		RDATA(bziv->io)->dfree = bziv->finalize;
-	    }
-	    Data_Get_Struct(bziv->bz2, struct bz_file, bzf);
-	    closed = bz_writer_internal_flush(bzf);
-	    if (bzf->flags & BZ2_RB_CLOSE) {
-		bzf->flags &= ~BZ2_RB_CLOSE;
-		if (!closed && rb_respond_to(bzf->io, id_close)) {
-		    rb_funcall2(bzf->io, id_close, 0, 0);
-		}
-	    }
-	}
     }
     return Qnil;
 }
@@ -293,24 +297,28 @@ bz_io_data_finalize(ptr)
 
     bziv = bz_find_struct(0, ptr, &pos);
     if (bziv) {
-	rb_ary_delete_at(bz_internal_ary, pos);
-	Data_Get_Struct(bziv->bz2, struct bz_file, bzf);
-	rb_protect(bz_writer_internal_flush, (VALUE)bzf, 0);
-	RDATA(bziv->bz2)->dfree = ruby_xfree;
-	if (bziv->finalize) {
-	    (*bziv->finalize)(ptr);
-	}
-	else if (TYPE(bzf->io) == T_FILE) {
-	    OpenFile *file = (OpenFile *)ptr;
-	    if (file->f) {
-		fclose(file->f);
-		file->f = 0;
-	    }
-	    if (file->f2) {
-		fclose(file->f2);
-		file->f2 = 0;
+	    rb_ary_delete_at(bz_internal_ary, pos);
+	    Data_Get_Struct(bziv->bz2, struct bz_file, bzf);
+	    rb_protect(bz_writer_internal_flush, (VALUE)bzf, 0);
+	    RDATA(bziv->bz2)->dfree = ruby_xfree;
+	    if (bziv->finalize) {
+	        (*bziv->finalize)(ptr);
+	    } else if (TYPE(bzf->io) == T_FILE) {
+	        // close bzf->io. 
+	        #ifdef RUBY_19
+	            rb_io_close(bzf->io);
+	        #else
+	            OpenFile *file = (OpenFile *)ptr;
+	            if (file->f) {
+	    	        fclose(file->f);
+	    	        file->f = 0;
+	            }
+	            if (file->f2) {
+	    	        fclose(file->f2);
+	    	        file->f2 = 0;
+	            }
+	        #endif
 	    }
-	}
     }
 }
 
@@ -436,8 +444,11 @@ bz_writer_init(argc, argv, obj)
     else {
 	VALUE iv;
 	struct bz_iv *bziv;
-	OpenFile *fptr;
-
+	#ifdef RUBY_19
+        rb_io_t *fptr;
+    #else
+	    OpenFile *fptr;
+    #endif
 	rb_io_taint_check(a);
 	if (!rb_respond_to(a, id_write)) {
 	    rb_raise(rb_eArgError, "first argument must respond to #write");
@@ -606,42 +617,42 @@ bz_reader_init(argc, argv, obj)
     int internal = 0;
 
     if (rb_scan_args(argc, argv, "11", &a, &b) == 2) {
-	small = RTEST(b);
+	    small = RTEST(b);
     }
     rb_io_taint_check(a);
     if (OBJ_TAINTED(a)) {
-	OBJ_TAINT(obj);
+	    OBJ_TAINT(obj);
     }
     if (rb_respond_to(a, id_read)) {
-	if (TYPE(a) == T_FILE) {
-	    OpenFile *fptr;
-
-	    GetOpenFile(a, fptr);
-	    rb_io_check_readable(fptr);
-	}
-	else if (rb_respond_to(a, id_closed)) {
-	    VALUE iv = rb_funcall2(a, id_closed, 0, 0);
-	    if (RTEST(iv)) {
-		rb_raise(rb_eArgError, "closed object");
+	    if (TYPE(a) == T_FILE) {
+	        #ifdef RUBY_19
+                rb_io_t *fptr;
+            #else
+	            OpenFile *fptr;
+	        #endif
+	        GetOpenFile(a, fptr);
+	        rb_io_check_readable(fptr);
+	    } else if (rb_respond_to(a, id_closed)) {
+	        VALUE iv = rb_funcall2(a, id_closed, 0, 0);
+	        if (RTEST(iv)) {
+	    	    rb_raise(rb_eArgError, "closed object");
+	        }
 	    }
-	}
-    }
-    else {
-	struct bz_str *bzs;
-	VALUE res;
-
-	if (!rb_respond_to(a, id_str)) {
-	    rb_raise(rb_eArgError, "first argument must respond to #read");
-	}
-	a = rb_funcall2(a, id_str, 0, 0);
-	if (TYPE(a) != T_STRING) {
-	    rb_raise(rb_eArgError, "#to_str must return a String");
-	}
-	res = Data_Make_Struct(bz_cInternal, struct bz_str, 
-			       bz_str_mark, ruby_xfree, bzs);
-	bzs->str = a;
-	a = res;
-	internal = BZ2_RB_INTERNAL;
+    } else {
+	    struct bz_str *bzs;
+	    VALUE res;
+        
+	    if (!rb_respond_to(a, id_str)) {
+	        rb_raise(rb_eArgError, "first argument must respond to #read");
+	    }
+	    a = rb_funcall2(a, id_str, 0, 0);
+	    if (TYPE(a) != T_STRING) {
+	        rb_raise(rb_eArgError, "#to_str must return a String");
+	    }
+	    res = Data_Make_Struct(bz_cInternal, struct bz_str, bz_str_mark, ruby_xfree, bzs);
+	    bzs->str = a;
+	    a = res;
+	    internal = BZ2_RB_INTERNAL;
     }
     Data_Get_Struct(obj, struct bz_file, bzf);
     bzf->io = a;
@@ -1485,14 +1496,14 @@ void Init_bz2()
 	       rb_intern("define_finalizer"), 2, bz_internal_ary,
 	       bz_proc_new(bz_internal_finalize, 0));
 
-    id_new = rb_intern("new");
-    id_write = rb_intern("write");
-    id_open = rb_intern("open");
-    id_flush = rb_intern("flush");
-    id_read = rb_intern("read");
-    id_close = rb_intern("close");
+    id_new    = rb_intern("new");
+    id_write  = rb_intern("write");
+    id_open   = rb_intern("open");
+    id_flush  = rb_intern("flush");
+    id_read   = rb_intern("read");
+    id_close  = rb_intern("close");
+    id_str    = rb_intern("to_str");
     id_closed = rb_intern("closed?");
-    id_str = rb_intern("to_str");
 
     bz_mBZ2 = rb_define_module("BZ2");
     bz_eConfigError = rb_define_class_under(bz_mBZ2, "ConfigError", rb_eFatal);

data/ext/amp/bz2/extconf.rb

@@ -3,6 +3,10 @@ ARGV.collect! {|x| x.sub(/^--with-bz2-prefix=/, "--with-bz2-dir=") }
 
 require 'mkmf'
 
+if RUBY_VERSION =~ /1.9/ then  
+    $CPPFLAGS += " -DRUBY_19"  
+end
+
 if unknown = enable_config("unknown")
    libs = if CONFIG.key?("LIBRUBYARG_STATIC")
 	     Config::expand(CONFIG["LIBRUBYARG_STATIC"].dup).sub(/^-l/, '')

data/ext/amp/bz2/mkmf.log

@@ -1,28 +1,37 @@
 have_library: checking for BZ2_bzWriteOpen() in -lbz2... -------------------- yes
 
-"gcc -o conftest -I. -I/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib/ruby/1.8/universal-darwin10.0 -I/Users/michaeledgar/mygems/amp/ext/amp/bz2  -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE   -arch i386 -arch x86_64 -g -Os -pipe -fno-common -DENABLE_DTRACE  -fno-common  -pipe -fno-common   conftest.c  -L. -L/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib -L. -arch i386 -arch x86_64      -lruby -lbz2  -lpthread -ldl  "
-conftest.c: In function ‘t’:
-conftest.c:3: error: ‘BZ2_bzWriteOpen’ undeclared (first use in this function)
-conftest.c:3: error: (Each undeclared identifier is reported only once
-conftest.c:3: error: for each function it appears in.)
+"gcc -o conftest -I/usr/local/include/ruby1.9-1.9.1/i386-darwin10.0.0 -I/usr/local/include/ruby1.9-1.9.1/ruby/backward -I/usr/local/include/ruby1.9-1.9.1 -I/Users/michaeledgar/mygems/amp/ext/amp/bz2  -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE   -DRUBY_19  -O2 -g -Wall -Wno-parentheses -pipe -fno-common conftest.c  -L. -L/usr/local/lib -L. -L/usr/local/lib     -lruby1.9-static  -lpthread -ldl -lobjc  "
+checked program was:
+/* begin */
+1: #include "ruby.h"
+2: 
+3: int main() {return 0;}
+/* end */
+
+"gcc -o conftest -I/usr/local/include/ruby1.9-1.9.1/i386-darwin10.0.0 -I/usr/local/include/ruby1.9-1.9.1/ruby/backward -I/usr/local/include/ruby1.9-1.9.1 -I/Users/michaeledgar/mygems/amp/ext/amp/bz2  -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE   -DRUBY_19  -O2 -g -Wall -Wno-parentheses -pipe -fno-common conftest.c  -L. -L/usr/local/lib -L. -L/usr/local/lib     -lruby1.9-static -lbz2  -lpthread -ldl -lobjc  "
 conftest.c: In function ‘t’:
-conftest.c:3: error: ‘BZ2_bzWriteOpen’ undeclared (first use in this function)
-conftest.c:3: error: (Each undeclared identifier is reported only once
-conftest.c:3: error: for each function it appears in.)
-lipo: can't figure out the architecture type of: /var/folders/zy/zyqc-SWsGjeyuLdp+7qPO++++TI/-Tmp-//cc7a8sUN.out
+conftest.c:5: error: ‘BZ2_bzWriteOpen’ undeclared (first use in this function)
+conftest.c:5: error: (Each undeclared identifier is reported only once
+conftest.c:5: error: for each function it appears in.)
 checked program was:
 /* begin */
-1: /*top*/
-2: int main() { return 0; }
-3: int t() { void ((*volatile p)()); p = (void ((*)()))BZ2_bzWriteOpen; return 0; }
+1: #include "ruby.h"
+2: 
+3: /*top*/
+4: int main() {return 0;}
+5: int t() { void ((*volatile p)()); p = (void ((*)()))BZ2_bzWriteOpen; return 0; }
 /* end */
 
-"gcc -o conftest -I. -I/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib/ruby/1.8/universal-darwin10.0 -I/Users/michaeledgar/mygems/amp/ext/amp/bz2  -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE   -arch i386 -arch x86_64 -g -Os -pipe -fno-common -DENABLE_DTRACE  -fno-common  -pipe -fno-common   conftest.c  -L. -L/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib -L. -arch i386 -arch x86_64      -lruby -lbz2  -lpthread -ldl  "
+"gcc -o conftest -I/usr/local/include/ruby1.9-1.9.1/i386-darwin10.0.0 -I/usr/local/include/ruby1.9-1.9.1/ruby/backward -I/usr/local/include/ruby1.9-1.9.1 -I/Users/michaeledgar/mygems/amp/ext/amp/bz2  -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE   -DRUBY_19  -O2 -g -Wall -Wno-parentheses -pipe -fno-common conftest.c  -L. -L/usr/local/lib -L. -L/usr/local/lib     -lruby1.9-static -lbz2  -lpthread -ldl -lobjc  "
+conftest.c: In function ‘t’:
+conftest.c:5: warning: implicit declaration of function ‘BZ2_bzWriteOpen’
 checked program was:
 /* begin */
-1: /*top*/
-2: int main() { return 0; }
-3: int t() { BZ2_bzWriteOpen(); return 0; }
+1: #include "ruby.h"
+2: 
+3: /*top*/
+4: int main() {return 0;}
+5: int t() { BZ2_bzWriteOpen(); return 0; }
 /* end */
 
 --------------------

data/lib/amp.rb

@@ -152,7 +152,7 @@ end
 require      "amp/repository/repository.rb"
 
 module Amp
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
   VERSION_TITLE = "John Locke"
   
   def self.new_irb_session(bndng)

data/lib/amp/commands/commands/help.rb

@@ -8,7 +8,7 @@ command :help do |c|
     if args.empty?
       output << "These are the following commands available:\n"
       
-      Amp::Command.all_for_workflow(options[:global_config]["amp", "workflow"], false).sort {|k1, k2| k1.to_s <=> k2.to_s}.each do |k, v| 
+      Amp::Command.all_for_workflow(options[:global_config]["amp"]["workflow", Symbol, :hg], false).sort {|k1, k2| k1.to_s <=> k2.to_s}.each do |k, v| 
         output << "\t#{k.to_s.ljust(30, " ")}#{v.desc}" + "\n"
       end
       
@@ -17,7 +17,7 @@ command :help do |c|
       Amp::UI.say output
     else
       
-      unless cmd = Amp::Command.all_for_workflow(options[:global_config]["amp","workflow"])[args.first.to_sym]
+      unless cmd = Amp::Command.all_for_workflow(options[:global_config]["amp"]["workflow", Symbol, :hg])[args.first.to_sym]
         Amp::UI.say "The command #{args.first} was not found."
       else
         cmd.collect_options

data/lib/amp/commands/commands/workflows/hg/bundle.rb

@@ -27,7 +27,7 @@ EOS
 
   c.opt :force, "Run even when remote repository is unrelated",     :short => '-f'
   c.opt :rev,   "A changeset up to which you would like to bundle", :short => '-r', :type => :string
-  c.opt :base,  "A base changeset to specify instead of a destination",             :type => :string
+  c.opt :base,  "A base changeset to specify instead of a destination",             :type => :string, :multi => true
   c.opt :all,   "Bundle all changesets in the repository",          :short => '-a'
   c.opt :type,  "Bundle compression type to use (default: bzip2)",  :short => '-t',                   :default => 'bzip2'
   c.opt :ssh,   "Specify ssh command to use",                       :short => '-e', :type => :string
@@ -41,14 +41,17 @@ EOS
     
     # Type notation!
     # rev :: Amp::Changeset
-    rev  = repo.lookup rev
-    base = repo.lookup(opts[:all] ? nil : opts[:base]) # --all overrides --base
+    rev  &&= repo.lookup rev
+    base   = opts[:all] ? [nil] : (opts[:base] || []) # --all overrides --base
     
-    if base
+    # we want [nil] and ["1", "23"] to be triggered here.
+    if !base.empty?
       if dest
         raise abort("--base is incompatible with specifiying a destination")
       end
       
+      base = base.map {|b| repo.lookup b }
+      
       o   = []
       has = {Amp::RevlogSupport::Node::NULL_ID => nil}
       
@@ -57,7 +60,7 @@ EOS
         has.update repo.changelog.reachable_nodes_for_node(node_id)
       end
       
-      visit = [rev]
+      visit = rev ? [rev] : repo.changelog.heads
       seen  = {} # {node => Boolean} where node is a string
       add   = proc do |node|
         seen[node] = true
@@ -65,7 +68,7 @@ EOS
       end
       
       until visit.empty?
-        n = visit.pop
+        n = visit.shift
         
         # for those who are lame:
         # rents = 'rents = parents
@@ -84,16 +87,17 @@ EOS
       dest, revs, checkout = *c.parse_url(path, [rev])
       # alio is Esperanto for "other"; it's conveniently the same length as repo
       alio = Amp::Repositories.pick nil, dest
-      o = repo.find_outgoing_roots alio, :force => opts[:force]
+      o    = repo.find_outgoing_roots alio, :force => opts[:force]
     end # end if
     
     # Oh no, bitches! If you thought we were done, you'd be wrong.
     # Nevermind, false alarm. Turns out there's not that much left to do.
     
     cg = if revs
-           p [o, rev]
            repo.changegroup_subset o, [rev], 'bundle'
          else
+           p [">>", o]
+           # !!!!!!!!!!!! The bug is in the following line !!!!!!!!! KILLME
            repo.changegroup o, 'bundle'
          end
     

data/lib/amp/commands/commands/workflows/hg/clone.rb

@@ -1,5 +1,6 @@
 command :clone do |c|
   c.workflow :hg
+  
   c.desc "Clone a repository"
   c.opt :pull, "Whether to do a pull from the destination (the alternative is to stream)", :short => '-p'
   c.opt :stream, "stream raw data uncompressed from repository", :short => '-u'
@@ -23,9 +24,10 @@ amp clone [options]+ src dest
   If an exception is raised, the partly cloned/updated destination
   repository will be deleted.
   
-  Where options are:
+Where options are:
 HELP
   
+  c.no_repo
   c.on_run do |opts, args|
     require 'uri'
     

data/lib/amp/commands/dispatch.rb

@@ -52,11 +52,6 @@ module Amp
         global_config["debug", "messages"] = true
       end
       
-      unless global_config["amp"]["workflow"]
-        global_config["amp"]["workflow"] = :hg
-        global_config.save! rescue Errno::EACCES
-      end
-      
       # the options to send to the command
       cmd_opts = {}
       
@@ -83,7 +78,7 @@ module Amp
         cmd_opts[:repository].config && local_config = cmd_opts[:repository].config
       end
       
-      workflow = local_config["amp"]["workflow"]
+      workflow = local_config["amp"]["workflow", Symbol, :hg]
       
       if File.exists?(File.expand_path(File.join(File.dirname(__FILE__), "commands/workflows/#{workflow}/")))
         require_dir { "amp/commands/commands/workflows/#{workflow}/**/*.rb" }
@@ -140,7 +135,7 @@ module Amp
       rock_bottom = false
       begin
         rock_bottom = true if dir == "/" 
-        ["ampfile","Ampfile","ampfile.rb","Ampfile.rb"].each do |pos|
+        ["ampfile", "Ampfile", "ampfile.rb", "Ampfile.rb"].each do |pos|
           file = File.join(dir, pos)
           return file if File.exist? file
         end
@@ -163,7 +158,7 @@ module Amp
     # @param [String] cmd the command to look up
     # @return [Amp::Command] the command object that was found, or nil if none was found.
     def self.pick_command(cmd, config)  
-      my_flow = config["amp"]["workflow"]
+      my_flow = config["amp"]["workflow", Symbol, :hg]
       if c = Amp::Command.all_for_workflow(my_flow).keys.map {|k| k.to_s}.abbrev[cmd]
         Amp::Command.command_for_workflow(c, my_flow)
       else

data/lib/amp/dependencies/python_config.rb

@@ -175,6 +175,9 @@ module PythonConfig
       return str if args.size == 1
       
       type = args[1]
+      
+      # really? this needs to be a case-when statement... right after
+      # thanksgiving break
       if type == Integer || type == Fixnum || type == Bignum
         result = str.to_i
       elsif type == Boolean
@@ -185,6 +188,8 @@ module PythonConfig
         result = str.split(",").map {|s| s.strip}
       elsif type == String
         result = str
+      elsif type == Symbol
+        result = str.to_s
       end
       return result if args.size == 2
       

data/lib/amp/repository/repositories/local_repository.rb

@@ -655,9 +655,9 @@ module Amp
                 new_heads - old_heads + 1
               end # end if
         
-        class << ret
-          def success?; self <= 1 || hdz.size == 1; end
-        end
+        # class << ret
+        #   def success?; self <= 1 || hdz.size == 1; end
+        # end
         
         ret
       end # end def

data/lib/amp/revlogs/revlog.rb

@@ -81,7 +81,7 @@ module Amp
     # @return [String] the node's ID
     def node_id_for_index(index)
       unless @index[index]
-        raise RevlogSupport::LookupError.new("Couldn't find node for id '#{index}'")
+        raise RevlogSupport::LookupError.new("Couldn't find node for id #{index.inspect}")
       end
       @index[index].node_id
     end
@@ -97,8 +97,7 @@ module Amp
     #   the requested node.
     def revision_index_for_node(id)
       unless @index.node_map[id]
-        p id
-        raise StandardError.new("Couldn't find node for id '#{id}'")
+        raise StandardError.new("Couldn't find node for id #{id.inspect}")
       end
       @index.node_map[id]
     end

data/lib/amp/server/fancy_http_server.rb

@@ -218,6 +218,8 @@ module Amp
             :"c++"
           when ".txt"
             :text
+          when ".md", ".markdown"
+            :markdown
           else
             ext[1..-1].to_sym
           end

data/lib/amp/server/fancy_views/stylesheet.sass

@@ -135,7 +135,7 @@ ul.versions
       :text-decoration none
     &:hover
       :background-color = !lightblue
-      :border = solid 1px !darkblue
+      :border = "solid" 1px !darkblue
       :width 118px
       :height 19px
       :padding-top 1px

data/lib/amp/support/ruby_19_compatibility.rb

@@ -4,12 +4,15 @@ end
 
 if RUBY_VERSION < "1.9"
   class String
+    require 'enumerator' unless method_defined?(:to_enum)
+
     # DON'T USE String#each. Use String#each_line
     def lines
-      self.split("\n").each do |l|
+      return to_enum(:lines) if !block_given?
+      self.split(/^/).each do |l|
         yield l
       end
-    end
+    end unless method_defined?(:lines)
     
     ##
     # Returns the numeric, ascii value of the first character
@@ -18,13 +21,13 @@ if RUBY_VERSION < "1.9"
     # @return [Fixnum] the ascii value of the first character in the string
     def ord
       self[0]
-    end
+    end unless method_defined?(:ord)
   end
   class Object
     def tap
       yield self
       self
-    end
+    end unless method_defined?(:tap)
   end
 else
   # 1.9 +
@@ -63,4 +66,4 @@ else
       FileUtils.makedirs(*args)
     end
   end
-end
+end

data/lib/amp/support/support.rb

@@ -111,6 +111,8 @@ module Platform
   
   if RUBY_PLATFORM =~ /(i\d86)/i
      ARCH = :x86
+  elsif RUBY_PLATFORM =~ /(x86_64|amd64)/i
+     ARCH = :x86_64
   elsif RUBY_PLATFORM =~ /ia64/i
      ARCH = :ia64
   elsif RUBY_PLATFORM =~ /powerpc/i

data/site/Rakefile

@@ -3,12 +3,23 @@
 require 'rubygems'
 require 'rake'
 require 'rake/tasklib'
-require 'haml'
+
 require 'src/helpers.rb'
 require 'ftools'
 
 desc "Compile Site"
 task :"build-website" do
+  missing_gems = []
+  requirements = ['haml', 'uv']
+  requirements.each do |requirement|
+    begin
+      require requirement
+    rescue LoadError => e
+      puts "The following gems are required to build the amp website: #{requirements.join(", ")}"
+      puts "Install them as follows: gem install #{requirements.join(" ")}"
+      exit
+    end
+  end
   Dir["src/**/*.haml"].reject {|item| item.split("/").last =~ /^_/}.each do |haml|
     FileUtils.makedirs(File.dirname("build" + haml[3..-6] + ".html"))
     File.open("build" + haml[3..-6] + ".html","w") do |out|
@@ -22,3 +33,6 @@ task :"build-website" do
     end
   end
 end
+
+task :default => :"build-website" do
+end

data/site/src/about/ampfile.haml

@@ -54,4 +54,15 @@
           %p
             Well, start hacking away! You might find the #{commands_link} section interesting, as well as our #{link_to "/learn/", "Learn Amp"} pages, where you can find the #{blue_amp} API. We'll be setting up a place for useful snippets to be posted soon.
           
-    = render("include/_footer.haml")
+    = render("include/_footer.haml")
+    :plain
+      <script type="text/javascript">
+      var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+      document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+      </script>
+      <script type="text/javascript">
+      try {
+      var pageTracker = _gat._getTracker("UA-11746178-1");
+      pageTracker._setDomainName(".carboni.ca");
+      pageTracker._trackPageview();
+      } catch(err) {}</script>

data/site/src/about/commands.haml

@@ -103,4 +103,15 @@
             Once we extract our repository, we decide which changesets to print based on the options. To get a given changeset, we simply use #{shellscript "repo[x]"}, where #{shellscript "x"} can be a revision number, a partial node ID, "tip", and so on. See the documentation for #{link_to "http://amp.carboni.ca/docs/Amp/Repositories/LocalRepository.html#%5B%5D-instance_method", "LocalRepository#[]"} for more details.
           %p
             This is just a quick once-over of some of the more obvious features of #{blue_amp "Amp's"} command system - there are far more features to discuss. Until those pages are written, take a look at the #{link_to "http://amp.carboni.ca/docs/Amp/Command.html", "Documentation for the Command class"}.
-    = render("include/_footer.haml")
+    = render("include/_footer.haml")
+    :plain
+      <script type="text/javascript">
+      var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+      document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+      </script>
+      <script type="text/javascript">
+      try {
+      var pageTracker = _gat._getTracker("UA-11746178-1");
+      pageTracker._setDomainName(".carboni.ca");
+      pageTracker._trackPageview();
+      } catch(err) {}</script>

data/site/src/about/index.haml

@@ -30,4 +30,15 @@
             %li #{ampfile_link "Ampfiles"} - tweak amp's settings for a specific repository with one file
             %li Want more features? #{link_to "/contribute/", "Help develop"} #{blue_amp "Amp"}! We've got a lot planned! 
           
-    = render("include/_footer.haml")
+    = render("include/_footer.haml")
+    :plain
+      <script type="text/javascript">
+      var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+      document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+      </script>
+      <script type="text/javascript">
+      try {
+      var pageTracker = _gat._getTracker("UA-11746178-1");
+      pageTracker._setDomainName(".carboni.ca");
+      pageTracker._trackPageview();
+      } catch(err) {}</script>

data/site/src/about/performance.haml

@@ -15,7 +15,7 @@
           %p
             We want #{blue_amp} to be fast. Like, as fast as possible. The biggest problem: Ruby isn't very fast. So here's our current goal: <b>we want #{blue_amp} to be as fast as mercurial</b>.
           %p
-            #{hg_link "Mercurial"} is written in Python, which according to the #{link_to "http://shootout.alioth.debian.org/", "Great Language Shootout"} is #{link_to "http://shootout.alioth.debian.org/u64q/benchmark.php?test=all&lang=python&lang2=ruby&box=1", "3-10 times slower than Python"}. That's for MRI 1.8.6 - here's a link to #{link_to "http://shootout.alioth.debian.org/u64q/benchmark.php?test=all&lang=python&lang2=jruby&box=1", "JRuby"} and #{link_to "http://shootout.alioth.debian.org/u32/benchmark.php?test=all&lang=yarv&lang2=python&box=1", "Ruby 1.9"}, which are similar though an improvement.
+            Amp is written in #{ruby_link "Ruby"}, which according to the #{link_to "http://shootout.alioth.debian.org/", "Great Language Shootout"} is #{link_to "http://shootout.alioth.debian.org/u64q/benchmark.php?test=all&lang=python&lang2=ruby&box=1", "3-10 times slower than Python"}. That's for MRI 1.8.6 - here's a link to #{link_to "http://shootout.alioth.debian.org/u64q/benchmark.php?test=all&lang=python&lang2=jruby&box=1", "JRuby"} and #{link_to "http://shootout.alioth.debian.org/u32/benchmark.php?test=all&lang=yarv&lang2=python&box=1", "Ruby 1.9"}, which are similar though an improvement.
           %h2 So how's that going?
           %p
             We hope to have some direct, auto-generated benchmarks up here soon. But for now - many amp operations are <b>only 1.5-2 times slower than Mercurial</b>. That's within the range that the language barrier is the major factor. Of course, we hope to do better.
@@ -28,4 +28,15 @@
           %p
             Head on over the #{contribute_link} page and join us! There's plenty of places where we can optimize code (or even if you want to help get some auto-generated benchmarks on this page, that'd be awesome too!)
           
-    = render("include/_footer.haml")
+    = render("include/_footer.haml")
+    :plain
+      <script type="text/javascript">
+      var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+      document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+      </script>
+      <script type="text/javascript">
+      try {
+      var pageTracker = _gat._getTracker("UA-11746178-1");
+      pageTracker._setDomainName(".carboni.ca");
+      pageTracker._trackPageview();
+      } catch(err) {}</script>

data/site/src/about/workflows.haml

@@ -31,4 +31,15 @@
           %h2 The git workflow sucks.
           %p
             We know. We're working on it. But #{commands_link "writing commands"} is actually pretty easy - do you want to #{contribute_link "help us out"}?
-    = render("include/_footer.haml")
+    = render("include/_footer.haml")
+    :plain
+      <script type="text/javascript">
+      var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+      document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+      </script>
+      <script type="text/javascript">
+      try {
+      var pageTracker = _gat._getTracker("UA-11746178-1");
+      pageTracker._setDomainName(".carboni.ca");
+      pageTracker._trackPageview();
+      } catch(err) {}</script>

data/site/src/contribute/index.haml

@@ -17,8 +17,8 @@
           %ul.bullets{:style => "margin-left:2em;"}
             %li The #{link_to "http://bitbucket.org/carbonica/amp/", "BitBucket source"}. We accept pull requests!
             %li Our #{link_to "http://github.com/michaeledgar/amp", "GitHub mirror"}. We accept GitHub pull requests!
-            %li We use #{link_to "http://bitbucket.org/carbonica/amp/issues/?status=new&status=open", "BitBucket's issue tracker."}...
-            %li ... and BitBucket's #{link_to "http://bitbucket.org/carbonica/amp/wiki/Home", "wiki, too."}
+            %li We use #{link_to "http://carbonica.lighthouseapp.com/projects/35539-amp/overview", "a LightHouse issue tracker."}...
+            %li ... and BitBucket's #{link_to "http://bitbucket.org/carbonica/amp/wiki/Home", "wiki."}
             %li Lastly, we've got a #{link_to "http://groups.google.com/group/amp-vcs/", "Google Group"}.
           %h2 OK, but how do I submit code?
           %p
@@ -62,4 +62,15 @@
               %li
                 %span{:style => "width:80px;"}= commits.to_s
                 %span{:style => "width:400px;"}= user
-    = render("include/_footer.haml")
+    = render("include/_footer.haml")
+    :plain
+      <script type="text/javascript">
+      var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+      document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+      </script>
+      <script type="text/javascript">
+      try {
+      var pageTracker = _gat._getTracker("UA-11746178-1");
+      pageTracker._setDomainName(".carboni.ca");
+      pageTracker._trackPageview();
+      } catch(err) {}</script>

data/site/src/contribute/style.haml

@@ -294,4 +294,15 @@
                                                :date => Time.now, 
                                                :changeset_base => repo[arg1.to_i], 
                                                :ancestor => some_other_changeset
-    = render("include/_footer.haml")
+    = render("include/_footer.haml")
+    :plain
+      <script type="text/javascript">
+      var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+      document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+      </script>
+      <script type="text/javascript">
+      try {
+      var pageTracker = _gat._getTracker("UA-11746178-1");
+      pageTracker._setDomainName(".carboni.ca");
+      pageTracker._trackPageview();
+      } catch(err) {}</script>

data/site/src/get/index.haml

@@ -29,4 +29,15 @@
           %p
             Amp's gem is hosted on #{link_to "http://www.rubyforge.org/", "Rubyforge"} and #{link_to "http://www.gemcutter.org/", "Gemcutter"}.
           
-    = render("include/_footer.haml")
+    = render("include/_footer.haml")
+    :plain
+      <script type="text/javascript">
+      var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+      document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+      </script>
+      <script type="text/javascript">
+      try {
+      var pageTracker = _gat._getTracker("UA-11746178-1");
+      pageTracker._setDomainName(".carboni.ca");
+      pageTracker._trackPageview();
+      } catch(err) {}</script>

data/site/src/helpers.rb

@@ -47,7 +47,7 @@ def hg_link(text = "Mercurial")
 end
 
 def yard_link(text = "YARD")
-  link_to "http://yard.soen.ca/", text
+  link_to "http://yardoc.org", text
 end
 
 def lighthouse_link(text = "Lighthouse")

data/site/src/index.haml

@@ -29,7 +29,7 @@
               %ul.bullets
                 %li== #{hg_link} in #{link_to "http://www.ruby-lang.org/", "Ruby"}. 100% compatible with hg.
                 %li== Uniquely #{link_to "/about/customization.html", "customizable"}
-                %li== Superbly #{link_to "/docs/", "documented"} with #{link_to "http://yard.soen.ca/", "YARD"}
+                %li== Superbly #{link_to "/docs/", "documented"} with #{yard_link "YARD"}
                 %li== Free and Open-Source (#{link_to "http://www.gnu.org/licenses/gpl-2.0.html", "GPLv2"})
                 %li== #{link_to "/about/performance.html", "Performance"} Focused
                 %li Dependency-free (you just need Ruby!)
@@ -100,5 +100,16 @@
                   %span.shellscript hg diff -r rev1 -r rev2 -U 3 > your.patch
                 %li Create ticket on #{lighthouse_link "Lighthouse, attach your patch"}
                 %li Land one patch, you get commit rights
-              %p== Want more details? Check out our #{link_to "/contributing/", "contributing page." } Or join us at #{link_to "irc://irc.freenode.net/#amp", "#amp on freenode" }.
-    = render("include/_footer.haml")
+              %p== Want more details? Check out our #{link_to "/contribute/", "contributing page." } Or join us at #{link_to "irc://irc.freenode.net/#amp", "#amp on freenode" }.
+    = render("include/_footer.haml")
+    :plain
+      <script type="text/javascript">
+      var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+      document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+      </script>
+      <script type="text/javascript">
+      try {
+      var pageTracker = _gat._getTracker("UA-11746178-1");
+      pageTracker._setDomainName(".carboni.ca");
+      pageTracker._trackPageview();
+      } catch(err) {}</script>

data/site/src/learn/index.haml

@@ -43,4 +43,15 @@
             = link_to "/docs/", "API Documentation"
           %p
             One of the most important aspects of our code is that it should be highly documented. We're sitting at around 45% comment/LOC ratio, and there's still plenty of places we want more documentation. We use #{yard_link} to document our code. You can find the complete documentation for our code (and the dependencies we've included in the #{blue_amp} source) by clicking "API Documentation" above, or just clicking #{link_to "/docs/", "right here"}.
-    = render("include/_footer.haml")
+    = render("include/_footer.haml")
+    :plain
+      <script type="text/javascript">
+      var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+      document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+      </script>
+      <script type="text/javascript">
+      try {
+      var pageTracker = _gat._getTracker("UA-11746178-1");
+      pageTracker._setDomainName(".carboni.ca");
+      pageTracker._trackPageview();
+      } catch(err) {}</script>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: amp
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors: 
 - Michael Edgar
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-23 00:00:00 -05:00
+date: 2009-11-27 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency