p4util 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55147439ca4bd86ac5eeed2b2a463237ac570956
-  data.tar.gz: 6878f4658acb96611ba1041125ec5939df36076b
+  metadata.gz: 77e7441f7a8592f7922f7c5431d7e7a6bbf83dd8
+  data.tar.gz: 74de30ab1497625d128782db576e03020eebd8b6
 SHA512:
-  metadata.gz: 8426cfcd5da52c2fe86752342a867b2d445ddb6232847b5f35bcaae923f4317f1231fd73508f1444a3d478500cff692df0fdde02bdd64af122a0e9ae9931ac2f
-  data.tar.gz: b768923e0aa9d274889d4102f592fc95f5e413488e136868daf155322ce71ea5109732b512665359dddc3a3e497f4292c5d0fbf7ab41b67b1cc3aaca559ce816
+  metadata.gz: 1728fe537fe341d2f0f7c9a939e72bfe12b73b3d68c3a4dcfcf9c720a4c67835f19b7fc3c0d3f6065d601b71e3ad3683f1a297a16b13197fe92017280a6a0c03
+  data.tar.gz: a9ee8af27a0a9db14fef1b03a4b4481a5f5e0a801bcc5a5eda57846068340334c445d10541004637259a8117c1fdcdf3e2a103c6ad94e19991de84beb7ee713d

data/README.md

@@ -35,6 +35,8 @@ Or install it yourself as:
 
 ## Changes
 
+* 0.4.2: After issuing login -p, reset the `password` property on the connection
+
 * 0.4.1: Use 'login -p' everywhere to avoid use of the .p4tickets file
 
 * 0.4: Change working directory from './work' to '/tmp/p4util'. If you are using

data/lib/commands/init/init_model.rb

@@ -95,8 +95,9 @@ module Commands
         else
           p4.user = super_user.login
           p4.password = super_user.password
-          login = p4.run_login('-p')
-          puts "login results for super #{login}, ticket is #{p4.password}"
+          results = p4.run_login('-p')
+          p4.password = results.first
+          puts "log in as super, ticket is #{p4.password}"
         end
 
         models.each { |m| m.execute(p4, models, super_user) }

data/lib/commands/init/p4_helpers.rb

@@ -30,7 +30,10 @@ module Commands
           oldpass = options[:oldpass] if options.key?(:oldpass)
           p4.user = user
           p4.password = password
-          p4.run_login('-p') if password
+          if password
+            results = p4.run_login('-p')
+            p4.password = results.first
+          end
         end
 
         name = RandomUtil.randstr
@@ -66,7 +69,10 @@ module Commands
           if (user)
             p4.user = olduser
             p4.password = oldpass
-            p4.run_login('-p') if oldpass
+            if oldpass
+              results = p4.run_login('-p')
+              p4.password = results.first
+            end
           end
 
           p4.run_client('-d', '-f', name)

data/lib/commands/init/system_settings_model.rb

@@ -100,13 +100,15 @@ module Commands
           super_user.password = super_pwd
 
           p4.password = super_user.password
-          p4.run_login('-p')
+          results = p4.run_login('-p')
+          p4.password = results.first
         else
           # Just create the user
           super_user.execute(p4)
           if super_user.password
             p4.password = super_user.password
-            p4.run_login('-p')
+            results = p4.run_login('-p')
+            p4.password = results.first
           end
         end
       end

data/lib/p4util/version.rb

@@ -1,3 +1,3 @@
 module P4Util
-  VERSION = '0.4.1'
+  VERSION = '0.4.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: p4util
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Tristan Juricek