bread_calculator 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 666fabbb1e5c7ca277e727d4c3e90cce94fbc0d2
-  data.tar.gz: 70432c965d212256fadb9e6be72d65edfae30301
+  metadata.gz: 8d51a14aeb0190404ecd01140c0daa9a489f75f2
+  data.tar.gz: 7416606cdbb1753be4dee8ed4d35c6b3d9b247f4
 SHA512:
-  metadata.gz: a6438357680a4f803b3e69f0455edc5e73f3ea404cb98629f1c4ec01ad4b8d42f23d96066754f6b6e88df531e2d69b8f3cc5be4f4583ee1f08d021c820a93181
-  data.tar.gz: 2f5885744e28b1e3f46ff0e0e9fad1fc5a3606553fda3565a37be29ceeb00e172cb08054c5f854879f599a8a505e439fdbe7d3e1138a26cfdc97ca162d27a1c9
+  metadata.gz: 26338dcb8070fff24aa8bf9ea8a3641a556923b4bbc63c3d237ed426de2a60d4537e7625918a6419f8eb7449b903b96ec34d27ad49113ce7c46c856f3f4c5b46
+  data.tar.gz: e265e1d62874d68e8e6096db8105b43062110b08220b19b51e75b4610ce4abbbc5252850c0a814607adedb30b2b69d7754d6045e98ab009662b5adaa1800f020

data/bin/bread-calc

@@ -8,12 +8,12 @@ def help status=true
 NAME
   bread-calc
 SYNOPSIS
-  bread-calc [OPTIONS] FILE
+  bread-calc [OPTIONS] [FILE]
 DESCRIPTION
-  bread-calc parses a nearly free-form bread recipe in file FILE. By default
-  the canonical representation of the recipe is printed to standard out.
-  Optionally, the weight, or bakers percentage formula can be generated, or the
-  recipe can by scaled up or down.
+  bread-calc parses a nearly free-form bread recipe in file FILE, or from
+  standard in. By default the canonical representation of the recipe is printed
+  to standard out.  Optionally, the weight, or bakers percentage formula can be
+  generated, or the recipe can by scaled up or down.
 OPTIONS:
   --help 
     print this help
@@ -46,6 +46,8 @@ BUGS
 
   It is undefined how 'liquid flour additive' is parsed, but don't expect 
   anything good.
+
+  There is no man page.
 EOF
   
   exit status
@@ -59,7 +61,8 @@ loop { case ARGV[0]
   when /--help/     then             @help = 'help'     ;  ARGV.shift; break
   when /--summary/  then             @get  = 'r.summary';  ARGV.shift
   when /--weight/   then             @get  = 'r.weight';   ARGV.shift
-  when /--scale-by/ then ARGV.shift; @get  = "r.scale_by #{ARGV.shift}"
+    #.to_f protects against 'no .<digit> floating literal anymore' for .33
+  when /--scale-by/ then ARGV.shift; @get  = "r.scale_by #{ARGV.shift.to_f}"
   when /--/ then ARGV.shift; break
   when /^-/ then help 1
   else break
@@ -67,8 +70,7 @@ end; }
 
 help if @help
 
-ARGV.each do |arg|
-  parser = BreadCalculator::Parser.new
-  r = parser.parse(arg)
-  puts eval("#{@get}")
-end
+parser = BreadCalculator::Parser.new
+r = parser.parse ARGF.file
+puts eval("#{@get}")
+

data/bread_calculator.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'bread_calculator'
-  s.version     = '0.1.0'
+  s.version     = '0.2.0'
   s.date        = '2014-03-07'
   s.summary     = "calculate baker's percentages"
   s.description = "a gem and command-line wrapper to generate baker's

data/lib/bread_calculator.rb

@@ -42,7 +42,15 @@ module BreadCalculator
     
     def to_s
       #FIXME check for existance
-      "\t#{@quantity} #{@units} #{@name}\n"
+      precision = 0
+      if @quantity < 10
+        precision = 1
+      end
+      if @quantity < 1
+        precision = 2
+      end
+      f_quantity = sprintf "%.#{precision}f", @quantity
+      "\t#{f_quantity} #{@units} #{@name}\n"
     end
   end
 
@@ -205,7 +213,7 @@ module BreadCalculator
   class Parser
 
     ##
-    # Create a new parser for Recipe +name+.
+    # Create a new parser for Recipe
     
     def initialize
       @i = 0
@@ -218,11 +226,12 @@ module BreadCalculator
     end
 
     ##
-    # Parse our text
+    # Parse text from IO object +input+. It is the caller's responsibility to
+    # open and close the +input+ correctly.
     
     def parse input
 
-      IO.foreach(input) do |line|
+      while line = input.gets
         new_step              && next if line =~ /(^-)|(^\s*$)/
         preprocess_meta(line) && next if @in_prelude
 

data/spec/bread_calculator_spec.rb

@@ -66,9 +66,10 @@ describe BreadCalculator do
 
   describe BreadCalculator::Parser do
     before do
-      @sample = "#{File.dirname(__FILE__)}/../sample/sandwich-bread.recipe"
       @parser = BreadCalculator::Parser.new 
-      @r = @parser.parse "#{@sample}"
+      @sample = "#{File.dirname(__FILE__)}/../sample/sandwich-bread.recipe"
+      @io = File.new(@sample,'r')
+      @r = @parser.parse @io
     end
 
     it 'gets a recipe from a text file' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bread_calculator
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Noah Birnel