dev 1.0.214 → 1.0.217
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/dev/Paths.rb +1 -1
- data/lib/dev/Project.rb +2 -23
- data/lib/dev/Scm.rb +21 -0
- data/lib/dev/cmd/Commit.rb +1 -10
- data/lib/dev/cmd/Replace.rb +2 -1
- data/lib/dev/cmd/Test.rb +3 -2
- data/lib/dev.rb +1 -1
- metadata +1 -1
data/lib/dev/Paths.rb
CHANGED
@@ -30,7 +30,7 @@ class Paths < Hash
|
|
30
30
|
nunit=""
|
31
31
|
nunitx86=""
|
32
32
|
|
33
|
-
["2.6.0.12051/bin","2.5.10.11092/bin/net-2.0"].each{ |v|
|
33
|
+
["2.6.3/bin","2.6.0.12051/bin","2.5.10.11092/bin/net-2.0"].each{ |v|
|
34
34
|
if nunit.length==0
|
35
35
|
Dir.glob("#{Dev::Environment.dev_root}/dep/*/NUnit/#{v}/nunit-console.exe").each{|f|
|
36
36
|
if nunit.length==0
|
data/lib/dev/Project.rb
CHANGED
@@ -16,9 +16,9 @@ class Project < Hash
|
|
16
16
|
system_call = Dev::SystemCall.new("semver init") if(!File.exist?(".semver"))
|
17
17
|
h=Hash.new
|
18
18
|
puts_debug "Dev::Project.defaults :scm_uri"
|
19
|
-
h[:scm_uri] = get_default_scm_uri if !get_default_scm_uri.nil?
|
19
|
+
h[:scm_uri] = Scm.get_default_scm_uri if !Scm.get_default_scm_uri.nil?
|
20
20
|
puts_debug "Dev::Project.defaults :scm_type"
|
21
|
-
h[:scm_type] = get_default_scm_type if !get_default_scm_type.nil?
|
21
|
+
h[:scm_type] = Scm.get_default_scm_type if !Scm.get_default_scm_type.nil?
|
22
22
|
h[:directory]=Rake.original_dir()
|
23
23
|
h[:fullname]=get_default_value_fullname
|
24
24
|
h[:group]=get_default_value_group
|
@@ -92,27 +92,6 @@ class Project < Hash
|
|
92
92
|
return "ruby"
|
93
93
|
end
|
94
94
|
|
95
|
-
def get_default_scm_type
|
96
|
-
call=Dev::SystemCall.new("svn info")
|
97
|
-
return "svn" if call.output.include?("Last Changed Date:")
|
98
|
-
return "svn" if File.exists?(".svn")
|
99
|
-
call=Dev::SystemCall.new("git status")
|
100
|
-
return "git" if call.output.include?("#")
|
101
|
-
return "git" if File.exists?(".git")
|
102
|
-
return nil
|
103
|
-
end
|
104
|
-
|
105
|
-
def get_default_scm_uri
|
106
|
-
|
107
|
-
if File.exists?(".svn")
|
108
|
-
text=`svn info`
|
109
|
-
text.scan(/URL: ([\w:\/.-]+)/).each { |m|
|
110
|
-
return m
|
111
|
-
}
|
112
|
-
end
|
113
|
-
return nil
|
114
|
-
end
|
115
|
-
|
116
95
|
def loc_cmd
|
117
96
|
cmd="countloc --recurse ."
|
118
97
|
cmd="countloc --recurse --mode ruby ." if self[:type]=="ruby" || self[:type]=="gem"
|
data/lib/dev/Scm.rb
CHANGED
@@ -95,6 +95,27 @@ class Scm
|
|
95
95
|
|
96
96
|
def self.update(local)
|
97
97
|
end
|
98
|
+
|
99
|
+
def self.get_default_scm_uri
|
100
|
+
|
101
|
+
text=`svn info`
|
102
|
+
if(!text.include?("not a working copy"))
|
103
|
+
text.scan(/URL: ([\w:\/.-]+)/).each { |m|
|
104
|
+
return m
|
105
|
+
}
|
106
|
+
end
|
107
|
+
return nil
|
108
|
+
end
|
109
|
+
|
110
|
+
def self.get_default_scm_type
|
111
|
+
call=Dev::SystemCall.new("svn info")
|
112
|
+
return "svn" if call.output.include?("Last Changed Date:")
|
113
|
+
return "svn" if File.exists?(".svn")
|
114
|
+
call=Dev::SystemCall.new("git status")
|
115
|
+
return "git" if call.output.include?("#")
|
116
|
+
return "git" if File.exists?(".git")
|
117
|
+
return nil
|
118
|
+
end
|
98
119
|
|
99
120
|
end # class Scm
|
100
121
|
end # module Dev
|
data/lib/dev/cmd/Commit.rb
CHANGED
@@ -4,7 +4,7 @@ class Commit < Array
|
|
4
4
|
def refresh
|
5
5
|
strip_auto_entries
|
6
6
|
File.open('commit.message','w'){|f|f.puts "commit all"} if !File.exists?('commit.message')
|
7
|
-
scm_type = get_default_scm_type
|
7
|
+
scm_type = Scm.get_default_scm_type
|
8
8
|
if scm_type == "svn"
|
9
9
|
self << "{:cmd=>'svn commit -F commit.message',:auto=>true}"
|
10
10
|
else
|
@@ -15,15 +15,6 @@ class Commit < Array
|
|
15
15
|
end
|
16
16
|
end
|
17
17
|
|
18
|
-
def get_default_scm_type
|
19
|
-
call=Dev::SystemCall.new("svn info")
|
20
|
-
return "svn" if call.output.include?("Last Changed Date:")
|
21
|
-
return "svn" if File.exists?(".svn")
|
22
|
-
call=Dev::SystemCall.new("git status")
|
23
|
-
return "git" if call.output.include?("#")
|
24
|
-
return "git" if File.exists?(".git")
|
25
|
-
return nil
|
26
|
-
end
|
27
18
|
end # class Compile
|
28
19
|
end # module Cmd
|
29
20
|
end # module Dev
|
data/lib/dev/cmd/Replace.rb
CHANGED
@@ -9,7 +9,8 @@ class Replace < Hash
|
|
9
9
|
}
|
10
10
|
|
11
11
|
# auto generate replace entry based on dep values
|
12
|
-
if File.exists?(".svn") || File.exists?(".git")
|
12
|
+
#if File.exists?(".svn") || File.exists?(".git")
|
13
|
+
if(Scm.get_default_scm_type == "svn" || Scm.get_default_scm_type =="git")
|
13
14
|
["vcxproj","csproj"].each { |ext|
|
14
15
|
if(Dir.glob("**/*.#{ext}").count > 0)
|
15
16
|
puts_debug "Dev::Cmd::Replace.refresh found file with extension #{ext}"
|
data/lib/dev/cmd/Test.rb
CHANGED
@@ -13,10 +13,11 @@ class Test < Array
|
|
13
13
|
self << "{:cmd=>'gem install #{gs.gsub('.gemspec','')}-#{DEV[:version]}.gem', :capture_output=>true, :auto=>true}"
|
14
14
|
}
|
15
15
|
|
16
|
-
Dir.glob("
|
16
|
+
Dir.glob("**/*.{Test.csproj,Features.csproj}").each { |cs|
|
17
17
|
platforms=Dev::MsBuild.extract_platforms(cs)
|
18
18
|
platforms.each { |platform|
|
19
|
-
|
19
|
+
proj_path=File.dirname(cs)
|
20
|
+
dll_name="#{proj_path}/bin/#{platform}/Release/#{File.basename(cs,'.csproj')}.dll"
|
20
21
|
if platform=="x86"
|
21
22
|
self << "{:cmd=> '<paths,nunitx86> /xml:#{dll_name}.nunit-results.xml #{dll_name}', :auto=>true, :capture_output=>true, :capture_error=>true}" if RUBY_PLATFORM.include?("w32")
|
22
23
|
self << "{:cmd-> 'mono <paths,nunitx86> #{dll_name}', :auto=>true}" if !RUBY_PLATFORM.include?("w32")
|
data/lib/dev.rb
CHANGED
@@ -39,7 +39,7 @@ end
|
|
39
39
|
|
40
40
|
puts_debug "read " + __FILE__.foreground(:green)
|
41
41
|
|
42
|
-
["Environment","Array","Hash","SystemCall","MsBuild","Paths","Dep","Deps","Database","BoostBuild","Project","Commands","Tasks"].each{ |f| require "#{File.dirname(__FILE__)}/dev/#{f}.rb" }
|
42
|
+
["Environment","Array","Hash","SystemCall","Scm","MsBuild","Paths","Dep","Deps","Database","BoostBuild","Project","Commands","Tasks"].each{ |f| require "#{File.dirname(__FILE__)}/dev/#{f}.rb" }
|
43
43
|
Dir["#{File.dirname(__FILE__)}/dev/**/*.rb"].each{ |f| require f }
|
44
44
|
|
45
45
|
DEV_ROOT=Dev::Environment.dev_root
|