docman 0.0.5 → 0.0.6

data/features/init/init.feature

@@ -0,0 +1,27 @@
+Feature: Init
+
+  In order to manage docroot
+  As a developer using Cucumber
+  I want to use the deploy steps to deploy to local
+
+  @announce
+  @no-clobber
+  @init
+  Scenario: Local force init
+    Given I run `docman init sample-docroot https://github.com/aroq/dm-test-docroot-config.git -f`
+    Then the exit status should be 0
+    Then the following directories should exist:
+      | sample-docroot |
+      | sample-docroot/config |
+
+  @announce
+  @no-clobber
+  @init
+  Scenario: Local interactive init
+    Given I run `docman init sample-docroot https://github.com/aroq/dm-test-docroot-config.git` interactively
+    And I type "yes"
+    Then the exit status should be 0
+    Then the following directories should exist:
+      | sample-docroot |
+      | sample-docroot/config |
+

data/features/local/local.feature

@@ -0,0 +1,88 @@
+Feature: Docroot management - Local
+
+  In order to manage docroot
+  As a developer using Cucumber
+  I want to use the deploy steps to deploy to local
+
+  @announce
+  @no-clobber
+  @local
+  @build
+  Scenario: Local build development
+    Given I cd to "sample-docroot"
+    Then I run `docman build local development`
+    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 |
+      | master/docroot/profiles/sample_profile |
+    Then the following files should exist:
+      | master/docroot/CHANGELOG.txt |
+#    Then I remove the file "master/docroot/profiles/sample_profile"
+#    Then the following directories should not exist:
+#      | master/docroot/profiles/sample_profile |
+#    Then I run `docman build local development`
+#    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 |
+#      | master/docroot/profiles/sample_profile |
+
+#  @announce
+#  @no-clobber
+#  @deploy
+#  Scenario: Local push into project1 develop
+#    Given I cd to "sample-docroot/master/projects/sample_project1"
+#    And I run `git reset --hard & git clean -f -d`
+#    And I run `git checkout develop`
+#    And I run `git pull origin develop`
+#    Then the exit status should be 0
+#    And I store in "name" value "test"
+#    And I check stored value of "name" should contain "test"
+##    And I create file with random name in "filename" content in "random_name"
+#    Given a file named "develop.txt" with:
+#      """
+#      test content
+#
+#      """
+#    And I run `git add -A`
+#    And I run `git commit -m "Test commit to develop"`
+#    And I run `git push origin develop`
+#    Then the exit status should be 0
+
+  @announce
+  @no-clobber
+  @local
+  @deploy
+  Scenario: Local deploy sample project 1 develop
+    Given I cd to "sample-docroot"
+    Then I run `docman deploy local sample_project1 branch develop`
+    Then the exit status should be 0
+    Then the following directories should exist:
+      | master/projects/sample_project1 |
+
+  @announce
+  @no-clobber
+  @local
+  @deploy
+  @master
+  @sample_project2
+  Scenario: Local deploy sample project 2 master
+    Given I cd to "sample-docroot"
+    Then I run `docman deploy local sample_project2 branch master`
+    Then the exit status should be 0
+    Then the following directories should exist:
+      | master/projects/sample_project1 |
+      | master/projects/sample_project2 |

data/features/local/local_deploy.feature

@@ -0,0 +1,6 @@
+Feature: Local deploy
+
+  In order to manage docroot
+  As a developer using Cucumber
+  I want to use the deploy steps to deploy to local
+

data/features/support/env.rb

@@ -2,5 +2,5 @@ require 'aruba/cucumber'
 
 Before do
   @dirs = ['/Users/alex/dev/dm/aruba']
-  @aruba_timeout_seconds = 600
+  @aruba_timeout_seconds = 6000
 end

data/lib/application.rb

@@ -4,40 +4,77 @@ require 'pathname'
 require 'fileutils'
 require 'docman/git_util'
 require 'docman/docroot_config'
-require 'docman/docroot_controller'
 require 'docman/exec'
+require 'docman/config'
+require 'docman/logging'
+require 'docman/context'
 require 'singleton'
+require 'logger'
+
+require 'docman/builders/builder'
+require 'docman/builders/dir_builder'
+require 'docman/builders/git_direct_builder'
+require 'docman/builders/git_strip_builder'
+require 'docman/builders/drupal_drush_builder'
+require 'docman/deployers/deployer'
+require 'docman/deployers/git_deployer'
+require 'docman/deployers/common_deployer'
+require 'docman/commands/command'
+require 'docman/commands/composite_command'
+require 'docman/commands/create_symlink_cmd'
+require 'docman/commands/execute_script_cmd'
+require 'docman/commands/clean_changed_cmd'
+require 'docman/commands/git_commit_cmd'
 
 module Docman
-  class Application
+  class Application < Docman::Command
 
-    attr_reader :config, :options
-    attr_accessor :deploy_target
+    attr_reader :config, :docroot_config
+    attr_accessor :deploy_target, :options, :force
 
     include Singleton
+    include Docman::Context
 
     def initialize
       # TODO: Define workspace properly
       @workspace_dir = Dir.pwd
-      @config = YAML::load_file(File.join(Pathname(__FILE__).dirname.parent, 'config', 'config.yaml'))
+      @config = Docman::Config.new(File.join(Pathname(__FILE__).dirname.parent, 'config', 'config.yaml'))
+      @force = false
     end
 
     def init(name, repo)
       `mkdir #{name} && cd #{name} && git clone #{repo} config`
     end
 
-    def build(deploy_target, state, options = false)
+    def build(deploy_target_name, state, options = false)
       @options = options
-      DocrootController.new(@workspace_dir, deploy_target).build(state)
+      @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)
     end
 
-    def deploy(deploy_target, name, type, version, options = false)
+    def deploy(deploy_target_name, name, type, version, options = false)
       @options = options
-      DocrootController.new(@workspace_dir, deploy_target).deploy(name, type, version)
+      @deploy_target = @config['deploy_targets'][deploy_target_name]
+      @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
+
+    def execute(action, state, name = nil)
+      params = @deploy_target
+      params['state'] = state
+      params['action'] = action
+      params['name'] = name
+      params['environment'] = @deploy_target['environments'][state]
+      Docman::Deployers::Deployer.create(params, nil, self).perform
     end
 
-    def state(name, type, version)
-      DocrootController.new(@workspace_dir, deploy_target).state(name, type, version)
+    def force?
+      @force or @options[:force]
     end
 
     def self.root

data/lib/docman/builders/builder.rb

@@ -1,62 +1,62 @@
-require 'yaml'
+require 'docman/commands/command'
 
 module Docman
   module Builders
-    class Builder
-      @@subclasses = {}
+    class Builder < Docman::Command
+      @@builders = {}
+      @@build_results = {}
 
-      def self.create(type, root, build_type, info)
-        c = @@subclasses[type]
+
+      def self.create(params = nil, context = nil, caller = nil)
+        c = @@builders[params['handler']]
         if c
-          c.new(root, build_type, info)
+          c.new(params, context, caller, 'builder')
         else
           raise "Bad builder type: #{type}"
         end
       end
 
       def self.register_builder(name)
-        @@subclasses[name] = self
+        @@builders[name] = self
+      end
+
+      def config
+        super
+        add_action('before_execute', {'type' => :clean_changed})
       end
 
-      def initialize(root, build_type, info)
-        @root = root
-        @build_type = build_type
-        @info = info
-        @before_build_actions = @build_type['before_build_actions'].nil? ? [] : @build_type['before_build_actions']
-        @after_build_actions = @build_type['after_build_actions'].nil? ? [] : @build_type['after_build_actions']
-        @before_build_actions << 'clean_if_changed'
+      def validate_command
+        raise "Please provide 'context'" if @context.nil?
+        raise "Context should be of type 'Info'" unless @context.is_a? Docman::Info
       end
 
-      def before_build_action_clean_if_changed
-        if File.directory? @info['full_build_path']
-          FileUtils.rm_r @info['full_build_path'] if @info.need_rebuild?
+      before_execute do
+        #TODO: rebuld if config changed.
+        if @context.need_rebuild?
+          log("Need rebuild")
+        else
+          log("Rebuild not needed")
+          raise NoChangesError, 'This version already deployed' unless changed?
         end
+
       end
 
-      def do
-        perform(@before_build_actions, 'before_build_action')
-        # Dispatch to corresponding method.
-        @info.write_info(self.send("#{@build_type['type']}"))
-        perform(@after_build_actions, 'after_build_action')
+      after_execute do
+        @execute_result = @context.write_info(@execute_result)
       end
 
-      def perform(actions, method_prefix)
-        unless actions.nil?
-          actions.each do |action|
-            method = "#{method_prefix}_#{action}"
-            self.send(method)
-          end
-        end
+      def changed?
+        false
       end
 
-      def repo?(path)
-        File.directory? File.join(path, '.git')
+      def describe
+        "Build: #{properties_info}"
       end
 
-      def after_build_action_git_commit
-        message = "name: #{@info['name']} updated, state: #{@info['state']}"
-        GitUtil.commit(@root['full_build_path'], @info['full_build_path'], message)
+      def prefix
+        "#{@context['name']} - #{self.class.name}"
       end
+
     end
   end
 end

data/lib/docman/builders/dir_builder.rb

@@ -0,0 +1,21 @@
+module Docman
+  module Builders
+    class DirBuilder < Builder
+
+      register_builder :dir_builder
+
+      def execute
+        if File.directory? @context['full_build_path']
+          if GitUtil.repo? @context['full_build_path']
+            log("Removed dir: #{@context['full_build_path']} because directory is git repo")
+            FileUtils.rm_r(@context['full_build_path'])
+          end
+        end
+        log("Created dir: #{@context['full_build_path']}")
+        FileUtils::mkdir_p @context['full_build_path']
+        @context['build_path']
+      end
+
+    end
+  end
+end

data/lib/docman/builders/drupal_drush_builder.rb

@@ -0,0 +1,22 @@
+require 'yaml'
+
+module Docman
+  module Builders
+    class DrupalDrushBuilder < Builder
+
+      register_builder :drupal_drush_builder
+
+      def execute
+        return unless @context.need_rebuild?
+        puts 'Download drupal through drush'
+        FileUtils.mkdir_p(@context['temp_path'])
+        Dir.chdir @context['temp_path']
+        `drush dl drupal-#{@context.version} --yes`
+        FileUtils.mkdir_p(@context['full_build_path'])
+        FileUtils.cp_r(Dir["#{@context['temp_path']}/drupal-#{@context.version}/."], @context['full_build_path'])
+        @context['version']
+      end
+
+    end
+  end
+end

data/lib/docman/builders/git_direct_builder.rb

@@ -0,0 +1,20 @@
+module Docman
+  module Builders
+    class GitDirectBuilder < Builder
+
+      register_builder :git_direct_builder
+
+      def execute
+        execute_result = GitUtil.get(@context['repo'], @context['full_build_path'], @context.version_type, @context.version)
+        @context['type'] == 'root' ? @context['build_path'] : execute_result
+      end
+
+      def changed?
+        stored_version = @context.stored_version['result']
+        repo_version = GitUtil.get(@context['repo'], @context['full_build_path'], @context.version_type, @context.version)
+        stored_version != repo_version
+      end
+
+    end
+  end
+end

data/lib/docman/builders/git_strip_builder.rb

@@ -0,0 +1,27 @@
+module Docman
+  module Builders
+    class GitStripBuilder < Builder
+
+      register_builder :git_strip_builder
+
+
+      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']
+        result = GitUtil.get(@context['repo'], @context['temp_path'], @context.version_type, @context.version)
+        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'))
+        # GitUtil.repo_changed?(@context['full_build_path']) ? result : false
+        result
+      end
+
+      def changed?
+        stored_version = @context.stored_version['result']
+        repo_version = GitUtil.get(@context['repo'], @context['temp_path'], @context.version_type, @context.version)
+        stored_version != repo_version
+      end
+
+    end
+  end
+end

data/lib/docman/cli.rb

@@ -32,6 +32,9 @@ module Docman
     method_option :force, :aliases => '-f', :desc => 'Force full rebuild'
     def build(deploy_target, state)
       config_dir?
+      if options[:force]
+        FileUtils.rm_r('master') if File.directory? 'master'
+      end
       Application.instance.build(deploy_target, state, options)
       say('Complete!', :green)
     end

data/lib/docman/commands/clean_changed_cmd.rb

@@ -0,0 +1,23 @@
+module Docman
+  class CleanChangedCmd < Docman::Command
+
+    register_command :clean_changed
+
+    def validate_command
+      raise "Please provide 'context'" if @context.nil?
+      raise "Context should be of type 'Info'" unless @context.is_a? Docman::Info
+    end
+
+    def execute
+      if File.directory? @context['full_build_path']
+        if @context.need_rebuild?
+          return false if @context['type'] == 'root' and @context['build_type'] == :dir_builder and not GitUtil.repo?(@context['full_build_path'])
+          return false if @context['type'] == 'root' and @context['build_type'] == :git_direct_builder and GitUtil.repo?(@context['full_build_path'])
+          log("Remove #{@context['full_build_path']}")
+          FileUtils.rm_rf @context['full_build_path']
+        end
+      end
+    end
+
+  end
+end