git-friendly 0.0.1

data/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2011 Joshua Wehner
+
+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

@@ -0,0 +1,78 @@
+git-friendly
+============
+
+GitFriendly currently contains two commands that make working with remote branches easier in git.
+
+
+git-publish
+-----------
+So, you've been working happily on feature_branch, and now you've come to the point where you'd like to
+share your work with others. But you can never remember the series of arcane commands to coerce git into
+publishing your branch to a remote. You try `git push`, but that doesn't do anything yet.
+
+Enter git-publish.
+
+Example:
+  $ git publish remote_name [branch_name]
+
+remote_name is the name of the remote you'd like to publish to. You need to have configured this remote
+            already, configuring a new remote is beyond what git-publish is currently capable of doing          
+            for you. Luckily, adding a new remote is not really that hard.
+
+branch_name is optional. If you omit it, git-publish will assume you want to publish the currently 
+            checked out branch. So, if you aren't working on the branch you'd like to publish, add 
+            it here.
+
+Here's what'll happen next:
+  $ git publish remote_name [branch_name]
+  >> Publish branch bug_fix/utf8_sphinx to jaw6 ? [Y/n]  
+
+If you hit enter, or y, or Y, or anything that isn't the letter n (n stands for "no"), then it'll go
+ahead and do this:
+
+  git push #{remote_name} #{branch_name}:refs/heads/#{branch_name}"
+  git fetch #{remote_name}"
+  git config branch.#{branch_name}.remote #{remote_name} 
+  git config branch.#{branch_name}.merge refs/heads/#{branch_name}"
+
+From then on, you'll be able to push and pull as you'd expect.
+
+git-follow
+----------
+So, someone just sent you an IM that says, "hey, I published that stuff on a branch, it's called
+stuff_im_workin_on". You'd like to set up a tracking branch, but maybe you'd rather it be called
+"new_feature_from_josh" locally. git-follow to the rescue!
+
+Examples:
+  $ git follow remote_name/branch_name
+  $ git follow https://github.com/jaw6/reponame/tree/stuff_im_workin_on
+  $ git follow branch_name              # will assume remote = 'origin'
+
+Note that if you only provide a branch name, and it has slashes in it (like, "feature/branch_name"),
+then git-follow will assume everything before the first slash is the remote_name (eg, "feature"). So, if
+branch_name has slashes, you should probably explicity provide a remote_name. But don't worry if you
+forget, because...
+
+Here's what'll happen next:
+  >> What remote/branch should be tracked?  [remote_name/branch_name]  
+  >> What should it be called locally?      [branch_name]  
+
+git-follow will show you the assumptions it's made, and allow you to override them. If you'd like the
+branch to be called something else locally, you can tell it, and it'll do the right thing. If the
+assumptions are correct, hit your enter key twice, and you'll be on your merry way.
+
+And then this will happen in the background:
+
+  git fetch #{remote_name}
+  git branch --track #{local_branch_name} #{remote_name}/#{branch_name}
+  git checkout #{local_branch_name}
+
+
+
+Do keep in mind
+---------------
+If you like working with remote branches so much, you should also check out Aanand Prasad's fantastic
+git-up (https://github.com/aanand/git-up), which honestly has inspired quite a bit of what git-friendly
+is trying to do.
+
+Also: I might not actually know what I'm doing.

data/Rakefile

@@ -0,0 +1,35 @@
+require 'rubygems'
+require 'rake'
+
+def gemspec
+  @gemspec ||= begin
+    file = File.expand_path('../git-friendly.gemspec', __FILE__)
+    eval(File.read(file), binding, file)
+  end
+end
+
+begin
+  require 'rake/gempackagetask'
+rescue LoadError
+  task(:gem) { $stderr.puts '`gem install rake` to package gems' }
+else
+  Rake::GemPackageTask.new(gemspec) do |pkg|
+    pkg.gem_spec = gemspec
+  end
+  task :gem => :gemspec
+end
+
+desc "validate the gemspec"
+task :gemspec do
+  gemspec.validate
+end
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "git-friendly #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/bin/git-follow

@@ -0,0 +1,77 @@
+#!/usr/local/bin/ruby
+
+require 'rubygems'
+require 'colored' rescue nil
+
+def colored?
+  String.new.respond_to?(:yellow)
+end
+
+abort("You didn't tell me which branch to follow!".send(colored? ? :red : 'to_s')) unless ARGV[0]
+
+def remote_and_branch_from_github_url(string)
+  # example: https://github.com/jaw6/shopify/tree/bug_fix/utf8_sphinx -- .com/:remote_name/:repo/tree/:branch_name
+  if string =~ %r{\Ahttp[s]*://github\.com/([^/]+)/[^/]+/tree/(.+)\Z}
+    [$1, $2]
+  end
+end
+
+def remote_and_branch_from_input(string)
+  split_arg = string.split('/')
+  if split_arg.size == 1 # just one argument = that's a branch name, remote is 'origin'
+    remote_name, branch_name = 'origin', string
+  else
+    remote_name = split_arg.shift
+    branch_name = split_arg.join('/')
+  end
+  [remote_name, branch_name]
+end
+
+def question1(branch_name, remote_name, color=colored?)
+  msg = ''
+  if color
+    msg << '>> What remote/branch should be tracked? '.yellow
+    msg << " [#{remote_name}/#{branch_name}]  ".white
+  else
+    msg = ">> What remote/branch should be tracked?  [#{remote_name}/#{branch_name}]  "
+  end
+  msg
+end
+
+def question2(branch_name, color=colored?)
+  msg = ''
+  if color
+    msg << '>> What should it be called locally? '.yellow
+    msg << "     [#{branch_name}]  ".white
+  else
+    msg = ">> What should it be called locally?      [#{branch_name}]  "
+  end
+  msg
+end
+
+def remote_and_branch(answer)
+  remote_and_branch_from_github_url(answer) || remote_and_branch_from_input(answer)
+end
+
+def get_remote_and_branch_from_user
+  remote_name, branch_name = remote_and_branch(ARGV[0])
+  print question1(branch_name, remote_name)
+  answer = STDIN.gets.strip
+  answer.empty? ? [remote_name, branch_name] : remote_and_branch(answer)
+end
+
+def get_local_branch_name_from_user(branch_name)
+  print question2(branch_name)
+  answer = STDIN.gets.strip
+  answer.empty? ? branch_name : answer
+end
+
+if (remote_name, branch_name = get_remote_and_branch_from_user) and local_branch_name = get_local_branch_name_from_user(branch_name)
+  commands = []
+  commands << fetch         = "git fetch #{remote_name}"
+  commands << config_branch = "git branch --track #{local_branch_name} #{remote_name}/#{branch_name}"
+  commands << checkout      = "git checkout #{local_branch_name}"
+  if `#{commands.join(' && ')}`
+    puts "  ... success! Checked out #{local_branch_name} tracking #{remote_name}/#{branch_name}...".send(colored? ? :green : 'to_s')
+  end
+end

data/bin/git-publish

@@ -0,0 +1,48 @@
+#!/usr/local/bin/ruby
+
+require 'rubygems'
+colored = require 'colored' rescue nil
+
+def load_grit_or_die!
+  require 'grit'
+  rescue 
+    abort "Unable to load grit" 
+end
+
+load_grit_or_die!
+
+def get_branch_name
+  git_dir = `git rev-parse --git-dir`
+  repo = Grit::Repo.new(File.dirname(git_dir))
+  repo.head.name
+  rescue 
+    abort "Cannot locate git repo"
+end
+
+remote_name = ARGV[0] || 'origin'
+branch_name = ARGV[1] || get_branch_name
+
+def question(branch_name, remote_name, color=false)
+  msg = ''
+  if color
+    msg << '>> Publish branch '.yellow
+    msg << branch_name.white
+    msg << ' to '.yellow
+    msg << remote_name.white
+    msg << ' ? [Y/n]  '
+  else
+    msg = ">> Publish branch #{branch_name} to #{remote_name}? [Y/n]  "
+  end
+  msg
+end
+
+print question(branch_name, remote_name, colored)
+if STDIN.gets != "n\n"
+  commands = []
+  commands << push_to_remote = "git push #{remote_name} #{branch_name}:refs/heads/#{branch_name}"
+  commands << fetch          = "git fetch #{remote_name}"
+  commands << config_branch  = "git config branch.#{branch_name}.remote #{remote_name} && git config branch.#{branch_name}.merge refs/heads/#{branch_name}"
+  if `#{commands.join(' && ')}`
+    puts "  ... success! Published to #{remote_name}:#{branch_name}...".send(colored ? :green : 'to_s')
+  end
+end

data/lib/git-friendly.rb

@@ -0,0 +1,6 @@
+require 'colored'
+require 'grit'
+
+class GitFriendly
+  VERSION = "0.0.1"
+end

metadata

@@ -0,0 +1,76 @@
+--- !ruby/object:Gem::Specification
+name: git-friendly
+version: !ruby/object:Gem::Version
+  version: 0.0.1
+  prerelease: 
+platform: ruby
+authors:
+- joshua wehner
+autorequire: 
+bindir: bin
+cert_chain: []
+date: 2011-10-05 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: colored
+  requirement: &2157432420 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2157432420
+- !ruby/object:Gem::Dependency
+  name: grit
+  requirement: &2157431360 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2157431360
+description: GitFriendly currently contains two commands that make working with remote
+  branches easier in git.
+email:
+- joshua.wehner@gmail.com
+executables:
+- git-follow
+- git-publish
+extensions: []
+extra_rdoc_files: []
+files:
+- bin/git-follow
+- bin/git-publish
+- lib/git-friendly.rb
+- LICENSE
+- README
+- Rakefile
+homepage: http://github.com/jaw6/git-friendly
+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.7
+signing_key: 
+specification_version: 3
+summary: git commands to make tracking and publishing remote branches easier for everyone
+test_files: []