git_reflow 0.2.2 → 0.2.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    git_reflow (0.2.2)
+    git_reflow (0.2.4)
       colorize (= 0.5.8)
       github_api (= 0.7.0)
       gli (= 2.1.0)

data/bin/git-reflow

@@ -14,7 +14,6 @@ $: << File.expand_path(File.dirname(File.realpath(__FILE__)) + '/../lib')
 require 'rubygems'
 require 'gli'
 require 'git_reflow'
-require 'git_reflow/version'
 
 include GLI::App
 
@@ -22,84 +21,7 @@ program_desc 'Git Reflow manages your git workflow.'
 
 version GitReflow::VERSION
 
-desc 'Describe some switch here'
-switch [:s,:switch]
-
-desc 'Describe some flag here'
-default_value 'the default'
-arg_name 'The name of the argument'
-flag [:f,:flagname]
-
-desc 'Setup your GitHub account'
-command :setup do |c|
-  c.action do |global_options,options,args|
-    GitReflow.setup
-  end
-end
-
-desc 'Start will create a new feature branch and setup remote tracking'
-arg_name 'Describe arguments to start here'
-command :start do |c|
-  c.desc 'Describe a switch to start'
-  c.switch :s
-
-  c.desc 'Describe a flag to start'
-  c.default_value 'default'
-  c.flag :f
-  c.action do |global_options,options,args|
-
-    # Your command logic here
-    if args.empty?
-      raise "usage: git-reflow start [new-branch-name]"
-    else
-      `git push origin master:refs/heads/#{args[0]}`
-      `git fetch origin`
-      `git checkout --track -b #{args[0]} origin/#{args[0]}`
-    end
-    # If you have any errors, just raise them
-    # raise "that command made no sense"
-  end
-end
-
-desc 'Describe review here'
-arg_name 'Describe arguments to review here'
-command :review do |c|
-  c.action do |global_options,options,args|
-    review_options = {'base' => nil, 'title' => nil, 'body' => nil}
-    case args.length
-    when 3
-      review_options['base'] = args[0]
-      review_options['title'] = args[1]
-      review_options['body'] = args[2]
-    when 2
-      review_options['base'] = args[0]
-      review_options['title'] = args[1]
-      review_options['body'] = review_options['title']
-    when 1
-      review_options['base'] = args[0]
-      review_options['title'] = review_options['body'] = GitReflow.get_first_commit_message
-    else
-      review_options['title'] = review_options['body'] = GitReflow.get_first_commit_message
-    end
-    GitReflow.review review_options
-  end
-end
-
-desc 'deliver will merge your feature branch down to your base branch'
-arg_name 'base_branch - the branch you want to merge into'
-command :deliver do |c|
-  c.action do |global_options,options,args|
-    deliver_options = {'base' => nil, 'head' => nil}
-    case args.length
-    when 2
-      deliver_options['base'] = args[0]
-      deliver_options['head'] = args[1]
-    when 1
-      deliver_options['base'] = args[0]
-    end
-    GitReflow.deliver deliver_options
-  end
-end
+commands_from 'git_reflow/commands'
 
 pre do |global,command,options,args|
   # Pre logic here

data/lib/git_reflow/commands/deliver.rb

@@ -0,0 +1,18 @@
+desc 'deliver your feature branch'
+long_desc 'merge your feature branch down to your base branch, and cleanup your feature branch'
+
+command :deliver do |c|
+  c.desc 'merge your feature branch down to your base branch, and cleanup your feature branch'
+  c.arg_name 'base_branch - the branch you want to merge into'
+  c.action do |global_options,options,args|
+    deliver_options = {'base' => nil, 'head' => nil}
+    case args.length
+    when 2
+      deliver_options['base'] = args[0]
+      deliver_options['head'] = args[1]
+    when 1
+      deliver_options['base'] = args[0]
+    end
+    GitReflow.deliver deliver_options
+  end
+end

data/lib/git_reflow/commands/review.rb

@@ -0,0 +1,25 @@
+desc 'review will push your latest feature branch changes to your remote repo and create a pull request'
+arg_name 'Describe arguments to review here'
+command :review do |c|
+  c.desc 'push your latest feature branch changes to your remote repo and create a pull request against the destination branch'
+  c.arg_name '[destination_branch] - the branch you want to merge your feature branch into'
+  c.action do |global_options,options,args|
+    review_options = {'base' => nil, 'title' => nil, 'body' => nil}
+    case args.length
+    when 3
+      review_options['base'] = args[0]
+      review_options['title'] = args[1]
+      review_options['body'] = args[2]
+    when 2
+      review_options['base'] = args[0]
+      review_options['title'] = args[1]
+      review_options['body'] = review_options['title']
+    when 1
+      review_options['base'] = args[0]
+      review_options['title'] = review_options['body'] = GitReflow.get_first_commit_message
+    else
+      review_options['title'] = review_options['body'] = GitReflow.get_first_commit_message
+    end
+    GitReflow.review review_options
+  end
+end

data/lib/git_reflow/commands/setup.rb

@@ -0,0 +1,7 @@
+desc 'Setup your GitHub account'
+command :setup do |c|
+  c.desc 'sets up your api token with GitHub'
+  c.action do |global_options, options, args|
+    GitReflow.setup
+  end
+end

data/lib/git_reflow/commands/start.rb

@@ -0,0 +1,25 @@
+desc 'Start will create a new feature branch and setup remote tracking'
+long_desc <<LONGTIME
+  Performs the following:\n
+  \t$ git pull origin <current_branch>\n
+  \t$ git push origin master:refs/heads/[new_feature_branch]\n
+  \t$ git checkout --track -b [new_feature_branch] origin/[new_feature_branch]\n
+LONGTIME
+arg_name '[new-feature-branch-name] - name of the new feature branch'
+command :start do |c|
+  c.desc 'Describe a switch to list'
+  c.switch :s
+
+  c.desc 'Describe a flag to list'
+  c.default_value 'default'
+  c.flag :f
+  c.action do |global_options, options, args|
+    if args.empty?
+      raise "usage: git-reflow start [new-branch-name]"
+    else
+      `git pull origin #{GitReflow.current_branch}`
+      `git push origin master:refs/heads/#{args[0]}`
+      `git checkout --track -b #{args[0]} origin/#{args[0]}`
+    end
+  end
+end

data/lib/git_reflow/commands/status.rb

@@ -0,0 +1,8 @@
+desc 'Display information about the status of your feature in the review process'
+arg_name "destination_branch - the branch you're merging your feature into ('master' is default)"
+command :status do |c|
+  c.action do |global_options, options, args|
+    destination_branch = args[0] || 'master'
+    GitReflow.status destination_branch
+  end
+end

data/lib/git_reflow/version.rb

@@ -1,3 +1,3 @@
 module GitReflow
-  VERSION = "0.2.2"
+  VERSION = "0.2.4"
 end

data/lib/git_reflow.rb

@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'rake'
+require 'git_reflow/version.rb'
 require 'open-uri'
 require "highline/import"
 require 'httpclient'
@@ -22,6 +22,19 @@ module GitReflow
     set_oauth_token(oauth_token)
   end
 
+  def status(destination_branch)
+    pull_request = find_pull_request( :from => current_branch, :to => destination_branch )
+
+    if pull_request.nil?
+      puts "\n[notice] No pull request exists for #{current_branch} -> #{destination_branch}"
+      puts "[notice] Run 'git reflow review #{destination_branch}' to start the review process"
+    else
+      puts "Here's the status of your review:"
+      display_pull_request_summary(pull_request)
+      ask_to_open_in_browser(pull_request)
+    end
+  end
+
   def review(options = {})
     options['base'] ||= 'master'
     fetch_destination options['base']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_reflow
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-17 00:00:00.000000000 Z
+date: 2012-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -218,6 +218,11 @@ files:
 - git_reflow.gemspec
 - lib/git_reflow.rb
 - lib/git_reflow/base.rb
+- lib/git_reflow/commands/deliver.rb
+- lib/git_reflow/commands/review.rb
+- lib/git_reflow/commands/setup.rb
+- lib/git_reflow/commands/start.rb
+- lib/git_reflow/commands/status.rb
 - lib/git_reflow/version.rb
 - spec/fixtures/git/git_config
 - spec/fixtures/pull_requests/pull_request.json
@@ -250,7 +255,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -900915323995072277
+      hash: -1280650752481315877
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -259,7 +264,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -900915323995072277
+      hash: -1280650752481315877
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24