git-inside-branch 0.0.1

data/.gitignore

@@ -0,0 +1,4 @@
+*.gem
+.bundle
+Gemfile.lock
+pkg/*

data/Gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in git-inside-branch.gemspec
+gemspec

data/LICENSE

@@ -0,0 +1,9 @@
+Copyright (c) 2011, Guillermo Álvarez <guillermo@cientifico.net>
+All rights reserved.
+
+"THE BEER-WARE LICENSE" (Revision 42):
+<guillermo@cientifico.net> wrote this file. As long as you retain this notice you
+can do whatever you want with this stuff. If we meet some day, and you think
+this stuff is worth it, you can buy me a beer in return Guillermo Álvarez.
+
+

data/README

@@ -0,0 +1,57 @@
+
+
+git-inside-branch
+=================
+
+git-inside-branch allows you to inspect and modify another branch in a temporarily directory without affecting current working tree.
+
+
+Usage
+=====
+
+From command line
+-----------------
+
+    git inside-branch doc_branch bash
+
+This will checkout doc_branch and run bash. Then you edit your docs with vim or emacs, commit the results and exit bash.
+
+    git inside-branch gh_pages "cp $HOME/projects/my_proj/rdoc . && git add . && git commit -am 'Doc updates' && git push"
+
+
+From ruby
+---------
+
+    Git::Inside::Branch.tempory_checkout("gh_pages") do
+      `cp $HOME/projects/my_lib/rdoc .`
+      `git commit -a -m 'Doc updates' && git push`
+    end
+
+I think is easy.
+
+Documentation
+=============
+
+* Git::Inside::Branch.tempory_checkout( *branch_name*, *&block* )
+  
+  Run the code passed in the block in another temporarily checkouted directory from the branch __branch_name__
+
+AUTHOR
+======
+
+ * Guillermo Álvarez <guillermo@cientifico.net>
+
+
+LICENSE
+=======
+
+
+Copyright (c) 2011, Guillermo Álvarez <guillermo@cientifico.net>
+All rights reserved.
+
+"THE BEER-WARE LICENSE" (Revision 42):
+<guillermo@cientifico.net> wrote this file. As long as you retain this notice you
+can do whatever you want with this stuff. If we meet some day, and you think
+this stuff is worth it, you can buy me a beer in return Guillermo Álvarez.
+
+

data/Rakefile

@@ -0,0 +1,16 @@
+require 'rubygems'
+require 'bundler/setup'
+Bundler.require(:default)
+require 'rake/testtask'
+
+
+Bundler::GemHelper.install_tasks
+
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.test_files = FileList['test/*_test.rb']
+  t.verbose = true
+end
+
+
+task :default => :test

data/bin/git-inside-branch

@@ -0,0 +1,22 @@
+#!/usr/bin/env ruby
+
+require 'git-inside-branch'
+
+args = ARGV.dup
+if args.size > 0 || args.include?("-h") || args.include?("--help")
+
+  Git::Inside::Branch.tempory_checkout(args.shift) do
+    args = %(bash) if args.empty?
+    pid = fork do 
+      exec(*args)
+    end
+    Process.wait(pid)
+  end
+
+else
+
+  $stderr.puts "usage: #{$0} branch_name [command]\n\n"
+  $stderr.puts "    If no command given, bash will be used."
+  $stderr.puts "WARNING: Do work with both checkouts at the same time."
+  
+end

data/git-inside-branch.gemspec

@@ -0,0 +1,24 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "git-inside-branch/version"
+
+Gem::Specification.new do |s|
+  s.name        = "git-inside-branch"
+  s.version     = Git::Inside::Branch::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Guillermo Álvarez"]
+  s.email       = ["guillermo@cientifico.net"]
+  s.homepage    = ""
+  s.summary     = %q{git-inside-branch let you inspect and modify other branches without affecting current directory}
+  s.description = %q{It set GIT_DIR, GIT_WORK_TREE and GIT_INDEX_FILE and checkout temporarily in a temp directory}
+
+  s.rubyforge_project = "git-inside-branch"
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+
+  s.add_development_dependency "rake"
+  s.add_development_dependency "bundler"
+end

data/lib/git-inside-branch.rb

@@ -0,0 +1,91 @@
+require 'tmpdir'
+require 'fileutils'
+
+module Git
+  module Inside
+    class Branch
+     
+      def self.tempory_checkout(branch)
+        dir = find_git_dir
+        return dir unless dir || !block_given?
+
+        new(dir,branch).start do
+          yield if block_given?
+        end
+      end
+
+      def initialize(git_dir, branch)
+        @branch, @git_dir = branch, git_dir
+      end
+
+      def start
+        prepare do |temp_dir|
+          Dir.chdir(temp_dir) do
+            `git co #{@branch} 2>&1`
+            yield
+          end
+        end
+      end
+
+      protected
+
+      def self.find_git_dir
+        dir = File.expand_path Dir.pwd
+
+        found = false
+        dir = Dir.basename(dir) until(found = File.directory?(File.join(dir,'.git')) || dir == "/")
+        
+        return found ? File.join(dir,'.git') : false
+      end
+
+      def prepare
+        in_temp_dir do
+          preserve_head do
+            set_git_env do |code_dir|
+              yield code_dir 
+            end
+          end
+        end
+      end
+
+      def in_temp_dir()
+        @temp_dir = Dir.mktmpdir(@branch)
+        yield 
+      ensure 
+        FileUtils.remove_entry_secure @temp_dir if File.directory? @temp_dir
+      end
+      
+      def preserve_head(*args)
+        old_HEAD_ref = `git symbolic-ref HEAD 2>&1`.strip
+        `git symbolic-ref HEAD refs/heads/#{@branch} 2>&1`
+
+        yield *args
+
+      ensure
+        `git symbolic-ref HEAD #{old_HEAD_ref} 2>&1` unless old_HEAD_ref.empty?
+      end
+      
+      def set_git_env
+        code_dir = File.join(@temp_dir, "code")
+        old_env = ENV.dup
+        Dir.mkdir(code_dir)
+
+        ENV["GIT_INDEX_FILE"] = File.join(@temp_dir,'index')
+        ENV["GIT_WORK_TREE"]  = code_dir
+        ENV["GIT_DIR"] = @git_dir 
+        yield code_dir
+      ensure
+        ENV.delete "GIT_INDEX_FILE"
+        ENV.delete "GIT_WORK_TREE"
+        ENV.delete "GIT_DIR"
+      end
+      
+      def in_git_dir?
+        return false if `git status --porcelain 2>&1 2>&1` =~ /^fatal.*/ 
+        true
+      end
+
+
+    end
+  end
+end

data/lib/git-inside-branch/version.rb

@@ -0,0 +1,7 @@
+module Git
+  module Inside
+    class Branch
+      VERSION = "0.0.1"
+    end
+  end
+end

data/task.rb

@@ -0,0 +1,64 @@
+#!/usr/bin/env ruby
+
+require 'tmpdir'
+require 'fileutils'
+
+module Task
+  extend self
+
+  def start
+    look_for_git_dir
+
+    prepare_git do |temp_dir|
+      `git clean -fdx && git co taskwarrior`
+      begin
+        old_home = ENV["HOME"]
+        ENV["HOME"] = temp_dir
+        #system("task", *ARGV)
+        system( *ARGV)
+      ensure
+        ENV["HOME"] = old_home
+      end
+
+      `find #{temp_dir} | xargs git add `
+      `git commit -m "Changes"`
+    end
+
+#    create_temp_dir
+#    import_files_from_git
+#    call_taskwarrior
+#    export_files_to_git
+#    push_changes    
+  end
+
+protected
+
+  def prepare_git
+    temp_dir = Dir.mktmpdir("git-task")
+    old_HEAD_ref = `git symbolic-ref HEAD`.strip
+    `git symbolic-ref HEAD refs/heads/taskwarrior`
+    code_dir = File.join(temp_dir, "code")
+
+    Dir.mkdir(File.join(code_dir))
+
+    ENV["GIT_INDEX_FILE"] = File.join(temp_dir,'index')
+    ENV["GIT_WORK_TREE"]  = code_dir
+    yield code_dir
+  ensure 
+    `git symbolic-ref HEAD #{old_HEAD_ref}`
+    FileUtils.remove_entry_secure temp_dir if File.directory? temp_dir
+  end
+
+  def look_for_git_dir
+    die("You are not in a git tracked directory!") if `git status --porcelain 2>&1` =~ /^fatal.*/ 
+  end
+
+
+  def die(msg)
+    $stderr.puts(msg)
+    exit -1
+  end
+end
+
+
+Task.start

data/test/git-inside-branch_test.rb

@@ -0,0 +1,84 @@
+# encoding: UTF-8
+#
+
+require "test_helper"
+
+class TestGitInsideBranch < Test::Unit::TestCase
+  include Git::Inside::Branch::Assertions
+
+  def test_env_setup_correctly
+    assert_git_doesnt_change do
+      assert_match /Guillermo.*initial import/m, `git log`
+    end
+  end
+
+  def test_env_doesnt_change_on_non_existing_branches
+    assert_git_doesnt_change do
+      Git::Inside::Branch.tempory_checkout("pepe")
+    end
+  end
+  
+
+  def test_env_doesnt_change_on_existing_branch
+    assert_git_doesnt_change do
+      Git::Inside::Branch.tempory_checkout("other_branch")
+    end
+  end
+
+  def test_env_doesnt_change_when_doing_operations
+    assert_git_doesnt_change do
+      Git::Inside::Branch.tempory_checkout("other_branch") do
+        assert_match /clean/, `git status`
+        assert_match /other_branch/, `git branch -a | grep '*'`
+        assert_match /other_branch/i, Dir.pwd
+        `echo ¿Qué tal? > Hello2.txt`
+        `echo adios >> Hello.txt`
+        `git add .`
+        `git commit -m "New cambios"`
+      end
+      assert_no_match /other_branch/i, Dir.pwd
+    end
+  end
+
+  def test_correct_dir
+    assert_git_doesnt_change do
+
+      Git::Inside::Branch.tempory_checkout("other_branch") do
+        assert_match /.*\/code\z/, Dir.pwd
+      end
+      
+    end
+
+  end
+
+  def test_changes_are_persistent
+    assert_git_doesnt_change do
+      Git::Inside::Branch.tempory_checkout("other_branch") do
+        `echo Hola2 >> Hello.txt`
+        `git add *`
+        `git commit -a -m "que pasa tron" `
+        assert_match /que pasa tron/, `git log`
+      end
+      Git::Inside::Branch.tempory_checkout("other_branch") do
+        assert_match /que pasa tron/, `git log`
+      end
+
+    end
+  end
+
+  def test_a_new_branch_is_created_correctly
+    assert_git_doesnt_change do
+      Git::Inside::Branch.tempory_checkout("new_branch") do
+        `echo Hola2 >> Hello.txt`
+        `git add *`
+        `git commit -a -m "que pasa tron" `
+        assert_match /que pasa tron/, `git log`
+      end
+      Git::Inside::Branch.tempory_checkout("new_branch") do
+        assert_match /que pasa tron/, `git log`
+      end
+
+    end
+  end
+
+end

data/test/test_helper.rb

@@ -0,0 +1,55 @@
+# encoding: UTF-8
+require 'test/unit'
+require 'git-inside-branch'
+require 'tmpdir'
+require 'fileutils'
+
+
+module Git::Inside::Branch::Assertions
+
+  def assert_git_doesnt_change
+    in_new_repo do 
+      info = get_git_info()
+      yield
+      assert_equal get_git_info, info, "The environment changed and it should not."
+    end
+  end
+
+  def get_git_info
+    info = {}
+    info["HEAD"] = `git symbolic-ref HEAD 2>&1`.strip
+    info["status"] = `git status --porcelain 2>&1`.strip
+    info["branch"] = `git branch -a | grep '*' 2>&1`.strip
+    info["env"]    = `env 2>&1`.strip
+    info
+  end
+
+
+  def in_new_repo
+    dir = new_repo
+    Dir.chdir(dir) do
+      yield dir
+    end
+  ensure
+    remove_repo dir
+  end
+  
+  def new_repo
+    dir = Dir.mktmpdir("git-inside-branch_test-repo")
+    Dir.chdir(dir) do
+      `git init 2>&1`
+      `echo Hola > Hello.txt 2>&1`
+      `git add Hello.txt 2>&1`
+      `git commit -a -m 'initial import' --author 'Guillermo Álvarez <guillermo@cientifico.net>' 2>&1`
+      `git checkout -b other_branch 2>&1`
+      `git checkout master 2>&1`
+      assert `git log 2>&1`.include?("initial import"), "The repository could not be created correctly"
+    end
+    return dir
+  end
+
+  def remove_repo(repo)
+    FileUtils.remove_entry_secure repo if File.directory? repo
+  end
+end
+

metadata

@@ -0,0 +1,90 @@
+--- !ruby/object:Gem::Specification
+name: git-inside-branch
+version: !ruby/object:Gem::Version
+  version: 0.0.1
+  prerelease: 
+platform: ruby
+authors:
+- Guillermo Álvarez
+autorequire: 
+bindir: bin
+cert_chain: []
+date: 2011-10-10 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &2152690840 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2152690840
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &2152689700 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2152689700
+description: It set GIT_DIR, GIT_WORK_TREE and GIT_INDEX_FILE and checkout temporarily
+  in a temp directory
+email:
+- guillermo@cientifico.net
+executables:
+- git-inside-branch
+extensions: []
+extra_rdoc_files: []
+files:
+- .gitignore
+- Gemfile
+- LICENSE
+- README
+- Rakefile
+- bin/git-inside-branch
+- git-inside-branch.gemspec
+- lib/git-inside-branch.rb
+- lib/git-inside-branch/version.rb
+- task.rb
+- test/git-inside-branch_test.rb
+- test/test_helper.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'
+      segments:
+      - 0
+      hash: 965474215564295548
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: 965474215564295548
+requirements: []
+rubyforge_project: git-inside-branch
+rubygems_version: 1.8.6
+signing_key: 
+specification_version: 3
+summary: git-inside-branch let you inspect and modify other branches without affecting
+  current directory
+test_files:
+- test/git-inside-branch_test.rb
+- test/test_helper.rb