approvals 0.0.19 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e2bdf9201b64d91a4d5368e0edf159eb3dd5cb2
-  data.tar.gz: f82203e46e50c60ac0d229db67a8ac6651fc6b8a
+  metadata.gz: 23b24cfaf9706d8ead8d9c1a436025d983ac8c7b
+  data.tar.gz: b5ee817b9554e90d064ebc0572f3f8786fbb429a
 SHA512:
-  metadata.gz: 3cbe81a1c8ab477819e5080a7cae752e0fab27f759497eb23bd5e84f0135a7622a7b82915693fc168c1a2d874393043471940c939c99011df56942035e31724a
-  data.tar.gz: cf9c5b74d5e40bfcef8b78dfeabb236d2d1328ca5b1264224a02b801d2caa4f9322e9e70cdf7fd3ba8643235cf3335982122584f99c6c0d2009166ef42d94350
+  metadata.gz: 1d64e7023845cfa1b25365bf09682849e0d1b9912b44c621994badab49ed46be3deda93db41468a28e7eb88e95fa5fa7d02d197647b1a33a7aa52b96fda725c6
+  data.tar.gz: c4f5a05a1cb1e317c69aae65f931a3521f1cfda9cfca0faf455052a1904a53c6c961fb6898dbca5908649c0defd7db5eb75708eadac11322e605bc5e98f76fd0

data/CHANGELOG.md

@@ -4,6 +4,10 @@
 
 * Your contribution here
 
+### v0.0.20 (2015-04-21)
+
+* [#63](https://github.com/kytrinyx/approvals/issues/62) Make CLI --ask compatible with new or old .approval file. - [@kytrinyx](https://github.com/kytrinyx)
+
 ### v0.0.19 (2015-04-20)
 
 * [#62](https://github.com/kytrinyx/approvals/issues/62) Fix bug in CLI with --ask option that deletes approval file instead of overwriting it. - [@kytrinyx](https://github.com/kytrinyx)

data/lib/approvals/cli.rb

@@ -11,12 +11,17 @@ module Approvals
 
       rejected = []
       approvals.each do |approval|
-        diff_command = "#{options[:diff]} #{approval}"
+        approved, received = approval.split(/\s+/)
+        if received.include?(".approved.")
+          received, approved = approved, received
+        end
+
+        diff_command = "#{options[:diff]} #{approved} #{received}"
         puts diff_command
         system(diff_command)
 
         if options[:ask] && yes?("Approve? [y/N] ")
-          system("mv #{approval}")
+          system("mv #{received} #{approved}")
         else
           rejected << approval
         end

data/lib/approvals/version.rb

@@ -1,3 +1,3 @@
 module Approvals
-  VERSION = '0.0.19'
+  VERSION = '0.0.20'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: approvals
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.20
 platform: ruby
 authors:
 - Katrina Owen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-20 00:00:00.000000000 Z
+date: 2015-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec