docman 0.0.76 → 0.0.77

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8be94daef026188f376e990598508337b640edbb
-  data.tar.gz: 9e6bd0190d00092bc09562abf1a3e5d362b64fd6
+  metadata.gz: 2e2afd9b63d84de74e86fac27722672576120501
+  data.tar.gz: bd1940da413dbe6f6ae113375e5ced359561e9c5
 SHA512:
-  metadata.gz: bd07ab28468f3373189433cb2ab82a81b2c7ea00e29b17db8a28790add824ffe0b745df3d045b2526a946c3d9219ac89b296d672e0ee5e3ab5cd46daec68cf9c
-  data.tar.gz: 204f8c2bd9221c232d1613ad201309f985adc58c207fe8cb20f48538b7943d23afc08117e92b547da42f921122efe42cf8df8e4a13eb888a7e51ba1a05bc2e2a
+  metadata.gz: 74a5cf325c5282c0974b95ca90967508c7034439f7bf8db27818f12140a8aa6093e85314fe8a7bb584cab0a7a8d207e91549babb80d040ff409c2e91cd6a0c5d
+  data.tar.gz: b37781c99b404e2fcac0988010d4f83ca4ec2bccc9a248233c3a086b1f974e345a1fdf0d3474cb78e768643126d363fa506696e50b5292e5b3985f092e44f484

data/config/config.yaml

@@ -7,10 +7,31 @@ deploy_targets:
         handler: :dir_builder
       root_chain:
         handler: :git_direct_builder
+        hooks:
+          builder:
+            after_execute:
+              - type: :yaml_execute
+                source_type: file
+                order: -10
+                stage: build
       drupal:
         handler: :drupal_drush_builder
+        hooks:
+          builder:
+            after_execute:
+              - type: :yaml_execute
+                source_type: file
+                order: -10
+                stage: build
       repo:
         handler: :git_direct_builder
+        hooks:
+          builder:
+            after_execute:
+              - type: :yaml_execute
+                source_type: file
+                order: -10
+                stage: build
       dir:
         handler: :dir_builder
       symlink:
@@ -35,6 +56,11 @@ deploy_targets:
         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$
@@ -54,6 +80,11 @@ deploy_targets:
               - 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$

data/lib/application.rb

@@ -28,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/yaml_execute_cmd'
 require 'docman/commands/git_pull_cmd'
 require 'docman/commands/git_copy_repo_content_cmd'
 require 'docman/taggers/tagger'

data/lib/docman/cli.rb

@@ -44,7 +44,7 @@ module Docman
     def build(deploy_target, state)
       get_to_root_dir
       if options[:force]
-        FileUtils.rm_r('master') if File.directory? 'master'
+        FileUtils.rm_rf('master') if File.directory? 'master'
       end
       Application.instance.build(deploy_target, state, options)
       say('Complete!', :green)

data/lib/docman/commands/command.rb

@@ -67,11 +67,14 @@ module Docman
     end
 
     def add_action(name, hook, context = nil)
-      hook['order'] = 0 unless hook['order']
-      if @hooks.has_key? name
-        @hooks[name] << hook
-      else
-        @hooks[name] = [hook]
+      version = Docman::Application.instance.config.version
+      unless hook['version'].nil? || hook['version'] != version
+        hook['order'] = 0 unless hook['order']
+        if @hooks.has_key? name
+          @hooks[name] << hook
+        else
+          @hooks[name] = [hook]
+        end
       end
     end
 
@@ -137,6 +140,7 @@ module Docman
       value.gsub!('$PROJECT$', @context['full_build_path']) unless @context['full_build_path'].nil?
       value.gsub!('$INFO$', @context['full_path']) unless @context['full_path'].nil?
       value.gsub!('$ENVIRONMENT$', @context.environment_name) unless @context.environment_name.nil?
+      value.gsub!('$DOCMAN_BIN$', Application::bin)
     end
 
   end

data/lib/docman/commands/execute_script_cmd.rb

@@ -4,7 +4,6 @@ module Docman
 
     register_command :script
 
-
     def validate_command
       raise Docman::CommandValidationError.new("Please provide 'execution_dir' param") if self['execution_dir'].nil?
       raise Docman::CommandValidationError.new("Please provide 'location' param") if self['location'].nil?

data/lib/docman/commands/yaml_execute_cmd.rb

@@ -0,0 +1,46 @@
+module Docman
+  class YamlExecuteCmd < Docman::Command
+
+    register_command :yaml_execute
+
+    def validate_command
+      raise "Please provide 'context'" if @context.nil?
+      raise "Context should be of type 'Info'" unless @context.is_a? Docman::Info
+      raise "Both file & inline could not be se for this command" if self['yaml_file_name'] && self['inline']
+    end
+
+    before_execute do
+      self['source_type'] = 'inline' if self['source_type'].nil?
+    end
+
+    def execute
+      with_logging('yaml_execute') do
+        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
+            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"
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/docman/config.rb

@@ -23,6 +23,7 @@ module Docman
     def merge_config_from_file(file)
       config = YAML::load_file(file)
       @config.deep_merge(config)
+      @config['version'] = config['version'].nil? ? 1 : config['version']
       assign_to_self
     end
 
@@ -30,5 +31,9 @@ module Docman
       Digest::MD5.hexdigest(Marshal::dump(@unmutable_config))
     end
 
+    def version
+      @config['version']
+    end
+
   end
 end

data/lib/docman/info.rb

@@ -61,8 +61,9 @@ module Docman
       to_save['result'] = result
       to_save['type'] = self['type']
       to_save['build_type'] = self['build_type']
-
-      File.open(File.join(self['full_build_path'], 'info.yaml'), 'w') {|f| f.write to_save.to_yaml}
+      if environment_name() != 'local'
+        File.open(File.join(self['full_build_path'], 'info.yaml'), 'w') {|f| f.write to_save.to_yaml}
+      end
       to_save
     end
 

data/lib/docman/version.rb

@@ -1,3 +1,3 @@
 module Docman
-  VERSION = "0.0.76"
+  VERSION = "0.0.77"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docman
 version: !ruby/object:Gem::Version
-  version: 0.0.76
+  version: 0.0.77
 platform: ruby
 authors:
 - Alexander Tolstikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-18 00:00:00.000000000 Z
+date: 2017-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -188,6 +188,7 @@ files:
 - lib/docman/commands/git_pull_cmd.rb
 - lib/docman/commands/ssh_target_checker.rb
 - lib/docman/commands/target_checker.rb
+- lib/docman/commands/yaml_execute_cmd.rb
 - lib/docman/config.rb
 - lib/docman/context.rb
 - lib/docman/deployers/common_deployer.rb