dtk-common 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1b9f77bf551411b6a1440ff76b5ad5aa063876c
-  data.tar.gz: c9d57c4a20f67ff82ae08ef9a707a5ca17dee5e8
+  metadata.gz: b269102b7a53c551cfc413179cd3914b27d25e52
+  data.tar.gz: b0109edf59d52e304e14bff93580014c0a7cace2
 SHA512:
-  metadata.gz: 9ca723c3d0dfcdd3a6682cb210bcf87895ad623e56b4135a2c17fb2a5db6536a76d6d02a0335828b617611ac592ac4fc1a5a7724259956070db6d706dc036655
-  data.tar.gz: 6336b19b0b40c010a2377f3b920e4081fc76fbfe1ccef6b887199119933a8a1fb986086f05e63ab0985b0c4c4769db415a307723b7565848bd6fbc40fc37ba32
+  metadata.gz: bd1324f1e83226e4ae9b0f98744587ef7061e965139792ac27bef6f3fcf4d24f553920fb1cd45fc72630ca606ef7bc17a828b26184e972b2b4c4c4668b168d76
+  data.tar.gz: 01ddabd85f4597452ee0b64aa62c6da738c7e35156110d9ddc55410f6f86403d740434da60931e946c4ca83b1464da4dc395ca9a2bf084b77207183f13476676

data/dtk-common.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
   gem.version       = "#{DtkCommon::VERSION}.#{ARGV[3]}".chomp(".")
 
   gem.add_dependency 'rugged','~> 0.17.0.b7'
-  gem.add_dependency 'dtk-common-core','0.7.0'
+  gem.add_dependency 'dtk-common-core','0.7.1'
   gem.add_dependency 'colorize','~> 0.5.8'
   # gem.add_dependency 'sequel','~> 3.40.0'
   # gem.add_dependency 'rdoc','~> 3.12'

data/lib/dsl/file_parser/file_types/component_module_refs/v1/component_module_refs.rb

@@ -11,15 +11,16 @@ module DtkCommon; module DSL; class FileParser
         component_modules.each do |component_module,v|
           new_el = OutputHash.new(:component_module => component_module)
           parse_error = true
-          if v.kind_of?(InputHash) and v.only_has_keys?(:version,:remote_namespace,:namespace) and not v.empty?()
+          if v.kind_of?(InputHash) and v.only_has_keys?(:version,:remote_namespace,:namespace,:external_ref) and not v.empty?()
             parse_error = false
-            # v[index] if index not found returns empty InputHash, not nil
+
+            namespace    = v[:namespace]
+            namespace    = v[:remote_namespace] if namespace.empty? # TODO: for legacy
+
+            # to extend module_refs.yaml attributes add code here
             new_el.merge_non_empty!(:version_info => v[:version])
-            namespace = v[:namespace]
-            namespace = v[:remote_namespace] if namespace.empty? # TODO: for legacy
-            # TODO: change this to new_el.merge_non_empty!(:namespace => namespace) while coordinating with users
-            # of api
             new_el.merge_non_empty!(:remote_namespace => namespace)
+            new_el.merge_non_empty!(:external_ref => v[:external_ref])
           elsif v.kind_of?(String)
             parse_error = false
             new_el.merge_non_empty!(:version_info => v)
@@ -43,16 +44,16 @@ module DtkCommon; module DSL; class FileParser
           end
           h.merge(cmp_module => Aux.hash_subset(r,OutputArrayToParseHashCols,:no_non_nil => true))
         end
-        {:component_modules => component_modules} 
+        {:component_modules => component_modules}
       end
-      
+
       OutputArrayToParseHashCols = [{:version_info => :version},:remote_namespace]
 
     end
 
     class OutputArray < FileParser::OutputArray
       def self.keys_for_row()
-        [:component_module,:version_info,:remote_namespace]
+        [:component_module,:version_info,:remote_namespace, :external_ref]
       end
       def self.has_required_keys?(hash_el)
         !hash_el[:component_module].nil?

data/lib/dsl/file_parser.rb

@@ -3,7 +3,7 @@ require 'json'
 require 'yaml'
 
 module DtkCommon
-  module DSL             
+  module DSL
     class Loader
       include Singleton
       def self.file_parser(file_type,version=nil)
@@ -43,7 +43,7 @@ module DtkCommon
       def default_version(file_type)
         FileTypeVesisonDefaults[file_type] || 1
       end
-      FileTypes = 
+      FileTypes =
         [
          :component_module_refs,
          :assembly
@@ -71,9 +71,8 @@ module DtkCommon
         #TODO: for Rich
         # we need to implement dsl v3 parser, this is just temp fix for autoimport
         # just changed parser to yaml instead of json because new modules/services
-        # are in yaml format now 
+        # are in yaml format now
         raw_hash_content = convert_yaml_content_to_hash(file_content,opts)
-        
         return raw_hash_content if raw_hash_content.is_a?(ErrorUsage::DSLParsing::JSONParsing)
 
         file_parser.parse_hash_content_aux(raw_hash_content)
@@ -168,7 +167,7 @@ module DtkCommon
         ret = Hash.new
         return ret if content.empty?
 
-        begin 
+        begin
           YAML.load(content)
         rescue Exception => e
           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
           return ret
         end
 
-        begin 
+        begin
           ::JSON.parse(json_file_content)
         rescue ::JSON::ParserError => e
           # raise ErrorUsage::JSONParse.new(e.to_s)

data/lib/dtk-common/version.rb

@@ -1,3 +1,3 @@
 module DtkCommon
-  VERSION="0.7.1"
+  VERSION="0.7.2"
 end

data/lib/gitolite/utils.rb

@@ -47,7 +47,7 @@ module Gitolite
       elsif permission.match(/^RWDP?/)
         return "RW+"
       elsif permission.match(/^RW/)
-        return "RW"
+        return "RW+"
       elsif permission.match(/^R/)
         return 'R'
       else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtk-common
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Rich PELAVIN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-12 00:00:00.000000000 Z
+date: 2015-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement