git-process 1.1.4 → 2.0.0

data/Gemfile

@@ -1,20 +0,0 @@
-source "http://rubygems.org"
-
-group :default do
-  gem "octokit", "~> 1.24" # GitHub API
-  gem "json", "~> 1.7.3"
-  gem "trollop", "~> 1.16.2" # CLI options parser
-  gem "highline", "1.6.13" # user CLI interaction. There is a bug in 1.6.14
-  gem "addressable", "~> 2.3.4" # URI processing
-end
-
-group :development do
-  gem "rake", "~> 0.9.2"
-  gem "yard", "~> 0.8.2.1" # documentation generator
-  gem "redcarpet", "~> 2.1.1"
-end
-
-group :test do
-  gem "rspec", "~> 2.12.0"
-  gem "webmock", "~> 1.8.7" # network mocking
-end

data/Gemfile.lock

@@ -1,53 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    addressable (2.3.4)
-    crack (0.3.2)
-    diff-lcs (1.1.3)
-    faraday (0.8.7)
-      multipart-post (~> 1.1)
-    faraday_middleware (0.9.0)
-      faraday (>= 0.7.4, < 0.9)
-    hashie (2.0.3)
-    highline (1.6.13)
-    json (1.7.7)
-    multi_json (1.7.2)
-    multipart-post (1.2.0)
-    netrc (0.7.7)
-    octokit (1.24.0)
-      addressable (~> 2.2)
-      faraday (~> 0.8)
-      faraday_middleware (~> 0.9)
-      hashie (~> 2.0)
-      multi_json (~> 1.3)
-      netrc (~> 0.7.7)
-    rake (0.9.6)
-    redcarpet (2.1.1)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.2)
-    rspec-expectations (2.12.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.2)
-    trollop (1.16.2)
-    webmock (1.8.11)
-      addressable (>= 2.2.7)
-      crack (>= 0.1.7)
-    yard (0.8.2.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  addressable (~> 2.3.4)
-  highline (= 1.6.13)
-  json (~> 1.7.3)
-  octokit (~> 1.24)
-  rake (~> 0.9.2)
-  redcarpet (~> 2.1.1)
-  rspec (~> 2.12.0)
-  trollop (~> 1.16.2)
-  webmock (~> 1.8.7)
-  yard (~> 0.8.2.1)

data/Rakefile

@@ -1,16 +0,0 @@
-#!/usr/bin/env rake
-require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
-require 'yard'
-require 'yard/rake/yardoc_task'
-
-desc 'Default: run specs.'
-task :default => :spec
-
-desc "Run specs"
-RSpec::Core::RakeTask.new do |t|
-  t.pattern = "./spec/**/*_spec.rb" # don't need this, it's default.
-end
-
-desc "Create docs"
-YARD::Rake::YardocTask.new

data/bin/git-new-fb

@@ -1,58 +0,0 @@
-#!/usr/bin/env ruby
-
-#require "rubygems"
-#require "bundler/setup"
-#$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '../lib')
-
-require 'git-process/git_process_options'
-require 'git-process/new_fb'
-require 'git-process/git_lib'
-include GitProc
-
-
-class NewFeatureBranchOptions
-  include GitProcessOptions
-
-  def summary
-    "Create a new feature branch based on the integration branch."
-  end
-
-
-  def description
-    <<DESC
-DESCRIPTION
-
-This creates the named branch based on the integration branch.
-
-EXAMPLE
-
-Assuming that the the integration branch on the server is "master", \
-typing "git new-fb my_feature" will do roughly the following \
-for you:
-  $ git checkout my_feature origin/master
-
-Also, if you are currently on the "_parking_" branch (see "git to-master"), \
-this will remove that branch.
-
-DESC
-  end
-
-
-  def usage(filename)
-    "#{filename} [options] branch_name"
-  end
-
-
-  def empty_argv_ok?
-    false
-  end
-
-
-  def post_parse(opts, argv)
-    opts[:branch_name] = argv.shift
-  end
-
-end
-
-opts = NewFeatureBranchOptions.new.parse_cli(File.basename(__FILE__), ARGV)
-GitProc::NewFeatureBranch.new(GitProc::GitLib.new('.', opts), opts).run

data/bin/git-pull-request

@@ -1,107 +0,0 @@
-#!/usr/bin/env ruby
-
-#require "rubygems"
-#require "bundler/setup"
-#$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '../lib')
-
-require 'git-process/git_lib'
-require 'git-process/pull_request'
-require 'git-process/git_process_options'
-include GitProc
-
-class PullRequestOptions
-  include GitProcessOptions
-
-
-  def summary
-    "Creates or gets a Pull Request."
-  end
-
-
-  def description
-    <<DESC
-DESCRIPTION
-
-This creates or gets a Pull Request on the GitHub server associated with the current \
-branch. For the reasons why Pull Requests are useful for the development process, \
-see https://help.github.com/articles/using-pull-requests
-
-The "git pull-request" command is a nice, simplified alternative to using the \
-web interface.
-
-If no name or number is provided, it is assumed that you want to create a new \
-pull request with the same name as the current branch.
-
-If a number is given, or a number with a server preceding it (e.g., "origin/23"), \
-then this assumes that the number refers to an existing pull request identified \
-by that number. In that case, the branch associated with the HEAD of the pull \
-request is checked out.
-
-EXAMPLE
-
-You've been developing your killer new feature or bug fix, and you want \
-someone else to look at it (to do code-review or otherwise provide input). \
-When you do "git pull-request", it synchronizes the current branch with \
-the server (effectively executing "git sync") and creates the Pull Request \
-against the integration branch. (Usually "master", but this can be changed; \
-see below.)
-
-The counterpart to this command is "git to-master".
-
-NOTES
-
-* It's assumed that you *never* do any work directly on "master":
-  everything is done on a feature branch.  In addition to being a much
-  safer and more flexible way of working in general, it is also a
-  requirement to take advantage of Pull Request functionality.
-* The first time you use a GitHub feature like this, you will be asked
-  for your username and password. This does not store them, but instead
-  uses them to get an OAuth2 token, which is stored in
-  "git config gitProcess.github.authToken".
-* If you want to use a different integration branch other than "master",
-  set the "gitProcess.integrationBranch" configuration value. (e.g.,
-  "git config gitProcess.integrationBranch my-integ-branch")
-
-DESC
-  end
-
-
-  def usage(filename)
-    "Usage: #{filename} [ options ] [pull_request_title | server/pull_request_number | pull_request_number]"
-  end
-
-
-  def extend_opts(parser)
-    parser.opt :base_branch, "The branch on the server that you want this \"pulled\" into. "+
-        "Defaults to the integration branch.", :type => :string
-    parser.opt :head_branch, "The branch that you want reviewed before being \"pulled\" "+
-        "into the base branch. Defaults to the current branch.", :type => :string
-    parser.opt :repo_name, "The name of the repository to \"pull\" into. Defaults to "+
-        "the current repository.", :type => :string
-    parser.opt :description, "The description of the Pull Request. Usually includes a "+
-        "nice description of what was changed to make things easier "+
-        "for the reviewer.", :short => :d, :type => :string
-    parser.opt :user, "Your GitHub username. Only needed the first time you connect, "+
-        "and you will be prompted for it if needed.", :type => :string
-    parser.opt :password, "Your GitHub password. Only needed the first time you connect, "+
-        "and you will be prompted for it if needed.", :type => :string
-  end
-
-
-  def post_parse(opts, argv)
-    arg = argv.shift
-    if /^\d+$/ =~ arg
-      opts[:prNumber] = arg
-    elsif /^(.*)\/(\d+)$/ =~ arg
-      m = /^(.*)\/(\d+)$/.match(arg)
-      opts[:server] = m[1]
-      opts[:prNumber] = m[2]
-    else
-      opts[:title] = arg
-    end
-  end
-
-end
-
-opts = PullRequestOptions.new.parse_cli(File.basename(__FILE__), ARGV)
-GitProc::PullRequest.new(GitProc::GitLib.new('.', opts), opts).run

data/bin/git-sync

@@ -1,73 +0,0 @@
-#!/usr/bin/env ruby
-
-# require "rubygems"
-# require "bundler/setup"
-# $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '../lib')
-
-require 'git-process/git_process_options'
-require 'git-process/sync'
-require 'git-process/git_lib'
-
-
-class SyncOptions
-  include GitProc::GitProcessOptions
-
-
-  def summary
-    "Gets the latest changes that have happened on the integration branch, then pushes your changes to a \"private\" branch on the server."
-  end
-
-
-  def description
-    <<DESC
-DESCRIPTION
-
-This fetches the latest repository from the server, rebases/merges the current branch \
-against the changes in the integration branch, then pushes the result up to a branch on \
-the server of the same name. (Unless told not to.)
-
-If there is a problem, such as a merge conflict, this tries to \
-resolve it automatically. If it can not do so in an automated way, \
-if tells you the steps involved for doing so manually.
-
-By default the first server name reported by 'git remote' is used as the server/remote name. \
-Since most projects only have a single remote (i.e., "origin") this works most of the time. \
-But if you have multiple remotes and want to explicitly set it, use the \
-'gitProcess.remoteName' configuration option.
-
-Setting `gitProcess.defaultRebaseSync` to "true" causes this to default to using rebase instead of merge.
-
-EXAMPLE
-
-Assuming that the current branch is called "interesting_changes" and the integration \
-branch on the server is "master", typing "git sync" will do roughly the following \
-for you:
-  $ git fetch -p
-  $ git merge origin/master
-  $ git push origin interesting_changes:interesting_changes
-
-DESC
-  end
-
-
-  def extend_opts(parser)
-    parser.opt :rebase, "Rebase instead of merge against the integration branch"
-    parser.opt :merge, "Merge instead of rebase against the integration branch", :short => :none, :default => true
-    parser.opt :force, "Force the push; defaults to true if --rebase is used", :short => :f, :default => false
-    parser.opt :local, "Do not do a push; gets remote changes, but does not update the server", :short => :l, :default => false
-
-    parser.conflicts :rebase, :merge
-    parser.conflicts :local, :force
-  end
-
-
-  #noinspection RubyUnusedLocalVariable
-  def post_parse(opts, argv)
-    opts[:force] = true if opts[:rebase]
-    opts[:merge] = !opts[:rebase]
-  end
-
-end
-
-opts = SyncOptions.new.parse_cli(File.basename(__FILE__), ARGV)
-GitProc::Sync.new(GitProc::GitLib.new('.', opts), opts).run

data/bin/git-to-master

@@ -1,133 +0,0 @@
-#!/usr/bin/env ruby
-
-#require "rubygems"
-#require "bundler/setup"
-#$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '../lib')
-
-require 'git-process/git_process_options'
-require 'git-process/rebase_to_master'
-require 'git-process/git_lib'
-
-
-class ToMasterOptions
-  include GitProc::GitProcessOptions
-
-
-  def summary
-    "Rebase against the integration branch, then pushes to it."
-  end
-
-
-  def description
-    <<DESC
-DESCRIPTION
-
-This fetches the latest changes from the server, rebases against \
-the integration branch, pushes to the integration branch, then does \
-housecleaning.
-
-If there is a problem, such as a merge conflict, this tries to \
-resolve it automatically (including responding appropriately to
-"rerere" merges). If it can not do so in an automated way, \
-if tells you the steps involved for doing so manually.
-
-"Housecleaning" includes such things as closing any \
-Pull Request that may exist for the branch, removing the (now obsolete) \
-local and remote feature branches, and then "parking" on the \
-special "_parking_" branch.
-
-Work is not expected to be done on the "_parking_" branch, but any that is \
-done is brought over to a newly created feature branch when you do \
-"git new-fb".
-
-It's assumed that you *never* do any work directly on "master": \
-everything is done on a feature branch.  In addition to being a much \
-safer and more flexible way of working in general, it is also a \
-requirement to take advantage of Pull Request functionality.
-
-By default the first server name reported by 'git remote' is used as the \
-server/remote name. Since most projects only have a single remote (i.e., \
-"origin") this works most of the time. But if you have multiple remotes and \
-want to explicitly set it, use the 'gitProcess.remoteName' configuration option.
-
-If a number is given, or a number with a server preceding it (e.g., \
-"origin/23"), then this assumes that the number refers to an existing pull \
-request identified by that number. In that case, the branch associated with \
-the HEAD of the pull request is checked out before doing the rest of the \
-"to-master".
-
-EXAMPLE WITHOUT PULL REQUEST
-
-Assuming that the current branch is called "interesting_changes" and the \
-integration branch on the server is "master", typing "git to-master" will do \
-roughly the following for you:
-  $ git fetch -p
-  $ git rebase origin/master
-  $ git push origin interesting_changes:master
-  # close pull request if one exists
-  $ git checkout -b _parking_ origin/master
-  $ git branch -d interesting_changes
-  $ git push origin --delete interesting_changes
-
-If you use the --interactive option, then it does an interactive rebase before the first "push".
-
-If you use the --keep option, then the process stops after the first "push".
-
-
-EXAMPLE WITH PULL REQUEST
-
-Assuming that the pull request number is 493, its branch name is "interesting_changes" \
-and the integration branch on the server is "master", typing "git to-master 493" will \
-do roughly the following for you:
-  $ git fetch -p
-  # looks up the information for pull-request 493
-  $ git checkout -b interesting_changes origin/interesting_changes
-  $ git rebase origin/master
-  $ git push origin interesting_changes:master
-  # close pull request
-  $ git checkout -b _parking_ origin/master
-  $ git branch -d interesting_changes
-  $ git push origin --delete interesting_changes
-
-If you would like the review the changes locally first, use "git pull-request 493"
-instead.
-
-NOTES
-
-* If you want to use a different integration branch other than "master",
-  set the "gitProcess.integrationBranch" configuration value. (e.g.,
-  "git config gitProcess.integrationBranch my-integ-branch")
-
-DESC
-  end
-
-  def usage(filename)
-    "Usage: #{filename} [ options ] [server/pull_request_number | pull_request_number]"
-  end
-
-
-  def extend_opts(parser)
-    parser.opt :keep, "Don't do any \"cleanup.\" It keeps the current local "+
-        "and remote branches, and does not close any "+
-        "outstanding pull requests.", :short => :k, :default => false
-    parser.opt :interactive, "Do an interactive rebase before pushing to the server.", :short => :i, :default => false
-  end
-
-
-  def post_parse(opts, argv)
-    arg = argv.shift
-    if /^\d+$/ =~ arg
-      opts[:prNumber] = arg
-    elsif /^(.*)\/(\d+)$/ =~ arg
-      m = /^(.*)\/(\d+)$/.match(arg)
-      opts[:server] = m[1]
-      opts[:prNumber] = m[2]
-    else
-      # "normal" to-master
-    end
-  end
-
-end
-
-opts = ToMasterOptions.new.parse_cli(File.basename(__FILE__), ARGV)
-GitProc::RebaseToMaster.new(GitProc::GitLib.new('.', opts), opts).run