hem-tasks-magento1 1.0.2 → 1.0.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 1b8acc3934a669bb5dbd0a8c3f525c9fa1eabfc5
4
- data.tar.gz: 68b3ec8937b783a8d49b428eb8565052d2b7d3dc
3
+ metadata.gz: 9bfca629830f43aa113c01736f4fc62c27101876
4
+ data.tar.gz: 9be817026427df8815c244a9c30d27e574ef56f4
5
5
  SHA512:
6
- metadata.gz: 3aa14b71cffeed3b878e19bd9572df687ec04c51289030d1a3200be912363736e03e90e9621a2e9c84ed1f1e61d76ecca6ea3a07ba1d67713187ca01d24534ac
7
- data.tar.gz: 052455af5c3828406b45e6e7d2d32d5ffb9d6ecdde23507f48549e61165aeb316751f2cddbb8ea9764ce2f4f24e052a5d235ca98728260740fc3b11a4db5baae
6
+ metadata.gz: 5b78febba92735b20911b78f20c2152bf5d06dd145f8c8ca39d12453dfac5411cc19f620cc06647beadf1cb6858839a25f5735f2fa1bf0d588d9eb750a2379a5
7
+ data.tar.gz: 945d3b5e89d59e7572292f5ab13a672daf5ba3831004dd9e28ab716770fb7332276bee3b041c789c9352ae8fc443676ff8396a7d88136217973d997ee12ff243
data/CHANGELOG.md CHANGED
@@ -1,4 +1,10 @@
1
- ## 1.0.3 (07 Dec 2016)
1
+ ## 1.0.3 (27 Sep 2017)
2
+
3
+ BUG FIXES:
4
+
5
+ * Sort magento patches using natural sorting so higher SUPEE numbers applied later
6
+
7
+ ## 1.0.2 (07 Dec 2016)
2
8
 
3
9
  BUG FIXES:
4
10
 
@@ -93,6 +93,14 @@ namespace :patches do
93
93
  use_vm
94
94
  end
95
95
 
96
+ def get_magento_patches path
97
+ patch_files = Dir.glob("#{path}/*.{sh,patch,diff}")
98
+
99
+ patch_files.sort_by do |file|
100
+ file.scan(/[^\d\.]+|[\d\.]+/).collect { |f| f.match(/\d+(\.\d+)?/) ? f.to_f : f }
101
+ end
102
+ end
103
+
96
104
  desc "Apply patches to Magento"
97
105
  task "apply" do
98
106
  detect_clean
@@ -116,7 +124,7 @@ namespace :patches do
116
124
  use_vm = false
117
125
  use_vm = detect_tools if Dir.glob("#{incoming_path}/*.sh").length > 0
118
126
 
119
- patch_files = Dir.glob("#{incoming_path}/*.{sh,patch,diff}")
127
+ patch_files = get_magento_patches incoming_path
120
128
 
121
129
  Hem.ui.success("#{patch_files.length} new patches found")
122
130
 
@@ -1,7 +1,7 @@
1
1
  module Hem
2
2
  module Tasks
3
3
  module Magento1
4
- VERSION = '1.0.2'
4
+ VERSION = '1.0.3'
5
5
  end
6
6
  end
7
7
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: hem-tasks-magento1
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.2
4
+ version: 1.0.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Andy Thompson
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-12-12 00:00:00.000000000 Z
11
+ date: 2017-09-27 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler