docman 0.0.17 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19f94ad0fa7db90b3885c21db21c601d3f88b3c6
-  data.tar.gz: 31ecc7e39088113ca2b6641b011f2108656dd3e9
+  metadata.gz: 6d91c91e2da9dc5481483fc7e9bdbd5483f2690b
+  data.tar.gz: 387e3605485f728f50a760f9800e8c579904a9e4
 SHA512:
-  metadata.gz: 769e911a9c9f66418a64b249721a64c7e0db4e654bc5cea51f054bc70eca865c44de340e10d9b990f93009a157157af9c03e74049b895c2a4fb2a980707e9541
-  data.tar.gz: 371f377760e27394464e5fecb117d0f883f82f06b27f1416faad1dacdef35cd039306a9261017755132dad5b4dce6ec99cb31f1f5a69b98524438ce6929e907f
+  metadata.gz: 7028de3b0029ac4e81bd537171ad23474573a62fda966c099a747cc4e23c2953ffd2fa6a2198c718a730727e4f87bd0bf50253b95fcfdb0343501c5f818eae43
+  data.tar.gz: 7da3e17324ae345528ae23b4d01d77b86e0a7e9086fd68378eb6413eba60cb07340c93f402e42018e9fdcd6942898fb42a72714f080d20316cfeb09b1cd0a69c

data/lib/application.rb

@@ -45,8 +45,11 @@ module Docman
       @force = false
     end
 
-    def init(name, repo)
-      `mkdir #{name} && cd #{name} && git clone --depth 1 #{repo} config`
+    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`
+      #Dir.chdir File.join(name, 'config')
+      #`git checkout #{branch} & git branch -u origin #{branch}`
     end
 
     def with_rescue

data/lib/docman/builders/git_direct_builder.rb

@@ -5,10 +5,12 @@ module Docman
       register_builder :git_direct_builder
 
       def execute
+        old_revision = GitUtil.last_revision @context['full_build_path']
         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
+        last_revision = GitUtil.last_revision @context['full_build_path']
         @version = @context['type'] == 'root' ? @context['build_path'] : execute_result
-        GitUtil.repo_changed?(@context['full_build_path']) ? @version : false
+        old_revision != last_revision ? @version : false
       end
 
       def changed?

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 :skip, :aliases => '-s', :desc => 'Skip if docroot initialized already'
+    option :branch
     def init(name, repo)
       if File.directory? name
         say("Directory #{name} already exists")
@@ -32,7 +33,7 @@ module Docman
       end
 
       puts "Init docroot directory #{name} and retrieve config from provided repo."
-      Application.instance.init(name, repo)
+      Application.instance.init(name, repo, options)
       say('Complete!', :green)
     end
 

data/lib/docman/git_util.rb

@@ -47,14 +47,19 @@ module Docman
         Dir.chdir path
         exec "git checkout #{version}"
       end
-      result = type == 'branch' ? self.last_revision : version
+      result = type == 'branch' ? self.last_revision(path) : version
       result
     end
 
 
-    def self.last_revision
-      result = `git rev-parse --short HEAD`
-      result.delete!("\n")
+    def self.last_revision(path = nil)
+      result = nil
+      if self.repo? path
+        Dir.chdir path unless path.nil?
+        result = `git rev-parse --short HEAD`
+        result.delete!("\n")
+      end
+      result
     end
 
     def self.update(path)

data/lib/docman/info.rb

@@ -108,6 +108,7 @@ module Docman
       false
     end
 
+    #TODO: check if info.yaml needed for local state
     def stored_version
       info_filename = File.join(self['full_build_path'], 'info.yaml')
       return false unless File.file?(info_filename)

data/lib/docman/version.rb

@@ -1,3 +1,3 @@
 module Docman
-  VERSION = "0.0.17"
+  VERSION = "0.0.18"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docman
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
 platform: ruby
 authors:
 - Alexander Tolstikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-22 00:00:00.000000000 Z
+date: 2014-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler