docman 0.0.80 → 0.0.81

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7879f486dcae92bf43bb21d279c226a58c7ddc9
-  data.tar.gz: ea6dfe6ebd3df5c78fe973b98e33a806b76535de
+  metadata.gz: 9143ca229196d50ceb0be8f5e11d6d8e3650ac1d
+  data.tar.gz: 04440af097c5ea1cabb15190c871df939621981a
 SHA512:
-  metadata.gz: dfc8c60aec13d38a4230b250dc2f4e986689aba36c46e88a6432e5d4f67ec6d6ba4213f1e509c2168590a83a360446062d922d9607a2120fbcf6df836d592c16
-  data.tar.gz: 501990da1d1399890eba3b520d0a790d0f41cc1c0c605ddb2c0f606eda54f0136ef40b969173248e05e0443f9db9ea1d7975ca1ff4b48a83ab3ec542086cf814
+  metadata.gz: 94991a65d0c2d8eb88c04a1a6e43d66e85cf8f449c789f102bb1b64a136d10bed191a0848c1aa28a7bf453137c586147f8b5d787e4b9ce83de39d9675bbaa874
+  data.tar.gz: b884a747f67815c57758efed8bb9e61fbdc885ab5f0aea5afc2fbad91773ee7061a63dc24daf72e546e696cc3fd83031979d89ac4d2511bb29ec083e4e984237

data/config/config.yaml

@@ -1,115 +1,157 @@
 ---
+# common hooks used in deploy targets below
+common_hooks:
+  - &execute_yaml_file
+    type: yaml_execute
+    source_type: file
+    order: -10
+    stage: build
+
+  - &execute_yaml_file_for_git_provider
+    <<: *execute_yaml_file
+    providers:
+      - :git_repo_provider
+
+  - &remove_git_dir
+    type: :yaml_execute
+    providers:
+      - :git_repo_provider
+    order: 0
+    commands:
+      - rm -fR .git
+
+  - &git_commit
+    type: :git_commit
+    order: 100
+
 deploy_targets:
+  # target for local build
   local:
+    # deployer handler
     handler: :common_deployer
     builders:
       root:
         handler: :dir_builder
       root_chain:
-        handler: :git_direct_builder
+        handler: :direct_builder
+        provider: :git_repo_provider
+        target_path_id: full_build_path
         hooks:
           builder:
             after_execute:
-              - type: :yaml_execute
-                source_type: file
-                order: -10
-                stage: build
-      drupal:
-        handler: :drupal_drush_builder
+              - <<: *execute_yaml_file_for_git_provider
+      repo:
+        handler: :direct_builder
+        provider: :git_repo_provider
+        target_path_id: full_build_path
         hooks:
           builder:
             after_execute:
-              - type: :yaml_execute
-                source_type: file
-                order: -10
-                stage: build
+              - <<: *execute_yaml_file
+      dir:
+        handler: :dir_builder
+    states:
+      development: local
+      staging: local
+      stable: local
+
+  # Target for striped (from .git dirs)
+  striped:
+    # deployer handler
+    handler: :common_deployer
+    builders:
+      root:
+        handler: :dir_builder
+      root_chain:
+        handler: :direct_builder
+        provider: :git_repo_provider
+        target_path_id: full_build_path
+        hooks:
+          builder:
+            after_execute:
+              - <<: *remove_git_dir
+              - <<: *execute_yaml_file_for_git_provider
       repo:
-        handler: :git_direct_builder
+        handler: :direct_builder
+        provider: :git_repo_provider
+        target_path_id: full_build_path
         hooks:
           builder:
             after_execute:
-              - type: :yaml_execute
-                source_type: file
-                order: -10
-                stage: build
+              - <<: *remove_git_dir
+              - <<: *execute_yaml_file
       dir:
         handler: :dir_builder
-      symlink:
-        handler: :symlink_builder
     states:
       development: local
       staging: local
       stable: local
+
+  # Target for pushing build result into target repo
   git_target:
+    # deployer handler
     handler: :git_deployer
     builders:
       root:
-        handler: :git_direct_builder
+        handler: :direct_builder
+        provider: :git_repo_provider
+        target_path_id: full_build_path
         hooks:
           builder:
             after_execute:
-              - type: :git_commit
-                order: 100
-                execution_dir: $PROJECT$
+              - <<: *git_commit
       root_chain:
         handler: :git_root_chain_builder
+        provider: :git_repo_provider
+        target_path_id: temp_path
         hooks:
           builder:
             after_execute:
-              - type: :yaml_execute
-                source_type: file
-                order: -10
-                execution_dir: $PROJECT$
-                stage: build
-              - type: :git_commit
-                order: 100
-                execution_dir: $PROJECT$
-      drupal:
-        handler: :drupal_drush_builder
-        hooks:
-          builder:
-            after_execute:
-              - type: :git_commit
-                order: 100
-                execution_dir: $PROJECT$
+              - <<: *execute_yaml_file_for_git_provider
+              - <<: *git_commit
       repo:
         handler: :git_strip_builder
+        provider: :git_repo_provider
+        target_path_id: temp_path
+        hooks:
         hooks:
           builder:
             before_execute:
               - type: :git_pull
-                execution_dir: $PROJECT$
             after_execute:
-              - type: :yaml_execute
-                source_type: file
-                order: -10
-                execution_dir: $PROJECT$
-                stage: build
-              - type: :git_commit
-                order: 100
-                execution_dir: $PROJECT$
+              - <<: *execute_yaml_file_for_git_provider
+              - <<: *git_commit
       dir:
         handler: :dir_builder
         hooks:
           builder:
             after_execute:
-              - type: :git_commit
-                order: 100
-                execution_dir: $PROJECT$
-      symlink:
-        handler: :symlink_builder
-        hooks:
-          builder:
-            after_execute:
-              - type: :git_commit
-                order: 100
-                execution_dir: $PROJECT$
+              - <<: *git_commit
     states:
       development: dev
       staging: test
       stable: prod
+
 environments:
   local:
     deploy_target: local
     state: development
     clean_changed: true
+  striped:
+    deploy_target: striped
+    state: development
+    clean_changed: true
+  dev:
+    deploy_target: git_target
+    state: development
+  test:
+    deploy_target: git_target
+    state: staging
+  prod:
+    deploy_target: git_target
+    state: stable
+
+components:
+  master:
+
+pipeline_script: .pipeline

data/docman.gemspec

@@ -27,4 +27,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'net-sftp'
   spec.add_dependency 'hooks'
   spec.add_dependency 'diffy'
+  spec.add_dependency 'io-console'
+  spec.add_dependency 'json'
 end

data/lib/application.rb

@@ -13,12 +13,12 @@ require 'logger'
 require 'json'
 
 require 'docman/builders/builder'
+require 'docman/builders/provider_builder'
+require 'docman/builders/git_provider_builder'
 require 'docman/builders/dir_builder'
-require 'docman/builders/symlink_builder'
-require 'docman/builders/git_direct_builder'
+require 'docman/builders/direct_builder'
 require 'docman/builders/git_root_chain_builder'
 require 'docman/builders/git_strip_builder'
-require 'docman/builders/drupal_drush_builder'
 require 'docman/deployers/deployer'
 require 'docman/deployers/git_deployer'
 require 'docman/deployers/common_deployer'
@@ -30,7 +30,8 @@ require 'docman/commands/clean_changed_cmd'
 require 'docman/commands/git_commit_cmd'
 require 'docman/commands/yaml_execute_cmd'
 require 'docman/commands/git_pull_cmd'
-require 'docman/commands/git_copy_repo_content_cmd'
+require 'docman/commands/git_repo_provider_cmd'
+require 'docman/commands/nexus_provider_cmd'
 require 'docman/taggers/tagger'
 require 'docman/taggers/incremental_tagger'
 require 'docman/taggers/option_tagger'
@@ -80,9 +81,8 @@ module Docman
     def build(deploy_target_name, state, options = false)
       with_rescue do
         @options = options
-        @deploy_target = @config['deploy_targets'][deploy_target_name]
-        @deploy_target['name'] = deploy_target_name
-        @docroot_config = DocrootConfig.new(@workspace_dir, deploy_target)
+        @docroot_config = DocrootConfig.new(@workspace_dir, deploy_target_name, options)
+        @deploy_target = @docroot_config.deploy_target
         execute('build', state, nil, options['tag'])
       end
     end
@@ -91,10 +91,8 @@ module Docman
       result = nil
       with_rescue do
         @options = options
-        @deploy_target = @config['deploy_targets'][deploy_target_name]
-        raise "Wrong deploy target: #{deploy_target_name}" if @deploy_target.nil?
-        @deploy_target['name'] = deploy_target_name
-        @docroot_config = DocrootConfig.new(@workspace_dir, deploy_target)
+        @docroot_config = DocrootConfig.new(@workspace_dir, deploy_target_name, options)
+        @deploy_target = @docroot_config.deploy_target
         @docroot_config.states_dependin_on(name, version).keys.each do |state|
           execute('deploy', state, name)
           write_environment(@deploy_target['states'][state], name)
@@ -146,7 +144,7 @@ module Docman
 
     def info(command, file, options = false)
       result = {}
-      @docroot_config = DocrootConfig.new(@workspace_dir, deploy_target)
+      @docroot_config = DocrootConfig.new(@workspace_dir, nil, options)
       if (command == 'full')
         result['states'] = Docman::Application.instance.config['deploy_targets']['git_target']['states']
         result['environments'] = Docman::Application.instance.config['environments']

data/lib/docman/builders/builder.rb

@@ -3,6 +3,7 @@ require 'docman/commands/command'
 module Docman
   module Builders
     class Builder < Docman::Command
+
       @@builders = {}
       @@build_results = {}
 
@@ -28,8 +29,7 @@ module Docman
         clean_changed = environment['clean_changed'].nil? ? true : environment['clean_changed']
         add_action('before_execute', {'type' => :clean_changed}, @context) if clean_changed
 
-        info_file = File.join(@context['full_build_path'], 'info.yaml')
-        info = YAML::load_file(info_file) if File.file? info_file
+        info = @context.info_file_yaml
         if info
           info['context'] = @context
           name = @context['name']
@@ -37,6 +37,13 @@ module Docman
           environment['previous'][name] = info
         end
 
+        unless @context.key? 'provider'
+          @context['provider'] = self['provider']
+        end
+        if @context['provider'] && self['target_path_id']
+          self['target_path'] = @context[self['target_path_id']]
+          @provider = Docman::Command.create({'type' => @context['provider'], 'target_path' => self['target_path']}, @context, self)
+        end
       end
 
       def validate_command
@@ -51,6 +58,7 @@ module Docman
       before_execute do
         if @context.need_rebuild?
           @context.build_mode = :rebuild
+          log("Need to rebuild")
         else
           if @context.changed? or changed?
             @context.build_mode = :update

data/lib/docman/builders/direct_builder.rb

@@ -0,0 +1,9 @@
+module Docman
+  module Builders
+    class DirectBuilder < ProviderBuilder
+
+      register_builder :direct_builder
+
+    end
+  end
+end

data/lib/docman/builders/git_provider_builder.rb

@@ -0,0 +1,31 @@
+module Docman
+  module Builders
+    class GitProviderBuilder < ProviderBuilder
+
+      register_builder :git_provider_builder
+
+      def prepare_build_dir
+        FileUtils.mkdir_p(@context['full_build_path'])
+      end
+
+      def build_with_provider
+        FileUtils.rm_r(Dir["#{@context['full_build_path']}/*"]) if File.directory? @context['full_build_path']
+        FileUtils.rm_r self['target_path'] if @context.need_rebuild? and File.directory? self['target_path']
+        result = @provider.perform
+        `rsync -a --exclude '.git' #{self['target_path']}/. #{@context['full_build_path']}`
+        result
+      end
+
+      def changed_from_last_version?
+        @provider.changed_from_last_version?
+      end
+
+      def execute
+        prepare_build_dir
+        @execute_result = build_with_provider
+        changed_from_last_version? ? @execute_result : false
+      end
+
+    end
+  end
+end

data/lib/docman/builders/git_root_chain_builder.rb

@@ -1,21 +1,11 @@
 module Docman
   module Builders
-    class GitRootChainBuilder < Builder
+    class GitRootChainBuilder < GitProviderBuilder
 
       register_builder :git_root_chain_builder
 
-      def execute
-        GitUtil.get(@context['root_repo'], @context['full_build_path'], @context.version_type(type: 'root'), @context.version(type: 'root'))
-        @version = Docman::Command.create({'type' => :git_copy_repo_content, 'remove_target' => true}, @context, self).perform
-        @last_revision != @version ? @version : false
-      end
-
-      def changed?
-        stored_version = @context.stored_version['result']
-        @last_revision = GitUtil.last_revision @context['temp_path']
-        # No commit hash for 'root' as it will be changed later
-        @version = GitUtil.get(@context['repo'], @context['temp_path'], @context.version_type, @context.version)
-        stored_version != @version
+      def prepare_build_dir
+        GitUtil.get(@context['root_repo'], @context['full_build_path'], @context.version_type(type: 'root'), @context.version(type: 'root'), true, 1)
       end
 
     end

data/lib/docman/builders/git_strip_builder.rb

@@ -1,23 +1,11 @@
 module Docman
   module Builders
-    class GitStripBuilder < Builder
+    class GitStripBuilder < GitProviderBuilder
 
       register_builder :git_strip_builder
 
-      def execute
-        FileUtils.rm_r(@context['full_build_path']) if File.directory? @context['full_build_path']
-        FileUtils.rm_r @context['temp_path'] if @context.need_rebuild? and File.directory? @context['temp_path']
-        @version = GitUtil.get(@context['repo'], @context['temp_path'], @context.version_type, @context.version, nil, nil)
-        FileUtils.mkdir_p(@context['full_build_path'])
-        FileUtils.cp_r(Dir["#{@context['temp_path']}/."], @context['full_build_path'])
-        FileUtils.rm_r(File.join(@context['full_build_path'], '.git')) if File.directory?(File.join(@context['full_build_path'], '.git'))
-        GitUtil.repo_changed?(@context['full_build_path']) ? @version : false
-      end
-
-      def changed?
-        stored_version = @context.stored_version['result']
-        @version = GitUtil.get(@context['repo'], @context['temp_path'], @context.version_type, @context.version, nil, nil)
-        stored_version != @version
+      def changed_from_last_version?
+        GitUtil.repo_changed?(@context['full_build_path'])
       end
 
     end

data/lib/docman/builders/provider_builder.rb

@@ -0,0 +1,17 @@
+module Docman
+  module Builders
+    class ProviderBuilder < Builder
+
+      register_builder :provider_builder
+
+      def execute
+        @provider.perform
+      end
+
+      def changed?
+        @provider.changed?
+      end
+
+    end
+  end
+end

data/lib/docman/cli.rb

@@ -40,6 +40,7 @@ module Docman
 
     desc 'build', 'Build docroot'
     method_option :force, :aliases => '-f', :desc => 'Force full rebuild'
+    method_option :config, :desc => 'Configuration override JSON'
     option :tag
     def build(deploy_target, state)
       get_to_root_dir
@@ -52,6 +53,7 @@ module Docman
 
     desc 'deploy', 'Deploy to target'
     method_option :force, :aliases => '-f', :desc => 'Force full deploy'
+    method_option :config, :desc => 'Configuration override JSON'
     def deploy(deploy_target, name, type, version)
       get_to_root_dir
       if version.start_with?('state_')

data/lib/docman/commands/clean_changed_cmd.rb

@@ -14,11 +14,11 @@ module Docman
         if @context.need_rebuild?
           return false if @context['type'] == 'dir'
           return false if @context['type'] == 'root' and @context['build_type'] == :dir_builder and not GitUtil.repo?(@context['full_build_path'])
-          return false if @context['type'] == 'root' and @context['build_type'] == :git_direct_builder and GitUtil.repo?(@context['full_build_path'])
-          return false if @context['type'] == 'root_chain' and @context['build_type'] == :git_direct_builder and GitUtil.repo?(@context['full_build_path'])
+          return false if @context['type'] == 'root' and @context['build_type'] == :direct_builder and GitUtil.repo?(@context['full_build_path'])
+          return false if @context['type'] == 'root_chain' and @context['build_type'] == :direct_builder and GitUtil.repo?(@context['full_build_path'])
           return false if @context['type'] == 'root_chain' and @context['build_type'] == :git_root_chain_builder and GitUtil.repo?(@context['full_build_path'])
           if @context['type'] == 'repo'
-            if @context['build_type'] == :git_direct_builder
+            if @context['build_type'] == :direct_builder
               return false if GitUtil.repo?(@context['full_build_path'])
             end
           end

data/lib/docman/commands/command.rb

@@ -17,6 +17,7 @@ module Docman
     define_hooks :before_execute, :after_execute
 
     def self.create(params, context = nil, caller = nil)
+      params['type'] = params['type'].to_sym if params['type'].instance_of? String
       c = @@subclasses[params['type']]
       if c
         c.new(params, context, caller)

data/lib/docman/commands/git_repo_provider_cmd.rb

@@ -0,0 +1,42 @@
+module Docman
+  class GitRepoProvider < Docman::Command
+
+    attr_reader :version
+
+    register_command :git_repo_provider
+
+    def validate_command
+      raise "Please provide 'context'" if @context.nil?
+      raise "Context should be of type 'Info'" unless @context.is_a? Docman::Info
+    end
+
+    def execute
+      @execute_result = get_content
+      # No commit hash for 'root' as it will be changed later
+      @version = @context['type'] == 'root' ? @context['build_path'] : @execute_result
+    end
+
+    def changed?
+      stored_version = @context.stored_version['result']
+      @last_version = GitUtil.last_revision(self['target_path'])
+      # TODO: diff with remote instead of get
+      v = version(true)
+      stored_version != v
+    end
+
+    def get_content
+      GitUtil.get(@context['repo'], self['target_path'], @context.version_type, @context.version, true, 1)
+    end
+
+    def changed_from_last_version?
+      @last_version != @version
+    end
+
+    def version(remote = false)
+      # branch = remote ? "origin/#{@context.version}" : nil
+      # @context['type'] == 'root' ? @context['build_path'] : GitUtil.last_revision(self['target_path'], branch)
+      @context['type'] == 'root' ? @context['build_path'] : get_content
+    end
+
+  end
+end

data/lib/docman/commands/nexus_provider_cmd.rb

@@ -0,0 +1,60 @@
+module Docman
+  class NexusProvider < Docman::Command
+
+    register_command :nexus_provider
+
+    def validate_command
+      raise "Please provide 'context'" if @context.nil?
+      raise "Context should be of type 'Info'" unless @context.is_a? Docman::Info
+      raise "Please provide 'artifact_aid'" if @context['artifact_aid'].nil?
+      raise "Please provide 'artifact_gid'" if @context['artifact_gid'].nil?
+      raise "Please provide 'artifact_version'" if @context['artifact_version'].nil?
+    end
+
+    def execute
+      # TODO: refactor it.
+      nexus_address = '138.68.81.158:8081'
+      a = @context['artifact_aid']
+      g = @context['artifact_gid']
+      v = @context['artifact_version']
+      r = 'releases'
+      e = 'tar.gz'
+      artifact_file = "#{a}-#{v}.#{e}"
+
+      @context['version_type'] = 'nexus_artifact'
+      @context['version'] = v
+
+      FileUtils.mkdir_p(self['target_path'])
+      Dir.chdir self['target_path']
+
+      # TODO: refactor cmd execution.
+      cmd = "wget -O #{artifact_file} \"http://#{nexus_address}/nexus/service/local/artifact/maven/content?a=#{a}&g=#{g}&v=#{v}&r=#{r}&e=#{e}\""
+
+      `#{cmd}`
+
+      if $?.exitstatus > 0
+        raise "Artifact retrieving has been failed: #{cmd}"
+      end
+
+      cmd ="tar --strip-components=1 -xzf #{artifact_file}"
+      `#{cmd}`
+
+      if $?.exitstatus > 0
+        raise "Artifact unpack has been failed: #{cmd}"
+      end
+
+      cmd ="rm -f #{artifact_file}"
+      `#{cmd}`
+      @execute_result = artifact_file
+    end
+
+    def changed?
+      true
+    end
+
+    def changed_from_last_version?
+      true
+    end
+
+  end
+end

data/lib/docman/commands/yaml_execute_cmd.rb

@@ -15,27 +15,30 @@ module Docman
 
     def execute
       with_logging('yaml_execute') do
+        Dir.chdir @context['full_build_path']
         if self['environments'].nil? || self['environments'] == 'all' || self['environments'].include?(@context.environment_name)
-          commands = nil
-          if self['source_type'] == 'file'
-            yaml_file_name = self['yaml_file_name'].nil? ? '.build.yml' : self['yaml_file_name']
-            build_file = File.join(@context['full_build_path'], yaml_file_name)
-            if File.file? build_file
-              build_file_yaml = YAML::load_file(build_file)
-              commands = build_file_yaml[self['stage']]
-              source = yaml_file_name
+          if self['providers'].nil? || self['providers'] == 'all' || self['providers'].include?(@context['provider'])
+            commands = nil
+            if self['source_type'] == 'file'
+              yaml_file_name = self['yaml_file_name'].nil? ? '.build.yml' : self['yaml_file_name']
+              build_file = File.join(@context['full_build_path'], yaml_file_name)
+              if File.file? build_file
+                build_file_yaml = YAML::load_file(build_file)
+                commands = build_file_yaml[self['stage']]
+                source = yaml_file_name
+              end
             end
-          end
-          if self['source_type'] == 'inline'
-            commands = self['commands']
-            source = 'inline'
-          end
-          unless commands.nil?
-            commands.each do |cmd|
-              logger.info "Execute from #{source}: #{cmd}"
-              logger.info `#{cmd}`
-              if $?.exitstatus > 0
-                raise "Command #{cmd} was failed"
+            if self['source_type'] == 'inline'
+              commands = self['commands']
+              source = 'inline'
+            end
+            unless commands.nil?
+              commands.each do |cmd|
+                logger.info "Execute from #{source}: #{cmd}"
+                logger.info `#{cmd}`
+                if $?.exitstatus > 0
+                  raise "Command #{cmd} was failed"
+                end
               end
             end
           end

data/lib/docman/config.rb

@@ -1,15 +1,19 @@
 require 'singleton'
 require 'hash_deep_merge'
 require 'digest/md5'
+require 'json'
 
 module Docman
   class Config < Hash
 
     attr_reader :unmutable_config
 
+    @loaded_scenario_sources
+
     def initialize(file)
       super
       @config = YAML::load_file(file)
+      @loaded_scenario_sources = {}
       assign_to_self
     end
 
@@ -20,13 +24,77 @@ module Docman
       @unmutable_config = Marshal::load(Marshal.dump(@config))
     end
 
-    def merge_config_from_file(file)
-      config = YAML::load_file(file)
-      @config.deep_merge(config)
-      @config['version'] = config['version'].nil? ? 1 : config['version']
+    def merge_config_from_file(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']
+          scenarios_path = File.join(docroot_config_dir, '/../', 'scenarios')
+          `rm -fR #{scenarios_path}` if File.directory? scenarios_path
+          `mkdir -p scenarios_path`
+          unless config['scenarioSources']
+            config['scenarioSources'] = {}
+          end
+          config['scenarioSources']['root_config'] = {}
+          config['scenarioSources']['root_config']['dir'] = docroot_config_dir
+          @loaded_scenario_sources['root_config'] = config['scenarioSources']['root_config']
+          config = merge_scenarios_configs(config, {}, scenarios_path, 'root_config')
+        end
+      end
+      unless config.nil?
+        unless config['override_docman_default'].nil?
+          self.clear
+          @config = config
+        else
+          @config.deep_merge!(config)
+        end
+        @config['version'] = config['version'].nil? ? 1 : config['version']
+      end
+
       assign_to_self
     end
 
+    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|
+          scenario = {}
+          if s.is_a? String
+            values = s.split(':')
+            if values.size() > 1
+              scenario_source_name = values[0]
+              scenario_name = values[1]
+            else
+              scenario_source_name = current_scenario_source_name
+              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 @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']['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')
+              if File.file? scenario_config_file
+                scenario_config = merge_scenarios_configs(YAML::load_file(scenario_config_file), temp_config, scenarios_path, scenario_source_name)
+                scenarios_config.deep_merge!(scenario_config)
+                puts "Loaded scenario #{scenario['name']} from source #{scenario_source_name}"
+              end
+            end
+          end
+        end
+      end
+      scenarios_config.deep_merge!(config)
+    end
+
     def config_hash
       Digest::MD5.hexdigest(Marshal::dump(@unmutable_config))
     end

data/lib/docman/deployers/deployer.rb

@@ -171,12 +171,12 @@ module Docman
         @build_results[info['name']] = build_result ? build_result : 'Not builded'
         @versions[info['name']] = builder.version
         @builded << info['name']
-        if (build_result)
-          info['children'].sort_by!{|a| a['order']}
-          info['children'].each do |child|
-            build_recursive(child)
-          end
+        # if (build_result)
+        info['children'].sort_by!{|a| a['order']}
+        info['children'].each do |child|
+          build_recursive(child)
         end
+        # end
       end
 
       # TODO: need to refactor.

data/lib/docman/docroot_config.rb

@@ -7,23 +7,90 @@ module Docman
 
     attr_reader :structure, :deploy_target, :docroot_dir, :root, :raw_infos
 
-    def initialize(docroot_dir, deploy_target = nil)
+    def initialize(docroot_dir, deploy_target_name = nil, options = nil)
+      @override = {}
+      if options && options['config']
+        @override = JSON.parse(options['config'])
+      end
       @docroot_dir = docroot_dir
-      @deploy_target = deploy_target
+      #@deploy_target = deploy_target
       @docroot_config_dir = File.join(docroot_dir, 'config')
+
+      Dir.chdir @docroot_config_dir
       update(' origin master')
       if File.file? File.join(@docroot_config_dir, 'config.yaml')
-        Docman::Application.instance.config.merge_config_from_file(File.join(@docroot_config_dir, 'config.yaml'))
+        Docman::Application.instance.config.merge_config_from_file(@docroot_config_dir, 'config.yaml', options)
       end
+
+      if deploy_target_name
+        @deploy_target = Application.instance.config['deploy_targets'][deploy_target_name]
+        raise "Wrong deploy target: #{deploy_target_name}" if @deploy_target.nil?
+        @deploy_target['name'] = deploy_target_name
+      end
+
       @names = {}
       @raw_infos = {}
-      @structure = structure_build File.join(@docroot_config_dir, 'master')
+      master_file = File.join(@docroot_config_dir, 'master')
+      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'))
+      end
     end
 
     def update(options = '')
+      GitUtil.exec("reset --hard", false)
       GitUtil.update @docroot_config_dir, options
     end
 
+    def structure_build_from_config_file(path, prefix = '', parent = nil, parent_key = 'master')
+      config = Docman::Application.instance.config
+      return if config['components'][parent_key].nil?
+      children = []
+
+      info = config['components'][parent_key]
+      @raw_infos[parent_key] = info
+
+      unless info['status'].nil?
+        return if info['status'] == 'disabled'
+      end
+
+      name = parent_key
+      prefix = prefix.size > 0 ? File.join(prefix, name) : name
+      info['full_path'] = path
+      info['docroot_config'] = self
+      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
+
+      if @override['projects'] && @override['projects'].key?(info['name'])
+        info.merge! @override['projects'][info['name']]
+      end
+
+      i = Docman::Info.new(info)
+      @root = i if parent.nil?
+      i['root'] = @root
+
+      @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
+      i
+    end
+
     def structure_build(path, prefix = '', parent = nil)
       return unless File.file? File.join(path, 'info.yaml')
 
@@ -46,6 +113,10 @@ module Docman
       info['order'] = info.has_key?('order') ? info['order'] : 10
       info['children'] = children
 
+      if @override['projects'] && @override['projects'].key?(info['name'])
+        info.merge! @override['projects'][info['name']]
+      end
+
       i = Docman::Info.new(info)
       @root = i if parent.nil?
       i['root'] = @root

data/lib/docman/git_util.rb

@@ -8,7 +8,7 @@ module Docman
     @git = ENV.has_key?('GIT_CMD') ? ENV['GIT_CMD'] : 'git'
 
     def self.exec(command, show_result = true)
-      @logger.info "#{@git} #{command}"
+      @logger.info "#{@git} #{command} in #{Dir.pwd}"
       result = `#{@git} #{command}`
       #result = `#{@git} #{command}`.delete!("\n")
       @logger.info result if show_result and result
@@ -33,13 +33,13 @@ module Docman
       if File.directory? path and File.directory?(File.join(path, '.git'))
         Dir.chdir path
         self.reset_repo(path) #if self.repo_changed?(path)
+        exec 'fetch --tags'
         if type == 'branch'
-          exec "fetch"
+          #exec "fetch"
           exec "checkout #{version}"
           exec "pull origin #{version}"
         end
         if type == 'tag'
-          exec 'fetch --tags'
           exec "checkout tags/#{version}"
         end
       else
@@ -63,11 +63,11 @@ module Docman
       exec("clone #{single_branch} #{depth} #{repo} #{path}")
     end
 
-    def self.last_revision(path = nil)
+    def self.last_revision(path = nil, branch = 'HEAD')
       result = nil
       if self.repo? path
         Dir.chdir path unless path.nil?
-        result = `git rev-parse --short HEAD`
+        result = `git rev-parse --short #{branch}`
         result.delete!("\n")
       end
       result

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')
+            if state.has_key?('source') and (not state.has_key?('type') or state.has_key['type'] == 'external_source')
               if state['source']['type'] == :retrieve_from_repo
                 @state_name = name
                 repo = state['source']['repo'] == :project_repo ? self['repo'] : state['source']['repo']
@@ -46,7 +46,8 @@ module Docman
     end
 
     def version_type(options = {})
-      state(options).nil? ? nil : state(options)['type']
+      return self['version_type'] if self.key? 'version_type'
+      return state(options).nil? ? nil : state(options)['type']
     end
 
     def describe(type = 'short')
@@ -59,11 +60,18 @@ module Docman
       to_save['version_type'] = self.version_type unless self.version_type.nil?
       to_save['version'] = self.version unless self.version.nil?
       to_save['result'] = result
+      to_save['provider'] = self['provider'] unless self['provider'].nil?
       to_save['type'] = self['type']
       to_save['build_type'] = self['build_type']
-      if environment_name() != 'local'
-        File.open(File.join(self['full_build_path'], 'info.yaml'), 'w') {|f| f.write to_save.to_yaml}
+      FileUtils::mkdir_p info_dir unless File.directory? info_dir
+
+      # Create local git ignored .docman dir for info file
+      if environment_name() == 'local'
+        gitignore_file = File.join(info_dir, '.gitignore')
+        File.open(gitignore_file, 'w') {|f| f.write '*'} unless File.file? gitignore_file
       end
+      File.open(info_file, 'w') {|f| f.write to_save.to_yaml}
+      #end
       to_save
     end
 
@@ -112,11 +120,25 @@ module Docman
       false
     end
 
-    #TODO: check if info.yaml needed for local state
     def stored_version
-      info_filename = File.join(self['full_build_path'], 'info.yaml')
-      return false unless File.file?(info_filename)
-      YAML::load_file(info_filename)
+      info_file_yaml
+    end
+
+    def info_dir(path = nil)
+      File.join(
+          path.nil? ? self['full_build_path'] : path,
+          environment_name() == 'local' ? '.docman' : ''
+      )
+    end
+
+    # TODO: make default with lazy initialize
+    def info_file(path = nil)
+      File.join(info_dir(path), 'info.yaml')
+    end
+
+    def info_file_yaml
+      file = info_file
+      File.file?(file) ? YAML::load_file(file) : nil
     end
 
     def state(options = {})

data/lib/docman/version.rb

@@ -1,3 +1,3 @@
 module Docman
-  VERSION = "0.0.80"
+  VERSION = "0.0.81"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docman
 version: !ruby/object:Gem::Version
-  version: 0.0.80
+  version: 0.0.81
 platform: ruby
 authors:
 - Alexander Tolstikov
@@ -136,6 +136,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: io-console
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - atolstikov@adyax.com
@@ -172,11 +200,11 @@ files:
 - lib/application.rb
 - lib/docman/builders/builder.rb
 - lib/docman/builders/dir_builder.rb
-- lib/docman/builders/drupal_drush_builder.rb
-- lib/docman/builders/git_direct_builder.rb
+- lib/docman/builders/direct_builder.rb
+- lib/docman/builders/git_provider_builder.rb
 - lib/docman/builders/git_root_chain_builder.rb
 - lib/docman/builders/git_strip_builder.rb
-- lib/docman/builders/symlink_builder.rb
+- lib/docman/builders/provider_builder.rb
 - lib/docman/cli.rb
 - lib/docman/commands/clean_changed_cmd.rb
 - lib/docman/commands/command.rb
@@ -184,8 +212,9 @@ files:
 - lib/docman/commands/create_symlink_cmd.rb
 - lib/docman/commands/execute_script_cmd.rb
 - lib/docman/commands/git_commit_cmd.rb
-- lib/docman/commands/git_copy_repo_content_cmd.rb
 - lib/docman/commands/git_pull_cmd.rb
+- lib/docman/commands/git_repo_provider_cmd.rb
+- lib/docman/commands/nexus_provider_cmd.rb
 - lib/docman/commands/ssh_target_checker.rb
 - lib/docman/commands/target_checker.rb
 - lib/docman/commands/yaml_execute_cmd.rb
@@ -195,7 +224,6 @@ files:
 - lib/docman/deployers/deployer.rb
 - lib/docman/deployers/git_deployer.rb
 - lib/docman/docroot_config.rb
-- lib/docman/docroot_controller.rb
 - lib/docman/exceptions/command_validation_error.rb
 - lib/docman/exceptions/no_changes_error.rb
 - lib/docman/exec.rb

data/lib/docman/builders/drupal_drush_builder.rb

@@ -1,27 +0,0 @@
-require 'yaml'
-
-module Docman
-  module Builders
-    class DrupalDrushBuilder < Builder
-
-      register_builder :drupal_drush_builder
-
-      def execute
-        return if @build_mode == :none
-        #return unless @context.need_rebuild?
-        puts 'Download drupal through drush'
-        FileUtils.mkdir_p(@context['temp_path'])
-        Dir.chdir @context['temp_path']
-        `drush dl drupal-#{@context.version} --yes`
-        FileUtils.mkdir_p(@context['full_build_path'])
-        FileUtils.cp_r(Dir["#{@context['temp_path']}/drupal-#{@context.version}/."], @context['full_build_path'])
-        @context.version
-      end
-
-      def version
-        @context.version
-      end
-
-    end
-  end
-end

data/lib/docman/builders/git_direct_builder.rb

@@ -1,30 +0,0 @@
-module Docman
-  module Builders
-    class GitDirectBuilder < Builder
-
-      register_builder :git_direct_builder
-
-      def execute
-        execute_result = GitUtil.get(@context['repo'], @context['full_build_path'], @context.version_type, @context.version)
-        # No commit hash for 'root' as it will be changed later
-        @version = @context['type'] == 'root' ? @context['build_path'] : execute_result
-        @last_revision != @version ? @version : false
-      end
-
-      def changed?
-        stored_version = @context.stored_version['result']
-        if @context['type'] == 'root_chain'
-          repo_path = @context['temp_path']
-        else
-          repo_path = @context['full_build_path']
-        end
-
-        @last_revision = GitUtil.last_revision(repo_path)
-        # No commit hash for 'root' as it will be changed later
-        @version = @context['type'] == 'root' ? @context['build_path'] : GitUtil.get(@context['repo'], repo_path, @context.version_type, @context.version)
-        stored_version != @version
-      end
-
-    end
-  end
-end

data/lib/docman/builders/symlink_builder.rb

@@ -1,24 +0,0 @@
-module Docman
-  module Builders
-    class SymlinkBuilder < Builder
-
-      register_builder :symlink_builder
-
-      def execute
-        if File.directory? @context['full_build_path']
-          log("Removed dir: #{@context['full_build_path']} because directory is a directory")
-          FileUtils.rm_r(@context['full_build_path'])
-        end
-        Dir.chdir Pathname(@context['full_build_path']).dirname
-        `ln -f -s #{@context['target_path']} #{@context['name']}`
-        log("Created symlink: #{@context['full_build_path']}")
-        @context['build_path']
-      end
-
-      def version
-        @context['build_path']
-      end
-
-    end
-  end
-end

data/lib/docman/commands/git_copy_repo_content_cmd.rb

@@ -1,23 +0,0 @@
-module Docman
-  class GitCopyRepoContent < Docman::Command
-
-    register_command :git_copy_repo_content
-
-    def validate_command
-      raise "Please provide 'context'" if @context.nil?
-      raise "Context should be of type 'Info'" unless @context.is_a? Docman::Info
-    end
-
-    def execute
-      if (self['remove_target'])
-        FileUtils.rm_r(Dir["#{@context['full_build_path']}/*"]) if File.directory? @context['full_build_path']
-      end
-      FileUtils.rm_r @context['temp_path'] if @context.need_rebuild? and File.directory? @context['temp_path']
-      @version = GitUtil.get(@context['repo'], @context['temp_path'], @context.version_type, @context.version, nil, nil)
-      # FileUtils.rm_r(File.join(@context['temp_path'], '.git')) if File.directory?(File.join(@context['temp_path'], '.git'))
-      FileUtils.mkdir_p(@context['full_build_path'])
-      `rsync -a --exclude '.git' #{@context['temp_path']}/. #{@context['full_build_path']}`
-      @version
-    end
-  end
-end

data/lib/docman/docroot_controller.rb

@@ -1,47 +0,0 @@
-require 'docman/builders/builder'
-require 'docman/builders/dir_builder'
-require 'docman/builders/git_direct_builder'
-require 'docman/builders/git_root_chain_builder'
-require 'docman/builders/git_strip_builder'
-require 'docman/builders/drupal_drush_builder'
-require 'docman/deployers/deployer'
-require 'docman/deployers/git_deployer'
-require 'docman/deployers/common_deployer'
-
-# TODO: make universal logging class.
-
-module Docman
-  class DocrootController
-
-    attr_reader :docroot_dir, :docroot_config
-
-    def initialize(docroot_dir, deploy_target_name, options = {})
-      @deploy_target = Docman::Application.instance.config['deploy_targets'][deploy_target_name]
-      @deploy_target_name = deploy_target_name
-      Docman::Application.instance.deploy_target = @deploy_target
-      docroot_config = DocrootConfig.new(docroot_dir, @deploy_target)
-      @docroot_dir = docroot_dir
-      @docroot_config = docroot_config
-    end
-
-    def build(state_name)
-      execute(state_name)
-    end
-
-    def deploy(name, type, version)
-      @docroot_config.states_dependin_on(name, version).keys.each do |state_name|
-        execute(state_name, name)
-      end
-    end
-
-    def execute(state, name = nil)
-      #Docman::Application.instance.config.environment(state_name, @deploy_target_name)
-      params = @deploy_target
-      params['state'] = state
-      params['name'] = name
-      Docman::Deployers::Deployer.create(params, self).perform
-    end
-
-  end
-
-end