git-p4-sync 0.1.2 → 0.2.0

data/LICENSE

@@ -1,5 +1,5 @@
-Copyright (c) 2009 Carl Mercier
- 
+Copyright (c) 2012 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
@@ -7,10 +7,10 @@ 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

data/README.rdoc

@@ -30,9 +30,11 @@ To add addition items use the -i/--ignore flag. It can take a single item, or a
 
 == COPYRIGHT
 
-Copyright (c) 2009-2011 {Carl Mercier}[http://carlmercier.com]. See LICENSE for details.
+Copyright (c) 2009-2012 {Carl Mercier}[http://carlmercier.com]. See LICENSE for details.
 
 == CONTRIBUTORS
 
 {Vincent Batts}[https://github.com/vbatts]
+{Daniel Nugent}[https://github.com/DannoHung]
+
 

data/lib/git_p4_sync.rb

@@ -34,7 +34,7 @@ module GitP4Sync
     end
 
     if File.exist?(gitignore = File.join(git_path, ".gitignore"))
-      @ignore_list = @ignore_list.concat(File.read(gitignore).split(/\n/).map {|i| i.gsub("*",".*") } )
+      @ignore_list = @ignore_list.concat(File.read(gitignore).split(/\n/).reject{|i| (i.size == 0) or i.strip.start_with?("#") }.map {|i| i.gsub("*",".*") } )
     end
 
     diff = diff_dirs(p4_path, git_path)
@@ -52,13 +52,18 @@ module GitP4Sync
         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
+            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
+            file_path="#{p4_path}#{file}"
+            Find.find(file_path) do |f|
+              puts "DELETED in Git (dir contents): #{f}" if file_path != f
+              run_cmd("p4 delete '#{f}'", simulate)
+            end
+            FileUtils.remove_entry_secure(file_path,:force => true)
           when :modified
-            run_cmd "p4 edit #{p4_path}#{file}", simulate
-            run_cmd "cp #{git_path}#{file} #{p4_path}#{file}", simulate
+            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
@@ -69,7 +74,7 @@ module GitP4Sync
       if submit
         git_head_commit = ""
         Dir.chdir(git_path) do
-          git_head_commit = `git show --pretty=oneline`.split("\n")[0]
+          git_head_commit = `git show -v -s --pretty=oneline`.split("\n")[0]
         end
         
         Dir.chdir(p4_path) do

data/lib/init.rb

@@ -1,3 +1,5 @@
 require 'rubygems'
 require 'diff_dirs'
 require 'optparse'
+require 'find'
+require 'fileutils'

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: git-p4-sync
 version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: 
+  prerelease: false
   segments: 
   - 0
-  - 1
   - 2
-  version: 0.1.2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Carl Mercier
@@ -15,18 +14,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-18 00:00:00 -04:00
+date: 2012-06-18 00:00:00 -04:00
 default_executable: git-p4-sync
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: diff_dirs
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 31
         segments: 
         - 0
         - 1
@@ -47,7 +44,6 @@ files:
 - LICENSE
 - README.rdoc
 - Rakefile
-- VERSION
 - bin/git-p4-sync
 - lib/git_p4_sync.rb
 - lib/init.rb
@@ -64,27 +60,23 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: git-p4-sync
-rubygems_version: 1.4.2
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Submit changes made to a Git repository into to Perforce

data/VERSION

@@ -1 +0,0 @@
-0.1.2