p4tools 0.2.0.0 → 0.2.1.0

data/lib/p4tools/spec.rb

@@ -1,4 +1,4 @@
 module P4Tools
   PROJECT_NAME = 'p4tools'
-  VERSION = '0.2.0.0'
+  VERSION = '0.2.1.0'
 end

data/lib/p4tools/utils/validators/shelve_validator.rb

@@ -17,14 +17,9 @@ module P4Tools
       end
 
       unshelved_files = find_not_shelved_files
-      unless unshelved_files.empty?
-        return unshelved_files
-      end
-
-      find_diff_files
+      unshelved_files + find_diff_files
     end
 
-    # @return [Boolean]
     def find_not_shelved_files
       @opened_files - @shelved_files
     end
@@ -33,18 +28,27 @@ module P4Tools
     def find_diff_files
       return [] unless @check_diff
 
+      diff_files = []
       shelve_revisions = []
-      @p4.run_opened(*@opened_files).each { |file|
-        unless deleted?(file)
-          shelve_revisions.push("#{file['depotFile']}@=#{@cl}")
+      files_to_check = @opened_files & @shelved_files
+
+      unless files_to_check.empty?
+        @p4.run_opened(*files_to_check).each { |file|
+          if edited?(file)
+            shelve_revisions.push("#{file['depotFile']}@=#{@cl}")
+          end
+        }
+
+        unless shelve_revisions.empty?
+          diff_files = @p4.run_diff('-f', '-se', *shelve_revisions).collect { |d| d['depotFile'] }
         end
-      }
+      end
 
-      @p4.run_diff('-f', '-se', *shelve_revisions)
+      diff_files
     end
 
-    def deleted?(file)
-      file['action'].include?('delete')
+    def edited?(file)
+      file['action'].include?('edit')
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: p4tools
 version: !ruby/object:Gem::Version
-  version: 0.2.0.0
+  version: 0.2.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-16 00:00:00.000000000 Z
+date: 2015-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: P4Ruby-mingwx86