docman 0.0.81 → 0.0.82

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9143ca229196d50ceb0be8f5e11d6d8e3650ac1d
-  data.tar.gz: 04440af097c5ea1cabb15190c871df939621981a
+  metadata.gz: 3cdd636d62e958434d0c228cac7f4b87fed36eff
+  data.tar.gz: 53f29632b22a725ac462c45898fd10770270771a
 SHA512:
-  metadata.gz: 94991a65d0c2d8eb88c04a1a6e43d66e85cf8f449c789f102bb1b64a136d10bed191a0848c1aa28a7bf453137c586147f8b5d787e4b9ce83de39d9675bbaa874
-  data.tar.gz: b884a747f67815c57758efed8bb9e61fbdc885ab5f0aea5afc2fbad91773ee7061a63dc24daf72e546e696cc3fd83031979d89ac4d2511bb29ec083e4e984237
+  metadata.gz: f8de66b59de7c7cd891103c8b96783edb058ee7001accc9e1c11a074f55b3410290e4a08b424a831f89c830196b66fefddcc67c8dcd01743c8acb12c04cf7927
+  data.tar.gz: 762077fd3b560406c586f94d33632689d7be47dc47053c3a6dee6198ad204b00fe947ed4d5a05668258e86b0547f283249c47aa4d18d63c49213a9c0810e288f

data/config/config.yaml

@@ -30,6 +30,12 @@ deploy_targets:
     # deployer handler
     handler: :common_deployer
     builders:
+      single:
+        handler: :copy_builder
+        hooks:
+          builder:
+            after_execute:
+              - <<: *execute_yaml_file
       root:
         handler: :dir_builder
       root_chain:
@@ -60,6 +66,13 @@ deploy_targets:
     # deployer handler
     handler: :common_deployer
     builders:
+      single:
+        handler: :copy_builder
+        hooks:
+          builder:
+            after_execute:
+              - <<: *remove_git_dir
+              - <<: *execute_yaml_file
       root:
         handler: :dir_builder
       root_chain:
@@ -92,6 +105,13 @@ deploy_targets:
     # deployer handler
     handler: :git_deployer
     builders:
+      single:
+        handler: :copy_builder
+        hooks:
+          builder:
+            after_execute:
+              - <<: *execute_yaml_file
+              - <<: *git_commit
       root:
         handler: :direct_builder
         provider: :git_repo_provider

data/lib/application.rb

@@ -16,6 +16,7 @@ require 'docman/builders/builder'
 require 'docman/builders/provider_builder'
 require 'docman/builders/git_provider_builder'
 require 'docman/builders/dir_builder'
+require 'docman/builders/copy_builder'
 require 'docman/builders/direct_builder'
 require 'docman/builders/git_root_chain_builder'
 require 'docman/builders/git_strip_builder'
@@ -223,6 +224,17 @@ module Docman
       Docman::Deployers::Deployer.create(params, nil, self).perform
     end
 
+    def config_dirs(options)
+      config_dirs = []
+      if options[:config_dir]
+        config_dirs = options[:config_dir].split(',')
+      end
+      config_dirs.push('.unipipe')
+      config_dirs.push('.drupipe')
+      config_dirs.push('')
+      config_dirs
+    end
+
     def force?
       @force or @options[:force]
     end

data/lib/docman/builders/copy_builder.rb

@@ -0,0 +1,29 @@
+require 'pathname'
+
+module Docman
+  module Builders
+    class CopyBuilder < Builder
+
+      register_builder :copy_builder
+
+      def prepare_build_dir
+        if not @context['root_repo'].nil?
+          GitUtil.get(@context['root_repo'], @context['full_build_path'], @context.version_type(type: 'root'), @context.version(type: 'root'), true, 1)
+        end
+      end
+
+      def execute
+        prepare_build_dir
+        docroot_config_dir = Pathname(@context['docroot_config'].docroot_config_dir)
+        config_dir = Pathname(@context['docroot_config'].config_dir)
+        log("Copy project files from: #{docroot_config_dir}")
+        `rsync -a --exclude '.git' --exclude 'config.json' --exclude '#{config_dir.relative_path_from(docroot_config_dir)}' #{File.join(@context['docroot_config'].docroot_dir, 'config')}/. #{@context['full_build_path']}`
+      end
+
+      def version
+        @context['build_path']
+      end
+
+    end
+  end
+end

data/lib/docman/cli.rb

@@ -41,6 +41,7 @@ module Docman
     desc 'build', 'Build docroot'
     method_option :force, :aliases => '-f', :desc => 'Force full rebuild'
     method_option :config, :desc => 'Configuration override JSON'
+    method_option :config_dir, :desc => 'Config directories divided by coma where docman will search for config.yaml'
     option :tag
     def build(deploy_target, state)
       get_to_root_dir
@@ -54,6 +55,7 @@ module Docman
     desc 'deploy', 'Deploy to target'
     method_option :force, :aliases => '-f', :desc => 'Force full deploy'
     method_option :config, :desc => 'Configuration override JSON'
+    method_option :config_dir, :desc => 'Config directories divided by coma where docman will search for config.yaml'
     def deploy(deploy_target, name, type, version)
       get_to_root_dir
       if version.start_with?('state_')
@@ -97,6 +99,7 @@ module Docman
 
     desc 'info', 'Get info'
     method_option :force, :aliases => '-f', :desc => 'Force full rebuild'
+    method_option :config_dir, :desc => 'Config directories divided by coma where docman will search for config.yaml'
     option :tag
     def info(command, file)
       say(Application.instance.info(command, file, options).to_json);

data/lib/docman/commands/clean_changed_cmd.rb

@@ -13,6 +13,7 @@ module Docman
       if File.directory? @context['full_build_path']
         if @context.need_rebuild?
           return false if @context['type'] == 'dir'
+          return false if @context['type'] == 'single' and @context['build_type'] == :copy_builder and not GitUtil.repo?(@context['full_build_path'])
           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'] == :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'])

data/lib/docman/commands/yaml_execute_cmd.rb

@@ -20,9 +20,9 @@ module Docman
           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
+              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
+              if not build_file.nil?
                 build_file_yaml = YAML::load_file(build_file)
                 commands = build_file_yaml[self['stage']]
                 source = yaml_file_name

data/lib/docman/config.rb

@@ -24,14 +24,14 @@ module Docman
       @unmutable_config = Marshal::load(Marshal.dump(@config))
     end
 
-    def merge_config_from_file(docroot_config_dir, config_file, options = nil)
+    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']
-          scenarios_path = File.join(docroot_config_dir, '/../', 'scenarios')
+          scenarios_path = File.join(docroot_dir, '.docman/scenarios')
           `rm -fR #{scenarios_path}` if File.directory? scenarios_path
-          `mkdir -p scenarios_path`
+          `mkdir -p #{scenarios_path}`
           unless config['scenarioSources']
             config['scenarioSources'] = {}
           end

data/lib/docman/docroot_config.rb

@@ -1,3 +1,4 @@
+require 'application'
 require 'fileutils'
 require 'docman/info'
 
@@ -5,7 +6,7 @@ module Docman
 
   class DocrootConfig
 
-    attr_reader :structure, :deploy_target, :docroot_dir, :root, :raw_infos
+    attr_reader :structure, :deploy_target, :docroot_dir, :docroot_config_dir, :config_dir, :root, :raw_infos
 
     def initialize(docroot_dir, deploy_target_name = nil, options = nil)
       @override = {}
@@ -17,10 +18,18 @@ module Docman
       @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(@docroot_config_dir, 'config.yaml', options)
-      end
+      update('origin')
+      config_files = Docman::Application.instance.config_dirs(options).collect{|item|
+        File.join(@docroot_config_dir, item, 'config.{yaml,yml}')
+      }
+      config_file_path = Dir.glob(config_files).first
+
+      raise "Configuration file config.{yaml,yml} not found." if config_file_path.nil?
+
+      @config_dir = File.dirname(config_file_path)
+      @config_file = File.basename(config_file_path)
+
+      Docman::Application.instance.config.merge_config_from_file(docroot_dir, @config_dir, @config_file, options)
 
       if deploy_target_name
         @deploy_target = Application.instance.config['deploy_targets'][deploy_target_name]
@@ -39,8 +48,10 @@ module Docman
     end
 
     def update(options = '')
+      Dir.chdir @docroot_config_dir
       GitUtil.exec("reset --hard", false)
-      GitUtil.update @docroot_config_dir, options
+      branch = GitUtil.branch
+      GitUtil.update @docroot_config_dir, "#{options} #{branch.strip}"
     end
 
     def structure_build_from_config_file(path, prefix = '', parent = nil, parent_key = 'master')
@@ -60,9 +71,9 @@ module Docman
       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['full_build_path'] = File.join(@docroot_dir, '.docman', prefix)
+      info['temp_path'] = File.join(@docroot_dir, '.docman/tmp', info['build_path'])
+      info['states_path'] = File.join(@docroot_dir, '.docman/states', info['build_path'])
       info['name'] = name
       info['parent'] = parent
       info['order'] = info.has_key?('order') ? info['order'] : 10
@@ -105,9 +116,9 @@ module Docman
       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['full_build_path'] = File.join(@docroot_dir, '.docman', prefix)
+      info['temp_path'] = File.join(@docroot_dir, '.docman/tmp', info['build_path'])
+      info['states_path'] = File.join(@docroot_dir, '.docman/states', info['build_path'])
       info['name'] = name
       info['parent'] = parent
       info['order'] = info.has_key?('order') ? info['order'] : 10
@@ -172,4 +183,4 @@ module Docman
     end
 
   end
-end
+end

data/lib/docman/git_util.rb

@@ -19,7 +19,7 @@ module Docman
     def self.squash_commits(commit_count, message = nil)
       message = "$(git log --format=%B --reverse HEAD..HEAD@{1})" unless message
       exec "reset --soft HEAD~#{commit_count}"
-      exec "commit -m \"#{message}\""
+      exec "commit --no-verify -m \"#{message}\""
     end
 
     def self.reset_repo(path)
@@ -84,7 +84,7 @@ module Docman
         # pull root_path
         Dir.chdir root_path
         exec %Q(add --all #{path.slice "#{root_path}/"})
-        exec %Q(commit -m "#{message}") if repo_changed? path
+        exec %Q(commit --no-verify -m "#{message}") if repo_changed? path
         self.tag(root_path, tag) if tag
         Docman::Application.instance.commit_count = Docman::Application.instance.commit_count + 1
       end
@@ -126,4 +126,4 @@ module Docman
     end
   end
 
-end
+end

data/lib/docman/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docman
 version: !ruby/object:Gem::Version
-  version: 0.0.81
+  version: 0.0.82
 platform: ruby
 authors:
 - Alexander Tolstikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-12 00:00:00.000000000 Z
+date: 2017-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -199,6 +199,7 @@ files:
 - features/support/step_definitions/dm_steps.rb
 - lib/application.rb
 - lib/docman/builders/builder.rb
+- lib/docman/builders/copy_builder.rb
 - lib/docman/builders/dir_builder.rb
 - lib/docman/builders/direct_builder.rb
 - lib/docman/builders/git_provider_builder.rb