docman 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1322b6af3565d237bc3d042e02662b9e466aee37
-  data.tar.gz: 2747a8cca432a253cf16edfa55be4cedf05acc76
+  metadata.gz: 0fb73f66842f33cfed8718d90967ff300c9003df
+  data.tar.gz: 1a7ab11302d11b040020666a2cdcf03764c24937
 SHA512:
-  metadata.gz: d0acff39dadf9565285b4afde218b9491d18e6dbb1a79b23b6a775e088baae70a3f097bda85e592e45681fd9c4fe914737587d3c46d7803d913496bfcab1b65e
-  data.tar.gz: 1f47d645b9c3d7a20dc4085a520548fc5c40c49930c9e99beeeca186560ef020d6fc9fa5cad3abfecb240cf1060eb0aef838e9063ba8e9616b56209dfb8be5f4
+  metadata.gz: f195b9bcca8313fac8986eaa236e7125263740178b7a59779c2fe9c028ccb309ca652f75e3474ea1bdf059346df78a75596699d93f6bcf55429fd99c35e4a4ec
+  data.tar.gz: 6d219e4d86dfb1f2afd051e9951607a4ee98cc8fbd66737aa9d3bb7d1c9cbb00dc63443cdee35b20bb6066aed98b9e135b24296cf2269034de302b3d3b86f6d7

data/features/git_target/git_target.feature

@@ -63,3 +63,23 @@ Feature: Docroot management - git_target
       | master/profiles/sample_profile |
       | master/projects/sample_project1 |
       | master/projects/sample_project2 |
+
+  @announce
+  @no-clobber
+  @git_target
+  @master
+  @deploy
+  @sites
+  Scenario: git_target deploy sites master
+    Given I cd to "sample-docroot"
+    Then I run `docman deploy git_target sites branch master`
+    Then the exit status should be 0
+    Then the following directories should exist:
+      | master |
+      | master/docroot |
+      | master/docroot/sites |
+      | master/hooks |
+      | master/profiles |
+      | master/profiles/sample_profile |
+      | master/projects/sample_project1 |
+      | master/projects/sample_project2 |

data/lib/application.rb

@@ -57,6 +57,7 @@ module Docman
     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|
@@ -65,7 +66,7 @@ module Docman
     end
 
     def execute(action, state, name = nil)
-      params = @deploy_target.clone
+      params = Marshal.load(Marshal.dump(@deploy_target))
       params['state'] = state
       params['action'] = action
       params['name'] = name

data/lib/docman/builders/builder.rb

@@ -32,16 +32,24 @@ module Docman
 
       before_execute do
         if @context.need_rebuild?
-          log("Need rebuild")
+          @context.build_mode = :rebuild
         else
-          log("Rebuild not needed")
-          raise NoChangesError, 'This version already deployed' unless changed?
+          if @context.changed? or changed?
+            @context.build_mode = :update
+            log("Changed")
+          else
+            log("Not changed")
+            @context.build_mode = :none
+            raise NoChangesError, 'This version already deployed'
+          end
         end
 
       end
 
       after_execute do
-        @execute_result = @context.write_info(@execute_result)
+        if @execute_result
+          @execute_result = @context.write_info(@execute_result)
+        end
       end
 
       def changed?

data/lib/docman/builders/drupal_drush_builder.rb

@@ -7,7 +7,8 @@ module Docman
       register_builder :drupal_drush_builder
 
       def execute
-        return unless @context.need_rebuild?
+        return if @build_mode == :none
+        #return unless @context.need_rebuild?
         puts 'Download drupal through drush'
         FileUtils.mkdir_p(@context['temp_path'])
         Dir.chdir @context['temp_path']

data/lib/docman/builders/git_direct_builder.rb

@@ -7,13 +7,14 @@ module Docman
       def execute
         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
-        @context['type'] == 'root' ? @context['build_path'] : execute_result
+        result = @context['type'] == 'root' ? @context['build_path'] : execute_result
+        GitUtil.repo_changed?(@context['full_build_path']) ? result : false
       end
 
       def changed?
         stored_version = @context.stored_version['result']
         # No commit hash for 'root' as it will be changed later
-        repo_version = @context['type'] == 'root' ? @context['build_path'] : GitUtil.get(@context['repo'], @context['full_build_path'], @context.version_type, @context.version)
+        repo_version = @context['type'] == 'root' ? @context['build_path'] : GitUtil.get(@context['repo'], @context['full_build_path'], @context.version_type, @context.version, true)
         stored_version != repo_version
       end
 

data/lib/docman/builders/git_strip_builder.rb

@@ -11,7 +11,7 @@ module Docman
         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'))
-        result
+        GitUtil.repo_changed?(@context['full_build_path']) ? result : false
       end
 
       def changed?

data/lib/docman/commands/command.rb

@@ -50,7 +50,7 @@ module Docman
     def add_actions(obj, context = nil)
       if obj.has_key? 'hooks' and obj['hooks'].has_key? @type
         obj['hooks'][@type].each_pair do |name, hooks|
-          hooks = hooks.clone
+          hooks = Marshal::load(Marshal.dump(hooks))
           unless context.nil?
             hooks.each do |hook|
               hook['context'] = context

data/lib/docman/commands/git_commit_cmd.rb

@@ -10,9 +10,8 @@ module Docman
 
     before_execute do
       unless GitUtil.repo_changed? @context['root']['full_build_path']
-        raise NoChangesError, "Repo not changed needed, commit not needed"
+        raise NoChangesError, "Repo not changed, commit not needed" unless @context.need_rebuild?
       end
-      # @not_execute = true unless GitUtil.repo_changed? @context['root']['full_build_path']
     end
 
     def execute

data/lib/docman/config.rb

@@ -5,6 +5,8 @@ require 'digest/md5'
 module Docman
   class Config < Hash
 
+    attr_reader :unmutable_config
+
     def initialize(file)
       super
       @config = YAML::load_file(file)
@@ -15,6 +17,7 @@ module Docman
       @config.each_pair do |k, v|
         self[k] = v
       end
+      @unmutable_config = Marshal::load(Marshal.dump(@config))
     end
 
     def merge_config_from_file(file)
@@ -24,7 +27,7 @@ module Docman
     end
 
     def config_hash
-      Digest::MD5.hexdigest(Marshal::dump(self))
+      Digest::MD5.hexdigest(Marshal::dump(@unmutable_config))
     end
 
   end

data/lib/docman/deployers/deployer.rb

@@ -53,7 +53,7 @@ module Docman
 
         stored_config_hash = read_version_file_param('config_hash')
         @config_hash = Docman::Application.instance.config.config_hash
-        @config_yaml = Docman::Application.instance.config.to_yaml
+        @config_yaml = Docman::Application.instance.config.unmutable_config.to_yaml
 
         #TODO: need to refactor
         stored_docroot_config_hash = read_version_file_param('docroot_config_hash')
@@ -66,7 +66,7 @@ module Docman
           Docman::Application.instance.force = true
         end
         if stored_docroot_config_hash != @docroot_config_hash
-          log 'Forced rebuild as configuration was changed', 'info'
+          log 'Forced rebuild as docroot configuration was changed', 'info'
           filename = File.join(@docroot_config.root['full_build_path'], 'docroot_config.yaml')
           log Diffy::Diff.new(read_file(filename), @docroot_config_yaml) if File.file? filename
           Docman::Application.instance.force = true
@@ -105,7 +105,8 @@ module Docman
       def read_file(path)
         YAML::load_file(path)
       rescue
-        raise "Error in config file #{path}"
+        log "Error in config file #{path}"
+        return false
       end
 
       def read_version_file_param(param)
@@ -124,7 +125,7 @@ module Docman
       end
 
       def write_config_file(config, path)
-        File.open(path, 'w') {|f| f.write config.to_yaml}
+        File.open(path, 'w') {|f| f.write config}
       end
 
       def build

data/lib/docman/git_util.rb

@@ -20,28 +20,37 @@ module Docman
       exec 'git clean -f -d'
     end
 
-    def self.get(repo, path, type, version)
+    def self.get(repo, path, type, version, force_return = false)
       if File.directory? path and File.directory?(File.join(path, '.git'))
         Dir.chdir path
 
-        self.reset_repo(path) if self.repo_changed?(path)
+        self.reset_repo(path) #if self.repo_changed?(path)
 
         if type == 'branch'
           exec "git checkout #{version}"
+          initial_revision = self.last_revision
           exec "git pull origin #{version}"
         end
         if type == 'tag'
           exec 'git fetch --tags'
+          initial_revision = self.last_revision
           exec "git checkout tags/#{version}"
         end
       else
+        initial_revision = nil
         FileUtils.rm_rf path if File.directory? path
         exec "git clone #{repo} #{path}"
         Dir.chdir path
         exec "git checkout #{version}"
       end
-      result = `git rev-parse --short HEAD`
+      result = self.last_revision
       @logger.info "Commit hash: #{result}"
+      # force_return or result != initial_revision ? result : false
+      result
+    end
+
+    def self.last_revision
+      result = `git rev-parse --short HEAD`
       result.delete!("\n")
     end
 
@@ -54,7 +63,7 @@ module Docman
         # puts message
         pull root_path
         exec %Q(git add --all #{path.slice "#{root_path}/"})
-        exec %Q(git commit -m "#{message}")
+        exec %Q(git commit -m "#{message}") if repo_changed? path
       end
     end
 

data/lib/docman/info.rb

@@ -5,7 +5,7 @@ module Docman
 
     include Docman::Context
 
-    attr_accessor :need_rebuild
+    attr_accessor :need_rebuild, :build_mode
 
     def initialize(hash = {})
       super
@@ -14,6 +14,7 @@ module Docman
       end
       self['build_type'] = self['docroot_config'].deploy_target['builders'][self['type']]['handler']
       @need_rebuild = Hash.new
+      @changed = Hash.new
     end
 
     def version
@@ -41,6 +42,16 @@ module Docman
       to_save
     end
 
+    def changed?
+      #TODO: need refactor
+      return @changed[self['state']] if not @changed.nil? and @changed.has_key? self['state'] and not @changed[self['state']].nil?
+      @changed[self['state']] = false
+      if need_rebuild?
+        @changed[self['state']] = true
+      end
+      @changed[self['state']]
+    end
+
     def need_rebuild?
       return @need_rebuild[self['state']] if not @need_rebuild.nil? and @need_rebuild.has_key? self['state'] and not @need_rebuild[self['state']].nil?
       @need_rebuild[self['state']] = _need_rebuild?
@@ -66,10 +77,12 @@ module Docman
       return true unless v
       return true if v['type'] != self['type']
       return true if v['build_type'] != self['build_type']
-      return true if (not v['version'].nil? and v['version'] != self.version)
+      # return true if (not v['version'].nil? and v['version'] != self.version)
+      @changed[self['state']] = true if (not v['version'].nil? and v['version'] != self.version)
       return true if (not v['version_type'].nil? and v['version_type'] != self.version_type)
       unless v['state'].nil?
-        return true if v['state'] != self['state']
+        # return true if v['state'] != self['state']
+        @changed[self['state']] = true if v['state'] != self['state']
       end
       false
     end

data/lib/docman/version.rb

@@ -1,3 +1,3 @@
 module Docman
-  VERSION = "0.0.13"
+  VERSION = "0.0.14"
 end

metadata

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