p4util 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e13e10a9b31fb12e34d23ee7f6495eca21ce5e6
-  data.tar.gz: 2bf3006c190afaf1d19d0c2e216c6812d585f28f
+  metadata.gz: a0edf6cc773707c1a4980752d791f5411f02d26d
+  data.tar.gz: 989fb3cc701d1211c69c7f3c64e28325f6381750
 SHA512:
-  metadata.gz: 621d7626122bd7e2517191a45570c6f0e62bc93ecbb989f4f61cd475b4236c37259c624fad705e208b30897810a095b148383edae583eea109cb5e4988b6c936
-  data.tar.gz: d8882a9dedc2b56fa15f4ea1a3fc6c81181785b5542548c57546060eff3e0a17f0bd53fbe6dfd46920e237f60eabe67fb28839004ba1da0e1ef5341935a451e8
+  metadata.gz: b32a53524ad0e06c7f551ebeb7a8c77ec4da03bfad69880f53fb0e98635fa94642dda0a7a45c4a7582e38a831a0b29fc631f01e9f075fa1decdea31b5139f06b
+  data.tar.gz: fdad9a5c160ab074d20dda40c8fe9a3d9f7d441d795dbfdadff68c3a54fa8b5c5ac0010d9938101018dc947b1e350f47305e09d3962bc1f648f362dabebf48f7

data/README.md

@@ -35,6 +35,8 @@ Or install it yourself as:
 
 ## Changes
 
+* 0.1.2: Added depot model and the ability to customize the view for changelists
+
 * 0.1.1: Added documentation for Rake tasks and version string output
 
 * 0.1.0: Added `p4util init` command that can do some common p4d configurations,

data/Rakefile

@@ -1,7 +1,10 @@
 require 'bundler/gem_tasks'
 require 'rdoc/task'
+require 'rake/clean'
 
 RDoc::Task.new do |rdoc|
   rdoc.main = 'README.md'
   rdoc.rdoc_files.include('README.md', 'lib/**/*.rb')
-end
+end
+
+CLEAN.include('pkg')

data/lib/commands/init/changelist_model.rb

@@ -8,7 +8,7 @@ module Commands
     class ChangelistModel < InitModel
       include Commands::Init::P4Helpers
 
-      inheritable_attributes :description, :adds, :edits, :user
+      inheritable_attributes :description, :adds, :edits, :user, :view
 
       # Please make this descriptive
       @description = 'Init changelist'
@@ -23,6 +23,9 @@ module Commands
       # user
       @user = nil
 
+      # Don't use the default //depot/... mapping, use this instead
+      @view = nil
+
       #========================================================================
       # Internal implementation
       #========================================================================
@@ -31,13 +34,14 @@ module Commands
         true
       end
 
-      attr_accessor :description, :adds, :edits, :user
+      attr_accessor :description, :adds, :edits, :user, :view
 
       def initialize
         @description = self.class.description
         @adds = self.class.adds
         @edits = self.class.edits
         @user = self.class.user
+        @view = self.class.view
       end
 
       def execute(p4, models, super_user)
@@ -51,6 +55,9 @@ module Commands
           options[:olduser] = super_user.login
           options[:oldpass] = super_user.password
         end
+        if view
+          options[:view] = view
+        end
 
         # Define the logic of what the changelist model really does: make adds
         # and edits for the most part
@@ -61,6 +68,8 @@ module Commands
           results = p4.save_change(change_spec)
           change_id = results[0].gsub(/^Change (\d+) created./, '\1')
 
+          puts "Preparing changelist #{change_id} with #{@adds.length} adds and #{@edits.length} edits"
+
           @adds.each do |add|
             add_path = File.join(client_path, add.path)
             dir = File.dirname(add_path)
@@ -74,12 +83,14 @@ module Commands
             elsif add.local_path
               FileUtils.copy(add.local_path, add_path)
             end
-            p4.run_add('-c', change_id, add_path)
+            results = p4.run_add('-c', change_id, add_path)
+            puts "Added file #{add_path} to #{change_id}: #{results}"
           end
 
           @edits.each do |edit|
             edit_path = File.join(client_path, edit.path)
-            p4.run_edit('-c', change_id, edit_path)
+            results = p4.run_edit('-c', change_id, edit_path)
+            puts "Editing file #{edit_path} on #{change_id}: #{results}"
 
             if edit.content
               IO.write(edit_path, edit.content)

data/lib/commands/init/depot_model.rb

@@ -0,0 +1,60 @@
+require 'commands/init/init_model'
+require 'commands/init/p4_helpers'
+
+module Commands
+  module Init
+
+    class DepotModel < InitModel
+      include Commands::Init::P4Helpers
+
+      inheritable_attributes :depot, :description, :type, :address, :suffix, :map, :spec_map
+
+      # The depot name
+      @depot = nil
+
+      @description = 'Init depot'
+
+      @type = 'local'
+
+      @address = nil
+
+      @suffix = nil
+
+      @map = 'depot/...'
+
+      @spec_map = nil
+
+      #========================================================================
+      # Internal implementation
+      #========================================================================
+
+      def self.abstract
+        true
+      end
+
+      attr_accessor :depot, :description, :type, :address, :suffix, :map, :spec_map
+
+      def initialize
+        @depot = self.class.depot
+        @description = self.class.description
+        @type = self.class.type
+        @address = self.class.address
+        @suffix = self.class.suffix
+        @map = self.class.map
+        @spec_map = self.class.spec_map
+      end
+
+      def execute(p4, models=nil, super_user=nil)
+        d = p4.fetch_depot(depot)
+        d._depot = depot
+        d._description = description if description
+        d._type = type if type
+        d._address = address if address
+        d._suffix = suffix if suffix
+        d._map = map if map
+        d._spec_map = spec_map if spec_map
+        p4.save_depot(d)
+      end
+    end
+  end
+end

data/lib/commands/init/init_model.rb

@@ -81,6 +81,9 @@ module Commands
 
         models.sort! { |a, b| a.rank <=> b.rank }
 
+        # Clear out any P4 Environment variables
+        ENV.keys.select { |x| x =~ /^P4/ }.each { |x| ENV.delete(x) }
+
         p4 = P4.new
         p4.port = p4port
         p4.connect

data/lib/commands/init/p4_helpers.rb

@@ -44,7 +44,11 @@ module Commands
         spec._root = dir
         spec._client = name
         spec._description = 'p4util init temp client'
-        spec._view = ["//depot/... //#{name}/depot/..."]
+        if options.key?(:view)
+          spec._view = options[:view].map { |x| x.gsub("${name}", name) }
+        else
+          spec._view = ["//depot/... //#{name}/depot/..."]
+        end
 
         p4.save_client(spec)
 

data/lib/commands/init/user_model.rb

@@ -4,7 +4,7 @@ module Commands
   module Init
 
     class UserModel < InitModel
-      inheritable_attributes :login, :full_name, :password, :email, :super
+      inheritable_attributes :login, :full_name, :password, :email, :super, :skip
 
       @login = nil
       @full_name = nil
@@ -15,6 +15,12 @@ module Commands
       # protections entry for this user exists
       @super = false
 
+      # Set this to true if you actually just want to use this username/password
+      # combination and expect that the user actually exists in the system
+      # already. This basically allows us to use the same definition for
+      # existing users in initialization scripts.
+      @skip = false
+
       #========================================================================
       # Internal implementation - don't mess with this
       #========================================================================
@@ -59,16 +65,20 @@ module Commands
       end
 
       def execute(p4, models=nil, super_user=nil)
+        return if self.class.skip
+
+        puts "user: #{to_spec} as #{p4.user}"
+
         p4.save_user(to_spec, '-f')
 
         p4.user = login
-        p4.password = ''
+        p4.password = '' if password
 
         p4.run_password('', password) if password
 
         if super_user
           p4.user = super_user.login
-          p4.password = super_user.password
+          p4.password = super_user.password if super_user.password
         end
       end
     end

data/lib/commands/init.rb

@@ -2,6 +2,7 @@
 require 'commands/start'
 require 'commands/init/init_model'
 require 'commands/init/changelist_model'
+require 'commands/init/depot_model'
 require 'commands/init/file_definition'
 require 'commands/init/system_settings_model'
 require 'commands/init/user_model'
@@ -10,9 +11,25 @@ module Commands
 
   def Commands.init(options=nil)
     init_dir = 'p4init'
-    # TODO we may want to allow this to be overridden, though I find this a
-    #      spurious and dangerous use case
+
     p4port = '127.0.0.1:1666'
+    version = nil
+
+    if options and !options.params.empty?
+
+      op = OptionParser.new do |op|
+        op.on('-p PORT', '--port PORT', 'P4PORT setting') { |x| p4port = x }
+        op.on('-v VERSION', '--version VERSION', 'ftp.perforce.com version') do |v|
+          version = v
+        end
+      end
+
+      op.parse!(options.params)
+
+      if !options.params.empty?
+        init_dir = options.params.first
+      end
+    end
 
     if options and !options.params.empty?
       init_dir = options.params.shift
@@ -21,6 +38,8 @@ module Commands
     if !p4d_running?
       # The way this works: if you specify any options, like what to download
       # you must specify the initialization directory.
+      options = OpenStruct.new
+      options.params = ['--version', version] unless version.nil?
       Commands.start(options)
     end
 
@@ -29,7 +48,7 @@ module Commands
 
   def Commands.print_init_help
     puts <<-END.gsub(/^ {6}/, '')
-      p4util init [p4_init_dir]
+      p4util init [-p P4PORT] [p4_init_dir]
 
       Reads definitions in the directory p4_init_dir - by default, just
       'p4init' - and then calls methods on a p4d instance assumed to be running
@@ -134,6 +153,22 @@ module Commands
       as your super user, so set this to a UserModel instance that should exist
       at this point.
 
+      ## DepotModel ##
+
+      Example creating a new standard depot:
+
+        class ProjectDepot < DepotModel
+          def rank
+            1001
+          end
+          @depot = 'my_project'
+          @description = 'The My Project depot'
+        end
+
+      Other attributes that can be set that update the depot spec being written:
+
+        :type, :address, :suffix, :map, :spec_map
+
     END
   end
 

data/lib/commands/kill.rb

@@ -1,16 +1,16 @@
 require 'commands/util'
-require 'sys/proctable'
-
-include Sys
 
 module Commands
 
   def Commands.kill(options=nil)
-    ProcTable.ps().find_all{|p| p.comm =~ /p4d/}.each do |p|
+    list_process_names.select{|p| p =~ /p4d/}.each do |p|
+      pid = pid_for_process(p)
       begin
-        Process.kill('TERM', p.pid)
-      rescue
-        puts "Problem killing #{p}, ignoring"
+        puts "killing p4d #{p} at #{pid}"
+        Process.kill('TERM', pid)
+      rescue Exception => e
+        puts "Problem killing #{p}: #{e.message}"
+        puts e.backtrace.join('\n')
       end
     end
 

data/lib/commands/util.rb

@@ -1,9 +1,31 @@
-require 'sys/proctable'
 require 'P4'
+require 'osutil'
 
 module Commands
   def Commands.p4d_running?
-    !ProcTable.ps().find_all { |p| p.comm =~ /p4d/ }.empty?
+    list_process_names.select { |p| p =~ /p4d/ }.empty? == false
+  end
+
+  def self.list_process_names
+    if OsUtil.osx? or OsUtil.linux?
+      return `ps aux | awk '{print $11}'`.split(/\n/).drop(1)
+    else
+      # TODO investigate using tasklist just for this
+      raise 'No support for windows just yet'
+    end
+  end
+
+  def self.pid_for_process(process)
+    if OsUtil.osx? or OsUtil.linux?
+      line = `ps aux | awk '{print $2,$11}'`.split(/\n/).drop(1).find { |p| p =~ /#{process}/ }
+      unless line.nil?
+        return line.split('\n').first.to_i
+      else
+        return nil
+      end
+    else
+      raise 'NO support for windows yet'
+    end
   end
 
   def Commands.p4d_available?(port=':1666')

data/lib/p4util/version.rb

@@ -1,3 +1,3 @@
 module P4Util
-  VERSION = '0.1.1'
+  VERSION = '0.1.3'
 end

data/p4util.gemspec

@@ -20,7 +20,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.7'
 
-  spec.add_runtime_dependency 'sys-proctable', '~> 0.9'
-  spec.add_runtime_dependency 'p4ruby', '2014.2.0.pre1'
+  spec.add_runtime_dependency 'p4ruby', '~> 2014.2.0.pre'
   spec.add_runtime_dependency 'rake', '~> 10.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: p4util
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Tristan Juricek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-13 00:00:00.000000000 Z
+date: 2015-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -25,33 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
-  name: sys-proctable
+  name: p4ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 2014.2.0.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: p4ruby
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2014.2.0.pre1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2014.2.0.pre1
+        version: 2014.2.0.pre
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -86,6 +72,7 @@ files:
 - "./lib/commands/help.rb"
 - "./lib/commands/init.rb"
 - "./lib/commands/init/changelist_model.rb"
+- "./lib/commands/init/depot_model.rb"
 - "./lib/commands/init/file_definition.rb"
 - "./lib/commands/init/init_model.rb"
 - "./lib/commands/init/p4_helpers.rb"