docman 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4bab1348bae18d45a114e6b4d6b09062941dea2b
-  data.tar.gz: aea9b94d3dcc51c3c8434742656f8d088a31e5fa
+  metadata.gz: c523b74f00ef5c2e00b332f79f8e886bb8432991
+  data.tar.gz: 7690899373bc70b61271f3d376b829a547c33ec6
 SHA512:
-  metadata.gz: f92686f1ef0f5da95066dfbf18ef3b6d784d00df281347126855cbca9ee9a919596ce1d0d6b67634d5f11e91d4ff06b817b7b5d95d82eb9eae96f9d6d467a309
-  data.tar.gz: fe889237d4ca329320f242e9e86655f9e589b7186deb41ac39f2a091defc898298b2c374ea14a91dd7183c549d70db3b16db47d0571082412bda84f88ec22d56
+  metadata.gz: a87b66ae034745a1f126e727932fca79442367110d6afed95646dc925bdd3035699fcbc70922e2d0740a138dadba8d73ad2c6502a87da53858bd78fe1bb8a022
+  data.tar.gz: 6df3d08107aa0e8b1d624bdaa7c8c384abd3d409151c9a32070adf63b150f8177abeeee385aaa503e62dc029fa404618d3f62ea2a97177b2a98005e9da740e43

data/docman.gemspec

@@ -26,4 +26,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'hash-deep-merge'
   spec.add_dependency 'net-sftp'
   spec.add_dependency 'hooks'
+  spec.add_dependency 'diffy'
 end

data/lib/application.rb

@@ -65,7 +65,7 @@ module Docman
     end
 
     def execute(action, state, name = nil)
-      params = @deploy_target
+      params = @deploy_target.clone
       params['state'] = state
       params['action'] = action
       params['name'] = name

data/lib/docman/builders/builder.rb

@@ -22,7 +22,7 @@ module Docman
 
       def config
         super
-        add_action('before_execute', {'type' => :clean_changed})
+        add_action('before_execute', {'type' => :clean_changed}, @context)
       end
 
       def validate_command
@@ -31,7 +31,6 @@ module Docman
       end
 
       before_execute do
-        #TODO: rebuld if config changed.
         if @context.need_rebuild?
           log("Need rebuild")
         else

data/lib/docman/builders/git_direct_builder.rb

@@ -6,12 +6,14 @@ module Docman
 
       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
         @context['type'] == 'root' ? @context['build_path'] : execute_result
       end
 
       def changed?
         stored_version = @context.stored_version['result']
-        repo_version = GitUtil.get(@context['repo'], @context['full_build_path'], @context.version_type, @context.version)
+        # No commit hash for 'root' as it will be changed later
+        repo_version = @context['type'] == 'root' ? @context['build_path'] : GitUtil.get(@context['repo'], @context['full_build_path'], @context.version_type, @context.version)
         stored_version != repo_version
       end
 

data/lib/docman/builders/git_strip_builder.rb

@@ -4,15 +4,13 @@ module Docman
 
       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']
+        # FileUtils.rm_r @context['temp_path'] if @context.need_rebuild? and File.directory? @context['temp_path']
         result = GitUtil.get(@context['repo'], @context['temp_path'], @context.version_type, @context.version)
         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']) ? result : false
         result
       end
 

data/lib/docman/cli.rb

@@ -1,20 +1,28 @@
 require 'thor'
 require 'application'
+require 'docman/git_util'
 
 module Docman
   class CLI < Thor
 
     # TODO: add proper descriptions.
 
-    desc 'init NAME', 'init to NAME'
+    desc 'init "dirname" "repo"', 'Initialize docroot in "dirname" from config repo "repo"'
     method_option :force, :aliases => '-f', :desc => 'Force init'
+    method_option :skip, :aliases => '-s', :desc => 'Skip if docroot initialized already'
     def init(name, repo)
-      if File.directory? "#{name}"
+      if File.directory? name
         say("Directory #{name} already exists")
         if options[:force]
           FileUtils.rm_r(name)
-        elsif
-        choice = ask('Are you sure you want do delete existing docroot? Type "yes" if you agree.')
+        elsif options[:skip]
+         if File.directory? File.join(name, 'config') and GitUtil.repo? File.join(name, 'config')
+           return
+         else
+           FileUtils.rm_r(name)
+         end
+        else
+          choice = ask('Are you sure you want do delete existing docroot? Type "yes" if you agree.')
           if choice == 'yes'
             FileUtils.rm_r(name)
           elsif

data/lib/docman/commands/clean_changed_cmd.rb

@@ -11,8 +11,14 @@ module Docman
     def execute
       if File.directory? @context['full_build_path']
         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'])
+          if @context['type'] == 'repo'
+            if @context['build_type'] == :dir_direct_builder
+              return false if GitUtil.repo?(@context['full_build_path'])
+            end
+          end
           log("Remove #{@context['full_build_path']}")
           FileUtils.rm_rf @context['full_build_path']
         end

data/lib/docman/commands/command.rb

@@ -43,23 +43,29 @@ module Docman
     end
 
     def config
-      add_actions self
-      add_actions @context unless @context.nil?
+      add_actions(self, @context)
+      add_actions(@context, @context) if @context
     end
 
-    def add_actions(obj)
+    def add_actions(obj, context = nil)
       if obj.has_key? 'hooks' and obj['hooks'].has_key? @type
-        obj['hooks'][@type].each_pair do |name, hook|
+        obj['hooks'][@type].each_pair do |name, hooks|
+          hooks = hooks.clone
+          unless context.nil?
+            hooks.each do |hook|
+              hook['context'] = context
+            end
+          end
           if @hooks[name].nil?
-            @hooks[name] = hook
+            @hooks[name] = hooks
           else
-            @hooks[name].concat(hook)
+            @hooks[name].concat(hooks)
           end
         end
       end
     end
 
-    def add_action(name, hook)
+    def add_action(name, hook, context = nil)
       if @hooks.has_key? name
         @hooks[name] << {'type' => hook}
       else
@@ -70,45 +76,41 @@ module Docman
     def run_actions(name)
       if @hooks.has_key? name
         @hooks[name].each do |hook|
-          Docman::Command.create(hook, @context, self).perform
+          context = hook.has_key?('context') ? hook['context'] : @context
+          Docman::Command.create(hook, context, self).perform
         end
       end
     end
 
     def run_with_hooks(method)
        with_logging(method) do
+        run_actions("before_#{method}")
         run_hook "before_#{method}".to_sym
         result = self.send(method)
         @execute_result = result if method == 'execute'
         run_hook "after_#{method}".to_sym
+        run_actions("after_#{method}")
       end
     end
 
-    before_execute do
-      run_actions('before_execute')
-    end
-
     # @abstract
     def execute
       raise NoMethodError.new("Please define #execute for #{self.class.name}", '')
     end
 
-    after_execute do
-      run_actions('after_execute')
-    end
-
     def perform
       config if self.respond_to? :config
       validate_command if self.respond_to? :validate_command
-      @execute_result = run_with_hooks('execute')
+      run_with_hooks('execute')
+      @execute_result
     rescue CommandValidationError => e
-      logger.error "Command validation error: #{e.message}"
+      log "Command validation error: #{e.message}", 'error'
       return false
     rescue NoChangesError => e
-      logger.info "No changes: #{e.message}"
+      log "No changes: #{e.message}", 'error'
       return false
     rescue StandardError => e
-      logger.error e.message
+      log e.message, 'error'
       raise
     ensure
       @execute_result
@@ -130,7 +132,7 @@ module Docman
       value.gsub! '$DOCROOT$', @context['docroot_config'].docroot_dir
       value.gsub! '$PROJECT$', @context['full_build_path']
       value.gsub! '$INFO$', @context['full_path']
-      value.gsub! '$ENVIRONMENT$', @context['docroot_config'].deploy_target['environment']
+      value.gsub! '$ENVIRONMENT$', @context.environment
     end
 
   end

data/lib/docman/commands/execute_script_cmd.rb

@@ -30,7 +30,7 @@ module Docman
       params.each do |param|
         case param
           when 'environment'
-            result << @context['docroot_config'].deploy_target['environment']
+            result << @context.environment
         end
       end
       result.join(' ')

data/lib/docman/commands/ssh_target_checker.rb

@@ -10,6 +10,7 @@ module Docman
       Net::SFTP.start(self['ssh_host'], self['ssh_user']) do |sftp|
         n = 0
         begin
+          sleep 15
           n+=1
           log "Checking if files deployed, retry ##{n}, filename: #{filename}"
           sftp.stat!(filename) do |response|
@@ -18,7 +19,6 @@ module Docman
             end
           end
           data = YAML.load sftp.download!(filename)
-          sleep 30
         end until data['random'] == self['version']
       end
       true

data/lib/docman/deployers/deployer.rb

@@ -2,17 +2,19 @@ require 'docman/commands/target_checker'
 require 'docman/commands/ssh_target_checker'
 require 'docman/exceptions/no_changes_error'
 require 'securerandom'
+require 'diffy'
 
 module Docman
   module Deployers
     class Deployer < Docman::Command
 
-      attr_accessor :before, :after
-
-      define_hooks :before_push, :after_push
+      define_hooks :before_push, :after_push, :before_build, :after_build, :before_deploy, :after_deploy
 
       @@deployers = {}
 
+      #todo: prod ssh settings deploy target
+      #todo: docroot config in separate repos for projects
+
       def self.create(params, context = nil, caller = nil)
         c = @@deployers[params['handler']]
         if c
@@ -36,64 +38,92 @@ module Docman
       def config
         unless self['name'].nil?
           @docroot_config.chain(@docroot_config.info_by(self['name'])).values.each do |info|
-            add_actions(info)
+            add_actions(info, info)
           end
         end
-      end
 
-      before_execute do
         stored_config_hash = read_version_file_param('config_hash')
         @config_hash = Docman::Application.instance.config.config_hash
+        @config_yaml = Docman::Application.instance.config.to_yaml
+
+        #TODO: need to refactor
         stored_docroot_config_hash = read_version_file_param('docroot_config_hash')
         @docroot_config_hash = @docroot_config.config_hash
-        # config = Docman::Application.instance.config
-        # log(config.to_yaml)
-        if stored_config_hash != @config_hash or stored_docroot_config_hash != @docroot_config_hash
-          logger.info 'Forced rebuild as configuration was changed'
+        @docroot_config_yaml = @docroot_config.raw_infos.to_yaml
+        if stored_config_hash != @config_hash
+          log 'Forced rebuild as configuration was changed', 'info'
+          filename = File.join(@docroot_config.root['full_build_path'], 'config.yaml')
+          log Diffy::Diff.new(read_file(filename), @config_yaml) if File.file? filename
+          Docman::Application.instance.force = true
+        end
+        if stored_docroot_config_hash != @docroot_config_hash
+          log 'Forced rebuild as configuration was changed', 'info'
+          filename = File.join(@docroot_config.root['full_build_path'], 'docroot_config.yaml')
+          log Diffy::Diff.new(read_file(filename), @docroot_config_yaml) if File.file? filename
           Docman::Application.instance.force = true
         end
       end
 
       def execute
-        logger.info "Deploy started"
-        if self['name'].nil?
-          build_recursive
-        else
-          build_dir_chain(@docroot_config.info_by(self['name']))
-        end
-
+        run_with_hooks('build')
         if @changed
-          filename = 'version.yaml'
-          path = File.join(@docroot_config.root['full_build_path'], filename)
-          version = SecureRandom.hex
-          write_version_file version, path
-          run_with_hooks('push')
-          raise 'Files are not deployed' unless files_deployed? version, filename
+          run_with_hooks('deploy')
         else
-          logger.info 'No changes in docroot'
+          log 'No changes in docroot', 'info'
         end
-        logger.debug 'Deploy results:'
-        logger.debug @build_results.to_yaml
-        logger.info 'Deploy finished'
+        log "Deploy results:\n" + @build_results.to_yaml
+      end
+
+      def deploy
+        filename = 'version.yaml'
+        path = File.join(@docroot_config.root['full_build_path'], filename)
+        version = SecureRandom.hex
+        write_version_file version, path
+        write_config_file @config_yaml, File.join(@docroot_config.root['full_build_path'], 'config.yaml')
+        write_config_file @docroot_config_yaml, File.join(@docroot_config.root['full_build_path'], 'docroot_config.yaml')
+        run_with_hooks('push')
+        raise 'Files are not deployed' unless files_deployed? version, filename
+      end
+
+      def files_deployed?(version, filename)
+        return true unless self.has_key? 'target_checker'
+        params = self['target_checker']
+        params['version'] = version
+        params['filename'] = filename
+        Docman::TargetChecker.create(params, self).perform
+      end
+
+      def read_file(path)
+        YAML::load_file(path)
       end
 
       def read_version_file_param(param)
         path = File.join(@docroot_config.root['full_build_path'], 'version.yaml')
         return false unless File.file?(path)
-        content = YAML::load_file(path)
+        content = read_file(path)
         content[param] if content.has_key? param
       end
 
       def write_version_file(version, path)
         to_write = Hash.new
         to_write['random'] = version
-        # config = Docman::Application.instance.config.raw_config
-        # log(config.to_yaml)
         to_write['config_hash'] = @config_hash
         to_write['docroot_config_hash'] = @docroot_config_hash
         File.open(path, 'w') {|f| f.write to_write.to_yaml}
       end
 
+      def write_config_file(config, path)
+        File.open(path, 'w') {|f| f.write config.to_yaml}
+      end
+
+      def build
+        if self['name'].nil?
+          build_recursive
+        else
+          build_dir_chain(@docroot_config.info_by(self['name']))
+        end
+      end
+
       def build_dir_chain(info)
         @docroot_config.chain(info).values.each do |item|
           item.state = self['state']
@@ -109,12 +139,10 @@ module Docman
       def build_dir(info)
         return if @builded.include? info['name']
         info.state = self['state']
-
         build_result = Docman::Builders::Builder.create(self['builders'][info['type']], info, self).perform
         logger.info '-------------------------------------------------------'
         @changed = true if build_result
         @build_results[info['name']] = build_result
-
         @builded << info['name']
       end
 
@@ -127,14 +155,6 @@ module Docman
         end
       end
 
-      def files_deployed?(version, filename)
-        return true unless self.has_key? 'target_checker'
-        params = self['target_checker']
-        params['version'] = version
-        params['filename'] = filename
-        Docman::TargetChecker.create(params, self).perform
-      end
-
       def describe(type = 'short')
         properties_info(['handler'])
       end

data/lib/docman/docroot_config.rb

@@ -5,7 +5,8 @@ module Docman
 
   class DocrootConfig
 
-    attr_reader :structure, :deploy_target, :docroot_dir, :root
+    attr_reader :structure, :deploy_target, :docroot_dir, :root, :raw_infos
+
     def initialize(docroot_dir, deploy_target)
       @docroot_dir = docroot_dir
       @deploy_target = deploy_target
@@ -15,7 +16,7 @@ module Docman
         Docman::Application.instance.config.merge_config_from_file(File.join(@docroot_config_dir, 'config.yaml'))
       end
       @names = {}
-      @raw_infos = []
+      @raw_infos = {}
       @structure = structure_build File.join(@docroot_config_dir, 'master')
     end
 
@@ -28,7 +29,7 @@ module Docman
 
       children = []
       info = YAML::load_file(File.join(path, 'info.yaml'))
-      @raw_infos << YAML::load_file(File.join(path, 'info.yaml'))
+      @raw_infos[File.basename path] = YAML::load_file(File.join(path, 'info.yaml'))
       unless info['status'].nil?
         return if info['status'] == 'disabled'
       end
@@ -88,5 +89,9 @@ module Docman
       Digest::MD5.hexdigest(Marshal::dump(@raw_infos))
     end
 
+    def root_path
+      @root['fuil_build_path']
+    end
+
   end
 end

data/lib/docman/info.rb

@@ -98,5 +98,9 @@ module Docman
       []
     end
 
+    def environment
+      self['docroot_config'].deploy_target['environments'][self['state']]
+    end
+
   end
 end

data/lib/docman/version.rb

@@ -1,3 +1,3 @@
 module Docman
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docman
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Alexander Tolstikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-09 00:00:00.000000000 Z
+date: 2014-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -122,6 +122,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: diffy
+  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