dev 2.1.28 → 2.1.29

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 995a900072049adce78545d3a9847cc5d681c8af
4
- data.tar.gz: bf2724abc51a800368c2e1f4c7e720c46621f06d
3
+ metadata.gz: 778c2b65dd9b66d0fd6bc73e1acf3b56a1618021
4
+ data.tar.gz: e9b111ea7b8943302c744241a4d4cab0655aada7
5
5
  SHA512:
6
- metadata.gz: 55f306af0a2f81b44172b7a7182c2340556fbef13e2e3e7da859b44af293b948048e555c90ca90498aa1522911d4d3bdf2a29ce67ddece17d210f3c79053f6ef
7
- data.tar.gz: 6f5f1c031aea136185b418a9385ec72513e9a53ef4db23b69c5c8b452a4a4b1dba58cfbbeb983975511694bcd5514d4d9dd11f9eac6a3ab8cbf2bad935492b02
6
+ metadata.gz: cddb3fa8694e5f74b94a7f73c39d6132f3ddf265fe095cce7ed8d64c1d62085a4eec8ff324aeaa251d965a53384f413b8a17e7e1b89ac6d5e0221c5e54b028c9
7
+ data.tar.gz: 0ea1b44a5f809013d868344efcf5c90d5a82787feaeb18c15b55848da66b82e76344e0e1716d775f1d8b1c75efbe438723c19375513d81fc98dc18f8b78b6175
@@ -31,6 +31,10 @@ class Environment < Hash
31
31
  end
32
32
  #####End LEGACY support
33
33
 
34
+ def admin?
35
+ rights=%x[whoami /priv]
36
+ return rights.include?('SeCreateGlobalPrivilege')
37
+ end
34
38
  def root_dir
35
39
  get_env('DEV_ROOT').gsub('\\','/')
36
40
  end
data/lib/tasks/add.rb CHANGED
@@ -10,21 +10,26 @@ class Add < Array
10
10
  else
11
11
  if(defined?(SOURCE))
12
12
  if(File.exists?('.svn'))
13
+ #---
14
+ list_output = %x[svn list -R]
15
+ status_output = %x[svn status]
16
+ status_output = status_output.gsub(/\\/,"/")
17
+ #---
13
18
  SOURCE.each{|f|
14
- if(File.exists?(f) && File.file?(f))
19
+ if(File.exists?(f) && File.file?(f) && !list_output.include?(f))
15
20
  if(f.include?(' '))
16
- status=Command.output("svn status \"#{f}\"")
17
- error=Command.error("svn status \"#{f}\"")
18
- else
19
- status=Command.output("svn status #{f}")
20
- error=Command.error("svn status #{f}")
21
- end
22
- if(status.include?('?') || status.include?('was not found') || error.include?('was not found'))
23
- if(f.include?(' '))
21
+ status=Command.output("svn status \"#{f}\"")
22
+ error=Command.error("svn status \"#{f}\"")
23
+ else
24
+ status=Command.output("svn status #{f}")
25
+ error=Command.error("svn status #{f}")
26
+ end
27
+ if(status.include?('?') || status.include?('was not found') || error.include?('was not found'))
28
+ if(f.include?(' '))
24
29
  add_quiet "svn add \"#{f}\" --parents"
25
- else
30
+ else
26
31
  add_quiet "svn add #{f} --parents"
27
- end
32
+ end
28
33
  end
29
34
  end
30
35
  }
@@ -34,9 +39,9 @@ class Add < Array
34
39
  if(File.exists?(f) && File.file?(f))
35
40
  status=Command.output("git status #{f} --short")
36
41
  if status.include?('??') || status.include?(' M ')
37
- add_quiet "git add #{f} -v"
42
+ add_quiet "git add #{f} -v"
38
43
  end
39
- end
44
+ end
40
45
  }
41
46
  end
42
47
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dev
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.1.28
4
+ version: 2.1.29
5
5
  platform: ruby
6
6
  authors:
7
7
  - Lou Parslow
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-09-12 00:00:00.000000000 Z
11
+ date: 2016-09-30 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rake