Merge 9c7a40d into adcef36

ledger-rs · Mar 18, 2021 · c22dde7 · c22dde7
2 parents adcef36 + 9c7a40d
commit c22dde7
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -115,7 +115,8 @@ before_deploy: |
   # Create the releases
   # Macs
     sudo apt install build-essential
-    # cargo build --release --target x86_64-apple-darwin 
+    # Intel macs
+    cargo build --release --target x86_64-apple-darwin 
     # New macs
     # cargo build --release --target aarch64-apple-darwin 
     # Raspberry
@@ -130,11 +131,17 @@ before_deploy: |
     # cargo build --release --target x86_64-pc-windows-msvc
 
     # Package everything
-    # tar -czf dinero-mac-x86_64.tar.gz /home/travis/build/frosklis/dinero-rs/target/x86_64-apple-darwin/release/dinero
+    cd /home/travis/build/frosklis/dinero-rs/target/x86_64-apple-darwin/release
+    tar -czf dinero-mac-x86_64.tar.gz dinero
+    mv dinero-mac-x86_64.tar.gz /home/travis/build/frosklis/dinero-rs/
     # tar -czf dinero-mac-aarch64.tar.gz /home/travis/build/frosklis/dinero-rs/target/aarch64-apple-darwin/release/dinero
     cd /home/travis/build/frosklis/dinero-rs/target/x86_64-pc-windows-gnu/release/
     tar -czf dinero-windows-x86_64.tar.gz dinero.exe
     mv dinero-windows-x86_64.tar.gz /home/travis/build/frosklis/dinero-rs/
+
+    # SHA 256 for brew
+    cd /home/travis/build/frosklis/dinero-rs/
+    sha_256=$(shasum -a 256 dinero-mac-x86_64.tar.gz | cut -f 1 -d " ")
   fi
   
 deploy:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,8 @@ Changelog file for dinero-rs project, a command line application for managing fi
 ## [0.21.0] - xxx
 ### Changed
 - Continuos integration pipeline is now better. No more problems like what happened between releases 0.18 and 0.20.
+### Fixed
+- Commodities get parsed properly, always removing quotes
 ## [0.20.0] - 2021-03-15
 ### Fixed
 - Version numbers back on track

diff --git a/src/parser/utils.rs b/src/parser/utils.rs
@@ -59,7 +59,9 @@ pub(crate) fn parse_string(string: Pair<Rule>) -> String {
             quoted[1..len - 1].to_string()
         }
         Rule::unquoted => string.as_str().to_string(),
-        Rule::currency => parse_string(string.into_inner().next().unwrap()),
+        Rule::currency | Rule::commodity_in_directive => {
+            parse_string(string.into_inner().next().unwrap())
+        }
         _ => string.as_str().to_string(),
     }
 }