disloku 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 114b22aa9d4750cc34ec61df2eaa35db116d2019
-  data.tar.gz: e3ca011d1d3b297c073dec2a226fce5d290c6ef4
+  metadata.gz: 2f64d1e3ee54cc8b840c1c8d2a3e38093b71e35a
+  data.tar.gz: 03382e354613f9d820ff86ef242dbf4d156de129
 SHA512:
-  metadata.gz: 405cdd36e1552d1504d660cb604ce12d3bb3c5e05507b593c710a4bd761b24f031b12d98f02cb3e81e06d5d85353457212deed90ad235ad5bd21acfd5cd7ba1a
-  data.tar.gz: a098da49f71bbec30fdc13b55572e6f7d19a640cf52c2d9408d6861b7fd5518399796de84dbb3707b35a719d7389f88982674ae459283f702fc1064c4de11a1e
+  metadata.gz: 92fbd584e6295b784211813fd578caa6a9f276f52b3059ac6824ab1f1ac3e4020292ace0b87b28cb5e1ce37fbfcb96549eab94a7f56cc1de4546571bc07cd860
+  data.tar.gz: bf16508627508a393ac4dc89755a13a21491660a00d015e3286be7d74aba55c36213f5fae16a621d250c66f91dddb174a38fc90bfafdc3ea4dcdb119f931b272

data/LICENSE

@@ -0,0 +1,19 @@
+Copyright (c) 2014 Lukas Angerer
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/bin/disloku

@@ -1,4 +1,8 @@
 #!/usr/bin/env ruby
 
 require('disloku')
-DislokuCli.start()
+begin
+	DislokuCli.start()
+rescue Interrupt => e
+	$stderr.puts("Disloku was killed with CTRL+C")
+end

data/lib/disloku/ChangeSet.rb

@@ -1,12 +1,12 @@
-require 'Forwardable'
-require 'Pathname'
+require('forwardable')
+require('pathname')
 
 module Disloku
 	class ChangeSet
 		include Enumerable
 		extend Forwardable
 		def_delegators :@changes, :each, :<<
-		
+
 		def initialize()
 			@changes = Array.new()
 		end

data/lib/disloku/ChangeSetProvider.rb

@@ -2,12 +2,13 @@
 module Disloku
 	class ChangeSetProvider
 		attr_accessor :repository
-		
+
 		def initialize(repository)
 			@repository = repository
 		end
-		
-		def getChangeSet(from, to)
+
+		def getChangeSets(from, to)
+			raise NotImplementedError.new()
 		end
 	end
 end

data/lib/disloku/Config.rb

@@ -1,4 +1,4 @@
-require('YAML')
+require('yaml')
 require_relative('util/Hash')
 
 module Disloku

data/lib/disloku/Disloku.rb

@@ -39,12 +39,12 @@ module Disloku
 		end
 
 		def buildPackage(from, to)
-			changeset = @repository.getChangeSet(from, to)
+			changesets = @repository.getChangeSets(from, to)
 
 			folderInput = {
 				:options => @options,
 				:allowOverride => false,
-				:changesets => [changeset],
+				:changesets => changesets,
 				:target => nil,
 			}
 
@@ -57,12 +57,12 @@ module Disloku
 		end
 
 		def deployPackage(from, to)
-			changeset = @repository.getChangeSet(from, to)
+			changesets = @repository.getChangeSets(from, to)
 
 			folderInput = {
 				:options => @options,
 				:allowOverride => false,
-				:changesets => [changeset],
+				:changesets => changesets,
 				:target => nil,
 			}
 

data/lib/disloku/Log.rb

@@ -1,33 +1,42 @@
-require('Singleton')
-require('Logger')
+require_relative('util/Kernel')
+require('singleton')
+require('logger')
 
 module Disloku
 	class Log
 		include Singleton
-		
+
 		def initialize()
 			@logger = Logger.new(STDOUT)
 			@logger.formatter = proc { |severity, datetime, progname, msg|
 				"#{msg}\n"
 			}
 		end
-		
+
+		def level()
+			return @logger.level
+		end
+
+		def level=(level)
+			@logger.level = level
+		end
+
 		def debug(message)
 			@logger.debug(message)
 		end
-		
+
 		def info(message)
 			@logger.debug(message)
 		end
-		
+
 		def warn(message)
 			@logger.debug(message)
 		end
-		
+
 		def error(message)
 			@logger.debug(message)
 		end
-		
+
 		def fatal(message)
 			@logger.debug(message)
 		end

data/lib/disloku/Options.rb

@@ -1,6 +1,8 @@
+require_relative('Log')
 require_relative('Config')
-require('fileutils')
+require_relative('util/Kernel')
 require('tmpdir')
+require('fileutils')
 
 module Disloku
 	class Options
@@ -22,8 +24,14 @@ module Disloku
 			end
 
 			if (@options[:packageDir] == :temp)
-				puts("creating tempdir")
 				@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)
+				}
 			end
 		end
 

data/lib/disloku/Repository.rb

@@ -20,10 +20,11 @@ module Disloku
 		end
 
 		def getProvider()
+			raise NotImplementedError.new()
 		end
 
-		def getChangeSet(from = nil, to = nil)
-			return @provider.getChangeSet(from, to)
+		def getChangeSets(from = nil, to = nil)
+			return @provider.getChangeSets(from, to)
 		end
 	end
 end

data/lib/disloku/git/ChangeSetProvider.rb

@@ -20,7 +20,7 @@ module Disloku
 		}
 
 		class ChangeSetProvider < Disloku::ChangeSetProvider
-			def getChangeSet(from = nil, to = nil)
+			def getChangeSets(from = nil, to = nil)
 				if (from == nil)
 					from = "HEAD"
 				end
@@ -37,7 +37,7 @@ module Disloku
 					result << FileChange.new(repository, match[2], getChangeType(match[1]))
 				end
 
-				return result
+				return [result]
 			end
 
 			def getChangeType(changeChar)

data/lib/disloku/svn/ChangeSetProvider.rb

@@ -21,7 +21,7 @@ module Disloku
 		}
 
 		class ChangeSetProvider < Disloku::ChangeSetProvider
-			def getChangeSet(from, to)
+			def getChangeSets(from, to)
 				status = SysCmd.new("svn status #{repository.root}").execute()
 
 				result = ChangeSet.new()
@@ -30,7 +30,7 @@ module Disloku
 					result << FileChange.new(repository, match[2], getChangeType(match[1]))
 				end
 
-				return result
+				return [result]
 			end
 
 			def getChangeType(changeChar)

data/lib/disloku/tasks/FolderTask.rb

@@ -1,5 +1,6 @@
 require_relative('../Log')
 require_relative('../BaseTask')
+require_relative('../util/Kernel')
 require('fileutils')
 require('stringio')
 

data/lib/disloku/tasks/PsFtpTask.rb

@@ -1,6 +1,6 @@
 require_relative('../Log')
 require_relative('../BaseTask')
-require('Open3')
+require('open3')
 
 module Disloku
 	module Tasks

data/lib/disloku/util/Kernel.rb

@@ -0,0 +1,10 @@
+
+module Kernel
+  def suppress_warnings()
+    original_verbosity = $VERBOSE
+    $VERBOSE = nil
+    result = yield
+    $VERBOSE = original_verbosity
+    return result
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: disloku
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Lukas Angerer
@@ -9,7 +9,63 @@ autorequire:
 bindir: bin
 cert_chain: []
 date: 2014-03-05 00:00:00.000000000 Z
-dependencies: []
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.18.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.18.1
+- !ruby/object:Gem::Dependency
+  name: net-sftp
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 2.1.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 2.1.2
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 10.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 10.1.0
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 2.14.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !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
 executables:
@@ -46,9 +102,11 @@ files:
 - lib/disloku/tasks/PsFtpTask.rb
 - lib/disloku/util/File.rb
 - lib/disloku/util/Hash.rb
+- lib/disloku/util/Kernel.rb
 - lib/disloku.rb
+- LICENSE
 - bin/disloku
-homepage: 
+homepage: https://rubygems.org/gems/disloku
 licenses:
 - MIT
 metadata: {}