docman 0.0.84 → 0.0.85

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80578901d1ae0de8b772d64bc2fc60377efd4c79
-  data.tar.gz: b3a0a76aaea7b08d1b65d176ee592a2e5d9890df
+  metadata.gz: 70c7c3f2b86000da6bcba2c94d22aeabe5f0d433
+  data.tar.gz: 0dc6785c2f831f4b75b3133c9050797ddd1bd9b7
 SHA512:
-  metadata.gz: f31180892abc6e90eb00e16647fc2ea7b927aba9c68d3836aded44e9dffd8c1d5f62edff882d7510a1e6978089f0c70fa88fca9212fd881f3d1e9987452d3fc0
-  data.tar.gz: '0380ad7bc61bf16e81b4a1b4127d0790e9b1bab8c23d17dbf534fe59f53adaa5f91c6311e4741b5d6f0047b9370890b163733492205e51d6e2823e8f9da74b51'
+  metadata.gz: f4a890537942e8ea538ffd701615dad86fd9fbedc5f54cbfd28a7d75afa1da80a6e9f8b4aaa91f72340c8376d6f48216c93db076b56f82ba7fd5bb65909d9154
+  data.tar.gz: 4356556f737aaf1c98d0be54ec61c2beed20c2cded3c803a099b4468ca3a159c75f1528f2b359472a1b1edb96ee65b4301a3af435011cebca6b4c89b1d346dec

data/lib/application.rb

@@ -66,7 +66,7 @@ module Docman
     def with_rescue(write_to_file = true)
       failed_filepath = File.join(@workspace_dir, 'failed')
       if File.file?(failed_filepath)
-        log 'Last operation failed, forced rebuild mode'
+        puts 'Last operation failed, forced rebuild mode'
         FileUtils.rm_f failed_filepath
         @force = true
       end

data/lib/docman/cli.rb

@@ -10,6 +10,7 @@ module Docman
 
     desc 'init "dirname" "repo"', 'Initialize docroot in "dirname" from config repo "repo"'
     method_option :force, :aliases => '-f', :desc => 'Force init'
+    method_option :debug, :aliases => '-d', :desc => 'Debug'
     method_option :skip, :aliases => '-s', :desc => 'Skip if docroot initialized already'
     option :branch
     def init(name, repo)
@@ -40,6 +41,7 @@ module Docman
 
     desc 'build', 'Build docroot'
     method_option :force, :aliases => '-f', :desc => 'Force full rebuild'
+    method_option :debug, :aliases => '-d', :desc => 'Debug'
     method_option :config, :desc => 'Configuration override JSON'
     method_option :config_dir, :desc => 'Config directories divided by coma where docman will search for config.yaml'
     option :tag
@@ -54,6 +56,7 @@ module Docman
 
     desc 'deploy', 'Deploy to target'
     method_option :force, :aliases => '-f', :desc => 'Force full deploy'
+    method_option :debug, :aliases => '-d', :desc => 'Debug'
     method_option :config, :desc => 'Configuration override JSON'
     method_option :config_dir, :desc => 'Config directories divided by coma where docman will search for config.yaml'
     def deploy(deploy_target, name, type, version)
@@ -99,6 +102,7 @@ module Docman
 
     desc 'info', 'Get info'
     method_option :force, :aliases => '-f', :desc => 'Force full rebuild'
+    method_option :debug, :aliases => '-d', :desc => 'Debug'
     method_option :config_dir, :desc => 'Config directories divided by coma where docman will search for config.yaml'
     option :tag
     def info(command, file)

data/lib/docman/deployers/deployer.rb

@@ -83,7 +83,7 @@ module Docman
         else
           log 'No changes in docroot', 'info'
         end
-        log "Deploy results:\n" + @build_results.to_yaml
+        log "Deploy results:\n" + @build_results.to_yaml, 'info'
       end
 
       def deploy

data/lib/docman/git_util.rb

@@ -19,14 +19,20 @@ module Docman
     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 --no-verify -m \"#{message}\""
+      if Application::instance.options.has_key?('debug')
+        exec "commit --no-verify -m \"#{message}\""
+      else
+        exec "commit --quiet --no-verify -m \"#{message}\""
+      end
     end
 
     def self.reset_repo(path)
       Dir.chdir path
       exec 'reset --hard'
-      exec 'clean -f -d -x --dry-run'
-      exec 'status'
+      if Application::instance.options.has_key?('debug')
+        exec 'clean -f -d -x --dry-run'
+        exec 'status'
+      end
       exec 'clean -f -d -x'
     end
 
@@ -86,7 +92,14 @@ module Docman
         # pull root_path
         Dir.chdir root_path
         exec %Q(add --all #{path.slice "#{root_path}/"})
-        exec %Q(commit --no-verify -m "#{message}") if repo_changed? path
+        if repo_changed? path
+          if Application::instance.options.has_key?('debug')
+            exec %Q(commit --no-verify -m "#{message}")
+          else
+            exec %Q(commit --quiet --no-verify -m "#{message}")
+          end
+        end
+
         self.tag(root_path, tag) if tag
         Docman::Application.instance.commit_count = Docman::Application.instance.commit_count + 1
       end

data/lib/docman/logging.rb

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

data/lib/docman/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docman
 version: !ruby/object:Gem::Version
-  version: 0.0.84
+  version: 0.0.85
 platform: ruby
 authors:
 - Alexander Tolstikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-06 00:00:00.000000000 Z
+date: 2017-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler