docman 0.0.83 → 0.0.84

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa5406c9a38d244a708862e0387d24fb5f59eba5
-  data.tar.gz: aeac1767cd0ba692633103ec897d3d45efad0e8d
+  metadata.gz: 80578901d1ae0de8b772d64bc2fc60377efd4c79
+  data.tar.gz: b3a0a76aaea7b08d1b65d176ee592a2e5d9890df
 SHA512:
-  metadata.gz: a27b712bdb4ae70c9d74817b103d08fd76faa6b97475f93b8c7ff66ee5ded5008192b151f61a9a6e7cd55cbe4828ded8e63b441861d28bda4c9259cbed34b3bd
-  data.tar.gz: 1338af6f475474f42ab94330d38cfb6eeb18c8ad7d080fd27d389f34aaf69a4ccafb990a313e9bbb5826800c63a4820347386788778551c6029881260c8f5875
+  metadata.gz: f31180892abc6e90eb00e16647fc2ea7b927aba9c68d3836aded44e9dffd8c1d5f62edff882d7510a1e6978089f0c70fa88fca9212fd881f3d1e9987452d3fc0
+  data.tar.gz: '0380ad7bc61bf16e81b4a1b4127d0790e9b1bab8c23d17dbf534fe59f53adaa5f91c6311e4741b5d6f0047b9370890b163733492205e51d6e2823e8f9da74b51'

data/config/config.yaml

@@ -1,4 +1,25 @@
 ---
+uniconf:
+  1:
+    keys:
+      include: scenarios
+      sources: scenarioSources
+      params: params
+      jobs: jobs
+    dirs:
+      sources: scenarios
+    include:
+      prefix: .params.
+  2:
+    keys:
+      include: from
+      sources: sources
+      params: params
+      jobs: jobs
+    dirs:
+      sources: scenarios
+    include:
+      prefix: .params.
 # common hooks used in deploy targets below
 common_hooks:
   - &execute_yaml_file

data/lib/application.rb

@@ -226,12 +226,18 @@ module Docman
 
     def config_dirs(options)
       config_dirs = []
-      if options[:config_dir]
-        config_dirs = options[:config_dir].split(',')
+      if options.key? :config_dir
+        config_dirs_cli = options[:config_dir].split(',')
+        config_dirs_cli.each { |dir|
+          config_dirs.push(File.join(dir, '.unipipe'))
+          config_dirs.push(File.join(dir, '.drupipe'))
+          config_dirs.push('')
+        }
+      else
+        config_dirs.push('.unipipe')
+        config_dirs.push('.drupipe')
+        config_dirs.push('')
       end
-      config_dirs.push('.unipipe')
-      config_dirs.push('.drupipe')
-      config_dirs.push('')
       config_dirs
     end
 

data/lib/docman/commands/yaml_execute_cmd.rb

@@ -21,26 +21,38 @@ module Docman
             commands = nil
             if self['source_type'] == 'file'
               yaml_file_name = self['yaml_file_name'].nil? ? '{unipipe,.unipipe,drupipe,.drupipe,build,.build}.{yaml,yml}' : self['yaml_file_name']
-              build_file = Dir.glob([File.join(@context['docroot_config'].config_dir, yaml_file_name), File.join(@context['full_build_path'], yaml_file_name)]).first
+              search_pathes = []
+              if @context['name'] == 'master'
+                search_pathes.push File.join(@context['docroot_config'].config_dir, yaml_file_name)
+              end
+              search_pathes.push File.join(@context['full_build_path'], yaml_file_name)
+              build_file = Dir.glob(search_pathes).first
               if not build_file.nil?
                 build_file_yaml = YAML::load_file(build_file)
                 commands = build_file_yaml[self['stage']]
                 source = yaml_file_name
               end
             end
+            chdir = ''
             if self['source_type'] == 'inline'
               commands = self['commands']
               source = 'inline'
+              if self.has_key?('exec_dir')
+                chdir = self['exec_dir']
+              end
             end
+            chdir_full = File.join(@context['full_build_path'], chdir)
+            Dir.chdir chdir_full
             unless commands.nil?
               commands.each do |cmd|
-                logger.info "Execute from #{source}: #{cmd}"
+                logger.info "Execute in #{chdir_full} from #{source}: #{cmd}"
                 logger.info `#{cmd}`
                 if $?.exitstatus > 0
                   raise "Command #{cmd} was failed"
                 end
               end
             end
+            Dir.chdir @context['full_build_path']
           end
         end
       end

data/lib/docman/config.rb

@@ -24,20 +24,51 @@ module Docman
       @unmutable_config = Marshal::load(Marshal.dump(@config))
     end
 
+    def normalize_config(config)
+      temp_config = {}
+      @config['uniconf'][@config_version]['keys'].each{|key,value|
+        temp_config[value]
+        (1..@config_version).each {|version|
+          if config.has_key?(@config['uniconf'][version]['keys'][key])
+            tc = {}
+            tc[value] = config[@config['uniconf'][version]['keys'][key]]
+            config.delete(@config['uniconf'][version]['keys'][key])
+            temp_config.deep_merge!(tc)
+          end
+        }
+      }
+      return temp_config.deep_merge!(config)
+    end
+
     def merge_config_from_file(docroot_dir, docroot_config_dir, config_file, options = nil)
       file = File.join(docroot_config_dir, config_file)
       if File.file?(file)
-        config = YAML::load_file(file)
-        if config['scenarios']
+        yaml = YAML::load_file(file)
+        @config_version = 1
+        if yaml.has_key?('config_version')
+          @config_version = yaml['config_version']
+        end
+        config = normalize_config(yaml)
+        if config.has_key?(@config['uniconf'][@config_version]['keys']['include'])
           scenarios_path = File.join(docroot_dir, '.docman/scenarios')
           `rm -fR #{scenarios_path}` if File.directory? scenarios_path
           `mkdir -p #{scenarios_path}`
-          unless config['scenarioSources']
-            config['scenarioSources'] = {}
+          unless config.has_key?(@config['uniconf'][@config_version]['keys']['sources'])
+            config[@config['uniconf'][@config_version]['keys']['sources']] = {}
+          end
+          if ENV.has_key?('UNIPIPE_SOURCES')
+            unipipe_sources = ENV['UNIPIPE_SOURCES']
+            puts "UNIPIPE_SOURCES: #{unipipe_sources}"
+            sources = {}
+            sources[@config['uniconf'][@config_version]['keys']['sources']] = JSON.parse(unipipe_sources)
+            puts "UNIPIPE_SOURCES PARSED: #{sources}"
+            config.deep_merge(sources)
+          else
+            puts "UNIPIPE_SOURCES not defined in environment. Additional sources may be not available."
           end
-          config['scenarioSources']['root_config'] = {}
-          config['scenarioSources']['root_config']['dir'] = docroot_config_dir
-          @loaded_scenario_sources['root_config'] = config['scenarioSources']['root_config']
+          config[@config['uniconf'][@config_version]['keys']['sources']]['root_config'] = {}
+          config[@config['uniconf'][@config_version]['keys']['sources']]['root_config']['dir'] = docroot_config_dir
+          @loaded_scenario_sources['root_config'] = config[@config['uniconf'][@config_version]['keys']['sources']]['root_config']
           config = merge_scenarios_configs(config, {}, scenarios_path, 'root_config')
         end
       end
@@ -54,11 +85,11 @@ module Docman
       assign_to_self
     end
 
-    def merge_scenarios_configs(config, temp_config = {}, scenarios_path, current_scenario_source_name)
+    def merge_scenarios_configs(config, temp_config = {}, scenarios_path = '', current_scenario_source_name = '')
       temp_config.deep_merge!(config)
       scenarios_config = {}
-      unless config['scenarios'].nil?
-        config['scenarios'].each do |s|
+      if config.has_key?(@config['uniconf'][@config_version]['keys']['include'])
+        config[@config['uniconf'][@config_version]['keys']['include']].each do |s|
           scenario = {}
           if s.is_a? String
             values = s.split(':')
@@ -70,21 +101,25 @@ module Docman
               scenario_name = values[0]
             end
             scenario['name'] = scenario_name
-            if temp_config['scenarioSources'].key? scenario_source_name
-              temp_config['scenarioSources'][scenario_source_name]['dir']
-              scenario_source_path = temp_config['scenarioSources'][scenario_source_name]['dir'] ? temp_config['scenarioSources'][scenario_source_name]['dir'] : File.join(scenarios_path, scenario_source_name)
+            if temp_config[@config['uniconf'][@config_version]['keys']['sources']].has_key?(scenario_source_name)
+              scenario_source_path =  File.join(scenarios_path, scenario_source_name)
+              if temp_config[@config['uniconf'][@config_version]['keys']['sources']][scenario_source_name].has_key?('dir') and not temp_config[@config['uniconf'][@config_version]['keys']['sources']][scenario_source_name]['dir'].nil?
+                scenario_source_path = temp_config[@config['uniconf'][@config_version]['keys']['sources']][scenario_source_name]['dir']
+              end
               if @loaded_scenario_sources.key? scenario_source_name
                 scenario['source'] = @loaded_scenario_sources[scenario_source_name]
               else
                 `rm -fR #{scenario_source_path}` if File.directory? scenario_source_path
-                scenario['source'] = temp_config['scenarioSources'][scenario_source_name]
+                scenario['source'] = temp_config[@config['uniconf'][@config_version]['keys']['sources']][scenario_source_name]
                 scenario['source']['ref'] = scenario['source']['ref'] ? scenario['source']['ref'] : 'master'
                 GitUtil.clone_repo(scenario['source']['repo'], scenario_source_path, 'branch', scenario['source']['ref'], true, 1)
                 @loaded_scenario_sources[scenario_source_name] = scenario['source']
               end
-              scenario_config_file = File.join(scenario_source_path, 'scenarios', scenario['name'], 'config.yaml')
+              scenario_config_file = File.join(scenario_source_path, @config['uniconf'][@config_version]['dirs']['sources'], scenario['name'], 'config.yaml')
               if File.file? scenario_config_file
-                scenario_config = merge_scenarios_configs(YAML::load_file(scenario_config_file), temp_config, scenarios_path, scenario_source_name)
+                lyaml = YAML::load_file(scenario_config_file)
+                nyaml = normalize_config(lyaml)
+                scenario_config = merge_scenarios_configs(nyaml, temp_config, scenarios_path, scenario_source_name)
                 scenarios_config.deep_merge!(scenario_config)
                 puts "Loaded scenario #{scenario['name']} from source #{scenario_source_name}"
               end

data/lib/docman/docroot_config.rb

@@ -18,7 +18,9 @@ module Docman
       @docroot_config_dir = File.join(docroot_dir, 'config')
 
       Dir.chdir @docroot_config_dir
-      update('origin')
+      unless options.key? :config_dir
+        update('origin')
+      end
       config_files = Docman::Application.instance.config_dirs(options).collect{|item|
         File.join(@docroot_config_dir, item, 'config.{yaml,yml}')
       }

data/lib/docman/git_util.rb

@@ -25,7 +25,9 @@ module Docman
     def self.reset_repo(path)
       Dir.chdir path
       exec 'reset --hard'
-      exec 'clean -f -d'
+      exec 'clean -f -d -x --dry-run'
+      exec 'status'
+      exec 'clean -f -d -x'
     end
 
     def self.get(repo, path, type, version, single_branch = nil, depth = nil, reset = false)

data/lib/docman/info.rb

@@ -19,7 +19,7 @@ module Docman
       unless self['docroot_config'].deploy_target.nil?
         if self.has_key? 'states'
           self['states'].each_pair do |name, state|
-            if state.has_key?('source') and (not state.has_key?('type') or state.has_key['type'] == 'external_source')
+            if state.has_key?('source') and (not state.has_key?('type') or (state.has_key?('type') and state['type'] == 'external_source'))
               if state['source']['type'] == :retrieve_from_repo
                 @state_name = name
                 repo = state['source']['repo'] == :project_repo ? self['repo'] : state['source']['repo']
@@ -146,7 +146,7 @@ module Docman
     end
 
     def states(options = {})
-      if options[:type] == 'root' and self['type'] == 'root_chain'
+      if options[:type] == 'root' and (self['type'] == 'root_chain' or self['type'] == 'single')
         self['root_repo_states']
       else
         self['states']

data/lib/docman/version.rb

@@ -1,3 +1,3 @@
 module Docman
-  VERSION = "0.0.83"
+  VERSION = "0.0.84"
 end

metadata

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