docman 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31a8e8ab8ea33da04a99253e913fa7c525f6894b
-  data.tar.gz: 24d389f37957c2dcb57a1f0c427dd6b13e9a5490
+  metadata.gz: 19f94ad0fa7db90b3885c21db21c601d3f88b3c6
+  data.tar.gz: 31ecc7e39088113ca2b6641b011f2108656dd3e9
 SHA512:
-  metadata.gz: bf122265863bbb5756c8d165f172c3674813cb3668c146c6a1984c95cf7f9cbd927ed972bcda4039d187f8fdb7815e0d9cd9f06518973ffc4552be4e8a4eda51
-  data.tar.gz: d9f7cb95ab1acb5240e57e1c5ba73136e2142f44bb10c71fcc00e393bc70c8656cdb8570c425f8b9313c3a919eb673f9f495f1b1eea4061977246e18ee42a4c1
+  metadata.gz: 769e911a9c9f66418a64b249721a64c7e0db4e654bc5cea51f054bc70eca865c44de340e10d9b990f93009a157157af9c03e74049b895c2a4fb2a980707e9541
+  data.tar.gz: 371f377760e27394464e5fecb117d0f883f82f06b27f1416faad1dacdef35cd039306a9261017755132dad5b4dce6ec99cb31f1f5a69b98524438ce6929e907f

data/bin/bump-version.sh

@@ -57,7 +57,7 @@ else
         echo "" >> CHANGES
         git add VERSION CHANGES
         git commit -m "Added VERSION and CHANGES files, Version bump to 0.1.0"
-        git tag -a -m "[skip trigger] Tagging version 0.1.0" "0.1.0"
+        git tag -a -m "[skip] Tagging version 0.1.0" "0.1.0"
         git push origin --tags
         git push
     fi
@@ -77,7 +77,7 @@ if [ -n "$1" ]; then
   echo "type: tag" > info.yaml
   echo "version: $TAG" >> info.yaml
   git add -A
-  git commit -m "[skip trigger] Changed tag to: $TAG" & git push origin ${BRANCH}
+  git commit -m "[skip] Changed tag to: $TAG" & git push origin ${BRANCH}
   git checkout -
   echo ${TAG}
 fi

data/lib/application.rb

@@ -46,46 +46,55 @@ module Docman
     end
 
     def init(name, repo)
-      `mkdir #{name} && cd #{name} && git clone #{repo} config`
+      `mkdir #{name} && cd #{name} && git clone --depth 1 #{repo} config`
+    end
+
+    def with_rescue
+      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
+      yield
+    rescue Exception => e
+      log "Operation failed: #{e.message}", 'error'
+      File.open(failed_filepath, 'w') {|f| f.write('Failed!') }
+      raise e
     end
 
     def build(deploy_target_name, state, options = false)
-      @options = options
-      @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, nil, options['tag'])
+      with_rescue do
+        @options = options
+        @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, nil, options['tag'])
+      end
     end
 
     def deploy(deploy_target_name, name, type, version, options = false)
-      @options = options
-      @deploy_target = @config['deploy_targets'][deploy_target_name]
-      raise "Wrong deploy target: #{deploy_target_name}" if @deploy_target.nil?
-      @deploy_target['name'] = deploy_target_name
-      @docroot_config = DocrootConfig.new(@workspace_dir, deploy_target)
-      @docroot_config.states_dependin_on(name, version).keys.each do |state|
-        execute('deploy', state, name)
+      with_rescue do
+        @options = options
+        @deploy_target = @config['deploy_targets'][deploy_target_name]
+        raise "Wrong deploy target: #{deploy_target_name}" if @deploy_target.nil?
+        @deploy_target['name'] = deploy_target_name
+        @docroot_config = DocrootConfig.new(@workspace_dir, deploy_target)
+        @docroot_config.states_dependin_on(name, version).keys.each do |state|
+          execute('deploy', state, name)
+        end
       end
     end
 
     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['tag'] = tag ? tag : state + '-' + Time.now.strftime("%Y-%m-%d-%H-%M-%S")
       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/git_strip_builder.rb

@@ -6,8 +6,8 @@ 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']
-        @version = GitUtil.get(@context['repo'], @context['temp_path'], @context.version_type, @context.version)
+        FileUtils.rm_r @context['temp_path'] if @context.need_rebuild? and File.directory? @context['temp_path']
+        @version = GitUtil.get(@context['repo'], @context['temp_path'], @context.version_type, @context.version, nil, nil)
         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'))
@@ -16,7 +16,7 @@ module Docman
 
       def changed?
         stored_version = @context.stored_version['result']
-        @version = 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, nil, nil)
         stored_version != @version
       end
 

data/lib/docman/cli.rb

@@ -36,7 +36,7 @@ module Docman
       say('Complete!', :green)
     end
 
-    desc 'build NAME', 'init to NAME'
+    desc 'build', 'Build docroot'
     method_option :force, :aliases => '-f', :desc => 'Force full rebuild'
     option :tag
     def build(deploy_target, state)
@@ -48,7 +48,7 @@ module Docman
       say('Complete!', :green)
     end
 
-    desc 'deploy NAME', 'init to NAME'
+    desc 'deploy', 'Deploy to target'
     method_option :force, :aliases => '-f', :desc => 'Force full deploy'
     def deploy(deploy_target, name, type, version)
       if version.start_with?('state_')
@@ -61,19 +61,9 @@ module Docman
       end
     end
 
-    desc 'state NAME', 'init to NAME'
-    def state(name, type, version)
-      config_dir?
-      Application.instance.state(name, type, version)
-      say('Complete!', :green)
-    end
-
     no_commands {
       def config_dir?
-        unless File.directory?('config')
-          $stderr.puts 'ERROR: No config directory in docroot'
-          exit 1
-        end
+        raise 'ERROR: No config directory in docroot' unless File.directory?('config')
       end
     }
   end

data/lib/docman/deployers/deployer.rb

@@ -12,8 +12,6 @@ module Docman
 
       @@deployers = {}
 
-      #todo: docroot config in separate repos for projects
-
       def self.create(params, context = nil, caller = nil)
         c = @@deployers[params['handler']]
         if c
@@ -150,6 +148,14 @@ module Docman
         end
       end
 
+      def build_recursive(info = nil)
+        info = info ? info : @docroot_config.structure
+        build_dir(info)
+        info['children'].each do |child|
+          build_recursive(child)
+        end
+      end
+
       def build_dir(info)
         return if @builded.include? info['name']
         info.state_name = self['state']
@@ -162,15 +168,6 @@ module Docman
         @builded << info['name']
       end
 
-      def build_recursive(info = nil)
-        info = info ? info : @docroot_config.structure
-        build_dir(info)
-
-        info['children'].each do |child|
-          build_recursive(child)
-        end
-      end
-
       # TODO: need to refactor.
       def describe(type = 'short')
         properties_info(['handler'])

data/lib/docman/git_util.rb

@@ -20,7 +20,8 @@ module Docman
       exec 'git clean -f -d'
     end
 
-    def self.get(repo, path, type, version)
+    def self.get(repo, path, type, version, single_branch = nil, depth = nil, reset = false)
+      FileUtils.rm_rf path if reset and File.directory? path
       if File.directory? path and File.directory?(File.join(path, '.git'))
         Dir.chdir path
         self.reset_repo(path) #if self.repo_changed?(path)
@@ -35,7 +36,14 @@ module Docman
         end
       else
         FileUtils.rm_rf path if File.directory? path
-        exec "git clone #{repo} #{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 "git clone #{single_branch} #{depth} #{repo} #{path}"
         Dir.chdir path
         exec "git checkout #{version}"
       end
@@ -43,14 +51,6 @@ module Docman
       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`

data/lib/docman/info.rb

@@ -21,7 +21,7 @@ module Docman
           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'])
+              external_state_info = read_yaml_from_file(repo, self['temp_path'], state['source']['branch'], state['source']['file'])
               state.deep_merge! external_state_info
             end
           end
@@ -29,6 +29,15 @@ module Docman
       end
     end
 
+    def read_yaml_from_file(repo, path, version, filename)
+      GitUtil.get(repo, path, 'branch', version, nil, nil, need_rebuild?)
+      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 version
       state.nil? ? nil : state['version']
     end

data/lib/docman/version.rb

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

metadata

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