rakeoe 0.0.8 → 0.0.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. data/lib/rakeoe/binary_base.rb +16 -10
  2. data/lib/rakeoe/key_value_reader.rb +10 -8
  3. data/lib/rakeoe/toolchain.rb +2 -1
  4. data/lib/rakeoe/version.rb +1 -1
  5. metadata +32 -20
  6. checksums.yaml +0 -7
data/lib/rakeoe/binary_base.rb CHANGED
@@ -67,28 +67,34 @@ module RakeOE
67
67
  @srcs.uniq!
68
68
  end
69
69
 
70
+ if (@settings['TEST_FRAMEWORK'].nil? or @settings['TEST_FRAMEWORK'].empty?)
71
+ @test_fw = @tc.default_test_framework
72
+ else
73
+ @test_fw = @tc.test_framework(@settings['TEST_FRAMEWORK'])
74
+ end
75
+
70
76
  @objs = @srcs.map {|file| source_to_obj(file, @src_dir, @build_dir)}
71
- @test_objs = @test_srcs.map {|file| source_to_obj(file, @src_dir, @build_dir)}
72
77
  @deps = @objs.map {|obj| obj.ext('.d')}
73
- @test_deps = @test_objs.map {|obj| obj.ext('.d')}
78
+ if has_tests?
79
+ @test_objs = @test_srcs.map {|file| source_to_obj(file, @src_dir, @build_dir)}
80
+ @test_deps = @test_objs.map {|obj| obj.ext('.d')}
81
+ load_deps(@test_deps)
82
+ @test_inc_dirs = @settings['TEST_SOURCE_DIRS'].empty? ? '' : @test_fw.include.join(' ')
83
+ else
84
+ @test_objs = []
85
+ @test_deps = []
86
+ @test_inc_dirs = ''
87
+ end
74
88
 
75
89
  # load dependency files if already generated
76
90
  load_deps(@deps)
77
- load_deps(@test_deps)
78
91
 
79
92
  # all objs are dependent on project file and platform file
80
93
  (@objs+@test_objs).each do |obj|
81
94
  file obj => [@settings['PRJ_FILE'], @tc.config.platform]
82
95
  end
83
96
 
84
- if (@settings['TEST_FRAMEWORK'].nil? or @settings['TEST_FRAMEWORK'].empty?)
85
- @test_fw = @tc.default_test_framework
86
- else
87
- @test_fw = @tc.test_framework(@settings['TEST_FRAMEWORK'])
88
- end
89
-
90
97
  @test_binary = "#{bin_dir}/#{name}-test"
91
- @test_inc_dirs = @settings['TEST_SOURCE_DIRS'].empty? ? '' : @test_fw.include.join(' ')
92
98
 
93
99
  handle_prj_type
94
100
  handle_qt if '1' == @settings['USE_QT']
data/lib/rakeoe/key_value_reader.rb CHANGED
@@ -74,19 +74,21 @@ class KeyValueReader
74
74
  key.gsub!(/["']*/, '')
75
75
  key.strip!
76
76
 
77
- unless value.empty?
77
+ if value.empty?
78
+ if prev_key && !line.include?('=')
79
+ # multiline value: treat key as value and add to previous found key
80
+ env[prev_key] = "#{env[prev_key]} #{key}"
81
+ end
82
+ else
78
83
  prev_key = key
79
84
  # We could have split multiple '=' in one line.
80
85
  # Put back any "=" in the value part
81
86
  # and concatenate split strings
82
- val = value.join('=')
83
- val.gsub!(/["'\n]*/, '')
87
+ val = value.join('=').strip
88
+ val.gsub!(/^["']*/, '')
89
+ val.gsub!(/["']$/, '')
90
+ val.gsub!(/[\n]*/, '')
84
91
  env[key] = val.strip
85
- else
86
- if prev_key && !line.include?('=')
87
- # multiline value: treat key as value and add to previous found key
88
- env[prev_key] = "#{env[prev_key]} #{key}"
89
- end
90
92
  end
91
93
 
92
94
  end
data/lib/rakeoe/toolchain.rb CHANGED
@@ -222,7 +222,8 @@ class Toolchain
222
222
  end
223
223
 
224
224
  # Executes the command
225
- def sh(cmd, silent: false)
225
+ def sh(cmd, silent = false)
226
+
226
227
  if RbConfig::CONFIG["host_os"] != "mingw32"
227
228
  full_cmd = "export PATH=#{@settings['PATH']} && #{cmd}"
228
229
  else
data/lib/rakeoe/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module RakeOE
2
- VERSION = '0.0.8'
2
+ VERSION = '0.0.9'
3
3
  end
metadata CHANGED
@@ -1,86 +1,97 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rakeoe
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.8
4
+ version: 0.0.9
5
+ prerelease:
5
6
  platform: ruby
6
7
  authors:
7
8
  - Daniel Schnell
8
9
  autorequire:
9
10
  bindir: bin
10
11
  cert_chain: []
11
- date: 2014-05-13 00:00:00.000000000 Z
12
+ date: 2014-05-19 00:00:00.000000000 Z
12
13
  dependencies:
13
14
  - !ruby/object:Gem::Dependency
14
15
  name: bundler
15
16
  requirement: !ruby/object:Gem::Requirement
17
+ none: false
16
18
  requirements:
17
- - - "~>"
19
+ - - ~>
18
20
  - !ruby/object:Gem::Version
19
21
  version: '1.3'
20
22
  type: :development
21
23
  prerelease: false
22
24
  version_requirements: !ruby/object:Gem::Requirement
25
+ none: false
23
26
  requirements:
24
- - - "~>"
27
+ - - ~>
25
28
  - !ruby/object:Gem::Version
26
29
  version: '1.3'
27
30
  - !ruby/object:Gem::Dependency
28
31
  name: rake
29
32
  requirement: !ruby/object:Gem::Requirement
33
+ none: false
30
34
  requirements:
31
- - - ">="
35
+ - - ! '>='
32
36
  - !ruby/object:Gem::Version
33
37
  version: '0'
34
38
  type: :development
35
39
  prerelease: false
36
40
  version_requirements: !ruby/object:Gem::Requirement
41
+ none: false
37
42
  requirements:
38
- - - ">="
43
+ - - ! '>='
39
44
  - !ruby/object:Gem::Version
40
45
  version: '0'
41
46
  - !ruby/object:Gem::Dependency
42
47
  name: rspec
43
48
  requirement: !ruby/object:Gem::Requirement
49
+ none: false
44
50
  requirements:
45
- - - ">="
51
+ - - ! '>='
46
52
  - !ruby/object:Gem::Version
47
53
  version: '0'
48
54
  type: :development
49
55
  prerelease: false
50
56
  version_requirements: !ruby/object:Gem::Requirement
57
+ none: false
51
58
  requirements:
52
- - - ">="
59
+ - - ! '>='
53
60
  - !ruby/object:Gem::Version
54
61
  version: '0'
55
62
  - !ruby/object:Gem::Dependency
56
63
  name: factory_girl
57
64
  requirement: !ruby/object:Gem::Requirement
65
+ none: false
58
66
  requirements:
59
- - - "~>"
67
+ - - ~>
60
68
  - !ruby/object:Gem::Version
61
69
  version: '4.0'
62
70
  type: :development
63
71
  prerelease: false
64
72
  version_requirements: !ruby/object:Gem::Requirement
73
+ none: false
65
74
  requirements:
66
- - - "~>"
75
+ - - ~>
67
76
  - !ruby/object:Gem::Version
68
77
  version: '4.0'
69
78
  - !ruby/object:Gem::Dependency
70
79
  name: rake
71
80
  requirement: !ruby/object:Gem::Requirement
81
+ none: false
72
82
  requirements:
73
- - - ">="
83
+ - - ! '>='
74
84
  - !ruby/object:Gem::Version
75
85
  version: '0'
76
86
  type: :runtime
77
87
  prerelease: false
78
88
  version_requirements: !ruby/object:Gem::Requirement
89
+ none: false
79
90
  requirements:
80
- - - ">="
91
+ - - ! '>='
81
92
  - !ruby/object:Gem::Version
82
93
  version: '0'
83
- description: "Rake Optimized for Embedded: RakeOE is a build system for application/library
94
+ description: ! "Rake Optimized for Embedded: RakeOE is a build system for application/library
84
95
  development.\n RakeOE utilizes the power of Rake and the
85
96
  easyness of Ruby to make build management for\n embedded
86
97
  C/C++ development as easy and straight-forward as possible.\n It's
@@ -92,7 +103,7 @@ executables: []
92
103
  extensions: []
93
104
  extra_rdoc_files: []
94
105
  files:
95
- - ".gitignore"
106
+ - .gitignore
96
107
  - Gemfile
97
108
  - LICENSE
98
109
  - README.md
@@ -125,27 +136,28 @@ files:
125
136
  homepage: http://rakeoe.github.io/rakeoe/
126
137
  licenses:
127
138
  - GPLv3
128
- metadata: {}
129
139
  post_install_message:
130
140
  rdoc_options: []
131
141
  require_paths:
132
142
  - lib
133
143
  required_ruby_version: !ruby/object:Gem::Requirement
144
+ none: false
134
145
  requirements:
135
- - - ">="
146
+ - - ! '>='
136
147
  - !ruby/object:Gem::Version
137
148
  version: '0'
138
149
  required_rubygems_version: !ruby/object:Gem::Requirement
150
+ none: false
139
151
  requirements:
140
- - - ">="
152
+ - - ! '>='
141
153
  - !ruby/object:Gem::Version
142
154
  version: '0'
143
155
  requirements: []
144
156
  rubyforge_project:
145
- rubygems_version: 2.0.14
157
+ rubygems_version: 1.8.23.2
146
158
  signing_key:
147
- specification_version: 4
148
- summary: 'Rake Optimized for Embedded: build system for test driven Embedded C/C++
159
+ specification_version: 3
160
+ summary: ! 'Rake Optimized for Embedded: build system for test driven Embedded C/C++
149
161
  Development based on Ruby Rake.'
150
162
  test_files:
151
163
  - spec/factories.rb
checksums.yaml DELETED
@@ -1,7 +0,0 @@
1
- ---
2
- SHA1:
3
- metadata.gz: 3e86c7488b09a2adbd7eb607162e5301d0f9d5cc
4
- data.tar.gz: 0e553eaa97e2a661b5cd994f702e084cd1ba96ff
5
- SHA512:
6
- metadata.gz: 07da39a5f073ec28a06cc956b7d2a5bef9b269daf380426506a1f2723626c86b3668c75c182660f92ec9aef1face0d923d356e45b3df2c2960d574c14bed5f63
7
- data.tar.gz: 1474b08247648bc36072129cbd8a61c3358212ad32cd751ae77cf4145eabf98f182ae4bb2b829d8bbfa266259725831b33bda776a294d25b8c2c58236b5fadac