hg-port 0.0.0 → 0.0.1

data/bin/hg-port

@@ -1,12 +1,54 @@
 #!/usr/bin/env ruby
 require 'pathname'
+require 'yaml'
 require 'tempfile'
-
 THIS_PATH = Pathname.new(__FILE__).realpath
 THIS_DIR = THIS_PATH.dirname
 THIS_BASE_NAME = THIS_PATH.basename
+LIB_DIR = File.join(THIS_DIR, '..', 'lib', 'hg-port')
+require File.join(LIB_DIR, 'gem_info')
+require File.join(LIB_DIR, 'option_parser_with_required_args')
+require File.join(LIB_DIR, 'version')
+require File.join(LIB_DIR, 'version_template')
 
 module Helper
+  def self.option_parser
+    @option_parser ||= OptionParserWithRequiredArgs.new do |p|
+      p.banner = "Usage: #{THIS_BASE_NAME} [options]"
+
+      p.on_required(:merge_version, '--merge-version MERGE-VERSION', 'Merge version at which forward port will begin') do |options, value|
+        options.merge_version = value
+      end
+
+      p.on_tail '-h', '--help', 'Show help' do
+        puts p
+        exit
+      end
+
+      p.on_tail '--version', 'Show version' do
+        puts HGPort::GemInfo.version_string
+        exit
+      end
+    end
+  end
+
+  def self.read_config
+    config_file_name = nil
+    [
+      `hg root`.chomp,
+      ENV['HOME']
+    ].each do |path|
+      temp = File.join(path, '.hgportrc')
+      if File.exist?(temp)
+        config_file_name = temp
+        break
+      end
+    end
+    raise RuntimeError.new('No configuration file found') unless config_file_name
+
+    YAML.load(File.open(config_file_name))
+  end
+
   def self.fail(message, lines)
     display_output(lines)
     raise RuntimeError.new(message)
@@ -27,7 +69,7 @@ Switches:
     --merge-version <version-branch>
 
 Available versions:
-#{versions.collect { |version| "    #{version}" }.join("\n")}
+#{versions.reverse.collect { |version| "    #{version}" }.join("\n")}
 
 EOS
   end
@@ -62,74 +104,8 @@ module HGHelper
   end
 end
 
-
-class Version
-  include Comparable
-
-  attr_reader :major, :minor
-
-  def self.parse(str)
-    return nil if str !~ /^v([0-9]+)\.([0-9]+)$/
-    new(Integer($1), Integer($2))
-  end
-
-  def <=>(other)
-    return 1 if other.nil?
-
-    delta = major - other.major
-    return 1 if delta > 0
-    return -1 if delta < 0
-
-    delta = minor - other.minor
-    return 1 if delta > 0
-    return -1 if delta < 0
-    0
-  end
-
-  def to_s
-    "v#{major}.#{minor}"
-  end
-
-  private
-
-  def initialize(major, minor)
-    @major = major
-    @minor = minor
-  end
-end
-
-class Options
-  attr_reader :merge_version
-
-  def self.parse(args, versions)
-    merge_version = nil
-    while arg = args.shift
-      case arg
-      when '--merge-version' then
-        temp = args.shift or raise RuntimeError.new('Value required for --merge-version')
-        merge_version = Version.parse(temp) or raise RuntimeError.new("Invalid value \"#{temp}\" for --merge-version")
-      else
-        raise RuntimeError.new("Unsupported switch \"#{arg}\"")
-      end
-    end
-
-    if !merge_version || !versions.include?(merge_version)
-      Helper.display_usage(versions)
-      return nil
-    end
-
-    new(merge_version)
-  end
-
-  private
-
-  def initialize(merge_version)
-    @merge_version = merge_version
-  end
-end
-
-def get_versions(branches)
-  branches.collect { |branch| Version.parse(branch)}.compact.sort
+def get_versions(version_template, branches)
+  branches.collect { |branch| HGPort::Version.parse(version_template, branch)}.compact.sort
 end
 
 def forward_port(dir, merge_version, version)
@@ -138,7 +114,6 @@ def forward_port(dir, merge_version, version)
 
   # Build commit message from preview
   status, lines = HGHelper.run_hg(dir, "hg merge --preview #{merge_version}")
-  puts "LINES: #{lines.inspect}"
   commit_message = <<-EOS
 Automatic forward port from #{merge_version} to #{version}
 
@@ -188,15 +163,30 @@ end
 
 dir = '.'
 
-versions = get_versions(HGHelper.get_branches(dir))
-options = Options.parse(ARGV.clone, versions)
-exit 1 if options.nil?
+config = Helper.read_config
+raise RuntimeError.new('No version template specified') unless config.include?('version_template')
+
+version_template = HGPort::VersionTemplate.new(config['version_template'])
+branches = HGHelper.get_branches(dir)
+versions = get_versions(version_template, branches)
+
+options = nil
+begin
+  options, free_args = Helper.option_parser.run(ARGV)
+rescue OptionParserWithRequiredArgs::RunError => e
+  $stderr.puts e.message
+  exit 1
+end
+
+exit 0 if ENV.include?('HG_PORT_TEST')
 
-unless options.merge_version.to_s == HGHelper.current_branch(dir)
+merge_version = HGPort::Version.parse(version_template, options.merge_version) or raise RuntimeError.new("Invalid merge version \"#{options.merge_version}\"")
+current_branch_version = HGPort::Version.parse(version_template, HGHelper.current_branch(dir))
+unless current_branch_version && merge_version == current_branch_version
   raise RuntimeError.new("Check out merge version \"#{options.merge_version}\" before attempting a forward port")
 end
 
-merge_and_later_versions = versions.select { |version| version >= options.merge_version }
+merge_and_later_versions = versions.select { |version| version >= merge_version }
 merge_and_later_versions.each_with_index do |version, index|
   next if index == 0
   unless forward_port(dir, merge_and_later_versions[index - 1], version)

data/lib/hg-port.rb

@@ -0,0 +1,12 @@
+require 'pathname'
+
+module HGPort
+  autoload :Version, 'hg-port/version'
+
+  extend self
+end
+
+Dir[File.join(Pathname.new(__FILE__).realpath.dirname, 'hg-port', '*.rb')].each do |path|
+  require path
+end
+

data/lib/hg-port/gem_info.rb

@@ -0,0 +1,12 @@
+module HGPort
+  module GemInfo
+    MAJOR_VERSION = 0
+    MINOR_VERSION = 0
+    PATCH_VERSION = 1
+
+    def self.version_string
+      [MAJOR_VERSION, MINOR_VERSION, PATCH_VERSION].join('.')
+    end
+  end
+end
+

data/lib/hg-port/option_parser_with_required_args.rb

@@ -0,0 +1,48 @@
+require 'optparse'
+require 'ostruct'
+
+class OptionParserWithRequiredArgs < OptionParser
+  class RunError < Exception; end
+
+  def initialize
+    @required_arg_names = []
+    super
+  end
+
+  def on_required(arg_sym, *args, &block)
+    on *args, &block
+    @required_arg_names << arg_sym
+  end
+
+  def on(*args, &block)
+    super *args do |value|
+      block.call(@options, value)
+    end
+  end
+
+  def on_tail(*args, &block)
+    super *args do
+      block.call(@options)
+    end
+  end
+
+  def run(args)
+    @options = OpenStruct.new
+    cloned_args = args.clone
+    begin
+      parse!(cloned_args)
+    rescue OptionParser::InvalidOption, OptionParser::MissingArgument
+      message = $!.to_s + "\n\n" + self.to_s
+      raise RunError.new(message)
+    end
+
+    missing_arg_names = @required_arg_names.select { |arg_name| @options.send(arg_name).nil? }
+    if !missing_arg_names.empty?
+      message = "missing required option: #{missing_arg_names.join(', ')}\n\n" + self.to_s
+      raise RunError.new(message)
+    end
+
+    [@options, cloned_args]
+  end
+end
+

data/lib/hg-port/version.rb

@@ -0,0 +1,54 @@
+module HGPort
+  class Version
+    include Comparable
+
+    attr_reader :major, :minor, :patch
+
+    def self.parse(template, str)
+      values = template.parse(str)
+      return nil if values.nil?
+      major = values[:major]
+      minor = values[:minor]
+      patch = values[:patch]
+      return nil if major.nil? || minor.nil? || patch.nil?
+
+      new(template, major, minor, patch)
+    end
+
+    def <=>(other)
+      return 1 if other.nil?
+
+      delta = major - other.major
+      return 1 if delta > 0
+      return -1 if delta < 0
+
+      delta = minor - other.minor
+      return 1 if delta > 0
+      return -1 if delta < 0
+
+      delta = patch - other.patch
+      return 1 if delta > 0
+      return -1 if delta < 0
+
+      0
+    end
+
+    def to_s
+      @template.expand(
+        :major => major,
+        :minor => minor,
+        :patch => patch
+      )
+    end
+
+    private
+
+    def initialize(template, major, minor, patch)
+      @template = template
+      @major = major
+      @minor = minor
+      @patch = patch
+    end
+  end
+end
+

data/lib/hg-port/version_template.rb

@@ -0,0 +1,29 @@
+module HGPort
+  class VersionTemplate
+    def initialize(template_str)
+      @template_str = template_str
+
+      @keys = []
+      pattern = Regexp.escape(@template_str).gsub(/(:\w+)/) do |colon_key|
+        key = colon_key[1..-1]
+        @keys << key.to_sym
+        "(?<#{key}>[0-9]+)"
+      end
+
+      @regexp = Regexp.new("^#{pattern}$")
+    end
+
+    def expand(values)
+      @template_str.gsub(/(:\w+)/) do |colon_key|
+        key_sym = colon_key[1..-1].to_sym
+        values[key_sym] || $1
+      end
+    end
+
+    def parse(str)
+      match = @regexp.match(str)
+      match ? @keys.inject({}) { |memo, key| memo[key] = Integer(match[key]); memo } : nil
+    end
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hg-port
 version: !ruby/object:Gem::Version
-  version: 0.0.0
+  version: 0.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-23 00:00:00.000000000 Z
+date: 2013-07-26 00:00:00.000000000 Z
 dependencies: []
 description: Script to automate forward porting in Mercurial
 email: rcook@rcook.org
@@ -19,6 +19,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - MIT-LICENSE.txt
+- lib/hg-port/option_parser_with_required_args.rb
+- lib/hg-port/gem_info.rb
+- lib/hg-port/version_template.rb
+- lib/hg-port/version.rb
+- lib/hg-port.rb
 - bin/hg-port
 homepage: https://bitbucket.org/rcook/hg-port
 licenses: