disloku 0.2.0 → 0.4.0

data/lib/disloku/config/YamlConfig.rb

@@ -0,0 +1,54 @@
+require('yaml')
+
+module Disloku
+	module Config
+
+		class YamlConfig
+			attr_accessor :yaml
+
+			def initialize(config, isFile = true)
+				if (isFile)
+					@yaml = YAML.load_file(config)
+				else
+					@yaml = config
+				end
+			end
+
+			def merge(base)
+				@yaml = base.yaml.recursive_merge(@yaml)
+			end
+
+			def has?(key)
+				return self[key] != nil
+			end
+
+			def get(keys)
+				if (keys.empty?())
+					return self
+				end
+				current = keys.shift()
+				return @yaml.has_key?(current) ? YamlConfig.new(@yaml[current], false).get(keys) : nil
+			end
+
+			def [](key)
+				return self.get(key.split('.'))
+			end
+
+			def value()
+				if (@yaml.kind_of?(Array))
+					return @yaml.map() { |item| YamlConfig.new(item, false) }
+				end
+				return @yaml
+			end
+
+			def to_s()
+				return value().to_s()
+			end
+
+			def to_yaml()
+				return @yaml.to_yaml()
+			end
+		end
+
+	end
+end

data/lib/disloku/git/ChangeSetProvider.rb

@@ -25,16 +25,29 @@ module Disloku
 					from = "HEAD"
 				end
 
+				dirtyPaths = {}
+				status = SysCmd.new("git status --untracked-files=no --porcelain #{repository.root}").execute()
+				status.output.each_line() do |line|
+					match = /^(.)(.)\s+"([^"]+)"/.match(line) || /^(.)(.)\s+([^ \n\r]+)/.match(line)
+					dirtyPaths[match[3]] = true
+				end
+
+				result = ChangeSet.new(@repository.getHashOfRefspec(from), to || @repository.getHashOfRefspec("HEAD"))
+
 				if (to == nil)
-					status = SysCmd.new("git diff --name-status --staged #{from} #{repository.root}").execute()
+					diff = SysCmd.new("git diff --name-status --staged #{from} #{repository.root}").execute()
 				else
-					status = SysCmd.new("git diff --name-status #{from} #{to} #{repository.root}").execute()
+					diff = SysCmd.new("git diff --name-status #{from} #{to} #{repository.root}").execute()
 				end
 
-				result = ChangeSet.new()
-				status.output.each_line do |line|
-					match = /^(.)\s+(.*)$/.match(line)
-					result << FileChange.new(repository, match[2], getChangeType(match[1]))
+				Log.instance.scope([:default, :logfile]) do
+					diff.output.each_line() do |line|
+						match = /^(.)\s+(.*)$/.match(line)
+						dirty = dirtyPaths.has_key?(match[2])
+						change = FileChange.new(repository, match[2], getChangeType(match[1]), dirty)
+						Log.instance.info(change.to_s())
+						result << change
+					end
 				end
 
 				return [result]

data/lib/disloku/git/Repository.rb

@@ -19,8 +19,22 @@ module Disloku
 			end
 
 			def getBranchName()
-				branch = SysCmd.new("git --git-dir=\"#{@gitDir}\" rev-parse --abbrev-ref HEAD").execute()
-				return branch.output.strip()
+				return @branch || begin
+					branch = SysCmd.new("git --git-dir=\"#{@gitDir}\" rev-parse --abbrev-ref HEAD").execute()
+					@branch = branch.output.strip()
+				end
+			end
+
+			def getHashOfRefspec(refspec)
+				hash = SysCmd.new("git --git-dir=\"#{@gitDir}\" rev-parse #{refspec}").execute()
+				return hash.output.strip()
+			end
+
+			def getHeadHash()
+				return @headHash || begin
+					headHash = SysCmd.new("git --git-dir=\"#{@gitDir}\" rev-parse HEAD").execute()
+					@headHash = branch.output.strip()
+				end
 			end
 
 			def getProvider()

data/lib/disloku/svn/ChangeSetProvider.rb

@@ -1,41 +1,44 @@
-require_relative('../ChangeSetProvider');
-require_relative('../ChangeSet');
-require_relative('../FileChange');
-require_relative('../SysCmd');
-
-module Disloku
-	module Svn
-
-		CHANGE_MAP = {
-			' ' => :nochange,
-			'A' => :added,
-			'C' => :conflicted,
-			'D' => :deleted,
-			'I' => :ignored,
-			'M' => :modified,
-			'R' => :replaced,
-			'X' => :external,
-			'?' => :unversioned,
-			'!' => :missing,
-			'~' => :obstructed,
-		}
-
-		class ChangeSetProvider < Disloku::ChangeSetProvider
-			def getChangeSets(from, to)
-				status = SysCmd.new("svn status #{repository.root}").execute()
-
-				result = ChangeSet.new()
-				status.output.each_line do |line|
-					match = /^(.)......\s+(.*)$/.match(line)
-					result << FileChange.new(repository, match[2], getChangeType(match[1]))
-				end
-
-				return [result]
-			end
-
-			def getChangeType(changeChar)
-				return CHANGE_MAP[changeChar]
-			end
-		end
-	end
-end
+
+# TODO: start from scratch for SVN repository provider
+
+# require_relative('../ChangeSetProvider');
+# require_relative('../ChangeSet');
+# require_relative('../FileChange');
+# require_relative('../SysCmd');
+
+# module Disloku
+# 	module Svn
+
+# 		CHANGE_MAP = {
+# 			' ' => :nochange,
+# 			'A' => :added,
+# 			'C' => :conflicted,
+# 			'D' => :deleted,
+# 			'I' => :ignored,
+# 			'M' => :modified,
+# 			'R' => :replaced,
+# 			'X' => :external,
+# 			'?' => :unversioned,
+# 			'!' => :missing,
+# 			'~' => :obstructed,
+# 		}
+
+# 		class ChangeSetProvider < Disloku::ChangeSetProvider
+# 			def getChangeSets(from, to)
+# 				status = SysCmd.new("svn status #{repository.root}").execute()
+
+# 				result = ChangeSet.new()
+# 				status.output.each_line do |line|
+# 					match = /^(.)......\s+(.*)$/.match(line)
+# 					result << FileChange.new(repository, match[2], getChangeType(match[1]))
+# 				end
+
+# 				return [result]
+# 			end
+
+# 			def getChangeType(changeChar)
+# 				return CHANGE_MAP[changeChar]
+# 			end
+# 		end
+# 	end
+# end

data/lib/disloku/svn/Repository.rb

@@ -1,22 +1,25 @@
-require_relative('../Repository')
-require_relative('ChangeSetProvider')
 
-module Disloku
-	module Svn
-		class Repository < Disloku::Repository
-			def initialize(location)
-				super(location)
-			end
-			
-			def getRepositoryRoot()
-				info = %x[svn info --xml #{location}]
-				m = /<wcroot-abspath>(.*)<\/wcroot-abspath>/.match(info)
-				return m[1]
-			end
-			
-			def getProvider()
-				return ChangeSetProvider.new(self)
-			end
-		end
-	end
-end
+# TODO: start from scratch for SVN repository provider
+
+# require_relative('../Repository')
+# require_relative('ChangeSetProvider')
+
+# module Disloku
+# 	module Svn
+# 		class Repository < Disloku::Repository
+# 			def initialize(location)
+# 				super(location)
+# 			end
+
+# 			def getRepositoryRoot()
+# 				info = %x[svn info --xml #{location}]
+# 				m = /<wcroot-abspath>(.*)<\/wcroot-abspath>/.match(info)
+# 				return m[1]
+# 			end
+
+# 			def getProvider()
+# 				return ChangeSetProvider.new(self)
+# 			end
+# 		end
+# 	end
+# end

data/lib/disloku/tasks/FolderTask.rb

@@ -1,6 +1,7 @@
 require_relative('../Log')
 require_relative('../BaseTask')
-require_relative('../util/Kernel')
+require_relative('../config/Options')
+require_relative('../config/Target')
 require('fileutils')
 require('stringio')
 
@@ -10,10 +11,9 @@ module Disloku
 
 			def initialize(input)
 				super()
-				@options = getInputParam(input, :options, Options)
+				@options = getInputParam(input, :options, Config::Options)
 				@changesets = getInputParam(input, :changesets, Array)
-				@target = getInputParam(input, :target, Target)
-				@allowOverride = getInputParam(input, :allowOverride, Object)
+				@target = getInputParam(input, :target, Config::Target)
 				@deletes = StringIO.new()
 
 				@targetDirectory = File.join(@options.packageDir, @target.name)
@@ -22,7 +22,7 @@ module Disloku
 			def beforeExecute()
 				if (!Dir.exists?(@targetDirectory))
 					FileUtils.mkpath(@targetDirectory)
-				elsif (Dir.exists?(@targetDirectory) and !@allowOverride)
+				elsif (Dir.exists?(@targetDirectory) and !@options.allowOverride)
 					raise Exception.new("Directory '#{@targetDirectory}' already exists")
 				elsif (Dir.exists?(@targetDirectory))
 					FileUtils.rm_r(@targetDirectory, :force => true)

data/lib/disloku/tasks/NetSftpTask.rb

@@ -1,7 +1,10 @@
 require_relative('../DislokuError')
 require_relative('../Log')
 require_relative('../BaseTask')
+require_relative('../CliAdapter')
 require_relative('../SessionManager')
+require_relative('../config/Options')
+require_relative('../config/Target')
 
 module Net; module SFTP; module Operations
 	class Upload
@@ -26,11 +29,11 @@ module Disloku
 
 			def initialize(input)
 				super()
-				@repository = getInputParam(input, :repository, Repository)
-				@options = getInputParam(input, :options, Options)
+				@repository = getInputParam(input, :repository, Disloku::Repository)
+				@options = getInputParam(input, :options, Config::Options)
 				@directory = getInputParam(input, :directory, String)
 				@files = getInputParam(input, :files, Array)
-				@target = getInputParam(input, :target, Target)
+				@target = getInputParam(input, :target, Config::Target)
 			end
 
 			def beforeExecute()
@@ -46,46 +49,53 @@ module Disloku
 				@files.each() do |file|
 					puts(file)
 				end
-				puts()
-				puts("Continue with deployment (Y/N)?")
-				response = STDIN.readline().chomp()
-				@skip = response.match(/^[Yy]/) == nil
-				puts("skipping: #{@skip}")
+
+				@skip = !CliAdapter.queryYesNo("Continue with deployment?")
 			end
 
 			def executeTask()
 				if (@skip)
 					return
 				end
+				CliAdapter.puts("Doploying target [#{@target.name}]")
+
+				Log.instance.scope([:default, :logfile]) do
+
+					SessionManager.instance.get(@target.connection) do |sftp|
+						Log.instance.info("connection with [#{@target.name}] established")
 
-				SessionManager.instance.get(@target.connection) do |sftp|
-					Log.instance.info("copying new files...")
-					sftp.upload!(@directory, @target.targetDir, { :ignoreMkdirError => true }) do |event, uploader, *args|
-						case event
-							when :open then
-								# args[0] : file metadata
-								# "starting upload: #{args[0].local} -> #{args[0].remote} (#{args[0].size} bytes}"
-								print(".")
+						sftp.upload!(@directory, @target.targetDir, { :ignoreMkdirError => true }) do |event, uploader, *args|
+							case event
+								when :open then
+									# args[0] : file metadata
+									# "starting upload: #{args[0].local} -> #{args[0].remote} (#{args[0].size} bytes}"
+									CliAdapter.print(".")
+									Log.instance.info("#{args[0].local} -> #{args[0].remote} (#{args[0].size} bytes)")
+							end
 						end
-					end
-					puts()
+						CliAdapter.puts()
 
-					@files.each() do |file|
-						if (file.change.changeType == :deleted)
-							path = file.getAbsoluteDstPath()
-							Log.instance.info("deleting file #{path}")
-							begin
-								sftp.remove!(path)
-							rescue
-								if (!@options.ignoreDeleteErrors)
-									raise
-								else
-									Log.instance.info("unable to delete file #{path} (it probably doesn't exist)")
+						@files.each() do |file|
+							if (file.change.changeType == :deleted)
+								path = file.getAbsoluteDstPath()
+								Log.instance.info("deleting file #{path}")
+								begin
+									sftp.remove!(path)
+									CliAdapter.print("x")
+								rescue
+									if (!@options.ignoreDeleteErrors)
+										Log.instance.fatal("unable to delete file #{path} - failing")
+										raise
+									else
+										Log.instance.warn("unable to delete file #{path} (it probably doesn't exist)")
+									end
 								end
 							end
 						end
 					end
+
 				end
+
 			end
 
 			def afterExecute()

data/lib/disloku/util/File.rb

@@ -4,6 +4,11 @@ module Disloku
 		SPLIT_EXP = "\\#{File::SEPARATOR}|\\#{File::ALT_SEPARATOR}"
 
 		class File
+
+			def self.getSegments(path)
+				return path.split(/#{SPLIT_EXP}/)
+			end
+
 			attr_accessor :srcPath, :change
 
 			def initialize(filePath, basePath, target, change)
@@ -11,8 +16,8 @@ module Disloku
 				@target = target
 				@change = change
 
-				fileSegments = filePath.split(/#{SPLIT_EXP}/)
-				baseSegments = basePath.split(/#{SPLIT_EXP}/)
+				fileSegments = File.getSegments(filePath)
+				baseSegments = File.getSegments(basePath)
 				index = 0
 				while (fileSegments[index] == baseSegments[index])
 					index += 1
@@ -40,7 +45,8 @@ module Disloku
 			end
 
 			def to_s()
-				return "#{srcPath} -> #{getAbsoluteDstPath()}"
+				operation = (@change.changeType == :deleted ? "x>" : "->")
+				return "#{srcPath} #{operation} #{getAbsoluteDstPath()}"
 			end
 		end
 	end

data/lib/disloku.rb

@@ -1,32 +1,46 @@
-require_relative('disloku/Disloku')
+require_relative('disloku/Constants')
+require_relative('disloku/commands/Config')
+require_relative('disloku/commands/Build')
+require_relative('disloku/commands/Deploy')
 require_relative('disloku/SysCmd')
 require_relative('disloku/SessionManager')
 require('thor')
 
 class DislokuCli < Thor
+	class_option :verbose, :aliases => "-v", :type => :boolean, :desc => "verbose output"
+	class_option :debug, :aliases => "-d", :type => :boolean, :desc => "debug output"
+	class_option :scm, :aliases => "-s", :type => :string, :desc => "source control adapter to use (git) - defaults to git"
+
 	desc "deploy [FROM] [TO]", "deploy changes"
 	method_option :dir, :default => ".", :aliases => "-d", :desc => "repository directory"
 	method_option :target, :aliases => "-t", :desc => "target"
+	method_option :packageDir, :aliases => "-p", :desc => "directory in which the deployment package will be created (a temp folder is created if this option is omitted)"
+	method_option :ignoreDeleteErrors, :aliases => "--ignore-delete-errors", :type => :boolean, :desc => "ignore remote delete errors"
 	def deploy(from = nil, to = nil)
-		puts "deploy #{options.inspect}"
-
-		disloku = Disloku::Disloku.new(options)
-		disloku.deployPackage(from, to)
+		cmd = Disloku::Commands::Deploy.new(options)
+		cmd.execute(from, to)
 	end
 
 	desc "build [FROM] [TO]", "build change package"
 	method_option :dir, :default => ".", :aliases => "-d", :desc => "repository directory"
 	method_option :target, :aliases => "-t", :desc => "target"
+	method_option :packageDir, :default => "~/disloku", :aliases => "-p", :desc => "directory in which the deployment package will be created (~/disloku if this option is omitted)"
+	method_option :allowOverride, :aliases => "-f", :type => :boolean, :desc => "overwrites existing deployment packages in packageDir"
+	method_option :createDeletesFile, :aliases => "--create-deletes-file", :type => :boolean, :desc => "creates a .deletes file containing a list of deleted files"
 	def build(from = nil, to = nil)
-		p(options)
-		disloku = Disloku::Disloku.new(options)
-		dir = disloku.buildPackage(from, to)
+		cmd = Disloku::Commands::Build.new(options)
+		cmd.execute(from, to)
 	end
 
 	desc "config", "show configuration"
 	method_option :dir, :default => ".", :aliases => "-d", :desc => "repository directory"
 	def config()
-		disloku = Disloku::Disloku.new(options)
-		puts(disloku.config.to_yaml())
+		cmd = Disloku::Commands::Config.new(options)
+		cmd.execute()
+	end
+
+	desc "version", "show version"
+	def version()
+		puts(Disloku::VERSION)
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: disloku
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Lukas Angerer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-05 00:00:00.000000000 Z
+date: 2014-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -66,40 +66,45 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 2.14.1
-description: A deployment tool that allows copying of Git changesets via sftp
-email: executor.dev@gmail.com
+description: A deployment tool that allows copying of Git changesets via sftp (version
+  0.4.0 [e5344aa1bb])
+email:
+- executor.dev@gmail.com
 executables:
 - disloku
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/disloku/BaseCommand.rb
 - lib/disloku/BaseTask.rb
 - lib/disloku/ChangeSet.rb
 - lib/disloku/ChangeSetProvider.rb
-- lib/disloku/Commit.rb
-- lib/disloku/Config.rb
-- lib/disloku/Connection.rb
-- lib/disloku/ConnectionStore.rb
-- lib/disloku/Disloku.rb
+- lib/disloku/CliAdapter.rb
+- lib/disloku/commands/Build.rb
+- lib/disloku/commands/Config.rb
+- lib/disloku/commands/Deploy.rb
+- lib/disloku/config/Connection.rb
+- lib/disloku/config/ConnectionStore.rb
+- lib/disloku/config/Mapping.rb
+- lib/disloku/config/MappingStore.rb
+- lib/disloku/config/NamedConfigStore.rb
+- lib/disloku/config/Options.rb
+- lib/disloku/config/Target.rb
+- lib/disloku/config/YamlConfig.rb
+- lib/disloku/Constants.rb
 - lib/disloku/DislokuError.rb
 - lib/disloku/FileChange.rb
 - lib/disloku/git/ChangeSetProvider.rb
 - lib/disloku/git/Repository.rb
 - lib/disloku/Log.rb
-- lib/disloku/Mapping.rb
-- lib/disloku/MappingStore.rb
-- lib/disloku/NamedConfigStore.rb
-- lib/disloku/Options.rb
 - lib/disloku/Repository.rb
 - lib/disloku/SessionManager.rb
 - lib/disloku/svn/ChangeSetProvider.rb
 - lib/disloku/svn/Repository.rb
 - lib/disloku/SysCmd.rb
 - lib/disloku/SysCmdResult.rb
-- lib/disloku/Target.rb
 - lib/disloku/tasks/FolderTask.rb
 - lib/disloku/tasks/NetSftpTask.rb
-- lib/disloku/tasks/PsFtpTask.rb
 - lib/disloku/util/File.rb
 - lib/disloku/util/Hash.rb
 - lib/disloku/util/Kernel.rb

data/lib/disloku/Commit.rb

@@ -1,7 +0,0 @@
-
-module Disloku
-	class Commit
-		def initialize()
-		end
-	end
-end

data/lib/disloku/Config.rb

@@ -1,52 +0,0 @@
-require('yaml')
-require_relative('util/Hash')
-
-module Disloku
-	class Config
-		attr_accessor :yaml
-
-		def initialize(config, isFile = true)
-			if (isFile)
-				@yaml = YAML.load_file(config)
-			else
-				@yaml = config
-			end
-		end
-
-		def merge(base)
-			@yaml = base.yaml.recursive_merge(@yaml)
-		end
-
-		def has?(key)
-			return self[key] != nil
-		end
-
-		def get(keys)
-			if (keys.empty?())
-				return self
-			end
-			current = keys.shift()
-			return @yaml.has_key?(current) ? Config.new(@yaml[current], false).get(keys) : nil
-		end
-
-		def [](key)
-			return self.get(key.split('.'))
-		end
-
-		def value()
-			if (@yaml.kind_of?(Array))
-				return @yaml.map() { |item| Config.new(item, false) }
-			end
-			return @yaml
-		end
-
-		def to_s()
-			return value().to_s()
-		end
-
-		def to_yaml()
-			return @yaml.to_yaml()
-		end
-
-	end
-end

data/lib/disloku/Connection.rb

@@ -1,31 +0,0 @@
-require('net/sftp')
-require('digest/sha1')
-
-module Disloku
-	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

data/lib/disloku/ConnectionStore.rb

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