disloku 0.2.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f64d1e3ee54cc8b840c1c8d2a3e38093b71e35a
-  data.tar.gz: 03382e354613f9d820ff86ef242dbf4d156de129
+  metadata.gz: bf136697293ab97e26248c87878fc31f0cd6b12b
+  data.tar.gz: cfada9605a593237c98add5e05ee495c9478df98
 SHA512:
-  metadata.gz: 92fbd584e6295b784211813fd578caa6a9f276f52b3059ac6824ab1f1ac3e4020292ace0b87b28cb5e1ce37fbfcb96549eab94a7f56cc1de4546571bc07cd860
-  data.tar.gz: bf16508627508a393ac4dc89755a13a21491660a00d015e3286be7d74aba55c36213f5fae16a621d250c66f91dddb174a38fc90bfafdc3ea4dcdb119f931b272
+  metadata.gz: efb0820d1c241f39aa8d178e8cc19824e80d31f5f11e1bd1594de56885df268e73add14d5f7a483a3a08cf41aebfd96e5c521a7444316227f5a30f0d47ba4464
+  data.tar.gz: e988e227b042f025c133ffc3ab3b9de7489ae7e58c889786e0a462ac33deb9a2076d3a2cbf0713dbf2255a8c3d52aa8b884f9cb397b70be066c2a2948011ac72

data/lib/disloku/BaseCommand.rb

@@ -0,0 +1,79 @@
+require_relative('DislokuError')
+require_relative('Log')
+require_relative('config/YamlConfig')
+require_relative('config/Options')
+require_relative('config/MappingStore')
+require_relative('config/ConnectionStore')
+require_relative('config/Target')
+require_relative('git/Repository')
+
+module Disloku
+
+	class BaseCommand
+		attr_accessor :repository, :config, :options
+
+		def initialize(cliOptions)
+			processGlobalOptions(cliOptions)
+
+			@repository = @scmImplementation.new(cliOptions[:dir])
+			@config = loadConfiguration()
+			@options = Config::Options.new(@config["options"], cliOptions)
+			@mappingStore = Config::MappingStore.new(@config["mappings"])
+			@connectionStore = Config::ConnectionStore.new(@config["connections"])
+
+			Log.instance.addLogTarget(:logfile, File.join(repository.root, "disloku.log"), Logger::INFO)
+		end
+
+		def loadConfiguration()
+			repoConfig = File.join(repository.root, 'disloku.config')
+			if (!File.exists?(repoConfig))
+				raise DislokuError.new("There is no disloku.config file in #{repository.root}")
+			end
+
+			config = Config::YamlConfig.new(repoConfig)
+
+			userHome = File.expand_path("~")
+			userConfig = File.join(userHome, ".disloku.config")
+			if (File.exists?(userConfig))
+				base = Config::YamlConfig.new(userConfig)
+				config.merge(base)
+			end
+
+			return config
+		end
+
+		def processGlobalOptions(cliOptions)
+			if (cliOptions[:scm].nil? || cliOptions[:scm] == "git")
+				@scmImplementation = Git::Repository
+			end
+
+			if (cliOptions[:debug])
+				Log.instance.level(:default, Logger::DEBUG)
+			elsif (cliOptions[:verbose])
+				Log.instance.level(:default, Logger::INFO)
+			else
+				Log.instance.level(:default, Logger::WARN)
+			end
+		end
+
+		def resolveTargets(targets)
+			actualTargets = []
+
+			while (targets.count > 0)
+				current = targets.shift()
+				targetConfig = @config["targets"][current]
+				if (targetConfig != nil)
+					if (targetConfig["targets"] != nil)
+						targetConfig["targets"].value().each() { |x| targets.push(x.value()) }
+						next
+					end
+
+					actualTargets.push(Config::Target.new(current, targetConfig, @mappingStore, @connectionStore))
+				end
+			end
+
+			return actualTargets
+		end
+	end
+
+end

data/lib/disloku/ChangeSet.rb

@@ -7,8 +7,20 @@ module Disloku
 		extend Forwardable
 		def_delegators :@changes, :each, :<<
 
-		def initialize()
+		attr_accessor :idFrom, :idTo
+
+		def initialize(idFrom = "", idTo = "")
 			@changes = Array.new()
+			@idFrom = idFrom
+			@idTo = idTo
+		end
+
+		def dirty?()
+			return @changes.any?() { |f| f.dirty }
+		end
+
+		def to_s()
+			return "#{idFrom} -> #{idTo} (#{dirty? ? 'dirty' : 'clean'})"
 		end
 	end
 end

data/lib/disloku/CliAdapter.rb

@@ -0,0 +1,36 @@
+require('io/console')
+
+module Disloku
+
+	class CliAdapter
+		class << self
+
+			@@in = $stdin
+			@@out = $stdout
+
+			def queryYesNo(question)
+				@@out.puts()
+				@@out.puts("#{question} (Y/N)?")
+
+				char = @@in.getch()
+				return !char.match(/^[Yy]/).nil?
+			end
+
+			def queryYesNo!(question)
+				if (queryYesNo(question))
+					yield
+				end
+			end
+
+			def puts(output = nil)
+				@@out.puts(output)
+			end
+
+			def print(output = nil)
+				@@out.print(output)
+			end
+
+		end
+	end
+
+end

data/lib/disloku/Constants.rb

@@ -0,0 +1,4 @@
+
+module Disloku
+	VERSION = "0.4.0"
+end

data/lib/disloku/FileChange.rb

@@ -2,16 +2,21 @@ require_relative('util/File')
 
 module Disloku
 	class FileChange
-		attr_accessor :repository, :changeType
+		attr_accessor :repository, :changeType, :dirty
 
-		def initialize(repository, fullPath, changeType)
+		def initialize(repository, fullPath, changeType, dirty)
 			@repository = repository
 			@fullPath = fullPath
 			@changeType = changeType
+			@dirty = dirty
 		end
 
 		def getFile(target)
 			return Util::File.new(@fullPath, @repository.root, target, self)
 		end
+
+		def to_s()
+			return "<#{@changeType}> #{@fullPath}" + (@dirty ? " (dirty)" : "")
+		end
 	end
 end

data/lib/disloku/Log.rb

@@ -4,41 +4,68 @@ require('logger')
 
 module Disloku
 	class Log
+
 		include Singleton
 
 		def initialize()
-			@logger = Logger.new(STDOUT)
-			@logger.formatter = proc { |severity, datetime, progname, msg|
+			@loggers = {}
+
+			addLogTarget(:default, STDOUT, Logger::INFO) do |severity, datetime, progname, msg|
 				"#{msg}\n"
-			}
+			end
+
+			@scope = [[:default]]
+		end
+
+		def addLogTarget(key, io, level, &block)
+			@loggers[key] = Logger.new(io)
+			if (!block.nil?)
+				@loggers[key].formatter = block
+			end
 		end
 
-		def level()
-			return @logger.level
+		def getLogTarget(key)
+			return @loggers[key]
 		end
 
-		def level=(level)
-			@logger.level = level
+		def scope(scopeTargets)
+			if (scopeTargets.kind_of?(Symbol))
+				scopeTargets = [scopeTargets]
+			end
+
+			@scope.push(scopeTargets)
+			yield
+			@scope.pop()
+		end
+
+		def level(key, level)
+			@loggers[key].level = level
 		end
 
 		def debug(message)
-			@logger.debug(message)
+			log(:debug, message)
 		end
 
 		def info(message)
-			@logger.debug(message)
+			log(:info, message)
 		end
 
 		def warn(message)
-			@logger.debug(message)
+			log(:warn, message)
 		end
 
 		def error(message)
-			@logger.debug(message)
+			log(:error, message)
 		end
 
 		def fatal(message)
-			@logger.debug(message)
+			log(:fatal, message)
+		end
+
+		def log(method, message)
+			@scope.last().each() do |targetKey|
+				@loggers[targetKey].send(method, message) if !@loggers[targetKey].nil?
+			end
 		end
 	end
 end

data/lib/disloku/Repository.rb

@@ -1,3 +1,4 @@
+require_relative('Log')
 require_relative('util/File')
 
 module Disloku
@@ -24,7 +25,15 @@ module Disloku
 		end
 
 		def getChangeSets(from = nil, to = nil)
-			return @provider.getChangeSets(from, to)
+			changeSets = @provider.getChangeSets(from, to)
+
+			Log.instance.scope([:default, :logfile]) do
+				changeSets.each() do |changeSet|
+					Log.instance.info("gathered change set #{changeSet.to_s()}")
+				end
+			end
+
+			return changeSets
 		end
 	end
 end

data/lib/disloku/SysCmd.rb

@@ -6,9 +6,9 @@ module Disloku
 		def initialize(cmd)
 			@cmd = cmd
 		end
-		
+
 		def execute()
-			Log.instance.info("executing '#{@cmd}'")
+			Log.instance.debug("executing '#{@cmd}'")
 			return SysCmdResult.new(%x(#{@cmd}), $?)
 		end
 	end

data/lib/disloku/commands/Build.rb

@@ -0,0 +1,30 @@
+require_relative('../BaseCommand')
+require_relative('../tasks/FolderTask')
+
+module Disloku
+	module Commands
+
+		class Build < BaseCommand
+			def initialize(cliOptions)
+				super(cliOptions)
+			end
+
+			def execute(from, to)
+				changesets = @repository.getChangeSets(from, to)
+
+				folderInput = {
+					:options => @options,
+					:changesets => changesets,
+					:target => nil,
+				}
+
+				resolveTargets([@options.target]).each() do |t|
+					folderInput[:target] = t
+
+					result = Tasks::FolderTask.new(folderInput).execute()
+				end
+			end
+		end
+
+	end
+end

data/lib/disloku/commands/Config.rb

@@ -0,0 +1,17 @@
+require_relative('../BaseCommand')
+
+module Disloku
+	module Commands
+
+		class Config < BaseCommand
+			def initialize(cliOptions)
+				super(cliOptions)
+			end
+
+			def execute()
+				puts(config.to_yaml())
+			end
+		end
+
+	end
+end

data/lib/disloku/commands/Deploy.rb

@@ -0,0 +1,38 @@
+require_relative('../BaseCommand')
+require_relative('../tasks/FolderTask')
+require_relative('../tasks/NetSftpTask')
+
+module Disloku
+	module Commands
+
+		class Deploy < BaseCommand
+			def initialize(cliOptions)
+				super(cliOptions)
+			end
+
+			def execute(from, to)
+				changesets = @repository.getChangeSets(from, to)
+
+				folderInput = {
+					:options => @options,
+					:changesets => changesets,
+				}
+
+				resolveTargets([@options.target]).each() do |t|
+					folderInput[:target] = t
+
+					result = Tasks::FolderTask.new(folderInput).execute()
+
+					sftpInput = result.merge({
+						:repository => @repository,
+						:options => @options,
+						:target => t,
+					})
+
+					result = Tasks::NetSftpTask.new(sftpInput).execute()
+				end
+			end
+		end
+
+	end
+end

data/lib/disloku/config/Connection.rb

@@ -0,0 +1,34 @@
+require('net/sftp')
+require('digest/sha1')
+
+module Disloku
+	module Config
+
+		class Connection
+			attr_accessor :hash, :host, :user, :options
+
+			def initialize(config)
+				@host = config["host"].value()
+				@user = config["user"].value() if !config["user"].nil?
+				@options = {}
+				addOption(config, :password)
+				addOption(config, :port)
+				addOption(config, :keys, true)
+
+				@hash = Digest::SHA1.hexdigest([@host, @user, @options].join())
+			end
+
+			def addOption(config, key, unwrap = false)
+				value = config[key.to_s()]
+				if (!value.nil?)
+					if (unwrap)
+						@options[key] = value.value().map() { |e| e.value() }
+					else
+						@options[key] = value.value()
+					end
+				end
+			end
+		end
+
+	end
+end

data/lib/disloku/config/ConnectionStore.rb

@@ -0,0 +1,19 @@
+require_relative('NamedConfigStore')
+require_relative('Connection')
+
+module Disloku
+	module Config
+
+		class ConnectionStore < NamedConfigStore
+
+			def initialize(config = nil)
+				super(config)
+			end
+
+			def transformConfig(yamlConfig)
+				return Connection.new(yamlConfig)
+			end
+		end
+
+		end
+end

data/lib/disloku/config/Mapping.rb

@@ -0,0 +1,84 @@
+require_relative('../util/Hash')
+require_relative('../util/File')
+
+module Disloku
+	module Config
+
+		class Mapping
+
+			def initialize(config, mappingStore = nil, allowDefault = true)
+				@mapping = {}
+
+				mappingConfig = config["mapping"]
+				if (!mappingConfig.nil?)
+					mappingConfig.value().each() do |m|
+						node = @mapping
+						src = m["src"].value()
+
+						if (src.kind_of?(Symbol))
+							segments = [src]
+						else
+							segments = Util::File.getSegments(src)
+
+							segments[0..-2].each() do |segment|
+								if (!node.has_key?(segment))
+									node[segment] = {}
+								end
+								node = node[segment]
+							end
+						end
+
+						if (!m["block"].nil? && m["block"].value())
+							node[segments[-1]] = :block
+						else
+							dst = m["dst"].value()
+							if (dst.kind_of?(Symbol))
+								node[segments[-1]] = dst
+							else
+								node[segments[-1]] = Util::File.getSegments(m["dst"].value())
+							end
+						end
+					end
+				elsif (allowDefault)
+					@mapping[:any] = :keep
+				end
+
+				baseMapping = config["baseMapping"].nil? ? nil : config["baseMapping"].value()
+
+				if (!baseMapping.nil?)
+					if (mappingStore.nil?)
+						raise ArgumentError.new("mapping has a base but no mapping manager was passed")
+					else
+						@mapping = mappingStore.get(baseMapping).getTree().recursive_merge(@mapping)
+					end
+				end
+			end
+
+			def getTree()
+				return @mapping
+			end
+
+			def mapPath(pathSegments)
+				node = @mapping
+				for i in 0..pathSegments.count
+					if (node.has_key?(pathSegments[i]))
+						node = node[pathSegments[i]]
+					elsif (node.has_key?(:any))
+						node = node[:any]
+					else
+						return nil
+					end
+
+					if (node == :block)
+						return nil
+					elsif (node == :keep)
+						return pathSegments
+					elsif (node.kind_of?(Array))
+						return Array.new(node).concat(pathSegments[(i + 1)..-1])
+					end
+				end
+			end
+		end
+
+	end
+end

data/lib/disloku/config/MappingStore.rb

@@ -0,0 +1,19 @@
+require_relative('NamedConfigStore')
+require_relative('Mapping')
+
+module Disloku
+	module Config
+
+		class MappingStore < NamedConfigStore
+
+			def initialize(config = nil)
+				super(config)
+			end
+
+			def transformConfig(yamlConfig)
+				return Mapping.new(yamlConfig, self, false)
+			end
+		end
+
+	end
+end

data/lib/disloku/config/NamedConfigStore.rb

@@ -0,0 +1,41 @@
+require_relative('../DislokuError')
+require_relative('Connection')
+
+module Disloku
+	module Config
+		class NamedConfigStore
+
+			def initialize(config = nil)
+				@store = {}
+				if (!config.nil?)
+					load(config)
+				end
+			end
+
+			def get(name)
+				if (@store.has_key?(name))
+					return @store[name]
+				else
+					raise DislokuError.new("There is no stored object with the name '#{name}' in this store")
+				end
+			end
+
+			def add(name, yamlConfig)
+				@store[name] = transformConfig(yamlConfig)
+			end
+
+			def load(config)
+				if (!config.nil?)
+					config.value().each_key() do |key|
+						add(key, config[key])
+					end
+				end
+			end
+
+			def transformConfig(yamlConfig)
+				return yamlConfig
+			end
+		end
+
+	end
+end

data/lib/disloku/config/Options.rb

@@ -0,0 +1,51 @@
+require_relative('../Log')
+require('tmpdir')
+require('fileutils')
+
+module Disloku
+	module Config
+
+		class Options
+
+			def initialize(config, cliOptions)
+				@options = {
+					:ignoreDeleteErrors => false,
+					:createDeletesFile => false,
+					:allowOverride => false,
+					:target => "default",
+					:packageDir => :temp,
+				}
+
+				@options.each_key() do |key|
+					if (cliOptions.has_key?(key.to_s()))
+						@options[key] = cliOptions[key.to_s()]
+					elsif (config[key.to_s()] != nil)
+						@options[key] = config[key.to_s()].value()
+					end
+				end
+
+				if (@options[:packageDir] == :temp)
+					@options[:packageDir] = Dir.mktmpdir("disloku")
+					Log.instance.debug("Creating tmp directory #{@options[:packageDir]}")
+
+					# make sure the temp directory is deleted when the program exists
+					at_exit {
+						Log.instance.debug("Removing tmp directory #{@options[:packageDir]}")
+						FileUtils.rm_r(@options[:packageDir], :force => true)
+					}
+				else
+					@options[:packageDir] = File.expand_path(@options[:packageDir])
+				end
+			end
+
+			def method_missing(name, *args, &block)
+				if (!@options.has_key?(name))
+					raise ArgumentError.new("There's no option '#{name}' here")
+				end
+
+				return @options[name]
+			end
+		end
+
+	end
+end

data/lib/disloku/config/Target.rb

@@ -0,0 +1,37 @@
+require_relative('Mapping')
+require_relative('Connection')
+
+module Disloku
+	module Config
+
+		class Target
+			attr_accessor :name, :connection
+
+			def initialize(name, targetConfig, mappingStore, connectionStore)
+				@name = name
+				@config = targetConfig
+
+				if (@config["connection"].value().kind_of?(String))
+					@connection = connectionStore.get(@config["connection"].value())
+				else
+					@connection = Connection.new(@config["connection"])
+				end
+
+				@mapping = Mapping.new(@config, mappingStore)
+			end
+
+			def mapPath(pathSegments)
+				return @mapping.mapPath(pathSegments)
+			end
+
+			def method_missing(name, *args, &block)
+				if (!@config.has?(name.to_s()))
+					return nil
+				end
+
+				return @config[name.to_s()].value()
+			end
+		end
+
+	end
+end