gitcycle 0.2.6 → 0.2.7

data/README.md

@@ -126,7 +126,7 @@ Checkout the branch that you will eventually merge your feature into:
 
 	gitc checkout master
 
-Type `gitc reset` + your ticket URL to reset the branch:
+Type `gitc redo` + your ticket URL to reset the branch:
 
 	gitc redo https://xxx.lighthouseapp.com/projects/0000/tickets/0000-my-ticket
 

data/gitcycle.gemspec

@@ -6,7 +6,7 @@ $:.unshift lib unless $:.include?(lib)
 
 Gem::Specification.new do |s|
   s.name        = "gitcycle"
-  s.version     = '0.2.6'
+  s.version     = '0.2.7'
   s.platform    = Gem::Platform::RUBY
   s.authors     = [ 'Winton Welsh' ]
   s.email       = [ 'mail@wintoni.us' ]

data/lib/gitcycle.rb

@@ -75,19 +75,33 @@ class Gitcycle
   end
   alias :co :checkout
 
-  def commit_all
-    branch_info = get('branch',
-      'branch[name]' => branches(:current => true),
-      'create' => 0
-    )
+  def commit(*args)
+    msg = nil
 
-    if branch_info && (title = branch_info["title"]) && id = branch_info["body"].match(/#\d+/)
-      commit_msg = "[#{id}] #{title}"
+    if args.empty?
+      puts "\nRetrieving branch information from gitcycle.\n".green
+      branch = get('branch',
+        'branch[name]' => branches(:current => true),
+        'create' => 0
+      )
+
+      id = branch["lighthouse_url"].match(/tickets\/(\d+)/)[1] rescue nil
+      title = branch["title"]
+
+      if branch && id
+        msg = "[#{id}]"
+        msg += " #{title}" if title
+      end
     end
 
-    run "git add . && git commit -am" + (commit_msg ? " \"#{commit_msg}\"" : "")
+    if msg
+      run("git add . -u && git commit -am #{msg.dump}")
+      Kernel.exec("git commit --amend")
+    else
+      exec_git(:commit, args)
+    end
   end
-  alias :ca :commit_all
+  alias :ci :commit
 
   def create_branch(url_or_title, reset=false)
     require_git && require_config
@@ -412,8 +426,7 @@ class Gitcycle
 
     `git --help`.scan(/\s{3}(\w+)\s{3}/).flatten.each do |cmd|
       if command == cmd && !self.respond_to?(command)
-        args.unshift("git", command)
-        Kernel.exec(*args)
+        exec_git(cmd, args)
       end
     end
 
@@ -596,6 +609,11 @@ class Gitcycle
     end
   end
 
+  def exec_git(command, args)  
+    args.unshift("git", command)
+    Kernel.exec(*args)
+  end
+
   def fix_conflict(options)
     owner = options[:owner]
     repo = options[:repo]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gitcycle
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 2
-  - 6
-  version: 0.2.6
+  - 7
+  version: 0.2.7
 platform: ruby
 authors: 
 - Winton Welsh