docman 0.0.85 → 0.0.86

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70c7c3f2b86000da6bcba2c94d22aeabe5f0d433
-  data.tar.gz: 0dc6785c2f831f4b75b3133c9050797ddd1bd9b7
+  metadata.gz: 6234e6919844d4f9e7546fcecb7e58711d9bab64
+  data.tar.gz: 8c25759cc79929d0f825d0980f88c16bdd59ce4a
 SHA512:
-  metadata.gz: f4a890537942e8ea538ffd701615dad86fd9fbedc5f54cbfd28a7d75afa1da80a6e9f8b4aaa91f72340c8376d6f48216c93db076b56f82ba7fd5bb65909d9154
-  data.tar.gz: 4356556f737aaf1c98d0be54ec61c2beed20c2cded3c803a099b4468ca3a159c75f1528f2b359472a1b1edb96ee65b4301a3af435011cebca6b4c89b1d346dec
+  metadata.gz: 4bbfae6415164b4e058df0bdef17a1a85a872c358f298eaa97700f029412901223238b6b2eabaf6d1459b19347b04bde21ba7e5bcd045b1074232a8058fc76f8
+  data.tar.gz: 70bdefd68d94284c1c74e8db6b5658e15ca6498835421e739fc0c13b55f3e80c277eafced2a15b4234b9b625521152e4a33e04b233049d87d52d5cf0476e17c0

data/bin/bump-version.sh

@@ -48,8 +48,8 @@ if [ -f VERSION ]; then
     cat CHANGES >> tmpfile
     mv tmpfile CHANGES
     git add CHANGES VERSION
-    git commit -m "[skip] [ci-skip] Version bump to $INPUT_STRING"
-    git tag -a -m "[skip] [ci-skip] Tagging version $INPUT_STRING" "$INPUT_STRING"
+    git commit -m "[skip] [ci-skip] [ci skip] Version bump to $INPUT_STRING"
+    git tag -a -m "[skip] [ci-skip] [ci skip] Tagging version $INPUT_STRING" "$INPUT_STRING"
     git push origin ${INPUT_STRING}
     git push origin master
 else
@@ -67,8 +67,8 @@ else
         echo "" >> CHANGES
         echo "" >> CHANGES
         git add VERSION CHANGES
-        git commit -m "[skip] [ci-skip] Added VERSION and CHANGES files, Version bump to 0.1.0"
-        git tag -a -m "[skip] [ci-skip] Tagging version 0.1.0" "0.1.0"
+        git commit -m "[skip] [ci-skip] [ci skip] Added VERSION and CHANGES files, Version bump to 0.1.0"
+        git tag -a -m "[skip] [ci-skip] [ci skip] Tagging version 0.1.0" "0.1.0"
         git push origin --tags
         git push origin master
     fi
@@ -92,7 +92,7 @@ if [ -n "$1" ]; then
   echo "version: $TAG" >> info.yaml
   git add info.yaml
   if [ -n "$3" ] && [ "$3" == "skip" ]; then
-    git commit -m "[skip] [ci-skip] Changed tag to: $TAG" & git push -u origin ${BRANCH}
+    git commit -m "[skip] [ci-skip] [ci skip] Changed tag to: $TAG" & git push -u origin ${BRANCH}
   else
     git commit -m "Changed tag to: $TAG"
     git push -u origin ${BRANCH}

data/lib/application.rb

@@ -36,6 +36,7 @@ require 'docman/commands/nexus_provider_cmd'
 require 'docman/taggers/tagger'
 require 'docman/taggers/incremental_tagger'
 require 'docman/taggers/option_tagger'
+require 'docman/taggers/source_tagger'
 
 module Docman
   class Application < Docman::Command
@@ -72,7 +73,7 @@ module Docman
       end
       yield
     rescue Exception => e
-      log "Operation failed: #{e.message}", 'error'
+      puts "Operation failed: #{e.message}", 'error'
       if write_to_file
         File.open(failed_filepath, 'w') {|f| f.write(e.message) }
       end

data/lib/docman/deployers/deployer.rb

@@ -10,6 +10,8 @@ module Docman
 
       define_hooks :before_push, :after_push, :before_build, :after_build, :before_deploy, :after_deploy
 
+      attr_accessor :build_results
+
       @@deployers = {}
 
       def self.create(params, context = nil, caller = nil)

data/lib/docman/deployers/git_deployer.rb

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

data/lib/docman/git_util.rb

@@ -16,7 +16,7 @@ module Docman
       result
     end
 
-    def self.squash_commits(commit_count, message = nil)
+    def self.squash_commits(commit_count, message = nil, tag = nil)
       message = "$(git log --format=%B --reverse HEAD..HEAD@{1})" unless message
       exec "reset --soft HEAD~#{commit_count}"
       if Application::instance.options.has_key?('debug')
@@ -24,6 +24,7 @@ module Docman
       else
         exec "commit --quiet --no-verify -m \"#{message}\""
       end
+      self.tag(Dir.pwd, tag) if tag
     end
 
     def self.reset_repo(path)

data/lib/docman/logging.rb

@@ -32,7 +32,7 @@ module Docman
 
     def log(message, type = 'debug')
       if type == 'debug'
-        if Application::instance.options.has_key?('debug')
+        if Application::instance.options.respond_to?('has_key') and Application::instance.options.has_key?('debug')
           logger.send(type, "#{prefix} - #{message}")
         end
       else

data/lib/docman/taggers/source_tagger.rb

@@ -0,0 +1,15 @@
+require 'docman/taggers/tagger'
+
+module Docman
+  class SourceTagger < Docman::Taggers::Tagger
+
+    register_tagger :source
+
+    def execute
+      if @caller.build_results['master']['version_type'] == 'tag'
+        @caller.build_results['master']['version']
+      end
+    end
+
+  end
+end

data/lib/docman/taggers/tagger.rb

@@ -11,7 +11,7 @@ module Docman
         if c
           c.new(params, context, caller, 'tagger')
         else
-          raise "Bad tagger type: #{type}"
+          raise "Bad tagger type: #{params['handler']}"
         end
       end
 

data/lib/docman/version.rb

@@ -1,3 +1,3 @@
 module Docman
-  VERSION = "0.0.85"
+  VERSION = "0.0.86"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docman
 version: !ruby/object:Gem::Version
-  version: 0.0.85
+  version: 0.0.86
 platform: ruby
 authors:
 - Alexander Tolstikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-13 00:00:00.000000000 Z
+date: 2017-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -233,6 +233,7 @@ files:
 - lib/docman/logging.rb
 - lib/docman/taggers/incremental_tagger.rb
 - lib/docman/taggers/option_tagger.rb
+- lib/docman/taggers/source_tagger.rb
 - lib/docman/taggers/tagger.rb
 - lib/docman/version.rb
 homepage: ''