amp 0.5.2 → 0.5.3

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

@@ -42,7 +42,7 @@ command :tag do |c|
           raise abort("tag #{name} is not a #{expected_type} tag")
         end
       end
-      rev = Amp::RevlogSupport::Node::NULL_ID
+      rev = Amp::Mercurial::RevlogSupport::Node::NULL_ID
       message ||= "Removed tag #{names.join(", ")}"
     elsif !opts[:force]
       names.each do |name|
@@ -53,7 +53,7 @@ command :tag do |c|
       end
     end
     
-    if !rev && repo.dirstate.parents[1] != Amp::RevlogSupport::Node::NULL_ID
+    if !rev && repo.dirstate.parents[1] != Amp::Mercurial::RevlogSupport::Node::NULL_ID
       raise abort("uncommited merge - please provide" +
                                          " a specific revision")
     end

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

@@ -0,0 +1,12 @@
+command :untrack do |c|
+  c.workflow :hg
+  c.desc "Stop tracking the file"
+  
+  c.on_run do |opts, args|
+    opts[:"no-unlink"] = true
+    opts[:quiet]       = true
+    
+    puts "Forgetting #{args.size} file#{args.size == 1 ? '' : 's'}"
+    Amp::Command['remove'].run opts, args
+  end
+end

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

@@ -1,9 +1,19 @@
 command :verify do |c|
-  c.desc "Verifies the mercurial repository, checking for integrity errors"
   c.workflow :hg
+  
+  c.desc "Verifies the mercurial repository, checking for integrity errors"
   c.on_run do |opts, args|
     results = opts[:repository].verify
-    puts "#{results.files} files, #{results.changesets} changesets, #{results.revisions} revisions"
-    puts "#{results.errors} integrity errors, #{results.warnings} warnings." if results.errors > 0 || results.warnings > 0
+    
+    Amp::UI.tell "#{results.files} file#{results.files == 1 ? '' : 's' }, "
+    Amp::UI.tell "#{results.changesets} changeset#{results.changesets == 1 ? '' : 's' }, "
+    Amp::UI.tell "#{results.revisions} revision#{results.revisions == 1 ? '' : 's' }"
+    
+    if results.errors > 0 || results.warnings > 0
+      Amp::UI.tell ", #{results.errors} integrity error#{results.errors == 1 ? '' : 's' }, "
+      Amp::UI.tell "#{results.warnings} warning#{results.warnings == 1 ? '' : 's' }."
+    end
+    
+    Amp::UI.say
   end
 end

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

@@ -0,0 +1,18 @@
+command :"what-changed" do |c|
+  c.workflow :hg
+  
+  c.desc "Which commits have touched this file?"
+  c.opt :limit, "Limit how many revisions to show", :short => "-l", :type => :integer, :default => -1
+  c.opt :template, "Which template to use while printing", :short => "-t", :type => :string, :default => "default"
+  
+  c.on_run do |opts, args|
+    repo = opts[:repository]
+    file = repo.versioned_file args.shift
+    revs = file.map {|vf| vf.link_rev }
+    revs = revs[-opts[:limit]..-1] unless opts[:limit] <= 0
+    
+    revs.reverse.each do |rev|
+      Amp::UI.say repo[rev].to_templated_s(opts)
+    end
+  end
+end

data/lib/amp/commands/dispatch.rb

@@ -21,7 +21,7 @@ module Amp
       global_opts = Trollop::options do
         banner "Amp - some more crystal, sir?"
         version "Amp version #{Amp::VERSION} (#{Amp::VERSION_TITLE})"
-        opt :debug_opts,      "Debug the command-line options", :short => "-d", :default => false, :type => :boolean
+        opt :"debug-opts",      "Debug the command-line options", :short => "-d"
         opt :verbose,         "Verbose output"
         opt :profile,         "Profile the command being run, running it the given number of times"
         opt :repository,      "The path to the repository to use", :short => "-R", :type => :string, :default => Dir.pwd
@@ -41,14 +41,12 @@ module Amp
         $USE_RUBY = true
       end
       
-      global_config = Amp::AmpConfig.new
+      global_config  = Amp::AmpConfig.new
       Amp::UI.config = global_config
-      cmd = ARGV.shift # get the subcommand
-      cmd ||= "default"
+      cmd            = ARGV.shift || "default" # get the subcommand
+      opts_as_arr    = ARGV.dup
       
-      opts_as_arr = ARGV.dup
-      
-      if global_opts[:debug_opts]
+      if global_opts[:"debug-opts"]
         global_config["debug", "messages"] = true
       end
       
@@ -94,7 +92,7 @@ module Amp
       
       unless command
         puts "Invalid command! #{cmd}"
-        exit(-1)
+        return false
       end
       
       # get the sub-command's options
@@ -102,7 +100,7 @@ module Amp
       cmd_opts.merge!(command.collect_options) {|k, v1, v2| v2 || v1 }
       
       cmd_opts[:global_config] = local_config
-      if global_opts[:debug_opts]
+      if global_opts[:"debug-opts"]
         require 'yaml'
         puts "Current directory: #{Dir.pwd}"
         puts "Global options: \n#{global_opts.inspect.to_yaml}"
@@ -115,14 +113,16 @@ module Amp
         puts
       end
       
+      result = false
       # Run that fucker!!!
       begin
-        full_backtrace_please do
-          command.run cmd_opts, ARGV
-        end
+        #full_backtrace_please do
+          result = command.run cmd_opts, ARGV
+        #end
       rescue AbortError => e
         puts e.to_s
       end
+      result
     end
     
     ##
@@ -164,7 +164,6 @@ module Amp
         
         if prefix_list.size > 1
           puts "Ambiguous command: #{cmd}. Could mean: #{prefix_list.join(", ")}"
-          exit(-1)
         end
         nil
       end

data/lib/amp/dependencies/amp_support.rb

@@ -1 +1 @@
-amp_c_extension '../../../ext/amp/support/Support', 'amp_support/ruby_amp_support'
+amp_c_extension 'amp/support/CSupport', 'amp_support/ruby_amp_support'

data/lib/amp/dependencies/amp_support/ruby_amp_support.rb

@@ -1,3 +1,4 @@
+p "LOADING RUBY AMP SUPPORT"
 ##
 # Ruby versions of slow functions we've implemented in C
 class Integer

data/lib/amp/dependencies/maruku.rb

@@ -0,0 +1,136 @@
+#--
+#   Copyright (C) 2006  Andrea Censi  <andrea (at) rubyforge.org>
+#
+# This file is part of Maruku.
+# 
+#   Maruku is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 2 of the License, or
+#   (at your option) any later version.
+# 
+#   Maruku is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+# 
+#   You should have received a copy of the GNU General Public License
+#   along with Maruku; if not, write to the Free Software
+#   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#++
+
+require 'rexml/document'
+
+dir_path = File.expand_path(File.dirname(__FILE__))
+$:.unshift dir_path
+
+# :include:MaRuKu.txt
+module MaRuKu
+
+	module In
+		module Markdown
+			module SpanLevelParser; end
+			module BlockLevelParser; end
+		end
+		# more to come?
+	end
+
+	module Out
+		# Functions for exporting to MarkDown.
+		module Markdown; end
+		# Functions for exporting to HTML.
+		module HTML; end
+		# Functions for exporting to ANSI
+		module Ansi; end
+	end
+		
+	# These are strings utilities.
+	module Strings; end
+
+	module Helpers; end
+
+	module Errors; end
+		
+	class MDElement
+		include REXML
+		include MaRuKu
+		include Out::Markdown
+		include Out::HTML
+		include Out::Ansi
+		include Strings
+		include Helpers
+		include Errors
+	end
+	
+	
+	class MDDocument < MDElement
+		include In::Markdown
+		include In::Markdown::SpanLevelParser
+		include In::Markdown::BlockLevelParser
+	end
+end
+
+# This is the public interface
+class Maruku < MaRuKu::MDDocument; end
+
+
+
+require 'rexml/document'
+
+# Structures definition
+require 'maruku/structures'
+require 'maruku/structures_inspect'
+
+require 'maruku/defaults'
+# Less typing
+require 'maruku/helpers'
+
+# Code for parsing whole Markdown documents
+require 'maruku/input/parse_doc'
+
+# Ugly things kept in a closet
+require 'maruku/string_utils'
+require 'maruku/input/linesource'
+require 'maruku/input/type_detection'
+
+# A class for reading and sanitizing inline HTML
+require 'maruku/input/html_helper'
+
+# Code for parsing Markdown block-level elements
+require 'maruku/input/parse_block'
+
+# Code for parsing Markdown span-level elements
+require 'maruku/input/charsource'
+require 'maruku/input/parse_span_better'
+require 'maruku/input/rubypants'
+
+require 'maruku/input/extensions'
+
+require 'maruku/attributes'
+
+require 'maruku/structures_iterators'
+
+require 'maruku/errors_management'
+
+# Code for creating a table of contents
+require 'maruku/toc'
+
+# Version and URL
+require 'maruku/version'
+
+
+# Exporting to html
+require 'maruku/output/to_html'
+
+# Exporting to ansi terminal output
+require 'maruku/output/to_ansi'
+
+# Pretty print
+require 'maruku/output/to_markdown'
+
+# Exporting to text: strips all formatting (not complete)
+require 'maruku/output/to_s'
+
+# class Maruku is the global interface
+require 'maruku/maruku'
+
+$:.delete dir_path

data/lib/amp/dependencies/maruku/attributes.rb

@@ -0,0 +1,227 @@
+#--
+#   Copyright (C) 2006  Andrea Censi  <andrea (at) rubyforge.org>
+#
+# This file is part of Maruku.
+# 
+#   Maruku is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 2 of the License, or
+#   (at your option) any later version.
+# 
+#   Maruku is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+# 
+#   You should have received a copy of the GNU General Public License
+#   along with Maruku; if not, write to the Free Software
+#   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#++
+
+
+class String
+	def quote_if_needed
+		if /[\s\'\"]/.match self
+			inspect
+		else
+			self
+		end
+	end
+end
+
+module MaRuKu; 
+	MagicChar = ':'
+	
+	class AttributeList < Array
+		
+		# An attribute list becomes 
+		# {#id .cl key="val" ref}
+		# [ [:id, 'id'], [:class, 'id'], ['key', 'val'], [ :ref, 'ref' ]]
+
+		private :push
+		
+		def push_key_val(key, val); 
+			raise "Bad #{key.inspect}=#{val.inspect}" if not key and val
+			push [key, val] 
+		end
+		def push_ref(ref_id);       
+			
+			raise "Bad :ref #{ref_id.inspect}" if not ref_id
+			push [:ref, ref_id+""] 
+
+#			p "Now ", self ########################################
+		end
+		def push_class(val);        
+			raise "Bad :id #{val.inspect}" if not val
+			push [:class,  val] 
+		end
+		def push_id(val);           
+			raise "Bad :id #{val.inspect}" if not val
+			push [:id,  val] 
+		end
+		
+		def to_s
+			map do |k,v|
+				case k
+				when :id;    "#" + v.quote_if_needed
+				when :class; "." + v.quote_if_needed
+				when :ref;    v.quote_if_needed
+				else k.quote_if_needed + "=" + v.quote_if_needed
+				end
+			end . join(' ')
+		end
+		alias to_md to_s 
+	end
+	
+end
+
+module MaRuKu; module In; module Markdown; module SpanLevelParser
+	
+	def unit_tests_for_attribute_lists
+		[
+			[ "",     [], "Empty lists are allowed" ], 
+			[ "=",    :throw, "Bad char to begin a list with." ], 
+			[ "a =b", :throw, "No whitespace before `=`." ], 
+			[ "a= b", :throw, "No whitespace after `=`." ], 
+
+			[ "a b", [[:ref, 'a'],[:ref, 'b']], "More than one ref" ], 
+			[ "a b c", [[:ref, 'a'],[:ref, 'b'],[:ref, 'c']], "More than one ref" ], 
+			[ "hello notfound", [[:ref, 'hello'],[:ref, 'notfound']]], 
+
+			[ "'a'",  [[:ref, 'a']], "Quoted value." ], 
+			[ '"a"'   ], 
+
+			[ "a=b",  [['a','b']], "Simple key/val" ], 
+			[ "'a'=b"   ], 
+			[ "'a'='b'" ], 
+			[ "a='b'"   ], 
+
+			[ 'a="b\'"',  [['a',"b\'"]], "Key/val with quotes" ],
+			[ 'a=b\''],
+			[ 'a="\\\'b\'"',  [['a',"\'b\'"]], "Key/val with quotes" ], 
+			
+			['"', :throw, "Unclosed quotes"],
+			["'"],
+			["'a "],
+			['"a '],
+			
+			[ "#a",  [[:id, 'a']], "Simple ID" ], 
+			[ "#'a'" ], 
+			[ '#"a"' ], 
+
+			[ "#",  :throw, "Unfinished '#'." ], 
+			[ ".",  :throw, "Unfinished '.'." ], 
+			[ "# a",  :throw, "No white-space after '#'." ], 
+			[ ". a",  :throw, "No white-space after '.' ." ], 
+			
+			[ "a=b c=d",  [['a','b'],['c','d']], "Tabbing" ], 
+			[ " \ta=b \tc='d' "],
+			[ "\t a=b\t c='d'\t\t"],
+			
+			[ ".\"a'",  :throw, "Mixing quotes is bad." ], 
+			
+		].map { |s, expected, comment| 
+			@expected = (expected ||= @expected)
+			@comment  = (comment  ||= (last=@comment) )
+			(comment == last && (comment += (@count+=1).to_s)) || @count = 1
+			expected = [md_ial(expected)] if expected.kind_of? Array
+			["{#{MagicChar}#{s}}", expected, "Attributes: #{comment}"]
+		}
+	end
+	
+	def md_al(s=[]); AttributeList.new(s) end
+
+	# returns nil or an AttributeList
+	def read_attribute_list(src, con, break_on_chars)
+		
+		separators = break_on_chars + [?=,?\ ,?\t]
+		escaped = Maruku::EscapedCharInQuotes
+			
+		al = AttributeList.new
+		while true
+			src.consume_whitespace
+			break if break_on_chars.include? src.cur_char
+	
+			case src.cur_char
+			when nil 
+				maruku_error "Attribute list terminated by EOF:\n "+
+				             "#{al.inspect}" , src, con
+				tell_user "I try to continue and return partial attribute list:\n"+
+					al.inspect
+				break
+			when ?=     # error
+				maruku_error "In attribute lists, cannot start identifier with `=`."
+				tell_user "I try to continue"
+				src.ignore_char
+			when ?#     # id definition
+				src.ignore_char
+				if id = read_quoted_or_unquoted(src, con, escaped, separators)
+					al.push_id id
+				else
+					maruku_error 'Could not read `id` attribute.', src, con
+					tell_user 'Trying to ignore bad `id` attribute.'
+				end
+			when ?.     # class definition
+				src.ignore_char
+				if klass = read_quoted_or_unquoted(src, con, escaped, separators)
+					al.push_class klass
+				else
+					maruku_error 'Could not read `class` attribute.', src, con
+					tell_user 'Trying to ignore bad `class` attribute.'
+				end
+			else
+				if key = read_quoted_or_unquoted(src, con, escaped, separators)
+					if src.cur_char == ?=
+						src.ignore_char # skip the =
+						if val = read_quoted_or_unquoted(src, con, escaped, separators)
+							al.push_key_val(key, val)
+						else
+							maruku_error "Could not read value for key #{key.inspect}.",
+								src, con
+							tell_user "Ignoring key #{key.inspect}."
+						end
+					else
+						al.push_ref key
+					end
+				else
+					maruku_error 'Could not read key or reference.'
+				end
+			end # case
+		end # while true
+		al
+	end
+	
+	
+	# We need a helper
+	def is_ial(e); e.kind_of? MDElement and e.node_type == :ial end
+
+	def merge_ial(elements, src, con)	
+
+		# Apply each IAL to the element before
+		elements.each_with_index do |e, i| 
+		if is_ial(e) && i>= 1 then
+			before = elements[i-1]
+			after = elements[i+1]
+			if before.kind_of? MDElement
+				before.al = e.ial
+			elsif after.kind_of? MDElement
+				after.al = e.ial
+			else
+				maruku_error "It is not clear to me what element this IAL {:#{e.ial.to_md}} \n"+
+				"is referring to. The element before is a #{before.class.to_s}, \n"+
+				"the element after is a #{after.class.to_s}.\n"+
+				"\n before: #{before.inspect}"+
+				"\n after: #{after.inspect}",
+				src, con
+				# xxx dire se c'è empty vicino
+			end
+		end 
+		end
+		
+		if not Globals[:debug_keep_ials]
+			elements.delete_if {|x| is_ial(x) unless x == elements.first} 
+		end
+	end
+		
+end end end end 
+#module MaRuKu; module In; module Markdown; module SpanLevelParser