docman 0.0.43 → 0.0.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b99b2a213903d40fd1cdeac17fe2091fc769d1ce
-  data.tar.gz: dd4d512dcea9b89c414d964f44dcdfd588687a09
+  metadata.gz: 75c527ffe147b306981988ec6e43c9a8f52b5655
+  data.tar.gz: 29c28bb15683e9d69de0b1dd2aafeacdecaa12c3
 SHA512:
-  metadata.gz: 0b79609093e6877a035bb3d9309b900552b0a1fb06e01bcc974afb283290b77d955d0d4f8033c82225d37665f4ce336fbf8398bfe263597fc94ec9dec21bfa28
-  data.tar.gz: ee54712b1cf1923799427f449631a3eb8e2f7dc16a2419441e9aa87c8ffdcb591590885c0cf69a73152dcd90b03a9a20d4c61dfd1202f4000f93ccbd8c5646ff
+  metadata.gz: 5fd302dc345e6aadd97b11cc3dc7ade6d1646bf1dfb57043537e5ea8226f55eb5cab11bd2c74ead4364d8994d5441a8a2ae4f08a6fbfc2356584e5170f8f2e7f
+  data.tar.gz: 045be0319d90b1c7de8dc3cc354fff15a9bed63f10d2bfaf87713789019e98060de658ed978fae3e497c7c95aa9c79d3ad3d0b95d1273fb0be313a70005c1f59

data/README.md

@@ -4,6 +4,8 @@ Docman made for DOCroot MANagement for Drupal projects. Useful to manage multipl
 
 Notes: we are speaking about the code only, media files should be managed separately and for now are out of scope of this tool.
 
+Docman requires Linux or OS X.
+
 ## Installation
 
     $ gem install docman
@@ -37,4 +39,4 @@ Build the destination docroot using your settings:
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
-5. Create a new Pull Request
+5. Create a new Pull Request

data/bin/project-template.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+template_repo=$1
+
+git clone -b master --single-branch --depth 1 ${template_repo} tmp; rm -fR tmp/.git; cp -nR tmp/. .; rm -fR tmp

data/config/config.yaml

@@ -54,3 +54,4 @@ environments:
   local:
     deploy_target: local
     state: development
+    clean_changed: true

data/lib/application.rb

@@ -54,7 +54,7 @@ module Docman
       #`git checkout #{branch} & git branch -u origin #{branch}`
     end
 
-    def with_rescue
+    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'
@@ -64,7 +64,9 @@ module Docman
       yield
     rescue Exception => e
       log "Operation failed: #{e.message}", 'error'
-      File.open(failed_filepath, 'w') {|f| f.write('Failed!') }
+      if write_to_file
+        File.open(failed_filepath, 'w') {|f| f.write(e.message) }
+      end
       raise e
     end
 
@@ -96,6 +98,19 @@ module Docman
       result
     end
 
+    def template(name, options = false)
+      with_rescue(false) do
+        @options = options
+        @docroot_config = DocrootConfig.new(@workspace_dir, nil)
+        project = @docroot_config.project(name)
+        unless project['template'].nil?
+          Dir.chdir project['full_build_path']
+          Exec.do "#{Application::bin}/project-template.sh #{project['template']}"
+          log "Project had been initialized with template: #{project['template']}"
+        end
+      end
+    end
+
     def write_state state
       filepath = File.join(@workspace_dir, 'state')
       File.open(filepath, 'w') { |file| file.write(state) }
@@ -125,6 +140,10 @@ module Docman
       Pathname(__FILE__).dirname.parent
     end
 
+    def environment(name)
+      @config['environments'][name]
+    end
+
     def self.bin
       File.join root, 'bin'
     end

data/lib/docman/builders/builder.rb

@@ -23,7 +23,9 @@ module Docman
       def config
         super
         @version = nil
-        add_action('before_execute', {'type' => :clean_changed}, @context)
+        environment = Application.instance.environment(@context.environment_name)
+        clean_changed = environment['clean_changed'].nil? ? true : environment['clean_changed']
+        add_action('before_execute', {'type' => :clean_changed}, @context) if clean_changed
       end
 
       def validate_command

data/lib/docman/cli.rb

@@ -41,7 +41,7 @@ module Docman
     method_option :force, :aliases => '-f', :desc => 'Force full rebuild'
     option :tag
     def build(deploy_target, state)
-      config_dir?
+      get_to_root_dir
       if options[:force]
         FileUtils.rm_r('master') if File.directory? 'master'
       end
@@ -52,11 +52,11 @@ module Docman
     desc 'deploy', 'Deploy to target'
     method_option :force, :aliases => '-f', :desc => 'Force full deploy'
     def deploy(deploy_target, name, type, version)
+      get_to_root_dir
       if version.start_with?('state_')
         state = version.partition('_').last
         build(deploy_target, state)
       else
-        config_dir?
         result = Application.instance.deploy(deploy_target, name, type, version, options)
         say(result, :green)
       end
@@ -75,9 +75,31 @@ module Docman
       say('Complete!', :green)
     end
 
+    desc 'template', 'Reinit project from template'
+    method_option :force, :aliases => '-f', :desc => 'Force project override with template'
+    option :name
+    def template(name = nil)
+      current_dir_name = File.basename(Dir.pwd)
+      get_to_root_dir
+      name = current_dir_name if name.nil?
+      Application.instance.template(name, options)
+      say('Complete!', :green)
+    end
+
     no_commands {
+      def current_dir_has_config_dir
+        File.directory?('config')
+      end
+
       def config_dir?
-        raise 'ERROR: No config directory in docroot' unless File.directory?('config')
+        raise 'ERROR: No config directory in docroot' unless current_dir_has_config_dir
+      end
+
+      def get_to_root_dir
+        until current_dir_has_config_dir
+          raise 'ERROR: No config directory in docroot' if File.basename(Dir.pwd) == '/'
+          Dir.chdir('..')
+        end
       end
     }
   end

data/lib/docman/deployers/deployer.rb

@@ -40,6 +40,8 @@ module Docman
             add_actions(info, info)
           end
         else
+          # If no name then "state_*" branch is deployed, e.g. "state_stable"
+          # No actions (hooks) should be performed in this case.
           # add_actions()
         end
 

data/lib/docman/docroot_config.rb

@@ -79,11 +79,14 @@ module Docman
       @names[name]
     end
 
-    def states_dependin_on(name, version)
+    def project(name)
       raise "There is no project with name '#{name}' exists in config" unless @names.has_key? name
+      @names[name]
+    end
 
+    def states_dependin_on(name, version)
       states = {}
-      @names[name].states.each do |state, info|
+      project(name).states.each do |state, info|
         states[state] = info if info['version'] == version
       end
       states
@@ -97,5 +100,9 @@ module Docman
       @root['fuil_build_path']
     end
 
+    def deploy_target_name
+      @deploy_target.name
+    end
+
   end
 end

data/lib/docman/info.rb

@@ -12,17 +12,19 @@ module Docman
       hash.each_pair do |k, v|
         self[k] = v
       end
-      self['build_type'] = self['docroot_config'].deploy_target['builders'][self['type']]['handler']
+      self['build_type'] = self['docroot_config'].deploy_target['builders'][self['type']]['handler'] unless self['docroot_config'].deploy_target.nil?
       @need_rebuild = Hash.new
       @changed = Hash.new
       @state_name = nil
-      if self.has_key? 'states'
-        self['states'].each_pair do |name, state|
-          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 = read_yaml_from_file(repo, self['states_path'], state['source']['branch'], state['source']['file'])
-              state.deep_merge! external_state_info unless external_state_info.nil? or state.nil?
+      unless self['docroot_config'].deploy_target.nil?
+        if self.has_key? 'states'
+          self['states'].each_pair do |name, state|
+            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 = read_yaml_from_file(repo, self['states_path'], state['source']['branch'], state['source']['file'])
+                state.deep_merge! external_state_info unless external_state_info.nil? or state.nil?
+              end
             end
           end
         end
@@ -138,7 +140,7 @@ module Docman
     end
 
     def environment_name
-      self['docroot_config'].deploy_target['states'][@state_name]
+      self['docroot_config'].deploy_target['states'][@state_name] unless self['docroot_config'].deploy_target.nil?
     end
 
   end

data/lib/docman/version.rb

@@ -1,3 +1,3 @@
 module Docman
-  VERSION = "0.0.43"
+  VERSION = "0.0.44"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docman
 version: !ruby/object:Gem::Version
-  version: 0.0.43
+  version: 0.0.44
 platform: ruby
 authors:
 - Alexander Tolstikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-15 00:00:00.000000000 Z
+date: 2015-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -145,6 +145,7 @@ executables:
 - docman
 - docman.rb
 - functions.sh
+- project-template.sh
 extensions: []
 extra_rdoc_files: []
 files:
@@ -158,6 +159,7 @@ files:
 - bin/docman
 - bin/docman.rb
 - bin/functions.sh
+- bin/project-template.sh
 - config/config.yaml
 - config/cucumber.yml
 - docman.gemspec