gitx 2.13.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ae23c0140c764302c1c7cc84a1f05344f50f4459
+  data.tar.gz: fde7992a4535128773c335cf41ee88dc84de6487
+SHA512:
+  metadata.gz: 2d77a7dd2291a7978410485d2dd2c470892aa65bd4be6688678f2b539b23024acd2975250e5a11595d28ab7e77a62efa9b885b182207c0a1494de896e645f653
+  data.tar.gz: 7fbde0cd2c143ce9230e5a8d0f898b342e213562469a1ea50ed25b1f077dee461b91de67e96258a0465108e65e24c20a4785958b69bebc8b659085daacd3f2cd

data/.gitignore

@@ -0,0 +1,28 @@
+## MAC OS
+.DS_Store
+
+## TEXTMATE
+*.tmproj
+tmtags
+
+## EMACS
+*~
+\#*
+.\#*
+
+## VIM
+*.swp
+
+## GIT
+*.orig
+
+## PROJECT::GENERAL
+coverage
+rdoc
+pkg
+
+## bundler
+Gemfile.lock
+
+## RSpec temp files
+spec/tmp

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--require spec_helper

data/.ruby-version

@@ -0,0 +1 @@
+2.1.2

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+rvm:
+  - '2.1.2'
+before_install:
+  - git config remote.origin.fetch '+refs/heads/*:refs/remotes/origin/*'
+  - git fetch

data/CONTRIBUTING.md

@@ -0,0 +1,67 @@
+# Development Workflow
+
+## Resources
+* [Git Workflow Presentation](https://docs.google.com/presentation/d/1euOiki_e4OQ4jymGhS-o3xcET8-KZhDONUolDlOVT30/edit?usp=sharing)
+* [git extensions gem](https://github.com/wireframe/gitx)
+
+## Step 1:  Create feature branch...
+
+```bash
+$ git start my-feature-branch
+```
+
+* The `start` command ensures your branch name is valid and your codebase is uptodate.
+* Use a descriptive branch name to help other developers (ex: fix-login-screen, api-refactor, payment-reconcile, etc)
+
+## Step 2: Implement the requested change...
+Use [Test Driven Development](http://en.wikipedia.org/wiki/Test-driven_development) to ensure that the feature has proper code coverage.
+
+* **RED** - Write tests for the desired behavior...
+* **GREEN** - Write just enough code to get the tests to pass...
+* **REFACTOR** - Cleanup for clarity and DRY-ness...
+
+
+### Development Protips™
+* Follow [best practices](http://robots.thoughtbot.com/post/48933156625/5-useful-tips-for-a-better-commit-message) for git commit messages to communicate your changes.
+* Add [ticket references to commits to automatically trigger product management workflows](http://help.sprint.ly/knowledgebase/articles/108139-available-scm-vcs-commands)
+* Only write the **minimal** amount of code necessary to accomplish the given task.
+* Ensure branch stays up-to-date with latest changes that are merged into master by using: `$ git update`
+* Changes that are not directly related to the current feature should be cherry-picked into their own branch and merged separately.
+
+### Testing Protips™
+* Every line of code should have associated unit tests.  If it's not tested, it's probably broken and you just don't know it yet...
+* Use [BetterSpecs.org](http://betterspecs.org/) as reference for writing readable and maintainable unit tests.
+
+
+## Step 3: Peer Review (aka Pull Request)...
+
+```
+$ git review
+```
+
+* Describe high level overview of the branch in pull request description.  Include links to relevant resources.
+* Record **artifacts** created by this feature (ex: screenshots of UI changes, screencasts of UX changes, logs from database migrations, etc)
+* Document **follow-up** items/tasks that need to be addressed post-release
+
+### Questions to ask...
+* Is there a simpler way to accomplish the task at hand?
+* Are we solving the problems of today and not over engineering for the problems of tomorrow?
+
+## Step 4: QA
+
+> With great power comes great responsibility…
+
+* You are responsible to test your changes locally and in production environments as necessary
+* Test changes in local development environment using the same process used by Continuous Integration with: `$ rake ci`
+* Smoketest all changes locally and in staging environment when appropriate with: `$ git integrate staging`
+
+## Step 5: Sign-off and release
+
+```
+$ git release
+```
+
+* Ensure that build is green before releasing branch
+* Pull requests must be signed off by team leads before release (preferrably via :shipit: emoji)
+
+## Step 5: Profit?

data/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in your gemspec file
+gemspec

data/Guardfile

@@ -0,0 +1,8 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+guard :rspec, cmd: 'bundle exec rspec', failed_mode: :keep do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { 'spec' }
+end

data/LICENSE.txt

@@ -0,0 +1,22 @@
+Copyright (c) 2013 Ryan Sonnek
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -0,0 +1,87 @@
+[![Build Status](https://travis-ci.org/wireframe/gitx.png?branch=master)](https://travis-ci.org/wireframe/gitx)
+[![Code Coverage](https://coveralls.io/repos/wireframe/gitx/badge.png)](https://coveralls.io/r/wireframe/gitx)
+[![Code Climate](https://codeclimate.com/github/wireframe/gitx.png)](https://codeclimate.com/github/wireframe/gitx)
+
+# GitX
+
+> Useful Git eXtensions for improved development workflows
+
+### Global Options
+* `--trace` or `-v` = verbose output for debugging commands
+* `--pretend` or `-p` = dry run commands and do not actually invoke operations
+
+## git start <new_branch_name (optional)>
+
+update local repository with latest upstream changes and create a new feature branch
+
+## git update
+
+update the local feature branch with latest remote changes plus upstream released changes.
+
+## git integrate <aggregate_branch_name (optional, default: staging)>
+
+integrate the current feature branch into an aggregate branch (ex: prototype, staging)
+
+## git review <feature_branch_name (optional, default: current_branch)>
+
+create a pull request on github for peer review of the current branch.  This command is re-runnable
+in order to re-assign pull requests.
+
+options:
+* `--assign` or `-a` = assign pull request to github user
+* `--open` or `-o` = open pull request in default web browser.
+* `--bump` or `-b` = bump an existing pull request by posting a comment to re-review new changes
+* `--approve` = approve/signoff on pull request (with optional feedback)
+* `--reject` = reject pull request (with details)
+
+NOTE: the `--bump` option will also update the pull request commit status to mark the branch as 'pending peer review'.
+This setting is cleared when a reviewer approves or rejects the pull request.
+
+## git release <feature_branch_name (optional, default: current_branch)
+
+release the feature branch to master.  This operation will perform the following:
+
+* pull latest code from remote feature branch
+* pull latest code from master branch
+* prompt user to confirm they actually want to perform the release
+* check if pull request commit status is currently successful
+* merge current branch into master
+* (optional) cleanup merged branches from remote server
+
+options:
+* `--cleanup` = automatically cleanup merged branches after release complete
+
+# Extra Utility Git Extensions
+
+## git cleanup
+
+delete released branches after they have been merged into master.
+
+## git nuke <aggregate_branch_name>
+
+reset an aggregate branch (ex: prototype, staging) back to a known good state.
+
+## git buildtag
+
+create a build tag for the current Travis-CI build and push it back to origin
+
+
+## Contributing
+See [CONTRIBUTING.md](CONTRIBUTING.md)
+
+* Fork the project.
+* Make your feature addition or bug fix.
+* Add tests for it. This is important so I don't break it in a
+  future version unintentionally.
+* Commit, do not mess with rakefile, version, or history.
+  (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
+* Send me a pull request. Bonus points for topic branches.
+
+## Related Projects
+* [socialcast-git-extensions](https://github.com/socialcast/socialcast-git-extensions)
+* [thegarage-gitx](https://github.com/thegarage/thegarage-gitx)
+
+
+## Copyright
+See [LICENSE.txt](LICENSE.txt)
+

data/Rakefile

@@ -0,0 +1,5 @@
+require 'bundler/gem_tasks'
+
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new('spec')
+task :default => :spec

data/bin/git-buildtag

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+
+$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+require 'gitx/cli/buildtag_command'
+args = ARGV.dup.unshift('buildtag')
+Gitx::Cli::BuildtagCommand.start(args)

data/bin/git-cleanup

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+require 'gitx/cli/cleanup_command'
+args = ARGV.dup.unshift('cleanup')
+Gitx::Cli::CleanupCommand.start(args)
+

data/bin/git-integrate

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+
+$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+require 'gitx/cli/integrate_command'
+args = ARGV.dup.unshift('integrate')
+Gitx::Cli::IntegrateCommand.start(args)

data/bin/git-nuke

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+
+$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+require 'gitx/cli/nuke_command'
+args = ARGV.dup.unshift('nuke')
+Gitx::Cli::NukeCommand.start(args)

data/bin/git-release

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+
+$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+require 'gitx/cli/release_command'
+args = ARGV.dup.unshift('release')
+Gitx::Cli::ReleaseCommand.start(args)

data/bin/git-review

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+
+$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+require 'gitx/cli/review_command'
+args = ARGV.dup.unshift('review')
+Gitx::Cli::ReviewCommand.start(args)

data/bin/git-share

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+
+$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+require 'gitx/cli/share_command'
+args = ARGV.dup.unshift('share')
+Gitx::Cli::ShareCommand.start(args)

data/bin/git-start

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+
+$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+require 'gitx/cli/start_command'
+args = ARGV.dup.unshift('start')
+Gitx::Cli::StartCommand.start(args)

data/bin/git-track

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+
+$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+require 'gitx/cli/track_command'
+args = ARGV.dup.unshift('track')
+Gitx::Cli::TrackCommand.start(args)

data/bin/git-update

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+
+$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+require 'gitx/cli/update_command'
+args = ARGV.dup.unshift('update')
+Gitx::Cli::UpdateCommand.start(args)

data/gitx.gemspec

@@ -0,0 +1,37 @@
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'gitx/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = 'gitx'
+  spec.version       = Gitx::VERSION
+  spec.authors       = ['Ryan Sonnek']
+  spec.email         = ['ryan.sonnek@gmail.com']
+  spec.description   = %q{Git eXtensions for improved development workflow}
+  spec.summary       = %q{Utility scripts for Git to increase productivity for common operations}
+  spec.homepage      = ''
+  spec.license       = 'MIT'
+
+  spec.files         = `git ls-files`.split($/)
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ['lib']
+
+  spec.add_runtime_dependency 'rugged', '~> 0.21.0'
+  spec.add_runtime_dependency 'thor'
+  spec.add_runtime_dependency 'octokit'
+
+  spec.add_development_dependency 'bundler', '~> 1.3'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'pry', '>= 0'
+  spec.add_development_dependency 'webmock', '>= 0'
+  spec.add_development_dependency 'timecop', '~> 0.7.0'
+  spec.add_development_dependency 'vcr'
+  spec.add_development_dependency 'guard'
+  spec.add_development_dependency 'guard-rspec'
+  spec.add_development_dependency 'coveralls'
+  spec.add_development_dependency 'terminal-notifier'
+  spec.add_development_dependency 'terminal-notifier-guard'
+end

data/lib/gitx.rb

@@ -0,0 +1,8 @@
+require 'gitx/version'
+require 'gitx/configuration'
+require 'gitx/extensions/string'
+require 'gitx/extensions/thor'
+
+module Gitx
+  BASE_BRANCH = 'master'
+end

data/lib/gitx/cli/base_command.rb

@@ -0,0 +1,56 @@
+require 'thor'
+require 'pathname'
+require 'rugged'
+require 'gitx'
+
+module Gitx
+  module Cli
+    class BaseCommand < Thor
+      include Thor::Actions
+
+      class MergeError < Thor::Error; end
+
+      add_runtime_options!
+
+      method_option :trace, :type => :boolean, :aliases => '-v'
+      def initialize(*args)
+        super(*args)
+      end
+
+      private
+
+      def repo
+        @repo ||= begin
+          path = Dir.pwd
+          Rugged::Repository.discover(path)
+        end
+      end
+
+      def checkout_branch(branch_name)
+        run_cmd "git checkout #{branch_name}"
+      end
+
+      # lookup the current branch of the repo
+      def current_branch
+        repo.branches.find(&:head?)
+      end
+
+      def assert_aggregate_branch!(target_branch)
+        fail "Invalid aggregate branch: #{target_branch} must be one of supported aggregate branches #{config.aggregate_branches}" unless config.aggregate_branch?(target_branch)
+      end
+
+      def assert_not_protected_branch!(branch, action)
+        raise "Cannot #{action} reserved branch" if config.reserved_branch?(branch) || config.aggregate_branch?(branch)
+      end
+
+      # helper to invoke other CLI commands
+      def execute_command(command_class, method, args = [])
+        command_class.new.send(method, *args)
+      end
+
+      def config
+        @configuration ||= Gitx::Configuration.new(repo.workdir)
+      end
+    end
+  end
+end

data/lib/gitx/cli/buildtag_command.rb

@@ -0,0 +1,39 @@
+require 'thor'
+require 'gitx'
+require 'gitx/cli/base_command'
+
+module Gitx
+  module Cli
+    class BuildtagCommand < BaseCommand
+
+      desc 'buildtag', 'create a tag for the current build and push it back to origin (supports Travis CI and Codeship)'
+      def buildtag
+        fail 'Unknown branch. Environment variables TRAVIS_BRANCH or CI_BRANCH are required' unless branch_name
+        fail "Branch must be one of the supported taggable branches: #{config.taggable_branches}" unless config.taggable_branch?(branch_name)
+
+        label = "buildtag generated by build #{build_number}"
+        create_build_tag(branch_name, label)
+      end
+
+      private
+
+      # pull the current branch name from environment variables
+      # supports Travis CI or Codeship variables
+      # see https://www.codeship.io/documentation/continuous-integration/set-environment-variables/
+      def branch_name
+        ENV['TRAVIS_BRANCH'] || ENV['CI_BRANCH']
+      end
+
+      def build_number
+        ENV['TRAVIS_BUILD_NUMBER'] || ENV['CI_BUILD_NUMBER']
+      end
+
+      def create_build_tag(branch, label)
+        timestamp = Time.now.utc.strftime '%Y-%m-%d-%H-%M-%S'
+        git_tag = "build-#{branch}-#{timestamp}"
+        run_cmd "git tag #{git_tag} -a -m '#{label}'"
+        run_cmd "git push origin #{git_tag}"
+      end
+    end
+  end
+end