docman 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0fb73f66842f33cfed8718d90967ff300c9003df
-  data.tar.gz: 1a7ab11302d11b040020666a2cdcf03764c24937
+  metadata.gz: d138ff74ad5837f8460e69faec2e19fcf97ee0a5
+  data.tar.gz: ef1848962b219e8780fde2f4ffdc4e3a283ea539
 SHA512:
-  metadata.gz: f195b9bcca8313fac8986eaa236e7125263740178b7a59779c2fe9c028ccb309ca652f75e3474ea1bdf059346df78a75596699d93f6bcf55429fd99c35e4a4ec
-  data.tar.gz: 6d219e4d86dfb1f2afd051e9951607a4ee98cc8fbd66737aa9d3bb7d1c9cbb00dc63443cdee35b20bb6066aed98b9e135b24296cf2269034de302b3d3b86f6d7
+  metadata.gz: 0fd814d827b2a89666f19bf9b9cc320482f214fdecf205d22678de82258744378f335159881b22e40e9b0b1f3a63fb3a01d5720c153c15ddc92118c18c772058
+  data.tar.gz: d62645d7718be612acff746ea478bf2af4715a350cf94c1c12f89441a2f49c5af7567a6a4f88ed4740761172a49c9f37e2740bb297b5935f02a3264a80a864b3

data/bin/bump-version.sh

@@ -29,6 +29,7 @@ if [ -f VERSION ]; then
     fi
     echo "Will set new version to be $INPUT_STRING"
     echo $INPUT_STRING > VERSION
+    TAG=${INPUT_STRING}
     echo "Version $INPUT_STRING:" > tmpfile
     git log --pretty=format:" - %s" "$BASE_STRING"...HEAD >> tmpfile
     echo "" >> tmpfile
@@ -60,5 +61,21 @@ else
         git push origin --tags
         git push
     fi
- 
+    TAG="0.1.0"
+fi
+
+if [ -n "$1" ]; then
+  BRANCH="state_$1"
+  git show-ref --verify --quiet "refs/heads/${BRANCH}"
+  if [ $? == 0 ]; then
+    git checkout ${BRANCH}
+  else
+    git checkout -b ${BRANCH}
+  fi
+  echo "type: tag" > info.yaml
+  echo "version: $TAG" >> info.yaml
+  git add -A
+  git commit -m "Changed tag to: $TAG" & git push origin ${BRANCH}
+  git checkout -
+  echo ${TAG}
 fi

data/lib/application.rb

@@ -25,6 +25,9 @@ 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/taggers/tagger'
+require 'docman/taggers/incremental_tagger'
+require 'docman/taggers/option_tagger'
 
 module Docman
   class Application < Docman::Command
@@ -51,7 +54,7 @@ module Docman
       @deploy_target = @config['deploy_targets'][deploy_target_name]
       @deploy_target['name'] = deploy_target_name
       @docroot_config = DocrootConfig.new(@workspace_dir, deploy_target)
-      execute('build', state)
+      execute('build', state, nil, options['tag'])
     end
 
     def deploy(deploy_target_name, name, type, version, options = false)
@@ -65,14 +68,24 @@ module Docman
       end
     end
 
-    def execute(action, state, name = nil)
+    def execute(action, state, name = nil, tag = nil)
       params = Marshal.load(Marshal.dump(@deploy_target))
+      failed_filepath = File.join(@workspace_dir, 'failed')
+      if File.file?(failed_filepath)
+        log 'Last operation failed, forced rebuild mode'
+        FileUtils.rm_f failed_filepath
+        @force = true
+      end
       params['state'] = state
       params['action'] = action
       params['name'] = name
+      params['tag'] = tag
       params['environment'] = @config['environments'][@deploy_target['states'][state]]
       params['environment_name'] = @deploy_target['states'][state]
       Docman::Deployers::Deployer.create(params, nil, self).perform
+    rescue Exception => e
+      log "Operation failed: #{e.message}", 'error'
+      File.open(failed_filepath, 'w') {|f| f.write('Failed!') }
     end
 
     def force?

data/lib/docman/builders/builder.rb

@@ -22,6 +22,7 @@ module Docman
 
       def config
         super
+        @version = nil
         add_action('before_execute', {'type' => :clean_changed}, @context)
       end
 
@@ -30,6 +31,10 @@ module Docman
         raise "Context should be of type 'Info'" unless @context.is_a? Docman::Info
       end
 
+      def version
+        @version
+      end
+
       before_execute do
         if @context.need_rebuild?
           @context.build_mode = :rebuild

data/lib/docman/builders/dir_builder.rb

@@ -16,6 +16,10 @@ module Docman
         @context['build_path']
       end
 
+      def version
+        @context['build_path']
+      end
+
     end
   end
 end

data/lib/docman/builders/drupal_drush_builder.rb

@@ -18,6 +18,10 @@ module Docman
         @context.version
       end
 
+      def version
+        @context.version
+      end
+
     end
   end
 end

data/lib/docman/builders/git_direct_builder.rb

@@ -7,15 +7,15 @@ 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
-        result = @context['type'] == 'root' ? @context['build_path'] : execute_result
-        GitUtil.repo_changed?(@context['full_build_path']) ? result : false
+        @version = @context['type'] == 'root' ? @context['build_path'] : execute_result
+        GitUtil.repo_changed?(@context['full_build_path']) ? @version : false
       end
 
       def changed?
         stored_version = @context.stored_version['result']
         # 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, true)
-        stored_version != repo_version
+        @version = @context['type'] == 'root' ? @context['build_path'] : GitUtil.get(@context['repo'], @context['full_build_path'], @context.version_type, @context.version)
+        stored_version != @version
       end
 
     end

data/lib/docman/builders/git_strip_builder.rb

@@ -7,17 +7,17 @@ module Docman
       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']
-        result = GitUtil.get(@context['repo'], @context['temp_path'], @context.version_type, @context.version)
+        @version = 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
+        GitUtil.repo_changed?(@context['full_build_path']) ? @version : false
       end
 
       def changed?
         stored_version = @context.stored_version['result']
-        repo_version = GitUtil.get(@context['repo'], @context['temp_path'], @context.version_type, @context.version)
-        stored_version != repo_version
+        @version = GitUtil.get(@context['repo'], @context['temp_path'], @context.version_type, @context.version)
+        stored_version != @version
       end
 
     end

data/lib/docman/cli.rb

@@ -38,6 +38,7 @@ module Docman
 
     desc 'build NAME', 'init to NAME'
     method_option :force, :aliases => '-f', :desc => 'Force full rebuild'
+    option :tag
     def build(deploy_target, state)
       config_dir?
       if options[:force]

data/lib/docman/commands/git_commit_cmd.rb

@@ -15,7 +15,7 @@ module Docman
     end
 
     def execute
-      message = "name: #{@context['name']} updated, state: #{@context['state']}"
+      message = "name: #{@context['name']} updated, state: #{@context.state_name}"
       with_logging(message) do
         GitUtil.commit(@context['root']['full_build_path'], @context['full_build_path'], message)
       end

data/lib/docman/commands/ssh_target_checker.rb

@@ -3,6 +3,7 @@ require 'net/sftp'
 module Docman
 
   class SSHTargetChecker < Docman::TargetChecker
+
     register_checker :ssh
 
     def execute

data/lib/docman/deployers/deployer.rb

@@ -12,7 +12,6 @@ module Docman
 
       @@deployers = {}
 
-      #todo: prod ssh settings deploy target
       #todo: docroot config in separate repos for projects
 
       def self.create(params, context = nil, caller = nil)
@@ -33,7 +32,7 @@ module Docman
         @docroot_config = caller.docroot_config
         @builded = []
         @build_results = {}
-        @environments = Docman::Application.instance.config['envoronments']
+        @versions = {}
       end
 
       def config
@@ -41,6 +40,8 @@ module Docman
           @docroot_config.chain(@docroot_config.info_by(self['name'])).values.each do |info|
             add_actions(info, info)
           end
+        else
+          # add_actions()
         end
 
         path = @docroot_config.root['full_build_path']
@@ -121,6 +122,7 @@ module Docman
         to_write['random'] = version
         to_write['config_hash'] = @config_hash
         to_write['docroot_config_hash'] = @docroot_config_hash
+        to_write.deep_merge! @versions
         File.open(path, 'w') {|f| f.write to_write.to_yaml}
       end
 
@@ -138,7 +140,7 @@ module Docman
 
       def build_dir_chain(info)
         @docroot_config.chain(info).values.each do |item|
-          item.state = self['state']
+          item.state_name = self['state']
           if item.need_rebuild?
             build_recursive(item)
             return
@@ -150,11 +152,13 @@ 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
+        info.state_name = self['state']
+        builder = Docman::Builders::Builder.create(self['builders'][info['type']], info, self)
+        build_result = builder.perform
         logger.info '-------------------------------------------------------'
         @changed = true if build_result
-        @build_results[info['name']] = build_result
+        @build_results[info['name']] = build_result ? build_result : 'Not builded'
+        @versions[info['name']] = builder.version
         @builded << info['name']
       end
 
@@ -167,6 +171,7 @@ module Docman
         end
       end
 
+      # TODO: need to refactor.
       def describe(type = 'short')
         properties_info(['handler'])
       end

data/lib/docman/deployers/git_deployer.rb

@@ -6,8 +6,20 @@ module Docman
 
       def push
         root = @docroot_config.root
-        root.state = self['state']
-        GitUtil.commit(root['full_build_path'], root['full_build_path'], 'Updated version.yaml')
+        root.state_name = self['state']
+        tag = nil
+
+        if self['environment'].has_key?('tagger')
+          filepath = File.join(root['full_build_path'], 'VERSION')
+          prev_version = File.file?(filepath) ? File.open(filepath) : nil
+          params = self['environment']['tagger']
+          params['prev_version'] = prev_version
+          version = Docman::Taggers::Tagger.create(params, root, self).perform
+          File.open(filepath, 'w') {|f| f.write(version) }
+          tag = version
+        end
+
+        GitUtil.commit(root['full_build_path'], root['full_build_path'], 'Updated version', tag)
         GitUtil.push(root['full_build_path'], root.version)
       end
 

data/lib/docman/docroot_config.rb

@@ -81,7 +81,7 @@ module Docman
       raise "There is no project with name '#{name}' exists in config" unless @names.has_key? name
 
       states = {}
-      @names[name]['states'].each do |state, info|
+      @names[name].states.each do |state, info|
         states[state] = info if info['version'] == version
       end
       states

data/lib/docman/git_util.rb

@@ -20,35 +20,38 @@ module Docman
       exec 'git clean -f -d'
     end
 
-    def self.get(repo, path, type, version, force_return = false)
+    def self.get(repo, path, type, version)
       if File.directory? path and File.directory?(File.join(path, '.git'))
         Dir.chdir path
-
         self.reset_repo(path) #if self.repo_changed?(path)
-
         if type == 'branch'
+          exec "git fetch"
           exec "git checkout #{version}"
-          initial_revision = self.last_revision
           exec "git pull origin #{version}"
         end
         if type == 'tag'
           exec 'git fetch --tags'
-          initial_revision = self.last_revision
           exec "git checkout tags/#{version}"
         end
       else
-        initial_revision = nil
         FileUtils.rm_rf path if File.directory? path
         exec "git clone #{repo} #{path}"
         Dir.chdir path
         exec "git checkout #{version}"
       end
-      result = self.last_revision
-      @logger.info "Commit hash: #{result}"
-      # force_return or result != initial_revision ? result : false
+      result = type == 'branch' ? self.last_revision : version
       result
     end
 
+    def self.read_yaml_from_file(repo, path, version, filename)
+      self.get(repo, path, 'branch', version)
+      filepath = File.join(path, filename)
+      return YAML::load_file(filepath) if File.file? filepath
+      nil
+    rescue StandardError => e
+      raise "Error in info file: #{filepath}, #{e.message}"
+    end
+
     def self.last_revision
       result = `git rev-parse --short HEAD`
       result.delete!("\n")
@@ -58,12 +61,13 @@ module Docman
       pull path
     end
 
-    def self.commit(root_path, path, message)
+    def self.commit(root_path, path, message, tag = nil)
       if repo_changed? path
         # puts message
         pull root_path
         exec %Q(git add --all #{path.slice "#{root_path}/"})
         exec %Q(git commit -m "#{message}") if repo_changed? path
+        self.tag(root_path, tag) if tag
       end
     end
 
@@ -88,8 +92,14 @@ module Docman
 
     def self.push(root_path, version)
       Dir.chdir root_path
-      `git pull origin #{version}`
-      `git push origin #{version}`
+      exec "git pull origin #{version}"
+      exec "git push origin #{version}"
+    end
+
+    def self.tag(root_path, tag)
+      Dir.chdir root_path
+      exec %Q(git tag -a -m "Tagged to #{tag}" "#{tag}")
+      exec "git push origin #{tag}"
     end
   end
 

data/lib/docman/info.rb

@@ -5,7 +5,7 @@ module Docman
 
     include Docman::Context
 
-    attr_accessor :need_rebuild, :build_mode
+    attr_accessor :need_rebuild, :build_mode, :state_name
 
     def initialize(hash = {})
       super
@@ -15,14 +15,26 @@ module Docman
       self['build_type'] = self['docroot_config'].deploy_target['builders'][self['type']]['handler']
       @need_rebuild = Hash.new
       @changed = Hash.new
+      @state_name = nil
+      if self.has_key? 'states'
+        self['states'].each_pair do |name, state|
+          if state.has_key?('source')
+            if state['source']['type'] == :retrieve_from_repo
+              repo = state['source']['repo'] == :project_repo ? self['repo'] : state['source']['repo']
+              external_state_info = GitUtil.read_yaml_from_file(repo, self['temp_path'], state['source']['branch'], state['source']['file'])
+              state.deep_merge! external_state_info
+            end
+          end
+        end
+      end
     end
 
     def version
-      self['states'][self['state']].nil? ? nil : self['states'][self['state']]['version']
+      state.nil? ? nil : state['version']
     end
 
     def version_type
-      self['states'][self['state']].nil? ? nil : self['states'][self['state']]['type']
+      state.nil? ? nil : state['type']
     end
 
     def describe(type = 'short')
@@ -31,7 +43,7 @@ module Docman
 
     def write_info(result)
       to_save = {}
-      to_save['state'] = self['state']
+      to_save['state'] = @state_name
       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
@@ -44,25 +56,25 @@ module Docman
 
     def changed?
       #TODO: need refactor
-      return @changed[self['state']] if not @changed.nil? and @changed.has_key? self['state'] and not @changed[self['state']].nil?
-      @changed[self['state']] = false
+      return @changed[@state_name] if not @changed.nil? and @changed.has_key? @state_name and not @changed[@state_name].nil?
+      @changed[@state_name] = false
       if need_rebuild?
-        @changed[self['state']] = true
+        @changed[@state_name] = true
       end
-      @changed[self['state']]
+      @changed[@state_name]
     end
 
     def need_rebuild?
-      return @need_rebuild[self['state']] if not @need_rebuild.nil? and @need_rebuild.has_key? self['state'] and not @need_rebuild[self['state']].nil?
-      @need_rebuild[self['state']] = _need_rebuild?
-      if @need_rebuild[self['state']]
+      return @need_rebuild[@state_name] if not @need_rebuild.nil? and @need_rebuild.has_key? @state_name and not @need_rebuild[@state_name].nil?
+      @need_rebuild[@state_name] = _need_rebuild?
+      if @need_rebuild[@state_name]
         set_rebuild_recursive(self, true)
       end
-      @need_rebuild[self['state']]
+      @need_rebuild[@state_name]
     end
 
     def set_rebuild_recursive(obj, value)
-      obj.need_rebuild[self['state']] = value
+      obj.need_rebuild[@state_name] = value
       if obj.has_key?('children')
         obj['children'].each do |info|
           set_rebuild_recursive(info, value)
@@ -78,11 +90,11 @@ module Docman
       return true if v['type'] != self['type']
       return true if v['build_type'] != self['build_type']
       # return true if (not v['version'].nil? and v['version'] != self.version)
-      @changed[self['state']] = true if (not v['version'].nil? and v['version'] != self.version)
-      return true if (not v['version_type'].nil? and v['version_type'] != self.version_type)
+      @changed[@state_name] = true if (not v['version'].nil? and v['version'] != version)
+      return true if (not v['version_type'].nil? and v['version_type'] != version_type)
       unless v['state'].nil?
-        # return true if v['state'] != self['state']
-        @changed[self['state']] = true if v['state'] != self['state']
+        # return true if v['state'] != @state_name
+        @changed[@state_name] = true if v['state'] != @state_name
       end
       false
     end
@@ -93,8 +105,12 @@ module Docman
       YAML::load_file(info_filename)
     end
 
-    def state=(state)
-      self['state'] = state
+    def state
+      states[@state_name]
+    end
+
+    def states
+      self['states']
     end
 
     def disabled?
@@ -112,7 +128,7 @@ module Docman
     end
 
     def environment_name
-      self['docroot_config'].deploy_target['states'][self['state']]
+      self['docroot_config'].deploy_target['states'][@state_name]
     end
 
   end

data/lib/docman/taggers/incremental_tagger.rb

@@ -0,0 +1,17 @@
+require 'docman/taggers/tagger'
+
+module Docman
+  class IncrementalTagger < Docman::Taggers::Tagger
+
+    register_tagger :incremental
+
+    def execute
+      version = self['prev_version'].nil? ? 0 : self['prev_version'].to_i
+      version = 0 unless version.is_a? Integer
+      version + 1
+    rescue
+      1
+    end
+
+  end
+end

data/lib/docman/taggers/option_tagger.rb

@@ -0,0 +1,13 @@
+require 'docman/taggers/tagger'
+
+module Docman
+  class OptionTagger < Docman::Taggers::Tagger
+
+    register_tagger :option
+
+    def execute
+      @caller['tag']
+    end
+
+  end
+end

data/lib/docman/taggers/tagger.rb

@@ -0,0 +1,28 @@
+module Docman
+  module Taggers
+    class Tagger < Docman::Command
+
+      @@taggers = {}
+
+      #todo: docroot config in separate repos for projects
+
+      def self.create(params, context = nil, caller = nil)
+        c = @@taggers[params['handler']]
+        if c
+          c.new(params, context, caller, 'tagger')
+        else
+          raise "Bad tagger type: #{type}"
+        end
+      end
+
+      def self.register_tagger(name)
+        @@taggers[name] = self
+      end
+
+      def initialize(params, context = nil, caller = nil, type = nil)
+        super(params, context, caller, type)
+      end
+
+    end
+  end
+end

data/lib/docman/version.rb

@@ -1,3 +1,3 @@
 module Docman
-  VERSION = "0.0.14"
+  VERSION = "0.0.15"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docman
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Alexander Tolstikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-17 00:00:00.000000000 Z
+date: 2014-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -195,6 +195,9 @@ files:
 - lib/docman/git_util.rb
 - lib/docman/info.rb
 - lib/docman/logging.rb
+- lib/docman/taggers/incremental_tagger.rb
+- lib/docman/taggers/option_tagger.rb
+- lib/docman/taggers/tagger.rb
 - lib/docman/version.rb
 homepage: ''
 licenses: