p4tools 0.1.1 → 0.1.2

data/Gemfile.lock

@@ -1,14 +1,14 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    P4Ruby-mingwx86 (2014.1)
-    ffi (1.9.0-x86-mingw32)
-    rautomation (0.14.1)
-      ffi (= 1.9.0)
-
-PLATFORMS
-  x86-mingw32
-
-DEPENDENCIES
-  P4Ruby-mingwx86 (~> 2014.1)
-  rautomation (= 0.14.1)
+GEM
+  remote: https://rubygems.org/
+  specs:
+    P4Ruby-mingwx86 (2014.1)
+    ffi (1.9.0-x86-mingw32)
+    rautomation (0.14.1)
+      ffi (= 1.9.0)
+
+PLATFORMS
+  x86-mingw32
+
+DEPENDENCIES
+  P4Ruby-mingwx86 (~> 2014.1)
+  rautomation (= 0.14.1)

data/lib/commands/move.rb

@@ -15,7 +15,7 @@ module P4Tools
         help ''
         arg :workspace, "Name of the new workspace. If 'switch' option provided, this will be ignored.", :short => '-w', :type => :string
         arg :switch, 'Switch between workspaces, only 2 workspace name allowed.', :short => '-i', :type => :strings
-        arg :changelist, 'Changelist number to move.', :short => '-c', :type => :int, :required => true
+        arg :changelists, 'Changelist numbers to move.', :short => '-c', :type => :ints, :required => true
         arg :revert, 'Revert before move.', :short => '-r'
         arg :shelve, 'Shelve before move.', :short => '-s'
       end
@@ -25,17 +25,27 @@ module P4Tools
     def initialize(args)
       @args = args
       @p4 = P4Tools.connection
-      @changelist = @args[:changelist]
-      @is_not_empty = !empty_changelist?(@changelist)
+      workspaces = @args[:switch]
+
+      if workspaces
+        validate_workspaces(workspaces)
+
+        @workspaces = Hash[workspaces.permutation.to_a]
+      end
     end
 
     def run
-      shelve
-      revert
+      @args[:changelists].each do |changelist|
+        @changelist = changelist
+        @is_not_empty = !empty_changelist?(@changelist)
 
-      changelist_spec = @p4.fetch_change(@changelist)
-      changelist_spec['Client'] = get_workspace(changelist_spec)
-      @p4.save_change(changelist_spec)
+        shelve
+        revert
+
+        changelist_spec = @p4.fetch_change(@changelist)
+        changelist_spec['Client'] = get_workspace(changelist_spec)
+        @p4.save_change(changelist_spec)
+      end
     end
 
 
@@ -54,26 +64,25 @@ module P4Tools
     end
 
     def get_workspace(changelist_spec)
-      if @args[:switch]
+      if @workspaces
         current = changelist_spec['Client']
-        workspaces = @args[:switch]
-
-        validate_workspaces(workspaces, current)
+        validate_current(current)
 
-        workspaces.delete(current)
-        workspaces.first
+        @workspaces[current]
       else
         @args[:workspace]
       end
     end
 
-    def validate_workspaces(workspaces, current)
-      if workspaces.length != 2
-        raise(ArgumentError, 'The switch parameter need to contains 2 workspace names exactly!')
+    def validate_current(current_workspace)
+      unless @workspaces.include?(current_workspace)
+        raise(ArgumentError, "The switch parameter does not contains the currently active workspace: #{current_workspace}!")
       end
+    end
 
-      unless workspaces.include?(current)
-        raise(ArgumentError, "The switch parameter does not contains the currently active workspace: #{current}!")
+    def validate_workspaces(workspaces)
+      if workspaces.length != 2
+        raise(ArgumentError, 'The switch parameter need to contains 2 workspace names exactly!')
       end
     end
   end

data/lib/commands/revert.rb

@@ -5,13 +5,18 @@ module P4Tools
       parameters = []
       parameters.push('-w') if arguments[:delete_added_files]
 
-      if arguments[:changelist]
-        parameters.push('-c').push(arguments[:changelist]).push('//...')
+      if arguments[:changelists]
+        parameters.push('-c').push('').push('//...')
+
+        arguments[:changelists].each do |changelist|
+          parameters[-2] = changelist
+          p4.run_revert(parameters)
+        end
       else
         parameters.push(*arguments[:files])
+        p4.run_revert(parameters)
       end
 
-      p4.run_revert(parameters)
     end
 
     def self.set_options(opts)
@@ -21,7 +26,7 @@ module P4Tools
         help 'Options:'
         help ''
         arg :delete_added_files, 'Delete added files.', :short => '-d'
-        arg :changelist, 'Changelist number.', :short => '-c', :type => :int
+        arg :changelists, 'Changelist numbers.', :short => '-c', :type => :ints
         arg :files, 'The absolute path of the files to delete.', :short => '-f', :type => :strings
       end
     end

data/lib/p4_tools.rb

@@ -3,7 +3,6 @@ require_relative 'p4tools/environment'
 require_relative 'p4tools/p4_delegate'
 require_relative 'p4tools/utils/utils'
 require_relative 'p4tools/utils/command_utils'
-require_relative 'p4tools/utils/window_manager'
 require_relative 'p4tools/parsers/command_parser'
 require_relative 'p4tools/parsers/trollop_custom'
 require_relative 'p4tools/parsers/command_options'
@@ -22,7 +21,6 @@ module P4Tools
 
     begin
       run_commands(entries)
-      WindowManager.refresh if global_arguments[:refresh]
     ensure
       @p4.disconnect
     end
@@ -39,7 +37,6 @@ module P4Tools
       help ''
       help 'Global options:'
       help ''
-      arg :refresh, 'Send a refresh keystroke(F5) to the Visual Client.', :short => '-r'
       arg :p4config, 'Absolute path of the P4CONFIG file.', :short => '-p', :type => :string
     end
   end

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

@@ -24,16 +24,14 @@ module P4Tools
 
     # @return [Boolean]
     def files_are_identical?
-      if @check_diff
-        intersection = @shelved_files & @opened_files
+      identical = true
 
-        intersection.each do |file|
-          diff = @p4.run(%W{ diff -Od #{file}@=#{@changelist} })
-          return false unless diff.empty?
-        end
+      if @check_diff
+        shelve_revisions = @opened_files.map { |file| file + "@=#{@changelist}" }
+        identical = @p4.run_diff('-Od', *shelve_revisions).empty?
       end
 
-      true
+      identical
     end
   end
 end

data/p4tools.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name               = 'p4tools'
-  gem.version            = '0.1.1'
+  gem.version            = '0.1.2'
 
   gem.author = ['Norbert Csibra']
   gem.email    = 'napispam@gmail.com'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: p4tools
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-22 00:00:00.000000000 Z
+date: 2014-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: P4Ruby-mingwx86
@@ -51,7 +51,6 @@ files:
 - lib/p4tools/utils/command_utils.rb
 - lib/p4tools/utils/utils.rb
 - lib/p4tools/utils/validators/shelve_validator.rb
-- lib/p4tools/utils/window_manager.rb
 - p4tools.gemspec
 homepage: https://github.com/ncsibra/P4Tools
 licenses: []
@@ -73,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.28
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Simple command line tool to run custom perforce commands.

data/lib/p4tools/utils/window_manager.rb

@@ -1,18 +0,0 @@
-module P4Tools
-  module WindowManager
-    def self.refresh
-      try_require
-
-      window = RAutomation::Window.new(:title => /Perforce P4V/i)
-      window.send_keys(:f5) if window.exist?
-    end
-
-    def self.try_require
-      begin
-        require 'rautomation'
-      rescue
-        raise(LoadError, "To use this module please install the 'rautomation' gem, version '0.14.1'. It might not work with other versions. Use command: 'gem install rautomation -v 0.14.1'")
-      end
-    end
-  end
-end