dev 1.0.149 → 1.0.150

Sign up to get free protection for your applications and to get access to all the features.
@@ -95,7 +95,7 @@ class SystemCall
95
95
  capture_error=false if capture_error == "false"
96
96
  puts_debug "system2('#{@dir}','#{@command}',#{@capture_output.to_s},#{@capture_error.to_s}) (in SystemCall.execute)"
97
97
  @status,@output,@error=system2(@dir,@command,@capture_output,@capture_error)
98
- puts_debug "system2 call complete"
98
+ #puts_debug "system2 call complete"
99
99
  @end_time=Time.now
100
100
  rescue
101
101
  puts "error executing ruby code: #{@command}"
@@ -108,18 +108,18 @@ class SystemCall
108
108
  end
109
109
 
110
110
  def system2(working_dir,command,capture_output,capture_error)
111
- puts_debug "begin SystemCall.system2"
111
+ #puts_debug "begin SystemCall.system2"
112
112
  capture_output=true if capture_output.nil?
113
113
  capture_output=false if capture_output == "false"
114
114
  capture_error=true if capture_error.nil?
115
115
  capture_error=false unless capture_output
116
116
  capture_error=false if capture_error == "false"
117
117
 
118
- puts_debug "system2(" + working_dir.to_s + "," + command + ") capture_output(" + capture_output.to_s + ") capture_error(" + capture_error.to_s + ")"
118
+ #puts_debug "system2(" + working_dir.to_s + "," + command + ") capture_output(" + capture_output.to_s + ") capture_error(" + capture_error.to_s + ")"
119
119
  filename=Dir.tmpdir + "/" + (0...8).map{65.+(rand(25)).chr}.join
120
- puts_debug " filename=#{filename}"
120
+ #puts_debug " filename=#{filename}"
121
121
  working_dir = Dir.pwd if working_dir.nil? || working_dir.empty?
122
- puts_debug " working_dir=#{working_dir}"
122
+ #puts_debug " working_dir=#{working_dir}"
123
123
  status=0
124
124
  output=""
125
125
  error=""
@@ -156,7 +156,7 @@ class SystemCall
156
156
  end
157
157
  status=$?.exitstatus
158
158
 
159
- puts_debug "status = " + status.to_s
159
+ #puts_debug "status = " + status.to_s
160
160
  return status,output,error
161
161
  end
162
162
 
@@ -57,13 +57,14 @@ def generate_tasks(project)
57
57
 
58
58
  hash.each do |k,v|
59
59
  name=k.to_s
60
+ puts_debug "checking if task #{name} should be autogenerated"
60
61
  desc=nil
61
62
  desc=v[:desc] if v.has_key?(:desc)
62
63
  #ruby="task :#{name} do; task_start '#{name}'; PROJECT.#{name}; end" if PROJECT.respond_to?(name)
63
64
  ruby="task :#{name} do; task_start '#{name}'; CMD.#{name}; end"
64
65
  ruby="desc '#{desc}'; " + ruby unless desc.nil?
65
66
  if !task_exists?(name)
66
- puts_debug "defining task " + name
67
+ puts_debug "defining task #{name} with '#{ruby}'"
67
68
  eval(ruby)
68
69
  end
69
70
  end
@@ -20,9 +20,9 @@ class Replace < Hash
20
20
  if !v.nil? && v.kind_of?(Hash) && v.has_key?(:rev) && v.has_key?(:dir) && !has_key?(k)
21
21
  puts_debug "adding key #{k.to_s}"
22
22
  group=v[:dir].split('/')[0]
23
- searchRegex=Regexp.new "#{group}\\\\#{k}\\\\[\\d]+"
24
- self[k]={ glob: "**/*.#{ext}", search: searchRegex, replace: "#{group}\\#{k}\\#{v[:rev]}", auto: true }
25
- #self[k][:auto]=true
23
+ name=v[:dir].split('/')[1]
24
+ searchRegex=Regexp.new "#{group}\\\\#{name}\\\\[\\d]+"
25
+ self[k]={ glob: "**/*.#{ext}", search: searchRegex, replace: "#{group}\\#{name}\\#{v[:rev]}", auto: true }
26
26
  else
27
27
  puts_debug "skipping key #{k.to_s}"
28
28
  end
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.149
4
+ version: 1.0.150
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -91,6 +91,22 @@ dependencies:
91
91
  - - ! '>='
92
92
  - !ruby/object:Gem::Version
93
93
  version: '0'
94
+ - !ruby/object:Gem::Dependency
95
+ name: sqlite3
96
+ requirement: !ruby/object:Gem::Requirement
97
+ none: false
98
+ requirements:
99
+ - - ! '>='
100
+ - !ruby/object:Gem::Version
101
+ version: '0'
102
+ type: :runtime
103
+ prerelease: false
104
+ version_requirements: !ruby/object:Gem::Requirement
105
+ none: false
106
+ requirements:
107
+ - - ! '>='
108
+ - !ruby/object:Gem::Version
109
+ version: '0'
94
110
  - !ruby/object:Gem::Dependency
95
111
  name: rubyzip
96
112
  requirement: !ruby/object:Gem::Requirement