p4util 0.1.6 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd44d36a39c704a989054b91c66f3480c3ff3da0
-  data.tar.gz: f1114069900aa1518b58df8f9067e662740a42c6
+  metadata.gz: 4fd37ebdc24b5bcfb77f66ddd30e5c91cfbfca5a
+  data.tar.gz: f201b07ddaa262063a9b0078b1ae884dea7814ee
 SHA512:
-  metadata.gz: 7332c6b0104de70035fc6098dc98c52b12ee81a4a8ca32b9741aa835ff23d337c651ee2cf48cba98c9e34bf40055d0ab5ef13577a596c87a42dc384d1ec0bcf2
-  data.tar.gz: 23dc876ed087e73c468527570764cd122ddb7e2778eb4001720c3509119aafab1ce91027b42662b105bea14d08c6c9b0e7575ff43bd54419bca02515900ee3f5
+  metadata.gz: 9214db3922784dc505ecce1a13bbca7e759ef0b67289872996a17db61a46e64d6bfa06ef35c7fc65cf50505dca7bc7f31000297234072a7d20ff6f161a7affbc
+  data.tar.gz: fbe5ec5af147dd85e44451cb331334b051319996d55a66605d388f8f224041a0181d89ef1119c3483a6618c11983c554d443a5bd2a5d67426ea90d72de7ede84

data/README.md

@@ -35,6 +35,8 @@ Or install it yourself as:
 
 ## Changes
 
+* 0.2.0: Added the ability to create 'groups'
+
 * 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

data/lib/commands/init/group_model.rb

@@ -0,0 +1,59 @@
+require 'commands/init/init_model'
+
+module Commands
+  module Init
+    class GroupModel < InitModel
+      inheritable_attributes :group, :max_results, :max_scan_rows,
+                             :max_lock_time, :password_timeout, :timeout,
+                             :users, :subgroups, :owners
+
+
+      @group = nil
+      @max_results = nil
+      @max_scan_rows = nil
+      @max_lock_time = nil
+      @timeout = nil
+      @password_timeout = nil
+      @users = nil
+      @subgroups = nil
+      @owners = nil
+
+      def self.abstract
+        true
+      end
+
+      def initialize
+        @group = self.class.group
+        @max_results = self.class.max_results
+        @max_scan_rows = self.class.max_scan_rows
+        @timeout = self.class.timeout
+        @password_timeout = self.class.password_timeout
+        @users = self.class.users
+        @subgroups = self.class.subgroups
+        @owners = self.class.owners
+      end
+
+      def to_spec
+        spec = {
+            'Group' => @group
+        }
+
+        spec['MaxResults'] = @max_results unless @max_results.nil?
+        spec['MaxScanRows'] = @max_scan_rows unless @max_scan_rows.nil?
+        spec['MaxLockTime'] = @max_lock_time unless @max_lock_time.nil?
+        spec['Timeout'] = @timeout unless @timeout.nil?
+        spec['PasswordTimeout'] = @password_timeout unless @password_timeout.nil?
+        spec['Users'] = @users unless @users.nil?
+        spec['Subgroups'] = @subgroups unless @subgroups.nil?
+        spec['Owners'] = @owners unless @owners.nil?
+
+        spec
+      end
+
+      def execute(p4, models=nil, super_user=nil)
+        puts "group: #{to_spec}"
+        p4.save_group(to_spec)
+      end
+    end
+  end
+end

data/lib/commands/init.rb

@@ -4,6 +4,7 @@ require 'commands/init/init_model'
 require 'commands/init/changelist_model'
 require 'commands/init/depot_model'
 require 'commands/init/file_definition'
+require 'commands/init/group_model'
 require 'commands/init/system_settings_model'
 require 'commands/init/user_model'
 
@@ -171,9 +172,14 @@ module Commands
   def Commands.initialize_p4d(init_dir, p4port, auto)
     # Go through our init_dir, and evaluate each script as if it were defined
     # in the Commands::Init module.
-    Dir.glob("#{init_dir}/**/*.rb") do |file|
-      contents = IO.read(file)
-      Commands::Init.class_eval(contents, file)
+    if File.directory?(init_dir)
+      Dir.glob("#{init_dir}/**/*.rb") do |file|
+        contents = IO.read(file)
+        Commands::Init.class_eval(contents, file)
+      end
+    elsif File.file?(init_dir)
+      contents = IO.read(init_dir)
+      Commands::Init.class_eval(contents, init_dir)
     end
 
     # Note that nothing is actually done until this line. This allows classes

data/lib/p4util/version.rb

@@ -1,3 +1,3 @@
 module P4Util
-  VERSION = '0.1.6'
+  VERSION = '0.2'
 end

data/p4init/test_groups.rb

@@ -0,0 +1,7 @@
+class SystemGroup < GroupModel
+  def rank; 2000 end
+  @group = 'system'
+  @timeout = 'unset'
+  @password_timeout = 'unset'
+  @users = ['app']
+end

data/p4init/test_users.rb

@@ -12,4 +12,11 @@ class JohnDoeUser < UserModel
   @login = 'jdoe'
   @full_name = 'John Doe'
   @password = 'johndoe1A!'
+end
+
+class AppUser < UserModel
+  def rank; 11 end
+  @login = 'app'
+  @full_name = 'Application'
+  @password = 'appuser1A!'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: p4util
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: '0.2'
 platform: ruby
 authors:
 - Tristan Juricek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-05 00:00:00.000000000 Z
+date: 2015-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -74,6 +74,7 @@ files:
 - "./lib/commands/init/changelist_model.rb"
 - "./lib/commands/init/depot_model.rb"
 - "./lib/commands/init/file_definition.rb"
+- "./lib/commands/init/group_model.rb"
 - "./lib/commands/init/init_model.rb"
 - "./lib/commands/init/p4_helpers.rb"
 - "./lib/commands/init/system_settings_model.rb"
@@ -91,6 +92,7 @@ files:
 - "./lib/random_util.rb"
 - "./p4init/287.jpg"
 - "./p4init/test_changelists.rb"
+- "./p4init/test_groups.rb"
 - "./p4init/test_system_settings.rb"
 - "./p4init/test_users.rb"
 - "./p4util.gemspec"