git-p4-sync 0.1.0 → 0.1.1

data/README.rdoc

@@ -23,4 +23,10 @@ The --test switch is useful to test git-p4-sync without actually doing anything
 
 == COPYRIGHT
 
-Copyright (c) 2009 {Carl Mercier}[http://carlmercier.com]. See LICENSE for details.
+Copyright (c) 2009-2011 {Carl Mercier}[http://carlmercier.com]. See LICENSE for details.
+
+== CONTRIBUTORS
+
+{Vincent Batts}[https://github.com/vbatts]
+
+

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/git_p4_sync.rb

@@ -1,5 +1,5 @@
 module GitP4Sync
-  
+
   def run(options)
     # branch    = options[:branch] || "master"
     branch = "master"
@@ -8,7 +8,17 @@ module GitP4Sync
     simulate  = options[:simulate] || false
     pull      = options[:pull] || false
     submit    = options[:submit] || false
-    ignore_list =  ( options[:ignore] ? options[:ignore].split(",") : [".git"] )
+
+    @ignore_list = [".git"]
+    if options[:ignore]
+      if options[:ignore].include?(":")
+        @ignore_list = @ignore_list.concat(options[:ignore].split(":"))
+      elsif options[:ignore].include?(",")
+        @ignore_list = @ignore_list.concat(options[:ignore].split(","))
+      else
+        @ignore_list = @ignore_list.insert(-1, options[:ignore])
+      end
+    end
 
     git_path = add_slash(File.expand_path(git_path))
     p4_path = add_slash(File.expand_path(p4_path))
@@ -23,6 +33,10 @@ module GitP4Sync
       end
     end
 
+    if File.exist?(gitignore = File.join(git_path, ".gitignore"))
+      @ignore_list = @ignore_list.concat(File.read(gitignore).split(/\n/).map {|i| i.gsub("*",".*") } )
+    end
+
     diff = diff_dirs(p4_path, git_path)
     
     if diff.size > 0
@@ -31,6 +45,7 @@ module GitP4Sync
         file = strip_leading_slash(d[1])
 
         # todo: skip ignored files/directories
+        next if is_ignored?(file)
         
         puts "#{action.to_s.upcase} in Git: #{file}"
         
@@ -80,6 +95,18 @@ module GitP4Sync
     [output, $?]
   end
   
+  def lambda_ignore(item)
+    re = Regexp.compile(/#{item}/)
+    lambda {|diff| diff =~ re }
+  end
+
+  def is_ignored?(file)
+    @ignore_list.each {|ignore|
+      return true if lambda_ignore(ignore).call(file)
+    }
+    return false
+  end
+  
   def add_slash(path)
     path += "/" unless path[-1..-1] == "/"
     path

data/lib/start.rb

@@ -29,6 +29,10 @@ OptionParser.new do |opts|
     options[:simulate] = o
   end
   
+  opts.on("-i", "--ignore [STRING]", "Items to ignore. this is a comma delimited list") do |o|
+    options[:ignore] = o
+  end
+  
 end.parse!
 
 def error(msg)

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: git-p4-sync
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  hash: 25
+  prerelease: 
+  segments: 
+  - 0
+  - 1
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Carl Mercier
@@ -9,19 +15,25 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-27 00:00:00 -04:00
+date: 2011-02-09 00:00:00 -05:00
 default_executable: git-p4-sync
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: diff_dirs
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 0
+        - 1
+        - 2
         version: 0.1.2
-    version: 
+  type: :runtime
+  version_requirements: *id001
 description: Submit changes made to a Git repository into to Perforce
 email: carl@carlmercier.com
 executables: 
@@ -52,21 +64,27 @@ 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"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: git-p4-sync
-rubygems_version: 1.3.2
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Submit changes made to a Git repository into to Perforce