kikubari 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 371a6f5fb3417f4522bf6cc728b110a78a7f8680
-  data.tar.gz: 18d561160ad2b71271cf0b8166a9c5212a7bbb12
+  metadata.gz: 4e2e03ad197ee1cec9342335ed3faf4ac1464e0c
+  data.tar.gz: 5ca5c1981325542b2eeef95d6215aa913e9fd441
 SHA512:
-  metadata.gz: 9c8d3fa771f5409136b799bbd766f0e4da51eedb276e55834092b7f71040f8146fe6b5ae9b5d3a8a9162f49b32b32ce1059d701954d13302fa97d53ce74f676a
-  data.tar.gz: e897c459fd8c151b94c3b8096427132978e6e8232d3726acb5368855f3f19b10fb578c3551726241a9ec6d9fe501f4206351e69c77f56864866a80632b97a086
+  metadata.gz: 70c6cb5f75e0bd9aafb7fba030e68df8ba8b682a5dedc6bfe42eb06b8a8ca074a902a489475ff8f8fb368692f8bfb94927fbd269e297faf0508b835e29790195
+  data.tar.gz: 712c7532fb5e09c0118feb2238e15e8d6cca0139ce9ebbdf96138b43d5149b2f3b22f5f1c300777326d8fbb975270b6ac6f4aee87765cca0acfe896063580136

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kikubari (0.0.4)
+    kikubari (0.1.0)
       git (~> 1.3)
 
 GEM

data/README.md

@@ -8,50 +8,62 @@ If you need a more complex solution maybe you want to take a look on Capistrano.
 
 ## Usage:
 
-  Create a *deploy.yml* file in your deploy target folder
-  Run *kikubari*:: */path_to_folder* or ./ *"environment_name"*
-  Have a beer and see it work
+* Create a *deploy.yml* file in your deploy target folder
+* Run *kikubari*:: */path_to_folder* or ./
+* Have a beer and see it work
 
-# Examples of a deploy.yml's files
+```
+project
+│   deploy.yml
+│   ...
 
-## PHP
+```
+
+```bash
+  kikubari .
+```
+
+
+Result:
+
+```
+project
+│   deploy.yml
+│
+└── releases
+│   │   12345678
+│   │   current
+│
+└── your_folder
+    │   your_files
+
+```
+
+# Examples
 
 ### Wordpress
 
+```ruby
+
   config:
     framework: wordpress
     system: git
-    origin: "git@github.com:josetonyp/iromegane.git"
+    origin: "git@github.com:josetonyp/path_to_project.git"
     branch: master
     history_limit: 10
 
   do:
     folder_structure:
-      log: 'log/#{environment}'
-      uploads: 'uploads/#{environment}'
-      config: 'config/#{environment}'
-      coda_cache: 'coda_cache/#{environment}'
+      log: 'log'
+      uploads: 'uploads'
+      config: 'config'
+      coda_cache: 'coda_cache'
 
-    folder_symbolic_links:
+    link_files:
       uploads: 'wp-content/uploads'
       coda_cache: 'wp-content/themes/coda/cache'
 
-    file_symbolic_link:
-      config: 'wp-config.php'
-
-    test_files:
-      config: 'config/#{environment}/wp-config.php'
-
-
-### Symfony
-
-  On proccess...
-
-## Ruby
-
-### Rails
-
-  On proccess...
+```
 
 # Contributing to kikubari
 

data/bin/kikubari

@@ -8,7 +8,7 @@ require "stringio"
 require 'open3'
 require 'git'
 
-require '../lib/kikubari'
+require_relative '../lib/kikubari'
 
 ##Globals
 debug, dry_run, rollback = false, false, false
@@ -39,65 +39,34 @@ loop do
     end
 end
 
-  if (!ARGV.first.nil? and File.directory? ARGV.first.to_s)
-      folder = ARGV.first.to_s
-  else
-
-    begin
-
+if (!ARGV.first.nil? and File.directory? ARGV.first.to_s)
+    folder = ARGV.first.to_s
+else
+  begin
     print "Please insert the project folder to deploy: "
     folder = gets.chomp
+  end until begin
 
-    end until begin
-
-            ##FileUtils.cd folder
-            puts "Deploying to #{folder}"
-            true
-          rescue Exception => e
-            print e.message
-            puts e.backtrace.inspect
-            false
-          end
+  ##FileUtils.cd folder
+  puts "Deploying to #{folder}"
+  true
 
+  rescue Exception => e
+    print e.message
+    puts e.backtrace.inspect
+    false
   end
+end
 
-
+folder = Pathname.new(folder).realpath
 p "Deploying to #{ Pathname.new( folder ).realpath }/..."
-
-
-  if( !ARGV[1].nil? )
-
-      env_folder = ARGV[1].to_s
-
-  else
-
-    begin
-
-    print "Production [1] or preproduction [2] ? (1,2) : "
-    environment = gets.chomp
-
-    end until begin
-                if environment =~ /1|2/
-                  true
-                else
-                  false
-                end
-              rescue Exception => e
-                      print e.message
-                      puts e.backtrace.inspect
-                      false
-              end
-
-    case environment
-      when "1"
-        env_folder = "production"
-      when "2"
-        env_folder = "preproduction"
-    end
-
- end
-
-p "Deploying on environment < #{ env_folder } >..."
-
-Kikubari::Deploy.new(Kikubari::Deploy::Configuration.new( "#{folder}/deploy.yml", :deploy_folder => folder, :debug => debug, :dry_run => dry_run , :environment => env_folder, :rollback => rollback ))
+p "Deploying ..."
+
+Kikubari::Deploy.new(
+    Kikubari::Deploy::Configuration.new(
+      "#{folder}/deploy.yml",
+      deploy_folder:  folder,
+      debug: debug,
+      dry_run: dry_run,
+      rollback: rollback ))
 

data/kikubari.gemspec

@@ -1,12 +1,6 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-# stub: kikubari 0.0.3 ruby lib
-
 Gem::Specification.new do |s|
   s.name = "kikubari"
-  s.version = "0.0.4"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]

data/lib/configuration/deploy_configuration.rb

@@ -10,7 +10,6 @@ module Kikubari
       attr_accessor :deploy_folder,
         :debug,
         :dry_run,
-        :environment,
         :rollback,
         :deploy_file,
         :config,
@@ -29,12 +28,12 @@ module Kikubari
           raise "Deploy guide file doesn't exists: #{file}"
         end
 
-        @deploy_file = YAML::load_file(file)
+        @deploy_file = parse_config_file(file)
 
-        @config = @deploy_file["config"] || {}
-        @do = @deploy_file["do"] || {}
-        @after = @deploy_file["after"] || {}
-        @before = @deploy_file["before"] || {}
+        @config = @deploy_file.config || {}
+        @do = @deploy_file.do || {}
+        @after = @deploy_file.after
+        @before = @deploy_file.before
 
         raise ArgumentError, "There is no params for deploy" if params.size == 0
 
@@ -49,65 +48,24 @@ module Kikubari
           raise ArgumentError , "Deploy folder #{@deploy_folder} is not a valid deploy folder"
         end
 
-        @environment_folder = "#{@deploy_folder}/#{@environment}"
+        @environment_folder = @deploy_folder.join "releases"
         @date_folder = DateTime.now.strftime("%Y%m%d%H%M%S%L")
-        @env_time_folder = "#{@deploy_folder}/#{@environment}/#{@date_folder}"
-        @current_deploy_folder = "#{@deploy_folder}/#{@environment}/current"
-
-        parse_strcuture_folders if @do.has_key?("folder_structure") && !@do["folder_structure"].empty?
-        parse_test_files if @do.has_key?("test_files") && !@do["test_files"].empty?
-
+        @env_time_folder = @environment_folder.join @date_folder
+        @current_deploy_folder = @environment_folder.join "current"
       end
 
       # Return a class name for create a deployer instance for deployment process
       def get_deployer_class
-        fw_class = ( @config.has_key?("framework") ) ? @config["framework"].downcase.capitalize : ""
-        fw_system = ( @config.has_key?("system") ) ? @config["system"].downcase.capitalize : ""
+        fw_class = ( @config.framework ) ? @config.framework.downcase.capitalize : ""
+        fw_system = ( @config.system ) ? @config.system.downcase.capitalize : ""
         "#{fw_class}#{fw_system}Deployer"
       end
 
-      # Return a class name for create a backup worker instance for backup process
-      def get_backup_class
-        fw_class = ( @config.has_key?("framework") ) ? @config["framework"].downcase.capitalize : ""
-        return "" unless @config.has_key?("database") && @config["database"].has_key?("driver")
-        driver = @config["database"]["driver"].downcase.capitalize
-        "#{fw_class}#{driver}Backup"
-      end
-
-      def get_structure_folder ( name )
-        @do["folder_structure"].each do |folder|
-          return folder.first[1] if folder.first[0] == name
-        end
-        ""
-      end
-
-      def get_test_file ( name )
-        @do["test_files"].each do |folder|
-          return folder.first[1] if folder.first[0] == name
-        end
-        ""
-      end
-
       private
 
-      def parse_strcuture_folders
-        tmp = Array.new
-        environment = @environment
-        @do["folder_structure"].each do |folder|
-           tmp.push Hash[ { folder[0] => "#{@deploy_folder}/#{eval(%Q["#{folder[1]}"])}"  } ]
-        end
-        @do["folder_structure"] = tmp
-      end
-
-
-
-      def parse_test_files
-        tmp = Array.new
-        environment = @environment
-        @do["test_files"].each do |folder|
-           tmp.push Hash[ { folder[0] => "#{@deploy_folder}/#{eval(%Q["#{folder[1]}"])}" } ]
-        end
-        @do["test_files"] = tmp
+      def parse_config_file(file)
+        @deploy_file = YAML::load_file(file)
+        JSON.parse(@deploy_file.to_json, object_class: OpenStruct)
       end
 
 

data/lib/deploy_dir.rb

@@ -12,16 +12,12 @@ class DeployDir < Dir
   # [+folder+] <b>String</b> A valid folder for deploys
   # [+limit+] <b>Integer</b> Limit the folders left in deploy folder
   def self.rotate_folders(folder , limit)
+    raise(ArgumentError, "Invalid directory #{folder}") unless exists?(folder)
 
-    raise( ArgumentError, "Invalid directory #{ folder }") unless File.directory? folder
-    limit = Integer(limit)
-
-    list = Dir["#{folder}/*"]
-    folders = list.select {|v| v =~ /\d+?/ }
-    was = folders.length
-    FileUtils.rm_f folders.reverse.slice( limit ,  folders.length  ) if folders.length > limit
-    return was - limit
+    glob(folder.join("*")).select {|file| file =~ /\d+?/ }.tap do |list|
+      FileUtils.rm_rf(list.reverse.slice(limit.to_i, list.length)) if list.length > limit.to_i
+    end
   end
 
 
-end
+end

data/lib/deployer/deployer.rb

@@ -1,3 +1,6 @@
+require 'json'
+require 'ostruct'
+
 # Describe the deployment process for each deployer
 #
 # Basically a deployment consist on gathering the code from a <b>Repository</b> writed in a <b>Framework</b> (In some language) and copying on deployment folder.
@@ -22,32 +25,19 @@ module Kikubari
       # Create te the folder structure as is in the YAML
       #
       def create_structure
-        @config.do["folder_structure"].each do |command|
-          unless File.directory? command.first[1]
-            @logger.print "Creating Structure folder: #{command.first[1]}"
-            FileUtils.mkdir_p command.first[1]
+        @config.do.folder_structure.each_pair do |folder, target_folder|
+          unless !target_folder.empty? && File.directory?(@config.deploy_folder.join(folder.to_s))
+            @logger.print "Creating Structure folder: #{folder}"
+            FileUtils.mkdir_p @config.deploy_folder.join(folder.to_s)
           end
         end
         self
       end
 
-
-      ##
-      # Create the environment folder as requested in the configuration
-      #
-      def create_environment_folder
-        environment = @config.environment
-        unless File.directory? @config.environment_folder
-          @logger.print "Creating Environment folder: #{ @config.environment_folder}"
-          FileUtils.mkdir_p  @config.environment_folder
-        end
-        self
-      end
-
       ##
       # Create the folder where you will deploy the actual version of the code based on the configuration
       #
-      def create_version_folder
+      def create_release_folder
         FileUtils.mkdir_p(@config.env_time_folder) unless File.directory? @config.env_time_folder
         self
       end
@@ -56,10 +46,8 @@ module Kikubari
       # Create the current symlink to the deploy version folder
       #
       def create_current_symlink_folder
-        destination = @config.current_deploy_folder
-        origin =  Pathname.new( @config.env_time_folder ).relative_path_from( Pathname.new( @config.current_deploy_folder.gsub(/\/[^\/]*?$/, "") ) ).to_s
-        FileUtils.rm_f(destination) if File.symlink?(destination)
-        FileUtils.ln_s origin, destination
+        FileUtils.rm_f(@config.current_deploy_folder) if File.symlink?(@config.current_deploy_folder)
+        FileUtils.ln_s @config.env_time_folder, @config.current_deploy_folder
         self
       end
 
@@ -68,10 +56,9 @@ module Kikubari
       # Test if selected file already exist
       #
       def test_files
-        @config.do["test_files"].each do |command|
-          y command
-          unless File.exist? command.first[1]
-            raise "Please verify this file exist: #{command.first[1]}"
+        @config.do.link_files.each_pair do |source, target|
+          unless File.exist? @config.deploy_folder.join(source.to_s)
+            raise ArgumentError, "Please verify this file exist: #{@config.deploy_folder.join(source.to_s)}"
           end
         end
         self
@@ -81,30 +68,28 @@ module Kikubari
       # Create the Symlinked folders
       #
       def create_sylinked_folders
-          @config.do["folder_symbolic_links"].each do |folder|
-            @logger.print "- linking: #{@config.env_time_folder}/#{folder[1]}"
-            raise "Folder: #{@config.env_time_folder}/#{folder[1]} already exists and the symlink can't be created" if File.directory?("#{@config.env_time_folder}/#{folder[1]}")
-            create_symlink( folder )
-          end
-          self
+        @config.do.folder_structure.each_pair do |folder, target_folder|
+          next if target_folder.empty?
+          @logger.print "- linking: #{@config.env_time_folder}/#{target_folder}"
+          raise "Folder: #{@config.env_time_folder.join(target_folder.to_s)} already exists and the symlink can't be created" if File.directory?(@config.env_time_folder.join(target_folder.to_s))
+          create_symlink( @config.deploy_folder.join(folder.to_s), @config.env_time_folder.join(target_folder.to_s) )
+        end
+        self
       end
 
       ##
       # Execute creation of symlinked folder
       #
-      def create_symlink( folder )
-        destination = "#{@config.env_time_folder}/#{folder[1]}"
-        raise ArgumentError , "Origin folder #{@config.get_structure_folder(folder[0])} is not a valid folder" unless File.directory?("#{@config.get_structure_folder(folder[0])}")
-        origin = Pathname.new( "#{@config.get_structure_folder(folder[0])}" ).relative_path_from( Pathname.new( destination.gsub(/\/[^\/]*?$/, "") ) ).to_s  ## Origin as a relative path from destination
-        FileUtils.ln_s origin, destination
+      def create_symlink( folder, target_folder )
+        raise ArgumentError , "Origin folder #{folder} is not a valid folder" unless File.directory?(folder)
+        FileUtils.ln_s folder, target_folder
       end
 
+
       def create_symlinked_files
-        @logger.print "Creating Files symbolic links"
-        @config.do["file_symbolic_link"].each do |folder|
-          destination = "#{@config.env_time_folder}/#{folder[1]}"
-          origin = Pathname.new( "#{@config.get_test_file(folder[0])}" ).relative_path_from(Pathname.new( destination.gsub(/\/[^\/]*?$/, "") )).to_s
-          FileUtils.ln_s  origin , destination
+        @config.do.link_files.each_pair do |source, target|
+          @logger.print "- linking: #{@config.env_time_folder.join(target.to_s)}"
+          FileUtils.ln_s(@config.deploy_folder.join(source.to_s), @config.env_time_folder.join(target.to_s))
         end
       end
 
@@ -113,8 +98,7 @@ module Kikubari
       # Create deployment structure
       #
       def create_deploy_structure
-        create_structure if @config.do.has_key?("folder_structure") && !@config.do["folder_structure"].empty?
-        create_environment_folder.create_version_folder
+        create_structure if @config.do.folder_structure
         self
       end
 
@@ -122,12 +106,12 @@ module Kikubari
       # Rotate old version folders
       #
       def rotate_folders
-        DeployDir.rotate_folders( @config.environment_folder , @config.config["history_limit"] )
+        DeployDir.rotate_folders( @config.environment_folder , @config.config.history_limit )
       end
 
 
       def has_after_deploy_run_commands
-        @config.after.has_key?("run") && !@config.after["run"].empty?
+        @config.after && @config.after.run && !@config.after.run.empty?
       end
 
       ##
@@ -137,22 +121,21 @@ module Kikubari
         return unless has_after_deploy_run_commands
         out = Array.new
         @logger.head "Executing After Deploy"
-        @config.after["run"].each do |run_task|
+        @config.after.run.each do |run_task|
           out.push(execute_shell(run_task) )
         end
         out
       end
 
-
       def has_before_deploy_run_commands
-        @config.before.has_key?("run") && !@config.before["run"].empty?
+        @config.before && @config.before.run && !@config.before.run.empty?
       end
 
       def before_deploy_run
         return unless has_before_deploy_run_commands
         out = Array.new
         @logger.head "Executing Before Deploy"
-        @config.before["run"].each do |run_task|
+        @config.before.run.each do |run_task|
           out.push(execute_shell(run_task) )
         end
         out
@@ -160,7 +143,7 @@ module Kikubari
 
       def execute_shell(command)
         @logger.run(command, @config.env_time_folder)
-        temp = capture_stderr "cd #{@config.env_time_folder} ; #{command} "
+        temp = capture_stderr "cd #{@config.env_time_folder.to_s.strip} && #{command} "
         @logger.result(temp[:stdout]) if temp[:stdout] != ""
         @logger.error(temp[:stderr]) if temp[:stderr] != ""
         temp
@@ -178,10 +161,10 @@ module Kikubari
       def deploy
           before_deploy_run
         @logger.head "Executing Deploy"
-        test_files  if @config.do.has_key?("test_files") && !@config.do["test_files"].empty?
+        test_files  if @config.do.test_files
           do_deploy
-        create_sylinked_folders if @config.do.has_key?("folder_symbolic_links") && !@config.do["folder_symbolic_links"].empty?
-        create_symlinked_files if @config.do.has_key?("file_symbolic_link") && !@config.do["file_symbolic_link"].empty?
+        create_sylinked_folders
+        create_symlinked_files if @config.do.link_files
         create_current_symlink_folder
         rotate_folders
           after_deploy_run

data/lib/kikubari.rb

@@ -36,7 +36,7 @@ module Kikubari
     private
 
     def get_deployer config
-      eval(deployer_class).new(config)
+      eval(config.get_deployer_class).new(config)
     end
 
 

data/spec/deploy_files/deploy.yml

@@ -1,7 +1,7 @@
 # Deploy example sheet for a Symfony 1.4 and MySQL project
 #
 # Author::    Jose A Pio  (mailto:josetonyp@latizana.com)
-# Copyright:: Copyright (c) 2011 
+# Copyright:: Copyright (c) 2011
 # License::   Distributes under the same terms as Ruby
 #
 
@@ -12,38 +12,38 @@ config:
   origin: "git@github.com:xxx"
   branch: master
   history_limit: 10
-  # Databases for projects are optionals. In case of having one plase fill the next section to configure the backup process  
+  # Databases for projects are optionals. In case of having one plase fill the next section to configure the backup process
   database:
     backup: true
     dirver: mysql
     user: root
-    pass: 
-    
-    
+    pass:
+
+
 ## Task actions for deployers
-## At versión 1 deployers should know the task order 
+## At versión 1 deployers should know the task order
 do:
 
   # Folder structure defining the backup and mantainance folder behind the deployment process
+  and it relative symlink inside the release folder
+  # folder_structure:
+  #  folder_name: linked_name
+  #  translates into:
+  #   /deploy_path/'folder_name': /release_path/'linked_name'
   folder_structure:
-    backup_mysql: 'backups/mysql/#{environment}'
-    backup_files: 'backups/files/#{environment}'
-    cache: 'cache/#{environment}'
-    log: 'log/#{environment}'
-    uploads: 'uploads/#{environment}'
-    config: 'config/#{environment}'
+    backup_mysql: 'backups/mysql'
+    backup_files: 'backups/files'
+    cache: 'cache'
+    log: 'log'
+    uploads: 'web/uploads'
+    config: ''
 
-  # Folder links from project folder and matainance folders
-  folder_symbolic_links:
-    cache: cache
-    log: log
-    uploads: web/uploads
+  # Link this files from structure foldes into the release folder path.
+  # link_files:
+  #  folder_name: source_file_name
+  #  translates into:
+  #   /deploy_path/'source_file_name': /release_path/'folder_name'
+  link_files:
+    'config/databases.yml': 'databases.yml'
 
-  # Links to be build from mantainance falders files and project files.
-  file_symbolic_link:
-    config: 'config/databases.yml'
-      
-  # Files to be tested before deployment. This files must exists or deployment will rise an exception
-  test_files:
-    config: 'config/#{environment}/databases.yml'
 

data/spec/deploy_files/deploy_git.yml

@@ -11,10 +11,5 @@ do:
 
   # Folder structure defining the backup and mantainance folder behind the deployment process
   folder_structure:
-    cache: 'cache/#{environment}'
-    log: 'log/#{environment}'
-
-  # Folder links from project folder and matainance folders
-  folder_symbolic_links:
-    cache: cache
-    log: log
+    cache: 'cache'
+    log: 'log'

data/spec/deploy_files/deploy_git_test_file.yml

@@ -11,8 +11,8 @@ do:
 
   # Folder structure defining the backup and mantainance folder behind the deployment process
   folder_structure:
-    cache: 'cache/#{environment}'
-    log: 'log/#{environment}'
+    cache: 'cache'
+    log: 'log'
 
   # Folder links from project folder and matainance folders
   folder_symbolic_links:
@@ -21,7 +21,7 @@ do:
 
   # Files to be tested before deployment. This files must exists or deployment will rise an exception
   test_files:
-    test: 'log/#{environment}/test.yml'
+    test: 'log/test.yml'
 
   # Links to be build from tested files. Only tested files can be converted in symlinks to the project
   file_symbolic_link:

data/spec/deploy_files/deploy_symlink.yml

@@ -14,24 +14,17 @@ do:
 
   # Folder structure defining the backup and mantainance folder behind the deployment process
   folder_structure:
-    cache: 'cache/#{environment}'
-    config: 'config/#{environment}'
+    cache: 'cache'
+    config: 'config'
+    blank: ''
 
-  # Folder links from project folder and matainance folders
-  folder_symbolic_links:
-    #name: #destination_name
-    cache: cache
-    config: config
-
-  # Files to be tested before deployment. This files must exists or deployment will rise an exception
-  # named_file: origin
-  test_files:
-    config: 'config/#{environment}/databases.yml'
-
-  # Links to be build from tested files. Only tested files can be converted in symlinks to the project
-  # named_file: destination
-  file_symbolic_link:
-    config: 'config/databases.yml'
+  # Link this files from structure foldes into the release folder path.
+  # link_files:
+  #  folder_name: source_file_name
+  #  translates into:
+  #   /deploy_path/'source_file_name': /release_path/'folder_name'
+  link_files:
+    'config/databases.yml': 'databases.yml'
 
 after:
   run:

data/spec/deploy_files/one_file_test.yml

@@ -3,9 +3,9 @@ config:
 
 do:
   folder_structure:
-    config: 'config/#{environment}'
-      
+    config: 'config'
+
   # Files to be tested before deployment. This files must exists or deployment will rise an exception
   test_files:
-    config: 'config/#{environment}/databases.yml'
+    config: 'config/databases.yml'
 

data/spec/deploy_files/one_folder.yml

@@ -2,9 +2,9 @@
 
 config:
 ## Task actions for deployers
-## At versión 1 deployers should know the task order 
+## At versión 1 deployers should know the task order
 
 do:
   # Folder structure defining the backup and mantainance folder behind the deployment process
   folder_structure:
-    backup_mysql: 'backups/mysql/#{environment}'
+    backup_mysql: 'backups/mysql'

data/spec/lib/deploy_spec.rb

@@ -19,21 +19,14 @@ describe Kikubari::Deploy::Deployer do
   end
 
   context 'Folder Structure' do
-
-    it "creates an environment folder to host the structure" do
-      expect(subject.create_environment_folder).to satisfy do |deployer|
-        File.directory?(deployer.config.environment_folder)
-      end
-    end
-
     it "creates a target version folder with a the current time stamp as name" do
-      expect(subject.create_version_folder).to satisfy do |deployer|
+      expect(subject.create_release_folder).to satisfy do |deployer|
         File.directory?(deployer.config.env_time_folder)
       end
     end
 
     it "createa a symlink 'current' to the actual target version folder" do
-      expect(subject.create_version_folder.create_current_symlink_folder).to satisfy do |deployer|
+      expect(subject.create_release_folder.create_current_symlink_folder).to satisfy do |deployer|
         File.symlink?(deployer.config.current_deploy_folder)
       end
     end
@@ -44,103 +37,113 @@ describe Kikubari::Deploy::Deployer do
     #  folder_structure:
     #    cache: 'cache/#{environment}'
     #    config: 'config/#{environment}'
+    #    blank: ''
     #
     # Example:
     # project:
     #   cache
-    #     [environment]
     #   config
-    #     [environment]
-    #   [environment]
+    #   releases
     #     [version_folder]
-    #       cache: Symlink to cache/[environment]
-    #       config: Symlink to config/[environment]
+    #       cache: Symlink to cache
+    #       config: Symlink to config
     #     current: Symlink to [version_folder]
     #
     it "creates the cache and condig folder inside" do
       subject.tap do |deployer|
-        deployer.create_environment_folder
-        deployer.create_version_folder
-        deployer.create_current_symlink_folder
+        deployer.create_release_folder
+        deployer.create_structure
+        deployer.create_sylinked_folders
 
-        expect(deployer.create_structure).to satisfy do
-          File.directory?("#{deployer.config.deploy_folder}/cache/#{deployer.config.environment}") &&
-          File.directory?("#{deployer.config.deploy_folder}/config/#{deployer.config.environment}")
-        end
+        expect(File.symlink?("#{deployer.config.env_time_folder}/cache")).to be_truthy
+        expect(File.symlink?("#{deployer.config.env_time_folder}/config")).to be_truthy
       end
     end
 
-    it "creates a symlink to inside the version folder pointing to the corresponding folder inside the structure" do
+    it 'does not create a symlink when target folder is blank is blank' do
       subject.tap do |deployer|
-        deployer.create_environment_folder
-        deployer.create_version_folder
+        deployer.create_release_folder
         deployer.create_structure
+        deployer.create_sylinked_folders
 
-        expect(deployer.create_sylinked_folders).to satisfy do
-          File.symlink?( "#{deployer.config.env_time_folder}/cache") &&
-          File.symlink?( "#{deployer.config.env_time_folder}/config")
-        end
+        expect(File.symlink?("#{deployer.config.env_time_folder}/blank")).to be_falsy
       end
     end
-
-    it "should not create the symlinked folder is folder already exist" do
-      subject.create_environment_folder.create_version_folder.create_current_symlink_folder
-      subject.create_structure
-      FileUtils.mkdir_p "#{config.env_time_folder}/cache"
-      expect {
-        subject.create_sylinked_folders
-      }.to raise_error
-    end
   end
 
   context 'File linking' do
     it "verifies a file in the folder and raise an error" do
-      subject.create_environment_folder.create_version_folder.create_current_symlink_folder
-      expect{subject.test_files}.to raise_error
+      subject.tap do |deployer|
+        deployer.create_release_folder
+        deployer.create_current_symlink_folder
+        expect{deployer.test_files}.to raise_error ArgumentError
+      end
     end
 
     it "verifies a file in the folder" do
-      subject.create_environment_folder.create_version_folder.create_current_symlink_folder
-      expect{subject.test_files}.to raise_error
+      subject.tap do |deployer|
+        deployer.create_release_folder
+        deployer.create_structure
+        deployer.create_current_symlink_folder
+        `echo "DB data...." >> #{deployer.config.deploy_folder}/config/databases.yml`
+
+        expect{deployer.test_files}.to_not raise_error ArgumentError
+      end
     end
 
     it "creates a symlink file from tested files" do
-      subject.create_deploy_structure
-      ## Faking the config folder that should come with the repository
-      FileUtils.mkdir_p "#{config.env_time_folder}/config"
-      `echo "DB data...." >> #{config.deploy_folder}/config/#{config.environment}/databases.yml`
-      subject.create_symlinked_files.should satisfy do |deployer|
-        File.symlink?( "#{config.env_time_folder}/config/databases.yml")
+      subject.tap do |deployer|
+        deployer.create_release_folder
+        deployer.create_structure
+        deployer.create_current_symlink_folder
+        `echo "DB data...." >> #{deployer.config.deploy_folder}/config/databases.yml`
+
+        deployer.create_symlinked_files
+        expect(File.symlink?( "#{config.env_time_folder}/databases.yml")).to be_truthy
       end
     end
   end
 
   context 'Execution' do
     it "should execute the after run tasks" do
-      subject.create_deploy_structure
-      FileUtils.mkdir_p "#{config.env_time_folder}/config"
-      `echo "DB data..." >> #{config.deploy_folder}/config/#{config.environment}/databases.yml`
-      subject.after_deploy_run.should satisfy do |deployer|
-        File.directory?("#{config.env_time_folder}/new_folder")
+      subject.tap do |deployer|
+        deployer.create_release_folder
+        deployer.create_structure
+        deployer.create_current_symlink_folder
+        deployer.after_deploy_run
+
+        expect(File.directory?("#{config.env_time_folder}/new_folder")).to be_truthy
       end
     end
 
     it "should capture STDERR messages in a variable is command is not valid" do
-      subject.create_deploy_structure
-      subject.config.after['run'] = [ 'This is not a command' ]
-      out = subject.after_deploy_run
-      out.count.should == 1
-      out[0][:stdout].should == ""
-      out[0][:stderr].should_not == ""
+      subject.tap do |deployer|
+        deployer.create_release_folder
+        deployer.create_structure
+        deployer.create_current_symlink_folder
+
+        deployer.config.after.run = [ 'This is not a command' ]
+        deployer.after_deploy_run.tap do |out|
+          expect(out.count).to eq(1)
+          expect(out[0][:stdout]).to eq("")
+          expect(out[0][:stderr]).to_not eq("")
+        end
+      end
     end
 
     it "should not capture STDERR messages in a variable if command is valid" do
-      subject.create_deploy_structure
-      subject.config.after['run'] = [ 'ls -lah' ]
-      out = subject.after_deploy_run
-      out.count.should == 1
-      out[0][:stdout].should_not == ""
-      out[0][:stderr].should == ""
+      subject.tap do |deployer|
+        deployer.create_release_folder
+        deployer.create_structure
+        deployer.create_current_symlink_folder
+
+        deployer.config.after.run = [ 'ls -lah' ]
+        deployer.after_deploy_run.tap do |out|
+          expect(out.count).to eq(1)
+          expect(out[0][:stdout]).to_not eq("")
+          expect(out[0][:stderr]).to eq("")
+        end
+      end
     end
   end
 end

data/spec/lib/deployers/git.rb

@@ -15,7 +15,6 @@ describe Kikubari::Deploy::GitDeployer do
 
   before :all do
     clear_target_project
-
   end
 
   it "clones the repository in the version folder" do
@@ -28,5 +27,6 @@ describe Kikubari::Deploy::GitDeployer do
     deployer.create_deploy_structure
     deployer.deploy
     expect(Dir.exist?("#{deployer.config.env_time_folder}/.git")).to be_falsy
+    binding.pry
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kikubari
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - Jose Antonio Pio Gil