dev 1.0.12 → 1.0.13

Sign up to get free protection for your applications and to get access to all the features.
Files changed (3) hide show
  1. data/lib/dev/Project.rb +6 -4
  2. data/lib/dev/SystemCall.rb +20 -8
  3. metadata +17 -19
data/lib/dev/Project.rb CHANGED
@@ -77,8 +77,8 @@ class Project < Hash
77
77
  end
78
78
 
79
79
  def replace
80
- puts " "
81
- puts "replace".foreground(:yellow).bright
80
+ #puts " "
81
+ #puts "replace".foreground(:yellow).bright
82
82
  hash=self[:replace]
83
83
  if hash.nil?
84
84
  puts " no replace directives"
@@ -195,8 +195,10 @@ class Project < Hash
195
195
  dir=expand_project_variables(value.get_value("dir")) unless value.get_value("dir").nil?
196
196
  dir=self[:dev_root] + "/dep/" + dir unless dir.include?(self[:dev_root])
197
197
 
198
- array << "svn export " + expand_project_variables(value.get_value("uri")) + " " + dir unless File.exists?(dir)
199
- array << "<%puts ' #{dir} exists.'%>" if File.exists?(dir)
198
+ cmd = "svn export " + expand_project_variables(value.get_value("uri")) + " " + dir
199
+ eval_cmd = "<%SystemCall.new('#{cmd}') unless File.exists?('#{dir}')%>"
200
+ array << eval_cmd
201
+ array << "<%puts ' #{dir} exists.' if File.exist?('#{dir}')%>"
200
202
 
201
203
  unless value.get_value("rake").nil?
202
204
  array << "{cmd: 'rake #{value.get_value("rake").to_s}', dir: '#{dir}', cache:'true'}" unless value.get_value("cache").nil?
@@ -80,20 +80,32 @@ class SystemCall
80
80
  filename=Dir.tmpdir + "/" + (0...8).map{65.+(rand(25)).chr}.join
81
81
  begin
82
82
  if(@dir.nil?)
83
- system("#{@command} >#{filename}.out 2>#{filename}.err")
83
+ if(!@outfile.nil?)
84
+ system("#{@command} > #{outfile}")
85
+ else
86
+ system("#{@command} >#{filename}.out 2>#{filename}.err")
87
+ end
84
88
  else
85
89
  Dir.chdir(dir) do
86
- system("#{@command} >#{filename}.out 2>#{filename}.err")
90
+ if(!@outfile.nil?)
91
+ system("#{@command} > #{outfile}")
92
+ else
93
+ system("#{@command} >#{filename}.out 2>#{filename}.err")
94
+ end
87
95
  end
88
96
  end
89
- File.open("#{filename}.out",'r') {|f|
97
+ if(File.exist?("#{filename}.out"))
98
+ File.open("#{filename}.out",'r') {|f|
90
99
  @output = f.read
91
100
  f.close
92
- }
93
- File.open("#{filename}.err",'r') {|f|
101
+ }
102
+ end
103
+ if(File.exist?("#{filename}.err"))
104
+ File.open("#{filename}.err",'r') {|f|
94
105
  @error = f.read
95
106
  f.close
96
- }
107
+ }
108
+ end
97
109
  @status=$?.exitstatus
98
110
  @end_time=Time.now
99
111
  rescue
@@ -115,8 +127,8 @@ class SystemCall
115
127
  summary += " dir: " + @dir unless @dir.nil?
116
128
  summary += " cache: true" unless @cache.nil?
117
129
  puts summary
118
- puts @output
119
- warn @error
130
+ puts @output if !@output.nil?
131
+ warn @error if !@error.nil?
120
132
  throw "exit status was " + @status.to_s
121
133
  else
122
134
  elapsed_str="[" + "%.0f" %(elapsed) + "s]"
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.12
4
+ version: 1.0.13
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,12 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-02-03 00:00:00.000000000 -07:00
13
- default_executable:
12
+ date: 2012-02-03 00:00:00.000000000 Z
14
13
  dependencies:
15
14
  - !ruby/object:Gem::Dependency
16
15
  name: rake
17
- requirement: &22267620 !ruby/object:Gem::Requirement
16
+ requirement: &26815212 !ruby/object:Gem::Requirement
18
17
  none: false
19
18
  requirements:
20
19
  - - ! '>='
@@ -22,10 +21,10 @@ dependencies:
22
21
  version: '0'
23
22
  type: :runtime
24
23
  prerelease: false
25
- version_requirements: *22267620
24
+ version_requirements: *26815212
26
25
  - !ruby/object:Gem::Dependency
27
26
  name: semver
28
- requirement: &22267248 !ruby/object:Gem::Requirement
27
+ requirement: &26814936 !ruby/object:Gem::Requirement
29
28
  none: false
30
29
  requirements:
31
30
  - - ! '>='
@@ -33,10 +32,10 @@ dependencies:
33
32
  version: '0'
34
33
  type: :runtime
35
34
  prerelease: false
36
- version_requirements: *22267248
35
+ version_requirements: *26814936
37
36
  - !ruby/object:Gem::Dependency
38
37
  name: countloc
39
- requirement: &22266792 !ruby/object:Gem::Requirement
38
+ requirement: &26814684 !ruby/object:Gem::Requirement
40
39
  none: false
41
40
  requirements:
42
41
  - - ! '>='
@@ -44,10 +43,10 @@ dependencies:
44
43
  version: '0'
45
44
  type: :runtime
46
45
  prerelease: false
47
- version_requirements: *22266792
46
+ version_requirements: *26814684
48
47
  - !ruby/object:Gem::Dependency
49
48
  name: rainbow
50
- requirement: &22266456 !ruby/object:Gem::Requirement
49
+ requirement: &26814432 !ruby/object:Gem::Requirement
51
50
  none: false
52
51
  requirements:
53
52
  - - ! '>='
@@ -55,10 +54,10 @@ dependencies:
55
54
  version: '0'
56
55
  type: :runtime
57
56
  prerelease: false
58
- version_requirements: *22266456
57
+ version_requirements: *26814432
59
58
  - !ruby/object:Gem::Dependency
60
59
  name: rspec
61
- requirement: &22266132 !ruby/object:Gem::Requirement
60
+ requirement: &26814180 !ruby/object:Gem::Requirement
62
61
  none: false
63
62
  requirements:
64
63
  - - ! '>='
@@ -66,10 +65,10 @@ dependencies:
66
65
  version: '0'
67
66
  type: :development
68
67
  prerelease: false
69
- version_requirements: *22266132
68
+ version_requirements: *26814180
70
69
  - !ruby/object:Gem::Dependency
71
70
  name: cucumber
72
- requirement: &22265796 !ruby/object:Gem::Requirement
71
+ requirement: &26813928 !ruby/object:Gem::Requirement
73
72
  none: false
74
73
  requirements:
75
74
  - - ! '>='
@@ -77,10 +76,10 @@ dependencies:
77
76
  version: '0'
78
77
  type: :development
79
78
  prerelease: false
80
- version_requirements: *22265796
79
+ version_requirements: *26813928
81
80
  - !ruby/object:Gem::Dependency
82
81
  name: bundler
83
- requirement: &22265424 !ruby/object:Gem::Requirement
82
+ requirement: &26813676 !ruby/object:Gem::Requirement
84
83
  none: false
85
84
  requirements:
86
85
  - - ! '>='
@@ -88,7 +87,7 @@ dependencies:
88
87
  version: '0'
89
88
  type: :development
90
89
  prerelease: false
91
- version_requirements: *22265424
90
+ version_requirements: *26813676
92
91
  description: development tasks
93
92
  email: lou.parslow@gmail.com
94
93
  executables:
@@ -106,7 +105,6 @@ files:
106
105
  - lib/dev/Tasks.rb
107
106
  - lib/dev.rb
108
107
  - bin/dev
109
- has_rdoc: true
110
108
  homepage: http://rubygems.org/gems/dev
111
109
  licenses: []
112
110
  post_install_message:
@@ -127,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
127
125
  version: '0'
128
126
  requirements: []
129
127
  rubyforge_project: dev
130
- rubygems_version: 1.5.2
128
+ rubygems_version: 1.8.11
131
129
  signing_key:
132
130
  specification_version: 3
133
131
  summary: dev