docman 0.0.69 → 0.0.70

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2cfada338b5ce6e3933b80a951142d7424f6f88f
-  data.tar.gz: 7bc258320b19c0faa53316b67b2a54ba79ec7e9e
+  metadata.gz: 10005717e54be448ce35f02aa8d0ec48d66facf8
+  data.tar.gz: aa012e44fa94f8bac747aff2645820c718e221e6
 SHA512:
-  metadata.gz: 951bb5f771f4fd4d1823f45ed5b03efeff03048bc6021fd2f90c630cffef075cdb44af3eaa805e59b2e7be12bf72551f6bc49f3f5079b9a0be280c60d6e3f7ac
-  data.tar.gz: 80c7cb1ea9b88fac99e07e97bff921ae180be09f8ba5a6d9f398249186ff2dfef3fa70e0ed79ecdf56167a1a73a1bcec8422a3c8945cda804d326bc2637eecc6
+  metadata.gz: 5f677a8c437fc6a63975e463de020897e471d9be014d7da1cd123fef589cde563e2112750008aeaae243a1738d873df623480b0b9b51dd96f2c3093e37534697
+  data.tar.gz: d9d68d33374aad7b20b20fe0a25995d9ec2857f450f51489a85742dccddf945090ac41fdbfb6739c1b6ea4e479e0d8a542fb5d06a3d4e3292b07eaa2a27aaee3

data/config/config.yaml

@@ -5,6 +5,8 @@ deploy_targets:
     builders:
       root:
         handler: :dir_builder
+      root_chain:
+        handler: :git_direct_builder
       drupal:
         handler: :drupal_drush_builder
       repo:
@@ -26,6 +28,15 @@ deploy_targets:
           builder:
             after_execute:
               - type: :git_commit
+                order: 100
+                execution_dir: $PROJECT$
+      root_chain:
+        handler: :git_root_chain_builder
+        hooks:
+          builder:
+            after_execute:
+              - type: :git_commit
+                order: 100
                 execution_dir: $PROJECT$
       drupal:
         handler: :drupal_drush_builder
@@ -33,6 +44,7 @@ deploy_targets:
           builder:
             after_execute:
               - type: :git_commit
+                order: 100
                 execution_dir: $PROJECT$
       repo:
         handler: :git_strip_builder
@@ -40,6 +52,7 @@ deploy_targets:
           builder:
             after_execute:
               - type: :git_commit
+                order: 100
                 execution_dir: $PROJECT$
       dir:
         handler: :dir_builder
@@ -47,6 +60,7 @@ deploy_targets:
           builder:
             after_execute:
               - type: :git_commit
+                order: 100
                 execution_dir: $PROJECT$
       symlink:
         handler: :symlink_builder
@@ -54,6 +68,7 @@ deploy_targets:
           builder:
             after_execute:
               - type: :git_commit
+                order: 100
                 execution_dir: $PROJECT$
     states:
       development: dev

data/lib/application.rb

@@ -16,6 +16,7 @@ require 'docman/builders/builder'
 require 'docman/builders/dir_builder'
 require 'docman/builders/symlink_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'
@@ -27,6 +28,7 @@ require 'docman/commands/create_symlink_cmd'
 require 'docman/commands/execute_script_cmd'
 require 'docman/commands/clean_changed_cmd'
 require 'docman/commands/git_commit_cmd'
+require 'docman/commands/git_copy_repo_content_cmd'
 require 'docman/taggers/tagger'
 require 'docman/taggers/incremental_tagger'
 require 'docman/taggers/option_tagger'
@@ -35,7 +37,7 @@ module Docman
   class Application < Docman::Command
 
     attr_reader :config, :docroot_config
-    attr_accessor :deploy_target, :options, :force
+    attr_accessor :deploy_target, :options, :force, :commit_count
 
     include Singleton
     include Docman::Context
@@ -45,6 +47,7 @@ module Docman
       @workspace_dir = Dir.pwd
       @config = Docman::Config.new(File.join(Pathname(__FILE__).dirname.parent, 'config', 'config.yaml'))
       @force = false
+      @commit_count = 0
     end
 
     def init(name, repo, options)

data/lib/docman/builders/git_direct_builder.rb

@@ -13,9 +13,15 @@ module Docman
 
       def changed?
         stored_version = @context.stored_version['result']
-        @last_revision = GitUtil.last_revision @context['full_build_path']
+        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'], @context['full_build_path'], @context.version_type, @context.version)
+        @version = @context['type'] == 'root' ? @context['build_path'] : GitUtil.get(@context['repo'], repo_path, @context.version_type, @context.version)
         stored_version != @version
       end
 

data/lib/docman/builders/git_root_chain_builder.rb

@@ -0,0 +1,23 @@
+module Docman
+  module Builders
+    class GitRootChainBuilder < Builder
+
+      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
+      end
+
+    end
+  end
+end

data/lib/docman/commands/clean_changed_cmd.rb

@@ -15,6 +15,8 @@ module Docman
           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_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
               return false if GitUtil.repo?(@context['full_build_path'])

data/lib/docman/commands/command.rb

@@ -53,6 +53,7 @@ module Docman
           hooks = Marshal::load(Marshal.dump(hooks))
           unless context.nil? or hooks.nil?
             hooks.each do |hook|
+              hook['order'] = 0 unless hook['order']
               hook['context'] = context
             end
           end
@@ -66,6 +67,7 @@ module Docman
     end
 
     def add_action(name, hook, context = nil)
+      hook['order'] = 0 unless hook['order']
       if @hooks.has_key? name
         @hooks[name] << {'type' => hook}
       else
@@ -75,6 +77,7 @@ module Docman
 
     def run_actions(name)
       if @hooks.has_key?(name) and not @hooks[name].nil?
+        @hooks[name].sort_by!{|a| a['order']}
         @hooks[name].each do |hook|
           next if hook.has_key?('run_on_success_only') and hook['run_on_success_only'] and not @execute_result
           context = hook.has_key?('context') ? hook['context'] : @context

data/lib/docman/commands/git_copy_repo_content_cmd.rb

@@ -0,0 +1,23 @@
+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/deployers/deployer.rb

@@ -146,8 +146,8 @@ module Docman
           if item.need_rebuild?
             build_recursive(item)
             return
-          elsif
-          build_dir(item)
+          else
+            build_dir(item)
           end
         end
       end
@@ -171,6 +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
+        end
       end
 
       # TODO: need to refactor.

data/lib/docman/deployers/git_deployer.rb

@@ -24,7 +24,8 @@ module Docman
         end
 
         GitUtil.commit(root['full_build_path'], root['full_build_path'], 'Updated version', tag)
-        GitUtil.push(root['full_build_path'], root.version)
+        GitUtil.squash_commits(Docman::Application.instance.commit_count)
+        GitUtil.push(root['full_build_path'], root.version(type: 'root'))
       end
 
     end

data/lib/docman/docroot_config.rb

@@ -96,17 +96,9 @@ module Docman
       Digest::MD5.hexdigest(Marshal::dump(@raw_infos))
     end
 
-    def root_path
-      @root['fuil_build_path']
-    end
-
     def deploy_target_name
       @deploy_target.name
     end
 
-    def root_states
-      @root.states
-    end
-
   end
 end

data/lib/docman/docroot_controller.rb

@@ -1,17 +1,12 @@
 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'
-require 'docman/command'
-require 'docman/composite_command'
-require 'docman/builders/commands/create_symlink_cmd'
-require 'docman/builders/commands/execute_script_cmd'
-require 'docman/builders/commands/clean_changed_cmd'
-require 'docman/builders/commands/git_commit_cmd'
 
 # TODO: make universal logging class.
 

data/lib/docman/git_util.rb

@@ -15,6 +15,12 @@ module Docman
       result
     end
 
+    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}\""
+    end
+
     def self.reset_repo(path)
       Dir.chdir path
       exec 'reset --hard'
@@ -74,11 +80,11 @@ module Docman
 
     def self.commit(root_path, path, message, tag = nil)
       if repo_changed? path
-        # puts message
         pull root_path
         exec %Q(add --all #{path.slice "#{root_path}/"})
         exec %Q(commit -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
     end
 

data/lib/docman/info.rb

@@ -21,6 +21,7 @@ module Docman
           self['states'].each_pair do |name, state|
             if state.has_key?('source')
               if state['source']['type'] == :retrieve_from_repo
+                @state_name = name
                 repo = state['source']['repo'] == :project_repo ? self['repo'] : state['source']['repo']
                 external_state_info = read_yaml_from_file(repo, self['states_path'], state['source']['branch'], state['source']['file'])
                 state.deep_merge! external_state_info unless external_state_info.nil? or state.nil?
@@ -32,7 +33,7 @@ module Docman
     end
 
     def read_yaml_from_file(repo, path, version, filename)
-      GitUtil.get(repo, path, 'branch', version, true, 1, need_rebuild?)
+      GitUtil.get(repo, path, 'branch', version, true, 1, true)
       filepath = File.join(path, filename)
       return YAML::load_file(filepath) if File.file? filepath
       nil
@@ -40,12 +41,12 @@ module Docman
       raise "Error in info file: #{filepath}, #{e.message}"
     end
 
-    def version
-      state.nil? ? nil : state['version']
+    def version(options = {})
+      state(options).nil? ? nil : state(options)['version']
     end
 
-    def version_type
-      state.nil? ? nil : state['type']
+    def version_type(options = {})
+      state(options).nil? ? nil : state(options)['type']
     end
 
     def describe(type = 'short')
@@ -117,12 +118,16 @@ module Docman
       YAML::load_file(info_filename)
     end
 
-    def state
-      states[@state_name]
+    def state(options = {})
+      states(options)[@state_name]
     end
 
-    def states
-      self['states']
+    def states(options = {})
+      if options[:type] == 'root' and self['type'] == 'root_chain'
+        self['root_repo_states']
+      else
+        self['states']
+      end
     end
 
     def disabled?

data/lib/docman/version.rb

@@ -1,3 +1,3 @@
 module Docman
-  VERSION = "0.0.69"
+  VERSION = "0.0.70"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docman
 version: !ruby/object:Gem::Version
-  version: 0.0.69
+  version: 0.0.70
 platform: ruby
 authors:
 - Alexander Tolstikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-11 00:00:00.000000000 Z
+date: 2016-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -174,6 +174,7 @@ files:
 - lib/docman/builders/dir_builder.rb
 - lib/docman/builders/drupal_drush_builder.rb
 - lib/docman/builders/git_direct_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/cli.rb
@@ -183,6 +184,7 @@ 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/ssh_target_checker.rb
 - lib/docman/commands/target_checker.rb
 - lib/docman/config.rb