dev 2.0.194 → 2.0.195
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/apps/git.rb +0 -3
- data/lib/apps/msbuild.rb +0 -1
- data/lib/apps/svn.rb +3 -11
- data/lib/apps/wix.rb +5 -14
- data/lib/base/command.rb +1 -4
- data/lib/base/environment.rb +0 -1
- data/lib/base/file.rb +0 -1
- data/lib/base/hash.rb +0 -2
- data/lib/base/internet.rb +0 -1
- data/lib/base/project.rb +15 -5
- data/lib/base/string.rb +0 -1
- data/lib/base/version.rb +1 -1
- data/lib/tasks/add.rb +0 -6
- data/lib/tasks/analyze.rb +0 -1
- data/lib/tasks/commit.rb +1 -3
- data/lib/tasks/default.rb +1 -1
- data/lib/tasks/doc.rb +0 -1
- data/lib/tasks/info.rb +0 -6
- data/lib/tasks/publish.rb +0 -1
- data/lib/tasks/push.rb +1 -1
- data/lib/tasks/test.rb +0 -1
- metadata +3 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 2991a183429492e7bf7c04d35bef2feebd45c24b
|
4
|
+
data.tar.gz: 19754b66567aabc1e2bd4c2eb95466c70e2aafbe
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 54721601d4d67c6a37c9926be84f109d762f5b1f58afdb0cde736046f9c114ad6ed210802432d5597133b579e27fb589e3ed30251bf85babc18185a7b70c7936
|
7
|
+
data.tar.gz: b74b4ebc3cd3b6e240cf606fbe31d8e711bfd33bb8af2a0ae549f943dcafae640bc297676a8dbfe5e502394406b44cb64d5e86a7b8b4c7138cc9cb66308cf439
|
data/lib/apps/git.rb
CHANGED
data/lib/apps/msbuild.rb
CHANGED
@@ -88,7 +88,6 @@ class MSBuild < Hash
|
|
88
88
|
sln_arg="\"#{sln_filename}\"" if sln_filename.include?(' ')
|
89
89
|
platform_arg="/p:Platform=#{platform}"
|
90
90
|
platform_arg="/p:Platform=\"#{platform}\"" if platform.include?(' ')
|
91
|
-
#build_commands << "#{msbuild_arg} #{sln_arg} /nologo /p:Configuration=#{configuration} #{platform_arg}"
|
92
91
|
build_commands << "#{msbuild_arg} #{sln_arg} /p:Configuration=#{configuration} #{platform_arg}"
|
93
92
|
}
|
94
93
|
}
|
data/lib/apps/svn.rb
CHANGED
@@ -82,7 +82,6 @@ class Svn
|
|
82
82
|
|
83
83
|
output = "\n"
|
84
84
|
if(`svn info #{destination} 2>&1`.include?('Revision:'))
|
85
|
-
#raise "Svn.publish: destination #{destination} already exists"
|
86
85
|
puts "Svn.publish: destination #{destination} already exists"
|
87
86
|
else
|
88
87
|
# create subversion directory
|
@@ -95,17 +94,10 @@ class Svn
|
|
95
94
|
files = source_filelist.to_a
|
96
95
|
end
|
97
96
|
files=source_filelist
|
98
|
-
#Dir.chdir(source_dir) do
|
99
|
-
# files=FileList.new(source_glob).to_a
|
100
|
-
#end
|
101
97
|
output = output + "\nfiles: "
|
102
|
-
|
103
|
-
|
104
|
-
|
105
|
-
}
|
106
|
-
#end
|
107
|
-
#output = output + "\nfiles: #{files.to_s}"
|
108
|
-
|
98
|
+
files.each{|f|
|
99
|
+
output = output + f + " "
|
100
|
+
}
|
109
101
|
pwd=Dir.pwd
|
110
102
|
Dir.mktmpdir{|dir|
|
111
103
|
|
data/lib/apps/wix.rb
CHANGED
@@ -10,20 +10,11 @@ class Wix
|
|
10
10
|
build_commands=Array.new if build_commands.nil?
|
11
11
|
build_commands << "candle #{wxs_file} -ext WixNetFxExtension -ext WixBalExtension -ext WixUtilExtension"
|
12
12
|
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
end
|
19
|
-
#end
|
20
|
-
#elsif(IO.read(wxs_file).include?('<Bundle'))
|
21
|
-
# if(defined?(VERSION))
|
22
|
-
# build_commands << "light #{File.basename(wxs_file,'.*')}.wixobj -out #{File.basename(wxs_file,'.*')}-#{VERSION}.exe -ext WixNetFxExtension -ext WixBalExtension -ext WixUtilExtension"
|
23
|
-
# else
|
24
|
-
# build_commands << "light #{File.basename(wxs_file,'.*')}.wixobj -ext WixNetFxExtension -ext WixBalExtension -ext WixUtilExtension"
|
25
|
-
# end
|
26
|
-
#end
|
13
|
+
if(defined?(VERSION))
|
14
|
+
build_commands << "light #{File.basename(wxs_file,'.*')}.wixobj -out #{File.basename(wxs_file,'.*')}-#{VERSION}.msi -ext WixNetFxExtension -ext WixBalExtension -ext WixUtilExtension"
|
15
|
+
else
|
16
|
+
build_commands << "light #{File.basename(wxs_file,'.*')}.wixobj -ext WixNetFxExtension -ext WixBalExtension -ext WixUtilExtension"
|
17
|
+
end
|
27
18
|
end
|
28
19
|
build_commands
|
29
20
|
end
|
data/lib/base/command.rb
CHANGED
@@ -97,8 +97,6 @@ class Command < Hash
|
|
97
97
|
self[:end_time] = Time.now
|
98
98
|
else
|
99
99
|
require_relative 'timeout.rb'
|
100
|
-
#puts run_with_timeout(self[:input], self[:timeout], 1).to_s
|
101
|
-
#self[:output] = run_with_timeout(self[:input], self[:timeout], 1)
|
102
100
|
result=run_with_timeout2(self[:directory],self[:input], self[:timeout], 2)
|
103
101
|
self[:output]=result[0]
|
104
102
|
self[:error]=result[1]
|
@@ -130,7 +128,7 @@ class Command < Hash
|
|
130
128
|
end
|
131
129
|
if(!self.has_key?(:ignore_failure) || !self[:ignore_failure])
|
132
130
|
raise "#{self[:input]} failed"
|
133
|
-
end
|
131
|
+
end
|
134
132
|
end
|
135
133
|
|
136
134
|
end
|
@@ -164,7 +162,6 @@ class Command < Hash
|
|
164
162
|
return ENV[v].gsub('\\','/') unless ENV[v].nil?
|
165
163
|
}
|
166
164
|
dir=home
|
167
|
-
#dir=ENV["DEV_ROOT"].gsub('\\','/') unless ENV["DEV_ROOT"].nil?
|
168
165
|
return dir
|
169
166
|
end
|
170
167
|
|
data/lib/base/environment.rb
CHANGED
@@ -60,7 +60,6 @@ class Environment < Hash
|
|
60
60
|
end
|
61
61
|
|
62
62
|
def self.check
|
63
|
-
#["ruby","svn","git","msbuild","candle","light"].each{|cmd|
|
64
63
|
puts 'checking commands...'
|
65
64
|
missing_command=false
|
66
65
|
['ruby --version','svn --version --quiet','git --version','msbuild /version','nunit-console','nuget','candle','light','gem --version'].each{|cmd|
|
data/lib/base/file.rb
CHANGED
data/lib/base/hash.rb
CHANGED
data/lib/base/internet.rb
CHANGED
data/lib/base/project.rb
CHANGED
@@ -50,10 +50,6 @@ class Project < Hash
|
|
50
50
|
parts[parts.length-1]
|
51
51
|
#self[:name]
|
52
52
|
end
|
53
|
-
|
54
|
-
#def get_latest_unique_id
|
55
|
-
# '51ed9c9d45ba3979c808740d75ba1831c85aff5d'
|
56
|
-
#end
|
57
53
|
|
58
54
|
def wrk_dir
|
59
55
|
"#{Environment.dev_root}/wrk/#{self.fullname}"
|
@@ -110,7 +106,6 @@ class Project < Hash
|
|
110
106
|
def make tag
|
111
107
|
rake_default=nil
|
112
108
|
logfile="#{Environment.dev_root}/log/#{self.fullname}/#{tag}/#{Environment.user}@#{Environment.machine}.json"
|
113
|
-
#logfile="#{Environment.dev_root}/log/#{Environment.machine}/#{Environment.user}/#{self.fullname}/#{tag}.json"
|
114
109
|
if(File.exists?(logfile))
|
115
110
|
# load hash from json
|
116
111
|
return Command.new(JSON.parse(IO.read(logfile)))
|
@@ -138,6 +133,21 @@ class Project < Hash
|
|
138
133
|
end
|
139
134
|
end
|
140
135
|
|
136
|
+
def tags
|
137
|
+
tags=Array.new
|
138
|
+
if !File.exists? wrk_dir
|
139
|
+
clone=Command.new({:input=>'git clone #{self[:url]} #{wrk_dir}',:quiet=>true})
|
140
|
+
clone.execute
|
141
|
+
end
|
142
|
+
Dir.chdir(wrk_dir) do
|
143
|
+
Command.output('git tag').split('\n').each{|line|
|
144
|
+
tag=line.strip
|
145
|
+
tags << tag if tag.length < 0
|
146
|
+
}
|
147
|
+
end
|
148
|
+
tags
|
149
|
+
end
|
150
|
+
|
141
151
|
def clobber
|
142
152
|
|
143
153
|
end
|
data/lib/base/string.rb
CHANGED
data/lib/base/version.rb
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
class Version
|
2
2
|
def self.read filename
|
3
3
|
return "#{Gem::Specification.load(filename).version.to_s}" if filename.include?('.gemspec')
|
4
|
-
return IO.read(
|
4
|
+
return IO.read(filename).scan(/Version\(\"[\d.]+\"\)/)[0] if filename.include?('AssemblyInfo.cs')
|
5
5
|
'0.0.0'
|
6
6
|
end
|
7
7
|
end
|
data/lib/tasks/add.rb
CHANGED
@@ -17,9 +17,6 @@ class Add < Array
|
|
17
17
|
if(status.include?('?') || status.include?('was not found') || error.include?('was not found'))
|
18
18
|
puts "svn add #{f} --parents"
|
19
19
|
add "svn add #{f} --parents"
|
20
|
-
else
|
21
|
-
#puts "#{status}" if status.strip.length > 0
|
22
|
-
#puts " #{f}" if status.strip.length == 0
|
23
20
|
end
|
24
21
|
end
|
25
22
|
}
|
@@ -28,12 +25,9 @@ class Add < Array
|
|
28
25
|
SOURCE.each{|f|
|
29
26
|
if(File.exists?(f) && File.file?(f))
|
30
27
|
status=`git status #{f} --short`
|
31
|
-
#if status.include?('untracked') || status.include?('modified:')
|
32
28
|
if status.include?('??') || status.include?(' M ')
|
33
29
|
puts "git add #{f} -v"
|
34
30
|
add "git add #{f} -v"
|
35
|
-
else
|
36
|
-
#puts status if status.strip.length > 0
|
37
31
|
end
|
38
32
|
end
|
39
33
|
}
|
data/lib/tasks/analyze.rb
CHANGED
data/lib/tasks/commit.rb
CHANGED
@@ -15,7 +15,7 @@ class Commit < Array
|
|
15
15
|
if(File.exists?('.git') && `git config --list`.include?('user.name='))
|
16
16
|
if(!`git status`.include?('nothing to commit') &&
|
17
17
|
!`git status`.include?('untracked files present'))
|
18
|
-
if(message.length==0)
|
18
|
+
if(message.length==0)
|
19
19
|
if(defined?(REQUIRE_COMMIT_MESSAGE))
|
20
20
|
Commit.reset_commit_message
|
21
21
|
raise "commit.message required to perform commit"
|
@@ -23,11 +23,9 @@ class Commit < Array
|
|
23
23
|
add "git commit -m'all'"
|
24
24
|
end
|
25
25
|
else
|
26
|
-
#add "git commit -a -v -m \"#{File.read('commit.message')}\""
|
27
26
|
add "git commit -a -v --file commit.message"
|
28
27
|
add "<%Commit.reset_commit_message%>"
|
29
28
|
end
|
30
|
-
# add "<%File.open('commit.message','w'){|f|f.write('')}%>"
|
31
29
|
end
|
32
30
|
end
|
33
31
|
if(File.exists?('.svn'))
|
data/lib/tasks/default.rb
CHANGED
@@ -21,7 +21,7 @@ if(!defined?(NO_DEFAULT_TASK))
|
|
21
21
|
Rake::Task["clean"].reenable
|
22
22
|
CLEAN.include('rake.default')
|
23
23
|
puts `git add -A` if(File.exists?('.gitignore'))
|
24
|
-
if(Git.has_changes?)
|
24
|
+
if(Git.has_changes?)
|
25
25
|
puts 'Git changes detected.'
|
26
26
|
puts `git status`
|
27
27
|
[:setup,:build,:test,:add,:commit,:publish,:clean,:push,:pull].each{|task| Rake::Task[task].invoke}
|
data/lib/tasks/doc.rb
CHANGED
data/lib/tasks/info.rb
CHANGED
@@ -1,7 +1,5 @@
|
|
1
1
|
puts __FILE__ if defined?(DEBUG)
|
2
2
|
|
3
|
-
#require_relative 'array.rb'
|
4
|
-
#INFO=Array.new
|
5
3
|
desc 'displays project info'
|
6
4
|
task :info do
|
7
5
|
Environment.info
|
@@ -9,9 +7,5 @@ task :info do
|
|
9
7
|
PROJECT.info
|
10
8
|
puts ' '
|
11
9
|
COMMANDS.info
|
12
|
-
#if(defined?(INFO) && INFO.length > 0)
|
13
|
-
# puts "[:info]" if(!Tasks.quiet)
|
14
|
-
# INFO.each{|l|puts l}
|
15
|
-
#end
|
16
10
|
end
|
17
11
|
|
data/lib/tasks/publish.rb
CHANGED
data/lib/tasks/push.rb
CHANGED
@@ -7,7 +7,7 @@ class Push < Array
|
|
7
7
|
def update
|
8
8
|
if(File.exists?('.git') && `git config --list`.include?('user.name=') && `git branch`.include?('* master'))
|
9
9
|
self << 'git push'
|
10
|
-
self << 'git push --tags'
|
10
|
+
self << 'git push --tags'
|
11
11
|
end
|
12
12
|
end
|
13
13
|
end
|
data/lib/tasks/test.rb
CHANGED
@@ -24,7 +24,6 @@ class Test < Array
|
|
24
24
|
xml_arg="/xml:#{nunit_dll}.TestResults.xml"
|
25
25
|
xml_arg="/xml:\"#{nunit_dll}.TestResults.xml\"" if(nunit_dll.include?(' '))
|
26
26
|
add "#{nunit_arg} #{dll_arg} #{xml_arg}"
|
27
|
-
#add "\"#{Test.nunit_console}\" \"#{Rake.application.original_dir}\\#{nunit_dll}\" /xml:\"#{nunit_dll}.TestResults.xml\""
|
28
27
|
}
|
29
28
|
end
|
30
29
|
|
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.0.
|
4
|
+
version: 2.0.195
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Lou Parslow
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2015-08-
|
11
|
+
date: 2015-08-18 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rake
|
@@ -111,3 +111,4 @@ signing_key:
|
|
111
111
|
specification_version: 4
|
112
112
|
summary: dev
|
113
113
|
test_files: []
|
114
|
+
has_rdoc:
|