gitorious-merge-request 2.0.0 → 2.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. data/README.markdown +19 -4
  2. data/bin/gitorious-merge-request +1 -1
  3. data/lib/gitorious_merge_request.rb +2 -0
  4. data/lib/gitorious_merge_request/version.rb +1 -1
  5. metadata +4 -4
data/README.markdown CHANGED
@@ -1,7 +1,7 @@
1
1
  Create Gitorious' merge requests from command-line
2
2
 
3
3
  Installation
4
- ===========
4
+ ============
5
5
 
6
6
  gem install gitorious-merge-request
7
7
 
@@ -9,19 +9,34 @@ or from source:
9
9
 
10
10
  bundle install
11
11
 
12
+ List of commands
13
+ ================
14
+
15
+ * new
16
+ * show
17
+ * rm
18
+ * list
19
+ * diff
20
+ * checkout
21
+
12
22
  Examples
13
23
  ========
14
24
 
15
25
  gitorious-merge-request --help
16
- gitorious-merge-request new --help
17
- gitorious-merge-request show --help
18
- gitorious-merge-request rm --help
26
+ gitorious-merge-request command --help
19
27
 
20
28
  gitorious-merge-request new -e brauliobo@gmail.com -s 'test' -r '~brauliobo/noosfero/brauliobos-noosfero' -a easysafeinstall -b master -t 'noosfero/noosfero'
21
29
  gitorious-merge-request show -c noosfero/noosfero:248
22
30
 
23
31
  gitorious-merge-request rm -c eita/test:3 -e brauliobo@gmail.com
24
32
 
33
+ # will use remote origin to guess repo
34
+ gitorious-merge-request list
35
+ gitorious-merge-request list -r eita/test
36
+
37
+ gitorious-merge-request diff -c 5
38
+ gitorious-merge-request checkout -c 5
39
+
25
40
 
26
41
 
27
42
 
data/bin/gitorious-merge-request CHANGED
@@ -42,7 +42,7 @@ EOS
42
42
  opt :summary, "Summary", :short => 's', :type => String
43
43
  opt :proposal, "Proposal", :short => 'p', :type => String
44
44
  opt :forked_repo, "Git remote name OR forked repo id (e.g. ~brauliobo/noosfero/brauliobos-noosfero)", :short => 'f', :type => String
45
- opt :forked_branch, "Forked branch", :short => 'a', :type => String
45
+ opt :forked_branch, "Forked branch OR default to current git branch name", :short => 'a', :type => String
46
46
  opt :target_repo, "Git remote name OR target repo id (e.g. noosfero/noosfero, defaults to git origin repository)",
47
47
  :short => 't', :type => String, :default => $origin_repo
48
48
  opt :target_branch, "Target branch (defaults to git's current branch)",
data/lib/gitorious_merge_request.rb CHANGED
@@ -23,6 +23,8 @@ class GitoriousMergeRequest
23
23
  end
24
24
 
25
25
  def cmd_new opts
26
+ opts[:forked_branch] ||= Git.current_branch
27
+
26
28
  Trollop::die :summary, "must exist" unless opts[:summary]
27
29
  Trollop::die :forked, "must exist" unless opts[:forked_repo]
28
30
  Trollop::die :forked_branch, "must exist" unless opts[:forked_branch]
data/lib/gitorious_merge_request/version.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  class GitoriousMergeRequest
2
2
 
3
- Version = '2.0.0'
3
+ Version = '2.0.1'
4
4
 
5
5
  end
6
6
 
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: gitorious-merge-request
3
3
  version: !ruby/object:Gem::Version
4
- hash: 15
4
+ hash: 13
5
5
  prerelease:
6
6
  segments:
7
7
  - 2
8
8
  - 0
9
- - 0
10
- version: 2.0.0
9
+ - 1
10
+ version: 2.0.1
11
11
  platform: ruby
12
12
  authors:
13
13
  - Braulio Bhavamitra
@@ -15,7 +15,7 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2012-11-14 00:00:00 +00:00
18
+ date: 2012-12-13 00:00:00 +00:00
19
19
  default_executable:
20
20
  dependencies:
21
21
  - !ruby/object:Gem::Dependency