git_switch_branch 0.1.1

data/.gitignore

@@ -0,0 +1,17 @@
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp

data/Gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gemspec

data/LICENSE.txt

@@ -0,0 +1,22 @@
+Copyright (c) 2012 Daniel Eriksson
+
+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,71 @@
+# Git Switch Branch
+
+This gem simplifies switching between git branches without losing uncommitted changes. Its meant as an alternative for "git checkout" and "git stash".
+
+1. If the branch you are switching from contains uncommitted changes they will be automatically
+saved to the folder ~/.git-switch-branch/REPO_NAME/BRANCH_NAME.
+
+2. If the branch you are switching to contains saved changes they will be automatically restored.
+
+3. It makes it easier to sync uncommitted changes between computers.
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+    gem 'git_switch_branch'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install git_switch_branch
+
+## Usage
+
+Basic usage is just:
+
+    $ gsb
+
+This will give you a list of all branches to choose from.
+
+    $ 1. master
+    $ 2. 123-nasty-bug
+
+If you know the name of the branch or part of the name you can do:
+
+    $ gsb 123
+
+## Syncing between computers
+
+If you are using Dropbox you can easily sync your uncommitted changes between all your computers.
+
+    mkdir -p ~/.git-switch-branch
+    ln -s ~/.git-switch-branch ~/Dropbox/.git-switch-branch
+
+## Known Bugs
+
+* Empty files are not restored.
+
+## Todo
+
+* Make it possible to find and automatically track remote branches.
+* Use the Git gem more (instead of the git shell command).
+
+## Contributing
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request
+
+## Supported platforms
+
+git_switch_branch has been tested with:
+
+* OS X Lion
+* Ruby 1.8.7, 1.9.3
+* Git 1.7.7, 1.7.8, 1.8.0

data/Rakefile

@@ -0,0 +1 @@
+require "bundler/gem_tasks"

data/bin/git-switch-branch

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+
+load File.join(File.dirname(__FILE__), 'gsb')

data/bin/gsb

@@ -0,0 +1,12 @@
+#!/usr/bin/env ruby
+
+THIS_FILE = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
+require File.expand_path('../lib/git_switch_branch', File.dirname(THIS_FILE))
+
+if ARGV[0] == '--help' || ARGV.size > 1
+  GitSwitchBranch.show_usage
+elsif ARGV[0] == '--version' || ARGV[0] == '-v'
+  GitSwitchBranch.show_version
+else
+  GitSwitchBranch.find_and_checkout_branch(ARGV[0])
+end

data/git_switch_branch.gemspec

@@ -0,0 +1,24 @@
+# -*- encoding: utf-8 -*-
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'git_switch_branch/version'
+
+Gem::Specification.new do |gem|
+  gem.name          = "git_switch_branch"
+  gem.version       = GitSwitchBranch::VERSION
+  gem.authors       = ["Daniel Eriksson"]
+  gem.email         = ["daniel.eriksson@bukowskis.com"]
+  gem.description   = %q(Easy git branch switching)
+  gem.summary       = %q(Simplifies switching between branches without losing uncommitted changes.)
+  gem.homepage      = ""
+
+  gem.files         = `git ls-files`.split($/)
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.require_paths = ["lib"]
+
+  gem.add_dependency "git", ">= 1.2.5"
+  gem.add_dependency "colored", ">= 1.2"
+  gem.add_dependency "highline", ">= 1.6.15"
+
+end

data/lib/git_switch_branch/changes.rb

@@ -0,0 +1,72 @@
+require 'git'
+require 'colored'
+
+module GitSwitchBranch
+
+  def self.save_changes
+    if saved_changes?
+      puts "This branch already has saved changes.".red
+    elsif uncommitted_changes?
+      stash_uncommitted_changes
+      save_stash_to_patch
+    else
+      puts "No uncommitted changes to save.".green
+    end
+  end
+
+  def self.restore_changes
+    return unless saved_changes?
+    puts "Restoring changes...".green
+    if apply_patch
+      File.delete(@patch_path)
+      @git.reset
+    else
+      puts "Failed to restore saved changes!"
+      puts "Please check #{@patch_path}"
+    end
+  end
+
+  def self.check_changes
+    if saved_changes?
+      puts "This branch has saved changes.".green
+    else
+      puts "This branch has no saved changes.".green
+    end
+  end
+
+  def self.show_changes
+    if saved_changes?
+      system "cat #{@patch_path} | less"
+    else
+      puts "No saved changes found for this branch at #{@patch_path})"
+    end
+  end
+
+  private
+
+  def self.stash_uncommitted_changes
+    puts "Saving uncommitted changes...".green
+    system "mkdir -p #{@repo_changes_path}"
+    @git.add('.')
+    system "git stash save"
+  end
+
+  def self.save_stash_to_patch
+    puts "Saving stash to #{@patch_path}"
+    system "git stash show -p > #{@patch_path}"
+    system "git stash drop"
+  end
+
+  def self.saved_changes?
+    File.exists?(@patch_path)
+  end
+
+  def self.uncommitted_changes?
+    `git status -s` != ''
+  end
+
+  def self.apply_patch
+    system "patch -p1 < #{@patch_path}"
+  end
+
+end

data/lib/git_switch_branch/version.rb

@@ -0,0 +1,3 @@
+module GitSwitchBranch
+  VERSION = "0.1.1"
+end

data/lib/git_switch_branch.rb

@@ -0,0 +1,93 @@
+require 'rubygems'
+require 'colored'
+require 'highline/import'
+
+gsb_app_root = File.expand_path(File.dirname(__FILE__) + '/..')
+$LOAD_PATH.unshift(gsb_app_root + '/lib')
+
+require 'git_switch_branch/version'
+require 'git_switch_branch/changes'
+
+module GitSwitchBranch
+
+  GSB_APP_DATA_DIR = '.git-switch-branch'
+
+  attr_accessor :git, :repo_changes_path, :patch_path
+
+  def self.initialize
+    @git = Git.open(Dir.pwd)
+    current_dir = File.basename(Dir.getwd)
+    @repo_changes_path = File.join(ENV['HOME'], GSB_APP_DATA_DIR, current_dir)
+    @patch_path = File.join(@repo_changes_path, @git.current_branch)
+  end
+
+  def self.find_and_checkout_branch(string)
+    initialize
+    checkout select_branch(string)
+  end
+
+  def self.show_version
+    puts GitSwitchBranch::VERSION
+  end
+
+  def self.show_usage
+    puts "git_switch_branch #{GitSwitchBranch::VERSION}\n\n"
+    puts "Usage: gsb <branchname_or_part_of_branchname>"
+  end
+
+  private
+
+  def self.select_branch(string)
+    matching_branches = find_matching_branches(string)
+    if matching_branches.count > 0
+      choose_branch(matching_branches)
+    else
+      choose_branch(local_branches)
+    end
+  end
+
+  def self.find_matching_branches(string)
+    extract_branch_names(`git branch | grep -v '*' | grep '#{string}'`)
+  end
+
+  def self.checkout(branch)
+    abort "Already on #{branch}" if @git.current_branch == branch
+    save_changes
+    puts "Checking out #{branch}...".green
+    puts `git checkout #{branch}`
+    restore_changes
+  end
+
+  def self.local_branches
+    extract_branch_names(`git branch`)
+  end
+
+  def self.extract_branch_names(output)
+    output.split("\n").map do |line|
+      line.strip.sub('*','').strip.sub('remotes/','').sub('origin/','')
+    end.uniq
+  end
+
+  def self.choose_branch(branches)
+    if branches.count == 0
+      abort "No branches found."
+    end
+
+    if branches.count == 1
+      puts "Matching branch found: #{branches.first}".green
+      return branches.first
+    end
+
+    puts "Branches found:".magenta.underline
+    choose do |menu|
+      menu.prompt = "\nChoose a branch to switch to: ".cyan
+      branches.each do |branch|
+        menu.choice(branch) { return branch }
+      end
+    end
+  end
+
+end
+
+
+

metadata

@@ -0,0 +1,92 @@
+--- !ruby/object:Gem::Specification
+name: git_switch_branch
+version: !ruby/object:Gem::Version
+  version: 0.1.1
+  prerelease: 
+platform: ruby
+authors:
+- Daniel Eriksson
+autorequire: 
+bindir: bin
+cert_chain: []
+date: 2012-11-16 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: git
+  requirement: &70155828829220 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.5
+  type: :runtime
+  prerelease: false
+  version_requirements: *70155828829220
+- !ruby/object:Gem::Dependency
+  name: colored
+  requirement: &70155828828760 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70155828828760
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: &70155828828300 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.15
+  type: :runtime
+  prerelease: false
+  version_requirements: *70155828828300
+description: Easy git branch switching
+email:
+- daniel.eriksson@bukowskis.com
+executables:
+- git-switch-branch
+- gsb
+extensions: []
+extra_rdoc_files: []
+files:
+- .gitignore
+- Gemfile
+- LICENSE.txt
+- README.md
+- Rakefile
+- bin/git-switch-branch
+- bin/gsb
+- git_switch_branch.gemspec
+- lib/git_switch_branch.rb
+- lib/git_switch_branch/changes.rb
+- lib/git_switch_branch/version.rb
+homepage: ''
+licenses: []
+post_install_message: 
+rdoc_options: []
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements: []
+rubyforge_project: 
+rubygems_version: 1.8.11
+signing_key: 
+specification_version: 3
+summary: Simplifies switching between branches without losing uncommitted changes.
+test_files: []
+has_rdoc: