dtk-common 0.7.1 → 0.7.2
Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: b269102b7a53c551cfc413179cd3914b27d25e52
|
4
|
+
data.tar.gz: b0109edf59d52e304e14bff93580014c0a7cace2
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: bd1324f1e83226e4ae9b0f98744587ef7061e965139792ac27bef6f3fcf4d24f553920fb1cd45fc72630ca606ef7bc17a828b26184e972b2b4c4c4668b168d76
|
7
|
+
data.tar.gz: 01ddabd85f4597452ee0b64aa62c6da738c7e35156110d9ddc55410f6f86403d740434da60931e946c4ca83b1464da4dc395ca9a2bf084b77207183f13476676
|
data/dtk-common.gemspec
CHANGED
@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
|
|
16
16
|
gem.version = "#{DtkCommon::VERSION}.#{ARGV[3]}".chomp(".")
|
17
17
|
|
18
18
|
gem.add_dependency 'rugged','~> 0.17.0.b7'
|
19
|
-
gem.add_dependency 'dtk-common-core','0.7.
|
19
|
+
gem.add_dependency 'dtk-common-core','0.7.1'
|
20
20
|
gem.add_dependency 'colorize','~> 0.5.8'
|
21
21
|
# gem.add_dependency 'sequel','~> 3.40.0'
|
22
22
|
# gem.add_dependency 'rdoc','~> 3.12'
|
@@ -11,15 +11,16 @@ module DtkCommon; module DSL; class FileParser
|
|
11
11
|
component_modules.each do |component_module,v|
|
12
12
|
new_el = OutputHash.new(:component_module => component_module)
|
13
13
|
parse_error = true
|
14
|
-
if v.kind_of?(InputHash) and v.only_has_keys?(:version,:remote_namespace,:namespace) and not v.empty?()
|
14
|
+
if v.kind_of?(InputHash) and v.only_has_keys?(:version,:remote_namespace,:namespace,:external_ref) and not v.empty?()
|
15
15
|
parse_error = false
|
16
|
-
|
16
|
+
|
17
|
+
namespace = v[:namespace]
|
18
|
+
namespace = v[:remote_namespace] if namespace.empty? # TODO: for legacy
|
19
|
+
|
20
|
+
# to extend module_refs.yaml attributes add code here
|
17
21
|
new_el.merge_non_empty!(:version_info => v[:version])
|
18
|
-
namespace = v[:namespace]
|
19
|
-
namespace = v[:remote_namespace] if namespace.empty? # TODO: for legacy
|
20
|
-
# TODO: change this to new_el.merge_non_empty!(:namespace => namespace) while coordinating with users
|
21
|
-
# of api
|
22
22
|
new_el.merge_non_empty!(:remote_namespace => namespace)
|
23
|
+
new_el.merge_non_empty!(:external_ref => v[:external_ref])
|
23
24
|
elsif v.kind_of?(String)
|
24
25
|
parse_error = false
|
25
26
|
new_el.merge_non_empty!(:version_info => v)
|
@@ -43,16 +44,16 @@ module DtkCommon; module DSL; class FileParser
|
|
43
44
|
end
|
44
45
|
h.merge(cmp_module => Aux.hash_subset(r,OutputArrayToParseHashCols,:no_non_nil => true))
|
45
46
|
end
|
46
|
-
{:component_modules => component_modules}
|
47
|
+
{:component_modules => component_modules}
|
47
48
|
end
|
48
|
-
|
49
|
+
|
49
50
|
OutputArrayToParseHashCols = [{:version_info => :version},:remote_namespace]
|
50
51
|
|
51
52
|
end
|
52
53
|
|
53
54
|
class OutputArray < FileParser::OutputArray
|
54
55
|
def self.keys_for_row()
|
55
|
-
[:component_module,:version_info,:remote_namespace]
|
56
|
+
[:component_module,:version_info,:remote_namespace, :external_ref]
|
56
57
|
end
|
57
58
|
def self.has_required_keys?(hash_el)
|
58
59
|
!hash_el[:component_module].nil?
|
data/lib/dsl/file_parser.rb
CHANGED
@@ -3,7 +3,7 @@ require 'json'
|
|
3
3
|
require 'yaml'
|
4
4
|
|
5
5
|
module DtkCommon
|
6
|
-
module DSL
|
6
|
+
module DSL
|
7
7
|
class Loader
|
8
8
|
include Singleton
|
9
9
|
def self.file_parser(file_type,version=nil)
|
@@ -43,7 +43,7 @@ module DtkCommon
|
|
43
43
|
def default_version(file_type)
|
44
44
|
FileTypeVesisonDefaults[file_type] || 1
|
45
45
|
end
|
46
|
-
FileTypes =
|
46
|
+
FileTypes =
|
47
47
|
[
|
48
48
|
:component_module_refs,
|
49
49
|
:assembly
|
@@ -71,9 +71,8 @@ module DtkCommon
|
|
71
71
|
#TODO: for Rich
|
72
72
|
# we need to implement dsl v3 parser, this is just temp fix for autoimport
|
73
73
|
# just changed parser to yaml instead of json because new modules/services
|
74
|
-
# are in yaml format now
|
74
|
+
# are in yaml format now
|
75
75
|
raw_hash_content = convert_yaml_content_to_hash(file_content,opts)
|
76
|
-
|
77
76
|
return raw_hash_content if raw_hash_content.is_a?(ErrorUsage::DSLParsing::JSONParsing)
|
78
77
|
|
79
78
|
file_parser.parse_hash_content_aux(raw_hash_content)
|
@@ -168,7 +167,7 @@ module DtkCommon
|
|
168
167
|
ret = Hash.new
|
169
168
|
return ret if content.empty?
|
170
169
|
|
171
|
-
begin
|
170
|
+
begin
|
172
171
|
YAML.load(content)
|
173
172
|
rescue Exception => e
|
174
173
|
return ErrorUsage::DSLParsing::JSONParsing.new("YAML parsing error #{e.to_s} in file", opts[:file_path]) if opts[:do_not_raise]
|
@@ -182,7 +181,7 @@ module DtkCommon
|
|
182
181
|
return ret
|
183
182
|
end
|
184
183
|
|
185
|
-
begin
|
184
|
+
begin
|
186
185
|
::JSON.parse(json_file_content)
|
187
186
|
rescue ::JSON::ParserError => e
|
188
187
|
# raise ErrorUsage::JSONParse.new(e.to_s)
|
data/lib/dtk-common/version.rb
CHANGED
data/lib/gitolite/utils.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: dtk-common
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.7.
|
4
|
+
version: 0.7.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Rich PELAVIN
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2015-
|
11
|
+
date: 2015-04-08 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rugged
|
@@ -30,14 +30,14 @@ dependencies:
|
|
30
30
|
requirements:
|
31
31
|
- - '='
|
32
32
|
- !ruby/object:Gem::Version
|
33
|
-
version: 0.7.
|
33
|
+
version: 0.7.1
|
34
34
|
type: :runtime
|
35
35
|
prerelease: false
|
36
36
|
version_requirements: !ruby/object:Gem::Requirement
|
37
37
|
requirements:
|
38
38
|
- - '='
|
39
39
|
- !ruby/object:Gem::Version
|
40
|
-
version: 0.7.
|
40
|
+
version: 0.7.1
|
41
41
|
- !ruby/object:Gem::Dependency
|
42
42
|
name: colorize
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|