hem-tasks-magento1 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b8acc3934a669bb5dbd0a8c3f525c9fa1eabfc5
-  data.tar.gz: 68b3ec8937b783a8d49b428eb8565052d2b7d3dc
+  metadata.gz: 9bfca629830f43aa113c01736f4fc62c27101876
+  data.tar.gz: 9be817026427df8815c244a9c30d27e574ef56f4
 SHA512:
-  metadata.gz: 3aa14b71cffeed3b878e19bd9572df687ec04c51289030d1a3200be912363736e03e90e9621a2e9c84ed1f1e61d76ecca6ea3a07ba1d67713187ca01d24534ac
-  data.tar.gz: 052455af5c3828406b45e6e7d2d32d5ffb9d6ecdde23507f48549e61165aeb316751f2cddbb8ea9764ce2f4f24e052a5d235ca98728260740fc3b11a4db5baae
+  metadata.gz: 5b78febba92735b20911b78f20c2152bf5d06dd145f8c8ca39d12453dfac5411cc19f620cc06647beadf1cb6858839a25f5735f2fa1bf0d588d9eb750a2379a5
+  data.tar.gz: 945d3b5e89d59e7572292f5ab13a672daf5ba3831004dd9e28ab716770fb7332276bee3b041c789c9352ae8fc443676ff8396a7d88136217973d997ee12ff243

data/CHANGELOG.md

@@ -1,4 +1,10 @@
-## 1.0.3 (07 Dec 2016)
+## 1.0.3 (27 Sep 2017)
+
+BUG FIXES:
+
+  * Sort magento patches using natural sorting so higher SUPEE numbers applied later
+
+## 1.0.2 (07 Dec 2016)
 
 BUG FIXES:
 

data/lib/hem/tasks/magento1/patches.rb

@@ -93,6 +93,14 @@ namespace :patches do
     use_vm
   end
 
+  def get_magento_patches path
+    patch_files = Dir.glob("#{path}/*.{sh,patch,diff}")
+
+    patch_files.sort_by do |file|
+      file.scan(/[^\d\.]+|[\d\.]+/).collect { |f| f.match(/\d+(\.\d+)?/) ? f.to_f : f }
+    end
+  end
+
   desc "Apply patches to Magento"
   task "apply" do
     detect_clean
@@ -116,7 +124,7 @@ namespace :patches do
     use_vm = false
     use_vm = detect_tools if Dir.glob("#{incoming_path}/*.sh").length > 0
 
-    patch_files = Dir.glob("#{incoming_path}/*.{sh,patch,diff}")
+    patch_files = get_magento_patches incoming_path
 
     Hem.ui.success("#{patch_files.length} new patches found")
 

data/lib/hem/tasks/magento1/version.rb

@@ -1,7 +1,7 @@
 module Hem
   module Tasks
     module Magento1
-      VERSION = '1.0.2'
+      VERSION = '1.0.3'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hem-tasks-magento1
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Andy Thompson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-12 00:00:00.000000000 Z
+date: 2017-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler