cmer-git-p4-sync 0.1.0

data/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2009 Carl Mercier
+ 
+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.rdoc

@@ -0,0 +1,26 @@
+= git-p4-sync
+
+Submit changes made to a Git repository into to Perforce
+
+== Use case
+
+Joe starts an amazing startup with a few l337 h4x0rs buddies. Obviously, they use Git as their SCM because of their awesomeness. Amazing Startup is eventually acquired by Big Co Inc, which uses Perforce as their SCM. The l337 h4x0rs are obviously not willing to give up Git, and convincing 3000 employees and C-Level executives to drop Perforce for Git sounds like mission impossible. Enters git-p4-sync. It allows l337 h4x0rs to sync a Git repository into Perforce with a simple command. It is easier to use than git-p4, and does just one thing: sync changes made on the Git repository into Perforce.
+
+A good way to use this script is to run it as a cronjob.
+  
+The --test switch is useful to test git-p4-sync without actually doing anything to your files.
+
+= Example
+  $ git-p4-sync -h  # get help
+  $ git-p4-sync -g ~/git/my-project/ -p ~/p4/my-project/ --pull --submit  # do it
+  $ git-p4-sync -g ~/git/my-project/ -p ~/p4/my-project/ --pull --submit  --test  # fake it
+
+== Dependencies (for tests only)
+
+  - Git command line executables
+  - Perforce command line executable
+  - diff_dirs gem
+
+== COPYRIGHT
+
+Copyright (c) 2009 {Carl Mercier}[http://carlmercier.com]. See LICENSE for details.

data/Rakefile

@@ -0,0 +1,53 @@
+require 'rake'
+require 'rake/testtask'
+ 
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib' << 'test'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = false
+end
+ 
+task :default => :test
+
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gemspec|
+    gemspec.name = "git-p4-sync"
+    gemspec.summary = "Submit changes made to a Git repository into to Perforce"
+    gemspec.email = "carl@carlmercier.com"
+    gemspec.homepage = "http://github.com/cmer/git-p4-sync"
+    gemspec.description = "Submit changes made to a Git repository into to Perforce"
+    gemspec.authors = ["Carl Mercier"]
+    gemspec.files =  FileList["[A-Z]*", "{bin,generators,lib,test}/**/*"]
+    gemspec.rubyforge_project = 'git-p4-sync'
+    gemspec.add_dependency('diff_dirs', '>= 0.1.2')
+  end
+rescue LoadError
+  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+end
+
+begin
+  require 'rake/contrib/sshpublisher'
+  namespace :rubyforge do
+
+    desc "Release gem and RDoc documentation to RubyForge"
+    task :release => ["rubyforge:release:gem", "rubyforge:release:docs"]
+
+    namespace :release do
+      desc "Publish RDoc to RubyForge."
+      task :docs => [:rdoc] do
+        config = YAML.load(
+            File.read(File.expand_path('~/.rubyforge/user-config.yml'))
+        )
+
+        host = "#{config['username']}@rubyforge.org"
+        remote_dir = "/var/www/cmercier/git-p4-sync/"
+        local_dir = 'rdoc'
+
+        Rake::SshDirPublisher.new(host, remote_dir, local_dir).upload
+      end
+    end
+  end
+rescue LoadError
+  puts "Rake SshDirPublisher is unavailable or your rubyforge environment is not configured."
+end

data/VERSION

@@ -0,0 +1 @@
+0.1.0

data/bin/git-p4-sync

@@ -0,0 +1,13 @@
+#!/usr/bin/env ruby
+##
+## git-p4-sync, by Carl Mercier (http://carlmercier.com)
+## Started in May 2009
+##
+## This script sync changes made to a Git repository back to Perforce.
+## It currently only supports one-way sync'ing:  GIT -> P4
+##
+
+path = File.dirname(__FILE__)
+require path + '/../lib/init'
+require path + '/../lib/git_p4_sync'
+require path + '/../lib/start'

data/lib/git_p4_sync.rb

@@ -0,0 +1,103 @@
+module GitP4Sync
+  
+  def run(options)
+    # branch    = options[:branch] || "master"
+    branch = "master"
+    git_path  = options[:git]
+    p4_path   = options[:p4]
+    simulate  = options[:simulate] || false
+    pull      = options[:pull] || false
+    submit    = options[:submit] || false
+    ignore_list =  ( options[:ignore] ? options[:ignore].split(",") : [".git"] )
+
+    git_path = add_slash(File.expand_path(git_path))
+    p4_path = add_slash(File.expand_path(p4_path))
+    
+    verify_path_exist!(git_path)
+    verify_path_exist!(p4_path)
+    
+    if pull
+      Dir.chdir(git_path) do
+        puts "Pulling Git from remote server."
+        run_cmd "git pull", simulate
+      end
+    end
+
+    diff = diff_dirs(p4_path, git_path)
+    
+    if diff.size > 0
+      diff.each do |d|
+        action = d[0]
+        file = strip_leading_slash(d[1])
+
+        # todo: skip ignored files/directories
+        
+        puts "#{action.to_s.upcase} in Git: #{file}"
+        
+        Dir.chdir(p4_path) do
+          case action
+          when :new
+            run_cmd "cp -r #{git_path}#{file} #{p4_path}#{file}", simulate
+            run_cmd "#{p4_add_recursively("#{p4_path}#{file}")}", simulate
+          when :deleted
+            run_cmd "p4 delete #{p4_path}#{file}", simulate
+          when :modified
+            run_cmd "p4 edit #{p4_path}#{file}", simulate
+            run_cmd "cp #{git_path}#{file} #{p4_path}#{file}", simulate
+          else
+            puts "Unknown change type #{action}. Stopping."
+            exit 1
+          end
+        end
+      end
+      
+      if submit
+        git_head_commit = ""
+        Dir.chdir(git_path) do
+          git_head_commit = `git show --pretty=oneline`.split("\n")[0]
+        end
+        
+        Dir.chdir(p4_path) do
+          puts "Submitting changes to Perforce"
+          run_cmd "p4 submit -d '#{git_head_commit.gsub("'", "''")}'", simulate
+        end
+      end
+    else
+      puts "Directories are identical. Nothing to do."
+      exit 0
+    end
+  end
+  
+  def run_cmd(cmd, simulate = false, puts_prefix = "  ")
+    if simulate
+      puts "#{puts_prefix}simulation: #{cmd}"
+    else
+      puts "#{puts_prefix}#{cmd}"
+    end
+    
+    output = ""
+    output = `#{cmd}` unless simulate
+    [output, $?]
+  end
+  
+  def add_slash(path)
+    path += "/" unless path[-1..-1] == "/"
+    path
+  end
+  
+  def strip_leading_slash(path)
+    path.sub(/^\//, "")
+  end
+  
+  def p4_add_recursively(path)
+    "find #{path} -type f -print | p4 -x - add -f"
+  end
+
+  def verify_path_exist!(path)
+    if !File.exist?(path) || !File.directory?(path)
+      puts "#{path} must exist and be a directory."
+      exit 1
+    end
+  end
+end
+

data/lib/init.rb

@@ -0,0 +1,3 @@
+require 'rubygems'
+require 'diff_dirs'
+require 'optparse'

data/lib/start.rb

@@ -0,0 +1,43 @@
+include GitP4Sync
+
+options = {}
+
+OptionParser.new do |opts|
+  opts.banner = "Usage: git-p4-sync [options]"
+
+  # opts.on("-b", "--branch [STRING]", String, "Git branch") do |o|
+  #   options[:branch] = o || "master"
+  # end
+
+  opts.on("-g", "--git [STRING]", String, "Path to Git repository") do |o|
+    options[:git] = o
+  end
+ 
+  opts.on("-p", "--p4 [STRING]", String, "Path to Perforce workspace directory") do |o|
+    options[:p4] = o
+  end
+
+  opts.on("-P", "--pull", "Pull Git repository before processing") do |o|
+    options[:pull] = o
+  end
+
+  opts.on("-S", "--submit", "Submit to Perforce after processing") do |o|
+    options[:submit] = o
+  end
+  
+  opts.on("-t", "--test", "Simulates a syncronisation without executing any command") do |o|
+    options[:simulate] = o
+  end
+  
+end.parse!
+
+def error(msg)
+  puts msg
+  exit 1
+end
+
+error("Option --git required.") unless options[:git]
+error("Option --p4 required.")  unless options[:p4]
+
+run options
+

data/test/git_p4_sync_test.rb

@@ -0,0 +1,16 @@
+# COWBOY CODING FTW! TESTING IS FOR WUSSIES. ;-)
+
+require File.dirname(__FILE__) + '/test_helper'
+
+class CowboyTest < Test::Unit::TestCase
+  def test_my_awesomeness
+    (0..12612).each {
+      assert :this_code_does_not_contain_bugs
+    }
+  end
+  
+  def test_whos_evil
+    assert :git_ftw
+    assert :perforce_is_evil
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,2 @@
+require 'rubygems'
+require 'test/unit'

metadata

@@ -0,0 +1,73 @@
+--- !ruby/object:Gem::Specification 
+name: cmer-git-p4-sync
+version: !ruby/object:Gem::Version 
+  version: 0.1.0
+platform: ruby
+authors: 
+- Carl Mercier
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2009-05-25 00:00:00 -07:00
+default_executable: git-p4-sync
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: diff_dirs
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.1.2
+    version: 
+description: Submit changes made to a Git repository into to Perforce
+email: carl@carlmercier.com
+executables: 
+- git-p4-sync
+extensions: []
+
+extra_rdoc_files: 
+- LICENSE
+- README.rdoc
+files: 
+- LICENSE
+- README.rdoc
+- Rakefile
+- VERSION
+- bin/git-p4-sync
+- lib/git_p4_sync.rb
+- lib/init.rb
+- lib/start.rb
+- test/git_p4_sync_test.rb
+- test/test_helper.rb
+has_rdoc: true
+homepage: http://github.com/cmer/git-p4-sync
+post_install_message: 
+rdoc_options: 
+- --charset=UTF-8
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+requirements: []
+
+rubyforge_project: git-p4-sync
+rubygems_version: 1.2.0
+signing_key: 
+specification_version: 3
+summary: Submit changes made to a Git repository into to Perforce
+test_files: 
+- test/git_p4_sync_test.rb
+- test/test_helper.rb