p4util 0.4.1 → 0.4.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/README.md +2 -0
- data/lib/commands/init/init_model.rb +3 -2
- data/lib/commands/init/p4_helpers.rb +8 -2
- data/lib/commands/init/system_settings_model.rb +4 -2
- data/lib/p4util/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 77e7441f7a8592f7922f7c5431d7e7a6bbf83dd8
|
|
4
|
+
data.tar.gz: 74de30ab1497625d128782db576e03020eebd8b6
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 1728fe537fe341d2f0f7c9a939e72bfe12b73b3d68c3a4dcfcf9c720a4c67835f19b7fc3c0d3f6065d601b71e3ad3683f1a297a16b13197fe92017280a6a0c03
|
|
7
|
+
data.tar.gz: a9ee8af27a0a9db14fef1b03a4b4481a5f5e0a801bcc5a5eda57846068340334c445d10541004637259a8117c1fdcdf3e2a103c6ad94e19991de84beb7ee713d
|
data/README.md
CHANGED
|
@@ -35,6 +35,8 @@ Or install it yourself as:
|
|
|
35
35
|
|
|
36
36
|
## Changes
|
|
37
37
|
|
|
38
|
+
* 0.4.2: After issuing login -p, reset the `password` property on the connection
|
|
39
|
+
|
|
38
40
|
* 0.4.1: Use 'login -p' everywhere to avoid use of the .p4tickets file
|
|
39
41
|
|
|
40
42
|
* 0.4: Change working directory from './work' to '/tmp/p4util'. If you are using
|
|
@@ -95,8 +95,9 @@ module Commands
|
|
|
95
95
|
else
|
|
96
96
|
p4.user = super_user.login
|
|
97
97
|
p4.password = super_user.password
|
|
98
|
-
|
|
99
|
-
|
|
98
|
+
results = p4.run_login('-p')
|
|
99
|
+
p4.password = results.first
|
|
100
|
+
puts "log in as super, ticket is #{p4.password}"
|
|
100
101
|
end
|
|
101
102
|
|
|
102
103
|
models.each { |m| m.execute(p4, models, super_user) }
|
|
@@ -30,7 +30,10 @@ module Commands
|
|
|
30
30
|
oldpass = options[:oldpass] if options.key?(:oldpass)
|
|
31
31
|
p4.user = user
|
|
32
32
|
p4.password = password
|
|
33
|
-
|
|
33
|
+
if password
|
|
34
|
+
results = p4.run_login('-p')
|
|
35
|
+
p4.password = results.first
|
|
36
|
+
end
|
|
34
37
|
end
|
|
35
38
|
|
|
36
39
|
name = RandomUtil.randstr
|
|
@@ -66,7 +69,10 @@ module Commands
|
|
|
66
69
|
if (user)
|
|
67
70
|
p4.user = olduser
|
|
68
71
|
p4.password = oldpass
|
|
69
|
-
|
|
72
|
+
if oldpass
|
|
73
|
+
results = p4.run_login('-p')
|
|
74
|
+
p4.password = results.first
|
|
75
|
+
end
|
|
70
76
|
end
|
|
71
77
|
|
|
72
78
|
p4.run_client('-d', '-f', name)
|
|
@@ -100,13 +100,15 @@ module Commands
|
|
|
100
100
|
super_user.password = super_pwd
|
|
101
101
|
|
|
102
102
|
p4.password = super_user.password
|
|
103
|
-
p4.run_login('-p')
|
|
103
|
+
results = p4.run_login('-p')
|
|
104
|
+
p4.password = results.first
|
|
104
105
|
else
|
|
105
106
|
# Just create the user
|
|
106
107
|
super_user.execute(p4)
|
|
107
108
|
if super_user.password
|
|
108
109
|
p4.password = super_user.password
|
|
109
|
-
p4.run_login('-p')
|
|
110
|
+
results = p4.run_login('-p')
|
|
111
|
+
p4.password = results.first
|
|
110
112
|
end
|
|
111
113
|
end
|
|
112
114
|
end
|
data/lib/p4util/version.rb
CHANGED