gitorious-merge-request 1.0.2 → 2.0.0

data/.gitignore

@@ -1,2 +1,5 @@
-Gemfile.lock
-pkg
+/Gemfile.lock
+/pkg
+
+*.swp
+*.swo

data/bin/gitorious-merge-request

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 
-require File.expand_path('../lib/gitorious-merge-request', File.dirname(__FILE__))
+require File.expand_path('../lib/gitorious_merge_request', File.dirname(__FILE__))
 
-SubCommands = %w(new show rm)
+SubCommands = %w(new show rm list checkout diff)
 global_opts = Trollop::options do
   version "gitorious-merge-request #{GitoriousMergeRequest::Version}"
   banner <<-EOS
@@ -16,18 +16,14 @@ EOS
   stop_on SubCommands
 end
 
+$origin_repo = Gitorious.remote_to_repo 'origin'
+$current_branch = Git.current_branch
+
 def login_opts
   opt :email, "Email for login", :short => 'e', :type => String
 end
 def code_opts
-  opt :code, "project/repo:id (e.g. noosfero/noosfero:248)", :type => String
-end
-
-def login_dies opts
-  Trollop::die :email, "must exist" unless opts[:email]
-end
-def code_dies opts
-  Trollop::die :code, "must exist" unless opts[:code]
+  opt :code, "id (using git's origin repository) or remote-name:id or project/repo:id (e.g. noosfero/noosfero:248)", :type => String
 end
 
 cmd = ARGV.shift # get the subcommand
@@ -45,10 +41,12 @@ EOS
       login_opts
       opt :summary, "Summary", :short => 's', :type => String
       opt :proposal, "Proposal", :short => 'p', :type => String
-      opt :forked_repo, "Forked repo id (e.g. ~brauliobo/noosfero/brauliobos-noosfero)", :short => 'f', :type => String
+      opt :forked_repo, "Git remote name OR forked repo id (e.g. ~brauliobo/noosfero/brauliobos-noosfero)", :short => 'f', :type => String
       opt :forked_branch, "Forked branch", :short => 'a', :type => String
-      opt :target_repo, "Target repo id (e.g. noosfero/noosfero)", :short => 't', :type => String
-      opt :target_branch, "Target branch", :short => 'b', :type => String
+      opt :target_repo, "Git remote name OR target repo id (e.g. noosfero/noosfero, defaults to git origin repository)",
+        :short => 't', :type => String, :default => $origin_repo
+      opt :target_branch, "Target branch (defaults to git's current branch)",
+        :short => 'b', :type => String, :default => $current_branch
     end
   when 'show'
     Trollop::options do
@@ -59,12 +57,29 @@ EOS
       login_opts
       code_opts
     end
+  when 'list'
+    Trollop::options do
+      opt :repo, "git-remote (defaults to git origin repository) or project/repo (e.g. noosfero/noosfero)",
+        :short => 'r', :type => String
+      opt :status, "Status (open or closed)", :type => String
+    end
+  when 'checkout'
+    Trollop::options do
+      code_opts
+    end
+  when 'diff'
+    Trollop::options do
+      code_opts
+    end
   else
     Trollop::die "use one of the subcommands: #{SubCommands.join ' '}"
   end
 
-include GitoriousMergeRequest
-
-send "cmd_#{cmd}", cmd_opts
+#require 'irb'
+#IRB.start
+#exit
 
+$mech = Mechanize.new
+gmr = GitoriousMergeRequest.new
+gmr.send "cmd_#{cmd}", cmd_opts
 

data/gitorious-merge-request.gemspec

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 
-require File.expand_path('./lib/gitorious-merge-request/version', File.dirname(__FILE__))
+require File.expand_path('./lib/gitorious_merge_request/version', File.dirname(__FILE__))
 
 Gem::Specification.new do |gem|
   gem.authors       = ["Braulio Bhavamitra"]

data/lib/git.rb

@@ -0,0 +1,31 @@
+# inspired from https://gitorious.org/gitorious/merge-request-cli
+class Git
+
+  def self.remote_url remote='origin'
+    output = `git remote -v`.scan(/^#{remote}\s+(.*.git)(.*)/)
+    output.first[0] if output
+  end
+
+  def self.current_branch
+    self.run('rev-parse', '--abbrev-ref HEAD', :quiet => true).squish
+  end
+
+  protected
+
+  def self.method_missing method, *args, &block
+    options = args.last
+    a = args.first
+    self.run method, a, options
+  end
+
+  def self.run cmd, args, options = {}
+    cmdline = "git #{cmd} #{args}"
+    if options[:quiet]
+      `#{cmdline} 2>&1`
+    else
+      puts "$ #{cmdline}"
+      system cmdline
+    end
+  end
+end
+

data/lib/gitorious.rb

@@ -0,0 +1,27 @@
+class Gitorious
+
+  Host = "https://gitorious.org"
+  MRListUrl = "#{Host}/%{repo}/merge_requests.xml?status=%{status}"
+  MRUrl = "#{Host}/%{repo}/merge_requests/%{id}"
+  MRUrlXml = "#{Host}/%{repo}/merge_requests/%{id}.xml"
+  NewMRUrl = "#{Host}/%{forked_repo}/merge_requests/new"
+  CommitListUrl = "#{Host}/%{forked_repo}/merge_requests/commit_list"
+
+  def self.login email, password
+    page = $mech.get 'https://gitorious.org/login'
+    form = page.forms.first
+    fields = form.fields
+    fields.find{ |f| f.name == 'email' }.value = email
+    fields.find{ |f| f.name == 'password' }.value = password
+    page = form.submit
+
+    raise "Can't login" unless page.content.include?('Logged in successfully')
+    page
+  end
+
+  def self.remote_to_repo remote='origin'
+    Git.remote_url(remote) =~ /gitorious\.org[\/:](.+).git/
+    $1
+  end
+
+end

data/lib/gitorious/merge_request.rb

@@ -0,0 +1,124 @@
+class Gitorious::MergeRequest
+
+  attr_accessor :id
+  attr_accessor :username
+  attr_accessor :proposal, :summary
+  attr_accessor :target_repo, :target_branch
+  attr_accessor :forked_repo, :forked_branch
+  attr_accessor :merge_base_sha, :ending_commit
+
+  def initialize *args
+    repo = args[0]
+    if args[1].is_a?(Nokogiri::XML::Node)
+      page = args[1]
+    else
+      id = args[1]
+      page = Nokogiri::HTML $mech.get(Gitorious::MRUrlXml % {:repo => repo, :id => id}).content
+    end
+
+    self.id = page.at("id").content
+    self.summary = page.at("summary").content
+    self.proposal = page.at("proposal").content
+    self.username = page.at("username").content
+    self.target_repo = repo
+    self.target_branch = page.at('target_repository/branch').content
+    self.forked_repo = "#{self.username}/#{page.at('source_repository/name').content}"
+    self.forked_branch = page.at('source_repository/branch').content
+    self.ending_commit = page.at("ending-commit").content
+    version = page.xpath('//versions/version').last
+    self.merge_base_sha = version.at('merge_base_sha').content if version
+  end
+
+  def self.list repo, status="Open"
+    page = Nokogiri::HTML $mech.get(Gitorious::MRListUrl % {:repo => repo, :status => status}).content
+    page.xpath('//merge-request').map do |node|
+      mr = self.new repo, node
+    end
+  end
+
+  def self.delete repo, id
+    page = $mech.get Gitorious::MRUrl % {:repo => repo, :id => id}
+    form = page.form_with :action => "/#{repo}/merge_requests/#{id}"
+    page = form.submit
+  end
+
+  def self.create attrs = {}
+    @summary = attrs[:summary]
+    @proposal = attrs[:proposal]
+    @forked_repo = attrs[:forked_repo]
+    @forked_branch = attrs[:forked_branch]
+    @target_repo = attrs[:target_repo]
+    @target_branch = attrs[:target_branch]
+
+    forked_repo = @forked_repo.split('/')[1,2].join('/')
+    target_repo = @target_repo.split('/').last
+
+    page = $mech.get Gitorious::NewMRUrl % {:forked_repo => forked_repo}
+    form = page.form_with :id => 'new_merge_request'
+
+    form.set_fields 'merge_request[summary]' => @summary
+    form.set_fields 'merge_request[proposal]' => @proposal
+
+    @authenticity_token = form.fields.find{ |f| f.name == 'authenticity_token' }.value
+
+    target_option = page.parser.css('#merge_request_target_repository_id option').find{ |o| o.text == target_repo }
+    raise "Can't find target repository" unless target_option
+    target_id = target_option['value']
+    form.set_fields 'merge_request[target_repository_id]' => target_id
+
+    target_branch_option = page.parser.css("#merge_request_target_branch option[value=#{@target_branch}]").first
+    raise "Can't find target branch" unless target_branch_option
+    form.set_fields 'merge_request[target_branch]' => @target_branch
+
+    forked_branch_option = page.parser.css("#merge_request_source_branch option[value=#{@forked_branch}]").first
+    raise "Can't find forked branch" unless forked_branch_option
+    form.set_fields 'merge_request[source_branch]' => @forked_branch
+
+    commit = self.select_ending_commit target_id
+    form.add_field! 'merge_request[ending_commit]', commit
+
+    page = form.submit
+    raise "Error while creating merge request" if page.parser.css('.errorExplanation').first
+
+    repo = @target_repo
+    id = page.uri.to_s.split('/').last
+    mr = self.new repo, id
+  end
+
+  def branch
+    "merge-requests/#{self.id}"
+  end
+
+  def checkout remote='origin', options = {}
+    if $current_branch != self.branch
+      Git.branch "-D #{branch}", :quiet => true
+      Git.checkout "-b #{branch} #{self.merge_base_sha}", options
+    end
+    Git.pull "#{remote} refs/#{branch}", :quiet => true
+  end
+
+  def diff remote='origin'
+    self.checkout remote, :quiet => true
+    Git.checkout $current_branch, :quiet => true
+    Git.diff branch
+  end
+
+  protected
+
+  def self.select_ending_commit target_id
+    forked_repo = @forked_repo.split('/')[1,2].join('/')
+
+    puts "Selecting last commit"
+    page = $mech.post Gitorious::CommitListUrl % {:forked_repo => forked_repo}, {
+      'authenticity_token' => @authenticity_token,
+      'merge_request[target_repository_id]' => target_id,
+      'merge_request[target_branch]' => @target_branch,
+      'merge_request[source_branch]' => @forked_branch}
+
+      # TODO: give option to select
+      first_commit = page.parser.css('#commit_0 input').first
+      raise 'No commit to merge' unless first_commit
+      first_commit['value']
+  end
+
+end

data/lib/gitorious_merge_request.rb

@@ -0,0 +1,104 @@
+require 'rubygems'
+
+require 'mechanize'
+require 'trollop'
+require 'active_support/all'
+require 'highline/import'
+require 'i18n/core_ext/string/interpolate'
+
+require File.expand_path('./gitorious_merge_request/version', File.dirname(__FILE__))
+require File.expand_path('./git', File.dirname(__FILE__))
+require File.expand_path('./gitorious', File.dirname(__FILE__))
+require File.expand_path('./gitorious/merge_request', File.dirname(__FILE__))
+
+class GitoriousMergeRequest
+
+  def login opts
+    Trollop::die :email, "must exist" unless opts[:email]
+    email = opts[:email]
+    password = ask('Password: '){ |q| q.echo = false }
+
+    puts 'Login...'
+    Gitorious.login email, password
+  end
+
+  def cmd_new opts
+    Trollop::die :summary, "must exist" unless opts[:summary]
+    Trollop::die :forked, "must exist" unless opts[:forked_repo]
+    Trollop::die :forked_branch, "must exist" unless opts[:forked_branch]
+    Trollop::die :target, "must exist" unless opts[:target_repo]
+    Trollop::die :target_branch, "must exist" unless opts[:target_branch]
+
+    login opts
+    puts "Opening merge request page"
+    mr = Gitorious::MergeRequest.create opts
+    puts "YOUR NEW MERGE REQUEST\n"
+    show mr
+  end
+
+  def parse_code code
+    id = Integer(code) rescue nil
+    id = nil if id.zero?
+    if id or code.blank?
+      repo = $origin_repo
+    else
+      raise 'Invalid code format' unless code =~ /(.+):(\d+)/
+      repo_or_remote, id = $1, $2.to_i
+      repo = if (remote = Gitorious.remote_to_repo(repo_or_remote))
+               then remote else repo_or_remote end
+    end
+    [repo, id]
+  end
+
+  def cmd_rm opts
+    repo, id = parse_code opts[:code]
+    login opts
+    Gitorious::MergeRequest.delete repo, id
+  end
+
+  def cmd_show opts
+    repo, id = parse_code opts[:code]
+    mr = Gitorious::MergeRequest.new repo, id
+    show mr
+  end
+
+  def cmd_list opts
+    repo, id = parse_code opts[:code]
+    status = opts[:status] || ''
+    list = Gitorious::MergeRequest.list repo, status
+    list.each do |mr|
+      puts "#{mr.id} from #{mr.username}: #{mr.summary}"
+    end
+  end
+
+  def cmd_checkout opts
+    repo, id = parse_code opts[:code]
+    mr = Gitorious::MergeRequest.new repo, id
+    mr.checkout
+  end
+
+  def cmd_diff opts
+    repo, id = parse_code opts[:code]
+    mr = Gitorious::MergeRequest.new repo, id
+    mr.diff
+  end
+
+  def show mr
+#Requester: #{mr.requester}
+    puts <<-EOS
+ID: #{mr.id} (#{Gitorious::MRUrl % {:repo => mr.target_repo, :id => mr.id}})
+User: #{mr.username} (#{Gitorious::Host}/#{mr.username})
+Summary: #{mr.summary}
+Proposal:
+#{mr.proposal}
+
+Fork: branch #{mr.forked_branch} of #{mr.forked_repo}  (#{Gitorious::Host}/#{mr.forked_repo})
+Target: branch #{mr.target_branch} of #{mr.target_repo} (#{Gitorious::Host}/#{mr.target_repo})
+Ending commit: #{mr.ending_commit}
+Merge base SHA: #{mr.merge_base_sha}
+
+EOS
+  end
+
+end
+

data/lib/gitorious_merge_request/version.rb

@@ -0,0 +1,6 @@
+class GitoriousMergeRequest
+
+  Version = '2.0.0'
+
+end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gitorious-merge-request
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 15
   prerelease: 
   segments: 
-  - 1
-  - 0
   - 2
-  version: 1.0.2
+  - 0
+  - 0
+  version: 2.0.0
 platform: ruby
 authors: 
 - Braulio Bhavamitra
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-10 00:00:00 +00:00
+date: 2012-11-14 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -90,9 +90,12 @@ files:
 - Rakefile
 - bin/gitorious-merge-request
 - gitorious-merge-request.gemspec
-- lib/gitorious-merge-request.rb
-- lib/gitorious-merge-request/.gitkeep
-- lib/gitorious-merge-request/version.rb
+- lib/git.rb
+- lib/gitorious.rb
+- lib/gitorious/merge_request.rb
+- lib/gitorious_merge_request.rb
+- lib/gitorious_merge_request/.gitkeep
+- lib/gitorious_merge_request/version.rb
 has_rdoc: true
 homepage: http://github.com/brauliobo/gitorious-merge-request
 licenses: []

data/lib/gitorious-merge-request.rb

@@ -1,161 +0,0 @@
-require 'rubygems'
-
-require 'mechanize'
-require 'trollop'
-require 'active_support/all'
-require 'highline/import'
-
-require File.expand_path('./gitorious-merge-request/version', File.dirname(__FILE__))
-
-module GitoriousMergeRequest
-
-  MRUrl = "https://gitorious.org/%{repo}/merge_requests/%{id}"
-  NewMRUrl = "https://gitorious.org/%{forked_repo}/merge_requests/new"
-  CommitListUrl = "https://gitorious.org/%{forked_repo}/merge_requests/commit_list"
-
-  def login opts
-    @email = opts[:email]
-
-    password = ask('Password: '){ |q| q.echo = false }
-
-    puts 'Login...'
-    page = @mechanize.get 'https://gitorious.org/login'
-    form = page.forms.first
-    fields = form.fields
-    fields.find{ |f| f.name == 'email' }.value = @email
-    fields.find{ |f| f.name == 'password' }.value = password
-    page = form.submit
-
-    raise "Can't login" unless page.content.include?('Logged in successfully')
-  end
-
-  def cmd_new opts
-    login_dies opts
-    Trollop::die :summary, "must exist" unless opts[:summary]
-    Trollop::die :forked, "must exist" unless opts[:forked_repo]
-    Trollop::die :forked_branch, "must exist" unless opts[:forked_branch]
-    Trollop::die :target, "must exist" unless opts[:target_repo]
-    Trollop::die :target_branch, "must exist" unless opts[:target_branch]
-
-    @summary = opts[:summary]
-    @proposal = opts[:proposal]
-    @forked_repo = opts[:forked_repo]
-    @forked_branch = opts[:forked_branch]
-    @target_repo = opts[:target_repo]
-    @target_branch = opts[:target_branch]
-
-    def ending_commit(target_id)
-      forked_repo = @forked_repo.split('/')[1,2].join('/')
-
-      puts "Selecting last commit"
-      page = @mechanize.post CommitListUrl % {:forked_repo => forked_repo}, {
-        'authenticity_token' => @authenticity_token,
-        'merge_request[target_repository_id]' => target_id,
-        'merge_request[target_branch]' => @target_branch,
-        'merge_request[source_branch]' => @forked_branch}
-
-        # TODO: give option to select
-        first_commit = page.parser.css('#commit_0 input').first
-        raise 'No commit to merge' unless first_commit
-        first_commit.attr 'value'
-    end
-
-    def merge_request
-      forked_repo = @forked_repo.split('/')[1,2].join('/')
-      target_repo = @target_repo.split('/').last
-
-      puts "Opening merge request page"
-      page = @mechanize.get NewMRUrl % {:forked_repo => forked_repo}
-      form = page.form_with :id => 'new_merge_request'
-
-      form.set_fields 'merge_request[summary]' => @summary
-      form.set_fields 'merge_request[proposal]' => @proposal
-
-      @authenticity_token = form.fields.find{ |f| f.name == 'authenticity_token' }.value
-
-      target_option = page.parser.css('#merge_request_target_repository_id option').find{ |o| o.text == target_repo }
-      raise "Can't find target repository" unless target_option
-      target_id = target_option.attr('value')
-      form.set_fields 'merge_request[target_repository_id]' => target_id
-
-      target_branch_option = page.parser.css("#merge_request_target_branch option[value=#{@target_branch}]").first
-      raise "Can't find target branch" unless target_branch_option
-      form.set_fields 'merge_request[target_branch]' => @target_branch
-
-      forked_branch_option = page.parser.css("#merge_request_source_branch option[value=#{@forked_branch}]").first
-      raise "Can't find forked branch" unless forked_branch_option
-      form.set_fields 'merge_request[source_branch]' => @forked_branch
-
-      commit = ending_commit target_id
-      form.add_field! 'merge_request[ending_commit]', commit
-
-      page = form.submit
-      raise "Error while creating merge request" if page.parser.css('.errorExplanation').first
-
-      puts "YOUR NEW MERGE REQUEST\n"
-      cmd_show_for page
-    end
-
-    @mechanize = Mechanize.new
-    login opts
-    merge_request
-  end
-
-  def parse_code opts
-    @code = opts[:code]
-
-    raise "can't parse code" unless @code =~ /(.+):(\d+)/
-    repo = $1
-    id = $2.to_i
-
-    [repo, id]
-  end
-
-  def cmd_rm opts
-    login_dies opts
-    code_dies opts
-
-    repo, id = parse_code opts
-
-    @mechanize = Mechanize.new
-    login opts
-    page = @mechanize.get MRUrl % {:repo => repo, :id => id}
-    form = page.form_with :action => "/#{repo}/merge_requests/#{id}"
-    page = form.submit
-  end
-
-  def cmd_show opts
-    code_dies opts
-
-    repo, id = parse_code opts
-
-    @mechanize = Mechanize.new
-    page = @mechanize.get MRUrl % {:repo => repo, :id => id}
-
-    cmd_show_for page
-  end
-
-  def cmd_show_for page
-    raise "can't grab summary" unless page.parser.css('#content h1').first.text.strip =~ /[^#]+ #(\d+): (.+)/
-      id, summary = $1, $2
-    proposal = page.parser.css('.proposal').first.text.strip
-
-    lis = page.parser.css('ul.meta li')
-    raise "can't get meta content" if lis.empty?
-
-    a = lis[0].css('a').last
-    requester = "#{a.text.strip} (http://gitorious.org#{a.attr('href')})"
-
-    puts <<-EOS
-Requester: #{requester}
-
-ID: #{id}
-Summary: #{summary}
-Proposal:
-#{proposal}
-
-EOS
-  end
-
-end
-

data/lib/gitorious-merge-request/version.rb

@@ -1,7 +0,0 @@
-
-module GitoriousMergeRequest
-
-  Version = '1.0.2'
-
-end
-