docman 0.0.22 → 0.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 103f476110120a4e3c22f27b456485adcfdd83ad
-  data.tar.gz: d11746e3b2708ded9f6e5d444f0c78922e097e88
+  metadata.gz: 4e87d9c175a4024bd789e088d61fc1f492db5d95
+  data.tar.gz: 539ec6f6f39e0ad0c0893394c9e9c4df8c8713c1
 SHA512:
-  metadata.gz: bd04c5684892cc31265c6b4a32f45e246216d986aa7c3096c7735d691a681e5f0109a42da94dbcb8da8d0f5c02279fcb2fe6697a9b0ec3076b32c46ed39b44b4
-  data.tar.gz: 222ac105c76a2eaa9eafae9fc4063243f0a5b14b31fd530ef2051534baea34d2d9317109d65a464fd9b6eec85bc06c26fbebdbae627c65691fb467da3eec22fd
+  metadata.gz: 179e3da3714364be4062cfacba7e069499b4c9edd9aa3e68ab1b6c4eb555683ba16b3e3bf95f4dfb6637eb5e57e22c766d0d0e53f56fd7cff97d09772d27a2f2
+  data.tar.gz: 174cc27a2d507a8c65568916c09af35527dd63acc9590f2ca7a237577628000f5ffade7b8541adf062c230b4dd54fb2a5016cd44007a66fa59f5e8143a48ba49

data/lib/application.rb

@@ -47,7 +47,9 @@ module Docman
 
     def init(name, repo, options)
       branch = options['branch'] ? options['branch'] : 'master'
-      `mkdir #{name} && cd #{name} && git clone -b #{branch} --single-branch --depth 1 #{repo} config`
+      `mkdir #{name}`
+      Dir.chdir name
+      GitUtil.clone_repo(repo, 'config', 'branch', branch, true, 1)
       #Dir.chdir File.join(name, 'config')
       #`git checkout #{branch} & git branch -u origin #{branch}`
     end

data/lib/docman/git_util.rb

@@ -5,18 +5,12 @@ module Docman
   module GitUtil
 
     @logger = Logger.new(STDOUT)
+    @git = ENV.has_key?('GIT_CMD') ? ENV['GIT_CMD'] : 'git'
 
-    def self.git
-      result = ENV.has_key?('GIT_CMD') ? ENV['GIT_CMD'] : 'git'
-      puts result
-      @logger.info ENV
-      result
-    end
-
-    def self.exec(command)
-      @logger.info command
-      result = `#{git} #{command}`.delete!("\n")
-      @logger.info result if result
+    def self.exec(command, show_result = true)
+      @logger.info "#{@git} #{command}"
+      result = `#{@git} #{command}`.delete!("\n")
+      @logger.info result if show_result and result
       raise "ERROR: #{result}" unless $?.exitstatus == 0
       result
     end
@@ -43,14 +37,7 @@ module Docman
         end
       else
         FileUtils.rm_rf path if File.directory? path
-        if type == 'branch'
-          single_branch = single_branch ? "-b #{version} --single-branch" : ''
-          depth = (depth and depth.is_a? Integer) ? "--depth #{depth}" : ''
-        else
-          single_branch=''
-          depth=''
-        end
-        exec "clone #{single_branch} #{depth} #{repo} #{path}"
+        clone_repo(repo, path, type, version, single_branch, depth)
         Dir.chdir path
         exec "checkout #{version}"
       end
@@ -58,6 +45,16 @@ module Docman
       result
     end
 
+    def self.clone_repo(repo, path, type, version, single_branch = nil, depth = nil)
+      if type == 'branch'
+        single_branch = single_branch ? "-b #{version} --single-branch" : ''
+        depth = (depth and depth.is_a? Integer) ? "--depth #{depth}" : ''
+      else
+        single_branch=''
+        depth=''
+      end
+      exec("clone #{single_branch} #{depth} #{repo} #{path}")
+    end
 
     def self.last_revision(path = nil)
       result = nil

data/lib/docman/version.rb

@@ -1,3 +1,3 @@
 module Docman
-  VERSION = "0.0.22"
+  VERSION = "0.0.23"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docman
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.0.23
 platform: ruby
 authors:
 - Alexander Tolstikov