docman 0.0.18 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d91c91e2da9dc5481483fc7e9bdbd5483f2690b
-  data.tar.gz: 387e3605485f728f50a760f9800e8c579904a9e4
+  metadata.gz: 5e2b2270da91cbcdc54d9bce217cd8c4969a3cb1
+  data.tar.gz: 613a17b47d5f2315b4fad66ef188b6225b54e598
 SHA512:
-  metadata.gz: 7028de3b0029ac4e81bd537171ad23474573a62fda966c099a747cc4e23c2953ffd2fa6a2198c718a730727e4f87bd0bf50253b95fcfdb0343501c5f818eae43
-  data.tar.gz: 7da3e17324ae345528ae23b4d01d77b86e0a7e9086fd68378eb6413eba60cb07340c93f402e42018e9fdcd6942898fb42a72714f080d20316cfeb09b1cd0a69c
+  metadata.gz: 4a7291fbe5463507e8774a3077dd4a35c81719bb726304dc3c94c083ce207ed044db841df96a3d922ce2378519c97dfea6a072c1730ea6513545f618135c4f7e
+  data.tar.gz: 5cfd599ed2a7edb241a1f5e0a6133b8ec9d243d46c12d1db3fac19f4586d03e9beb08888f890d412dbba37f1f486ca7917a49647a60d0356d544faad7562a4f9

data/bin/bump-version.sh

@@ -77,7 +77,7 @@ if [ -n "$1" ]; then
   echo "type: tag" > info.yaml
   echo "version: $TAG" >> info.yaml
   git add -A
-  git commit -m "[skip] Changed tag to: $TAG" & git push origin ${BRANCH}
-  git checkout -
+  git commit -m "[skip] Changed tag to: $TAG" & git push -u origin ${BRANCH}
+  #git checkout -
   echo ${TAG}
 fi

data/lib/docman/deployers/deployer.rb

@@ -151,7 +151,7 @@ module Docman
       def build_recursive(info = nil)
         info = info ? info : @docroot_config.structure
         build_dir(info)
-        info['children'].each do |child|
+        info['children'].sort.map do |key, child|
           build_recursive(child)
         end
       end

data/lib/docman/docroot_config.rb

@@ -27,7 +27,7 @@ module Docman
     def structure_build(path, prefix = '', parent = nil)
       return unless File.file? File.join(path, 'info.yaml')
 
-      children = []
+      children = {}
       info = YAML::load_file(File.join(path, 'info.yaml'))
       @raw_infos[File.basename path] = YAML::load_file(File.join(path, 'info.yaml'))
       unless info['status'].nil?
@@ -40,8 +40,10 @@ module Docman
       info['build_path'] = prefix
       info['full_build_path'] = File.join(@docroot_dir, prefix)
       info['temp_path'] = File.join(@docroot_dir, 'tmp', info['build_path'])
+      info['states_path'] = File.join(@docroot_dir, 'states', info['build_path'])
       info['name'] = name
       info['parent'] = parent
+      info['order'] = info.has_key?('order') ? info['order'] : 10
       info['children'] = children
 
       i = Docman::Info.new(info)
@@ -56,7 +58,7 @@ module Docman
         if File.directory?(full_path)
           dir_hash = structure_build(full_path, prefix, i)
           unless dir_hash == nil
-            children << dir_hash
+            children[dir_hash['order']] = dir_hash
           end
         end
       end

data/lib/docman/info.rb

@@ -21,7 +21,7 @@ module Docman
           if state.has_key?('source')
             if state['source']['type'] == :retrieve_from_repo
               repo = state['source']['repo'] == :project_repo ? self['repo'] : state['source']['repo']
-              external_state_info = read_yaml_from_file(repo, self['temp_path'], state['source']['branch'], state['source']['file'])
+              external_state_info = read_yaml_from_file(repo, self['states_path'], state['source']['branch'], state['source']['file'])
               state.deep_merge! external_state_info
             end
           end
@@ -30,7 +30,7 @@ module Docman
     end
 
     def read_yaml_from_file(repo, path, version, filename)
-      GitUtil.get(repo, path, 'branch', version, nil, nil, need_rebuild?)
+      GitUtil.get(repo, path, 'branch', version, true, 1, need_rebuild?)
       filepath = File.join(path, filename)
       return YAML::load_file(filepath) if File.file? filepath
       nil
@@ -85,7 +85,7 @@ module Docman
     def set_rebuild_recursive(obj, value)
       obj.need_rebuild[@state_name] = value
       if obj.has_key?('children')
-        obj['children'].each do |info|
+        obj['children'].values.each do |info|
           set_rebuild_recursive(info, value)
         end
       end

data/lib/docman/version.rb

@@ -1,3 +1,3 @@
 module Docman
-  VERSION = "0.0.18"
+  VERSION = "0.0.19"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docman
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
 platform: ruby
 authors:
 - Alexander Tolstikov