gitmine 0.1.4.pre.1 → 0.1.5

data/VERSION

@@ -1 +1 @@
-0.1.4.pre.1
+0.1.5

data/gitmine.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gitmine}
-  s.version = "0.1.4.pre.1"
+  s.version = "0.1.5"
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Philippe Creux"]
-  s.date = %q{2010-11-16}
+  s.date = %q{2010-11-24}
   s.default_executable = %q{gitmine}
   s.description = %q{Git log with status of associated redmine tickets}
   s.email = %q{pcreux@gmail.com}

data/lib/gitmine/cli.rb

@@ -2,15 +2,31 @@ module Gitmine
   class CLI
     def self.run
       case ARGV[0]
-      when nil
+      when "log"
         list
-      when "branch"
+      when "branch", "br"
         branch
+      when "checkout", "co"
+        checkout
+      when "delete", "del"
+        delete
       else
         puts <<-EOS
   Usage:
-  gitmine: show the 10 latest commits and their associated issue status
-  gitmine branch [BRANCH_NAME]: create a new branch
+  gitmine branch BRANCH_NAME
+    Create a new branch, push to origin, add github links to gitmine ticket
+    Example: gitmine branch 1234-my-branch
+
+  gitmine checkout ISSUE_ID
+    Checkout remote/local branch starting with ISSUE_ID
+    Example: gitmine checkout 1234
+
+  gitmine delete ISSUE_ID
+    Delete remote branch starting with ISSUE_ID
+    Example: gitmine delete 1234
+
+  gitmine log
+    Displays latest 10 commits and the status of their associated Redmine tickets
   EOS
       end
     end
@@ -22,5 +38,13 @@ module Gitmine
     def self.branch
       Gitmine.branch(ARGV[1])
     end
+
+    def self.checkout
+      Gitmine.checkout(ARGV[1])
+    end
+
+    def self.delete
+      Gitmine.delete(ARGV[1])
+    end
   end
 end

data/lib/gitmine/gitmine.rb

@@ -20,6 +20,7 @@ module Gitmine
     end
 
 
+    # TODO specs
     def self.branch(branch_name)
       issue_id = branch_name[/^\d+/]
       original_branch = File.read('./.git/HEAD').match(/^ref: refs\/heads\/(.+)/)[1]
@@ -43,12 +44,62 @@ module Gitmine
         note << %{ - "Compare on Github":https://github.com/#{config['github']}/compare/#{original_branch}...#{branch_name}}
       end
 
-      Issue.find(issue_id).add_note(note)
+      puts 'Done!' if Issue.find(issue_id).add_note(note)
+    end
+
+    # TODO specs
+    def self.checkout(issue_id)
+      if local_branch = local_branches.select { |branch| branch[/^#{issue_id}-/] }.first
+        run_cmd("git checkout #{local_branch}")
+        return
+      end
+
+      if remote_branch = remote_branches.select { |branch| branch[/^#{issue_id}-/] }.first
+        run_cmd("git checkout -b #{remote_branch} origin/#{remote_branch}")
+        return
+      end
+
+      raise "Can't find branch starting with #{issue_id}"
+    end
+
+    # TODO specs
+    def self.delete(issue_id)
+      if remote_branch = remote_branches.select { |branch| branch[/^#{issue_id}-/] }.first
+        run_cmd("git push origin :#{remote_branch}")
+      else
+        raise "Can't find branch starting with #{issue_id}"
+      end
     end
 
     def self.run_cmd(cmd)
       puts cmd
       exit! unless system(cmd)
     end
+
+    # TODO specs
+    def self.local_branches
+      branches = []
+      `git branch`.each_line do |line|
+        if match = line[/\d+.*$/]
+          branches << match
+        end
+      end
+
+      branches
+    end
+
+    # TODO specs
+    def self.remote_branches
+      run_cmd("git fetch")
+
+      branches = []
+      `git branch -r`.each_line do |line|
+        if match = line.match(/origin\/(\d+.*)/)
+          branches << match[1]
+        end
+      end
+
+      branches
+    end
   end
 end

data/lib/gitmine/issue.rb

@@ -44,9 +44,13 @@ module Gitmine
 
     # Add a note to the Issue
     def add_note(note)
-      p self.class.put(url(self.id), 
-                     :query => {:notes => note}, 
-                     :body => "") # nginx reject requests without body
+      response = self.class.put(url(self.id), :query => {:notes => note}, :body => "") # nginx reject requests without body
+
+      if response.code == 200
+        return true
+      else
+        raise response.response
+      end
     end
 
     include HTTParty

data/spec/issue_spec.rb

@@ -51,9 +51,10 @@ describe Gitmine::Issue do
   end
 
   describe "#add_note" do
+    let(:httparty_response) { mock(:http_party_response, :code => 200) }
     it "should PUT a note" do
       issue.stub!(:id) { 1 }
-      issue.class.should_receive(:put).with('/1.xml', :query => {:notes => "Hello"}, :body => "")
+      issue.class.should_receive(:put).with('/1.xml', :query => {:notes => "Hello"}, :body => "") { httparty_response }
       issue.add_note("Hello")
     end
   end

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gitmine
 version: !ruby/object:Gem::Version 
-  hash: 1923831963
-  prerelease: true
+  hash: 17
+  prerelease: false
   segments: 
   - 0
   - 1
-  - 4
-  - pre
-  - 1
-  version: 0.1.4.pre.1
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Philippe Creux
@@ -17,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-16 00:00:00 -08:00
+date: 2010-11-24 00:00:00 -08:00
 default_executable: gitmine
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -118,14 +116,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: