forkcms_deploy 2.4.1 → 2.4.2

data/VERSION

@@ -1 +1 @@
-2.4.1
+2.4.2

data/forkcms_deploy.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "forkcms_deploy"
-  s.version = "2.4.1"
+  s.version = "2.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tijs Verkoyen", "Jan De Poorter", "Sam Tubbax"]
-  s.date = "2013-01-14"
+  s.date = "2013-07-23"
   s.description = "Deployment for ForkCMS with Capistrano"
   s.email = "info@sumocoders.be"
   s.extra_rdoc_files = [
@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "https://github.com/sumocoders/forkcms_deploy"
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "1.8.25"
   s.summary = "Deployment for ForkCMS with Capistrano"
 
   if s.respond_to? :specification_version then

data/lib/forkcms_deploy/forkcms.rb

@@ -1,13 +1,30 @@
 module ForkCMSDeploy
 	class ForkCMS
+		ForkLibPath = File.dirname(__FILE__) + '/../forkcms_deploy'
+
 		def self.determine_version_to_use(version)
-			until version.empty?
-				if File.exists?(File.dirname(__FILE__) + "/../forkcms_deploy/forkcms_#{version}.rb")
-					return version
+			versions = version.split('.')
+			until versions.empty?
+				# Exact version match
+				if File.exists?(ForkLibPath + "/forkcms_#{versions.join('.')}.rb")
+					return versions.join('.')
+				else
+					level_version = versions.pop
+					
+					# Find a version that might match on the same level
+					matching_level = Dir.glob(ForkLibPath + "/forkcms_#{versions.join('.')}.[0-9]*.rb")
+					matching_level.sort.reverse.each do |file|
+						# Extract the file's level-version from the path
+						file_version = file[/(\d+).rb$/, 1]
+						
+						# Return this version if the file's version is lower then the Fork version
+						# (such that, for Fork 3.6, 3.5 is loaded, but not for Fork 3.4
+						return (versions + [file_version]).join('.') if file_version < level_version
+					end
 				end
-				version = version.sub(/\.?[^\.]+$/, '')
 			end
+
 			return "default"
 		end
 	end
-end
+end

data/test/test_forkcms_deploy.rb

@@ -3,10 +3,12 @@ require 'forkcms_deploy/forkcms.rb'
 
 class TestForkCMS < Test::Unit::TestCase
 	def	test_versions
-		assert_equal "3", ForkCMSDeploy::ForkCMS.determine_version_to_use("3.4")			# 3
+		assert_equal "3.5", ForkCMSDeploy::ForkCMS.determine_version_to_use("3.6")			# 3
+		assert_equal "3.5", ForkCMSDeploy::ForkCMS.determine_version_to_use("3.5")			# 3
+		assert_equal "3", ForkCMSDeploy::ForkCMS.determine_version_to_use("3.3")			# 3
 		assert_equal "3", ForkCMSDeploy::ForkCMS.determine_version_to_use("3")				# 3
 		assert_equal "2", ForkCMSDeploy::ForkCMS.determine_version_to_use("2")				# 2
 		assert_equal "default", ForkCMSDeploy::ForkCMS.determine_version_to_use("1")		# default
 		assert_equal "default", ForkCMSDeploy::ForkCMS.determine_version_to_use("1.2.3")	# default
 	end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forkcms_deploy
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-14 00:00:00.000000000 Z
+date: 2013-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -71,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Deployment for ForkCMS with Capistrano