dev 1.0.18 → 1.0.19

Sign up to get free protection for your applications and to get access to all the features.
@@ -74,6 +74,9 @@ class Dep < Hash
74
74
  if(File.exists?(get_wrk_dir))
75
75
  unless self[:rake].nil?
76
76
  array << "{cmd: 'rake pull', dir: '#{get_wrk_dir}'}"
77
+ #array << "{cmd: 'rake #{self.get_value("rake").to_s}', dir: '#{get_wrk_dir}'}"
78
+ rakefile="#{get_wrk_dir}/rakefile.rb"
79
+ array << "<%Dev::Svn::update_revision_variables('#{rakefile}')%>"
77
80
  array << "{cmd: 'rake #{self.get_value("rake").to_s}', dir: '#{get_wrk_dir}'}"
78
81
  end
79
82
  end
@@ -144,6 +144,10 @@ class Project < Hash
144
144
  end
145
145
  end
146
146
 
147
+ def update
148
+ array_method("update")
149
+ end
150
+
147
151
  def commit
148
152
  puts " no differences detected" unless has_diff
149
153
  array_method("commit") if has_diff
@@ -175,6 +179,7 @@ class Project < Hash
175
179
  end
176
180
 
177
181
  def pull
182
+ update unless has_diff
178
183
  array_method("pull")
179
184
  filename=Dir.pwd + "/rakefile.rb"
180
185
  puts " updating revision variables for " + filename
@@ -292,6 +297,9 @@ class Project < Hash
292
297
  array << 'git commit -a -m "rake commit all"' if File.exists?(".git")
293
298
  array << 'svn commit -m "rake commit all"' if File.exists?(".svn")
294
299
  end
300
+ if(key=="update")
301
+ array << 'svn update' if File.exists?(".svn")
302
+ end
295
303
 
296
304
  value=array if array.length > 0
297
305
 
@@ -304,7 +312,7 @@ class Project < Hash
304
312
  self[:type]="C#" if self[:type].nil?
305
313
 
306
314
  [ "version","dev_root","src_glob","scm_type",
307
- "paths","add","pull","setup","compile","test","features","commit" ].each do |k|
315
+ "paths","add","pull","setup","compile","test","features","commit","update" ].each do |k|
308
316
  puts_debug "set_default_value(#{k})"
309
317
  set_default_value(k)
310
318
  end
@@ -28,7 +28,8 @@ def generate_tasks(project)
28
28
  :loc=> { :desc=> 'count the lines of code' },
29
29
  :setup=> { :desc=> 'setup the project environment' },
30
30
  :pull=> { :desc=> 'rake working copies of dependencies' },
31
- :check=> { :desc=> 'checks if the project default task may be skipped' }
31
+ :check=> { :desc=> 'checks if the project default task may be skipped' },
32
+ :update=> { :desc=> 'updates changes from source code management' }
32
33
  }
33
34
  if project[:type]=="gem" || project[:type]=="ruby"
34
35
  task_hash[:features] = { :desc=> 'tests cucumber features' }
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.18
4
+ version: 1.0.19
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: &23903004 !ruby/object:Gem::Requirement
16
+ requirement: &22132200 !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: *23903004
24
+ version_requirements: *22132200
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: semver
27
- requirement: &23901096 !ruby/object:Gem::Requirement
27
+ requirement: &22131756 !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: *23901096
35
+ version_requirements: *22131756
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: countloc
38
- requirement: &23899896 !ruby/object:Gem::Requirement
38
+ requirement: &22131048 !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: *23899896
46
+ version_requirements: *22131048
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: rainbow
49
- requirement: &23897796 !ruby/object:Gem::Requirement
49
+ requirement: &22130232 !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: *23897796
57
+ version_requirements: *22130232
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: rspec
60
- requirement: &23919888 !ruby/object:Gem::Requirement
60
+ requirement: &22129800 !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: :development
67
67
  prerelease: false
68
- version_requirements: *23919888
68
+ version_requirements: *22129800
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: cucumber
71
- requirement: &23918784 !ruby/object:Gem::Requirement
71
+ requirement: &22129284 !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: *23918784
79
+ version_requirements: *22129284
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: bundler
82
- requirement: &23917752 !ruby/object:Gem::Requirement
82
+ requirement: &22128720 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
87
87
  version: '0'
88
88
  type: :development
89
89
  prerelease: false
90
- version_requirements: *23917752
90
+ version_requirements: *22128720
91
91
  description: development tasks
92
92
  email: lou.parslow@gmail.com
93
93
  executables: