amp 0.5.0

data/test/functional_tests/resources/version4/commands/experimental/lolcats.rb

@@ -0,0 +1,17 @@
+command :lolcats do |c|
+  c.opt :cheezburger, "Add cheezburger to lolcat"
+  c.on_run do |opts, args|
+    puts "lolcats!"
+    puts "lolcats!"
+    puts "lolcats!"
+    puts "lolcats!"
+    puts "lolcats!"
+  end
+  
+  c.before do |opts, args|
+    puts "Before lolcats...."
+  end
+  c.after do |opts, args|
+    puts "After lolcats!"
+  end
+end

data/test/functional_tests/resources/version4/commands/heads.rb

@@ -0,0 +1,22 @@
+command :heads do |c|
+  c.desc "Prints the heads of the repository."
+  c.add_opt :rev, "show only heads which are descendants of rev", {:short => "-r"}
+  c.add_opt :active, "show only active heads", {:short => "-a"}
+  c.add_opt :template, "Which template to use while printing", {:short => "-t", :type => :string, :default => "default"}
+  c.on_run do |options, args|
+    repo   = options[:repository]
+    start  = options[:rev] ? repo.lookup(options[:rev]) : nil
+    closed = options[:active]
+    if args.size == 0
+      heads = repo.heads(start, :closed => closed)
+    else
+      #branch shit
+    end
+    
+    options.merge!({:template_type => :log})
+    heads.each do |n|
+      puts repo[n].to_templated_s(options)
+    end
+    
+  end
+end

data/test/functional_tests/resources/version4/commands/manifest.rb

@@ -0,0 +1,12 @@
+command :manifest do |c|
+  c.desc "Prints the manifest at a given revision (defaults to working directory)"
+  c.add_opt :rev, "Specifies the revision to check", {:short => "-r", :type => :integer}
+  c.on_run do |options, arguments|
+    revision = options[:rev]
+    repo = options[:repository]
+    
+    repo[revision].each do |k, v|
+      puts "#{k}"
+    end
+  end
+end

data/test/functional_tests/resources/version4/commands/stats.rb

@@ -0,0 +1,25 @@
+command :stats do |c|
+  c.desc "Prints the stats at a given revision (defaults to working directory)"
+  c.add_opt :rev, "Specifies the revision to check", {:short => "-r", :type => :integer}
+  c.on_run do |options, arguments|
+    revision = options[:rev]
+    repo = options[:repository]
+    
+    repo[revision].each do |k, v|
+      puts "#{k}"
+    end
+  end
+end
+
+command :stats do |c|
+  c.desc "Prints the stats at a given revision (defaults to working directory)"
+  c.add_opt :rev, "Specifies the revision to check", {:short => "-r", :type => :integer}
+  c.on_run do |options, arguments|
+    revision = options[:rev]
+    repo = options[:repository]
+    
+    repo[revision].each do |k, v|
+      puts "#{k}"
+    end
+  end
+end

data/test/functional_tests/resources/version4/commands/status.rb

@@ -0,0 +1,90 @@
+command :status do |c|
+  c.desc "Prints the status of the working directory (or another revision)"
+  c.add_opt :all, "Show all files", {:short => "-A"}
+  c.add_opt :modified, "Show only modified files", {:short => "-m"}
+  c.add_opt :added,    "Show only added files", {:short => "-a"}
+  c.add_opt :deleted,  "Show only deleted files", {:short => "-D"}
+  c.add_opt :removed,  "Show only removed files", {:short => "-R"}
+  c.add_opt :clean,    "Show only files without changes", {:short => "-c"}
+  c.add_opt :unknown,  "Show only untracked files", {:short => "-u"}
+  c.add_opt :ignored,  "Show only ignored files", {:short => "-i"}
+  c.add_opt :rev,      "Selects which revision to use", {:short => "-r", :type => :string, :multi => true}
+  c.add_opt :hg,       "Print the information in hg's style"
+  c.add_opt :"no-color","Don't use color to categorize the output"
+  c.synonym :st
+  
+  c.on_run do |options, args|
+    repo = options[:repository]
+    node1, node2 = c.revision_pair(repo, options[:rev])
+    cwd = "" # use patterns later
+    stop = "\n"
+    copy = {}
+    colors = {'modified' => :cyan,
+              'added'    => :blue,
+              'removed'  => :red,
+              'deleted'  => :magenta,
+              'unknown'  => :green,
+              'ignored'  => :yellow,
+              'clean'    => :white
+             }
+    states = ['modified',
+              'added'   ,
+              'removed' ,
+              'deleted' ,
+              'unknown' ,
+              'ignored' ,
+              'clean'   ]
+    show = states.select {|k| options[k.to_sym]} # filter the list down
+    
+    show = states if options[:all]
+    show = states[0..4] if show.empty?
+    
+    statopts = {:node_1 => node1, :node_2 => node2 }
+    
+    show.each {|switch| statopts[switch.to_sym] = true }
+
+    status = repo.status statopts
+    
+    # PRINTING TIME!!!!!!!!
+    
+    if options[:hg]
+      status_as_array = [status[:modified],
+                         status[:added],
+                         status[:removed],
+                         status[:deleted],
+                         status[:unknown],
+                         status[:ignored],
+                         status[:clean]
+                        ]
+      changestates = states.zip("MAR!?IC".split(""), status_as_array)
+      changestates.each do |state, char, files|
+        if show.include? state
+          files.each do |f|
+            if options[:"no-color"]
+              Amp::UI.say "#{char} #{File.join(cwd, f.to_s)[1..-1]}#{stop}" unless f.nil?
+            else
+              Amp::UI.say "#{char.send colors[state]} #{File.join(cwd, f.to_s)[1..-1]}#{stop}" unless f.nil?
+            end
+          end
+        end
+      end
+    else
+      # print it our way
+      
+      show.each do |state|
+        next if status[state.to_sym].empty?
+        num_of_files = status[state.to_sym].size
+        
+        Amp::UI.say("#{state.upcase.send colors[state]}" +
+            " => #{num_of_files} file#{num_of_files > 1 ? 's' : ''}")
+        
+        status[state.to_sym].each do |file|
+          Amp::UI.say "\t#{File.join(cwd, file)[1..-1]}"
+        end
+        
+        puts
+      end
+    end
+    
+  end
+end

data/test/functional_tests/resources/version5_1/.hgignore

@@ -0,0 +1,5 @@
+syntax: regexp
+.*?lolcats\.rb$
+
+syntax: glob
+commands/experimental/*

data/test/functional_tests/resources/version5_1/STYLE.txt

@@ -0,0 +1,2 @@
+The Amp Commandments Redux:
+	1. This is intended to genreate a conflict. I'm out of witty stuff to put here.

data/test/functional_tests/resources/version5_1/command.rb

@@ -0,0 +1,374 @@
+need { 'command_support.rb' }
+module Amp
+  ##
+  # Represents a command within the Amp system. Simply instantiating a new
+  # command will make it available to the Amp executable. You configure the
+  # command by filling out a block in the command's initializer. 
+  # @example 
+  #   Command.new("add") do |c|
+  #     c.opt :include, "Paths to include", 
+  #                         :options => {:short => "-I", :multi => true}
+  #     c.opt :print_names, :desc => "Print the filenames", 
+  #               :options => {:short => "-p", 
+  #                            :default => false, 
+  #                             :type => :boolean}
+  #     c.on_run do |options, arguments|
+  #       if options[:print_names]
+  #         arguments.each do |filename|
+  #           puts filename
+  #         end
+  #       end
+  #     end
+  #     c.help "This is the help text when the user runs `amp help add`"
+  #   end
+  #
+  class Command
+    include CommandSupport
+    # All the commands registered in the system
+    @@all_commands = {}
+    
+    # Synonyms for commands. Used as a backup.
+    @@all_synonyms = {}
+    
+    # These are options that all commands support. Allows the user to put
+    # them after the subcommand.
+    GLOBAL_OPTIONS = []
+    
+    ##
+    # Returns all of the commands registered in the system.
+    # 
+    # @return [Hash] the commands, keyed by command name as a string
+    def self.all_commands
+      @@all_commands
+    end
+    
+    ##
+    # Returns all the synonyms registered in the system.
+    #
+    # @return [Hash] the synonyms, keyed by the synonym as a string
+    def self.all_synonyms
+      @@all_synonyms
+    end
+    
+    ##
+    # Returns all of the commands registered in the system.
+    # 
+    # @return [Hash] the commands, keyed by command name as a string
+    def self.[](arg)
+      return all_commands[arg] if all_commands[arg]
+      return all_synonyms[arg] if all_synonyms[arg]
+      nil
+    end
+
+    # Command-specific command-line options
+    attr_accessor :options
+    # The name of the command (eg add, init)
+    attr_accessor :name
+    # Short, 1-line description of the command
+    attr_accessor :description
+    # The options submitted
+    attr_accessor :options
+    
+    ##
+    # Creates a command in the Amp system. Simply instantiating a new
+    # command will make it available to the Amp executable. You configure the
+    # command by filling out a block in the command's initializer.
+    # 
+    # @example
+    #   Command.new("add") do |c|
+    #     c.opt :include, "Paths to include", 
+    #               :options => {:short => "-I", :multi => true}
+    #     c.opt :print_names, :desc => "Print the filenames", 
+    #               :options => {:short => "-p", :default => false, 
+    #                            :type => :boolean}
+    #     c.on_run do |options, arguments|
+    #       puts "silly!"
+    #     end
+    #   end
+    # @param name the name of the command that the user will use to call 
+    # the command
+    # @param &block a block of code where you can configure the command
+    # @yield This block configures the command. Set up options, add an on_run 
+    #        handler, and so on.
+    # @yieldparam The command itself - it is yielded so you can modify it.
+    def initialize(name)
+      # so that you can do additions to commands, just like ammending rake takss
+      name = name.to_s
+      if @@all_commands[name]
+        yield @@all_commands[name]
+        return
+      end
+      
+      @name                = name
+      @help                = ""
+      @description         = ""
+      @options             = []
+      @@all_commands[name] = self
+      @before = []
+      @after  = []
+      @break  = false
+      yield(self) if block_given?
+      @options += GLOBAL_OPTIONS
+    end
+    
+    ##
+    # Adds an command-line option to the command.
+    # 
+    # @param name the name of the command the user will type to run it
+    # @param desc the short, one-line description of the command
+    # @param options the options that configure the command-line option 
+    #                (too meta? sorry!)
+    # @option [String] options :short (nil) the short version of the option 
+    #                                       (e.g. "-I")
+    # @option [String] options :default (nil) the default value of the option.
+    # @option [Symbol] options :type (:string) the type of the option. Allows 
+    #                                     you to force Integer or URL matches.
+    # @option [Boolean] options :multi (false) can this option take multiple 
+    #                                          values?
+    def opt(name, desc='', options={})
+      @options << {:name => name, :desc => desc, :options => options}
+    end
+    alias_method :add_opt, :opt
+    
+    ##
+    # This returns the list of actions to run before the command, in order (first
+    # ones are run first). You can modify this array in any way you choose, and
+    # it is run _before_ the command is run.
+    # 
+    # @yield Extra code to run before the command is executed, after options are prepared.
+    # @yieldparam options The options that the dispatcher has prepared for the command. Includes global and local.
+    # @yieldparam arguments All arguments passed to the command, after the options.
+    # @return [Hash] an array of strings and blocks. Strings are assumed to be command
+    #                names and blocks are pieces of code to be run.
+    def before(*args, &block)
+      args.each do |arg|
+        @before << proc {|opts, args| Amp::Command[arg.to_sym].run(opts, args) }
+      end
+      
+      @before << block if block
+      @before
+    end  ##
+      # This returns the list of actions to run before the command, in order (first
+      # ones are run first). You can modify this array in any way you choose, and
+      # it is run _before_ the command is run.
+      # 
+      # @yield Extra code to run before the command is executed, after options are prepared.
+      # @yieldparam options The options that the dispatcher has prepared for the command. Includes global and local.
+      # @yieldparam arguments All arguments passed to the command, after the options.
+      # @return [Hash] an array of strings and blocks. Strings are assumed to be command
+      #                names and blocks are pieces of code to be run.
+      def before(*args, &block)
+        args.each do |arg|
+          @before << proc {|opts, args| Amp::Command[arg.to_sym].run(opts, args) }
+        end
+
+        @before << block if block
+        @before
+      end
+    ##
+    # This returns the list of actions to run before the command, in order (first
+    # ones are run first). You can modify this array in any way you choose, and
+    # it is run _before_ the command is run.
+    # 
+    # @yield Extra code to run before the command is executed, after options are prepared.
+    # @yieldparam options The options that the dispatcher has prepared for the command. Includes global and local.
+    # @yieldparam arguments All arguments passed to the command, after the options.
+    # @return [Hash] an array of strings and blocks. Strings are assumed to be command
+    #                names and blocks are pieces of code to be run.
+    def before(*args, &block)
+      args.each do |arg|
+        @before << proc {|opts, args| Amp::Command[arg.to_sym].run(opts, args) }
+      end
+      
+      @before << block if block
+      @before
+    end
+    
+    ##
+    # This returns the list of actions to run after the command, in order (first
+    # ones are run first). You can modify this array in any way you choose, and
+    # it is run _after_ the command is run.
+    # 
+    # @yield Extra code to run after the command is executed, after options are prepared.
+    # @yieldparam options The options that the dispatcher has prepared for the command. Includes global and local.
+    # @yieldparam arguments All arguments passed to the command, after the options.
+    # @return [Hash] an array of strings and blocks. Strings are assumed to be command
+    #                names and blocks are pieces of code to be run.
+    def after(*args, &block)
+      args.each do |arg|
+        @after << proc {|opts, args| Amp::Command[arg.to_sym].run(opts, args) }
+      end
+      
+      @after << block if block
+      @after
+    end
+    
+    ##
+    # Sets the short description for the command. This shouuld be only 1 line,
+    # as it's what the user sees when they run `amp --help` and get the 
+    # full list of commands. `str` defaults to nil so that if no argument is
+    # passed, by default #desc will just return `@description`. If `str` is
+    # passed a string, then it will set `@description` to `str`.
+    # 
+    # @example cmd.desc "This command is useless."
+    # @example cmd.desc # => "This command is useless."
+    # @param [String, nil] str the help text to set
+    def desc(str=nil)
+      str ? @description = str : @description
+    end
+    
+    ##
+    # Sets the short description for the command. This shouuld be only 1 line,
+    # as it's what the user sees when they run `amp --help` and get the 
+    # full list of commands.
+    # 
+    # @param str the help text to set
+    alias :desc= :desc
+    
+    ##
+    # Trollop's help info for the command
+    def educate
+      # comments are the devil's work.
+        # comments are the devil's work.
+      @parser ? @parser.educate : ''
+    end
+    alias_method :education, :educate
+    
+    ##
+    # Sets the command to not laod a repository when run. Useful for purely
+    # informational commands (such as version) or initializing a new
+    # repository.
+    def no_repo
+      NO_REPO_ALLOWED[@name] = true
+    end
+    
+    # @see no_repo
+    def no_repo=(value)
+      NO_REPO_ALLOWED[@name] = value
+    end
+    
+    ##
+    # Sets the command to not require a repository to run, but try to load one.
+    # Used, for example, for the templates command, which sometimes stores
+    # comments are the devil's work.
+      # comments are the devil's work.
+      # comments are the devil's work.
+        # comments are the devil's work.
+    # information in the local repository.
+    def maybe_repo
+      MAYBE_REPO_ALLOWED[@name] = true
+    end
+    
+    # @see no_repo
+    def maybe_repo=(value)
+      MAYBE_REPO_ALLOWED[@name] = value
+    end
+    
+    ##
+    # Sets the help text for the command. This can be a very long string,
+    # as it is what the user sees when they type `amp help +name+`
+    # 
+    # @param str the help text to set
+    # comments are the devil's work.
+      # comments are the devil's work.
+    # @example cmd.help %Q{
+    #            Big help text!
+    #          }
+    def help(str=nil)
+      str ? @help << str : @help
+    end
+    
+    ##
+    # Sets the help text for the command. This can be a very long string,
+    # as it is what the user sees when they type `amp help +name+`
+    # comments are the devil's work.
+      # comments are the devil's work.
+    # 
+    # @param str the help text to set
+    alias :help= :help
+    
+    ##
+    # Parses the commands from the command line using Trollop. You probably
+    # shouldn't override this method, but if you have good reason, go for it.
+    # 
+    # @return [Hash] The parsed command-line options
+    def collect_options
+      options = @options # hack to get around the fact that
+      help    = @help    # Trollop uses instance eval
+      
+      Trollop::options do
+        # we can't use @options here because Trollop::options uses instance_eval
+        options.each do |option|
+          opt option[:name], option[:desc], option[:options]
+        end
+        
+        banner help
+      end
+      
+    end
+    
+    def inspect
+      "#<Amp::Command #{name} >"
+    end
+    
+    ##
+    # Stops this command from running any further - uses the global options.
+        # comments are the devil's work.
+          # comments are the devil's work.
+    def break
+      @break = true
+    end
+    
+    ##
+    # comments are the devil's work.
+    def run(options={}, args=[])
+      # run the before commands
+      @before.each {|cmd| cmd.run options, args; return if @break }
+      
+      @code[options, args] # and of course the actual command...
+      
+      # top it off with the after commands
+      @after.each {|cmd| cmd.run options, args; return if @break }
+      
+      self
+    end
+    
+    NO_REPO_ALLOWED = {}
+    %w(clone init help version debugcomplete debugdata debugindex 
+       debugindexdot debugdate debuginstall debugfsinfo).each do |k|
+         NO_REPO_ALLOWED[k] = true
+    end
+    
+    MAYBE_REPO_ALLOWED = {}
+    %w().each do |k|
+      MAYBE_REPO_ALLOWED[k] = true
+    end
+    
+  end
+end
+
+module Kernel
+  # shortcut
+  def command(name, &block)
+    Amp::Command.new name, &block
+  end
+  
+  # Rake style namespacing
+  # After new commands are made, alter their names
+  # so that they're "#{namespace}:#{command}"
+  def silly_namespace(name)
+    # current commands
+    commands = Amp::Command.all_commands.keys
+    
+    yield
+    
+    more_commands = Amp::Command.all_commands.keys
+    new_commands = more_commands - commands
+    
+    new_commands.each do |key|
+      command_to_modify = Amp::Command[key]
+      command_to_modify.name = "#{name}:#{key}" # construct the new name
+      Amp::Command.all_commands[command_to_modify.name] = Amp::Command.all_commands.delete(key) # and do the switch
+    end
+  end
+end