dev 1.0.49 → 1.0.50

Sign up to get free protection for your applications and to get access to all the features.
Files changed (2) hide show
  1. data/lib/dev/Project.rb +17 -7
  2. metadata +17 -17
@@ -56,14 +56,24 @@ class Project < Hash
56
56
  return expandedHash
57
57
  end
58
58
 
59
- result=Dev::Environment.expand_string_variables(str) # expands ruby variables, e.g. '#{name}' to 'widget'
60
- if result.include?('<') && result.include?('>')
61
- result.scan(/(<[\w,]+>)/).each { |pvar| # expand project variables, e.g. '<name>' to 'widget
62
- key = pvar[0].gsub("<","").gsub(">","") # '<paths,nunit>' to 'C:/wherever/NUnit.exe'
63
- result = result.gsub(pvar[0],get_value(key))
64
- }
59
+ if str.kind_of?(Array)
60
+ expandedArray= Array.new
61
+ str.each{|e|expandedArray << expand_project_variable(e) }
62
+ return expandedArray
65
63
  end
66
- result
64
+
65
+ if str.kind_of?(String)
66
+ result=Dev::Environment.expand_string_variables(str) # expands ruby variables, e.g. '#{name}' to 'widget'
67
+ if result.include?('<') && result.include?('>')
68
+ result.scan(/(<[\w,]+>)/).each { |pvar| # expand project variables, e.g. '<name>' to 'widget
69
+ key = pvar[0].gsub("<","").gsub(">","") # '<paths,nunit>' to 'C:/wherever/NUnit.exe'
70
+ result = result.gsub(pvar[0],get_value(key))
71
+ }
72
+ end
73
+ return result
74
+ end
75
+
76
+ return str
67
77
  end
68
78
 
69
79
  def loc_cmd
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dev
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.49
4
+ version: 1.0.50
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -13,7 +13,7 @@ date: 2012-02-03 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rake
16
- requirement: &15876612 !ruby/object:Gem::Requirement
16
+ requirement: &25379424 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '0'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *15876612
24
+ version_requirements: *25379424
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: semver
27
- requirement: &15891996 !ruby/object:Gem::Requirement
27
+ requirement: &25392156 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '0'
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *15891996
35
+ version_requirements: *25392156
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: countloc
38
- requirement: &15890412 !ruby/object:Gem::Requirement
38
+ requirement: &25388220 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '0'
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *15890412
46
+ version_requirements: *25388220
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: rainbow
49
- requirement: &15889224 !ruby/object:Gem::Requirement
49
+ requirement: &25386036 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: '0'
55
55
  type: :runtime
56
56
  prerelease: false
57
- version_requirements: *15889224
57
+ version_requirements: *25386036
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: systemu
60
- requirement: &15896568 !ruby/object:Gem::Requirement
60
+ requirement: &25397892 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: '0'
66
66
  type: :runtime
67
67
  prerelease: false
68
- version_requirements: *15896568
68
+ version_requirements: *25397892
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: rspec
71
- requirement: &15894708 !ruby/object:Gem::Requirement
71
+ requirement: &25396524 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: '0'
77
77
  type: :development
78
78
  prerelease: false
79
- version_requirements: *15894708
79
+ version_requirements: *25396524
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: cucumber
82
- requirement: &15893928 !ruby/object:Gem::Requirement
82
+ requirement: &25393848 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
87
87
  version: '0'
88
88
  type: :development
89
89
  prerelease: false
90
- version_requirements: *15893928
90
+ version_requirements: *25393848
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: bundler
93
- requirement: &15893196 !ruby/object:Gem::Requirement
93
+ requirement: &25407804 !ruby/object:Gem::Requirement
94
94
  none: false
95
95
  requirements:
96
96
  - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
98
98
  version: '0'
99
99
  type: :development
100
100
  prerelease: false
101
- version_requirements: *15893196
101
+ version_requirements: *25407804
102
102
  description: development tasks
103
103
  email: lou.parslow@gmail.com
104
104
  executables: