docman 0.0.86 → 0.0.87

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6234e6919844d4f9e7546fcecb7e58711d9bab64
-  data.tar.gz: 8c25759cc79929d0f825d0980f88c16bdd59ce4a
+  metadata.gz: 03255c785f6091860d96ade58f4fedb79a90e202
+  data.tar.gz: 8a286ef146bfce8751c0bfdf9174dd11d51c9699
 SHA512:
-  metadata.gz: 4bbfae6415164b4e058df0bdef17a1a85a872c358f298eaa97700f029412901223238b6b2eabaf6d1459b19347b04bde21ba7e5bcd045b1074232a8058fc76f8
-  data.tar.gz: 70bdefd68d94284c1c74e8db6b5658e15ca6498835421e739fc0c13b55f3e80c277eafced2a15b4234b9b625521152e4a33e04b233049d87d52d5cf0476e17c0
+  metadata.gz: 6106b522056fa9001c4fcdd12a05c11c66d69857167d6faa4f500e1f1aa522e41085acc91e1c7237bade6d127f3ae83d0a187d474d645e330708cac4ca0e3848
+  data.tar.gz: '042814f4d6a523fb8d50f613859bc8baa053d667b5d6f51123d5b51096fec6e4aff37795997d2394478886c4dcb6ea94d71c4f0eac3fa22093a97e8d05b8c568'

data/.gitignore

@@ -21,3 +21,4 @@ tmp
 *.a
 mkmf.log
 .idea
+.project

data/lib/docman/docroot_config.rb

@@ -45,7 +45,7 @@ module Docman
       if File.directory? master_file
         @structure = structure_build(File.join(@docroot_config_dir, 'master'))
       else
-        @structure = structure_build_from_config_file(File.join(@docroot_config_dir, 'master'))
+        @structure = structure_build_from_config_file(Docman::Application.instance.config)
       end
     end
 
@@ -56,12 +56,17 @@ module Docman
       GitUtil.update @docroot_config_dir, "#{options} #{branch.strip}"
     end
 
-    def structure_build_from_config_file(path, prefix = '', parent = nil, parent_key = 'master')
-      config = Docman::Application.instance.config
+    def structure_build_from_config_file(config, prefix = '', parent = nil, parent_key = 'master')
       return if config['components'][parent_key].nil?
       children = []
 
       info = config['components'][parent_key]
+
+      children_components_config = nil
+      unless info['components'].nil?
+        children_components_config = {'components' => info.delete('components')}
+      end
+
       @raw_infos[parent_key] = info
 
       unless info['status'].nil?
@@ -70,7 +75,7 @@ module Docman
 
       name = parent_key
       prefix = prefix.size > 0 ? File.join(prefix, name) : name
-      info['full_path'] = path
+      info['full_path'] = @docroot_config_dir
       info['docroot_config'] = self
       info['build_path'] = prefix
       info['full_build_path'] = File.join(@docroot_dir, prefix)
@@ -91,16 +96,11 @@ module Docman
 
       @names[name.to_s] = i
 
-      # Dir.foreach(path) do |entry|
-      #   next if (entry == '..' || entry == '.')
-      #   full_path = File.join(path, entry)
-      #   if File.directory?(full_path)
-      #     dir_hash = structure_build(full_path, prefix, i)
-      #     unless dir_hash == nil
-      #       children << dir_hash
-      #     end
-      #   end
-      # end
+      unless children_components_config.nil?
+        children_components_config['components'].each {|name, config|
+          children << structure_build_from_config_file(children_components_config, prefix, i, name)
+        }
+      end
       i
     end
 

data/lib/docman/version.rb

@@ -1,3 +1,3 @@
 module Docman
-  VERSION = "0.0.86"
+  VERSION = "0.0.87"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docman
 version: !ruby/object:Gem::Version
-  version: 0.0.86
+  version: 0.0.87
 platform: ruby
 authors:
 - Alexander Tolstikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-18 00:00:00.000000000 Z
+date: 2017-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler