bread_calculator 0.0.0 → 0.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a454bc456276e0bac262c1f2bca15af7fb9c2687
-  data.tar.gz: 2c7578cc8609953f1391bede4fa2b9ca864013c2
+  metadata.gz: a1a94b93c70bcc5cc6d2527d32c73487a40614d2
+  data.tar.gz: 614044422ed75b82b707b695e889fd244ca675b6
 SHA512:
-  metadata.gz: acce0ad69d786710cb19cccb1f152615e1ba2605ee354d9a825678b4bdbf12a85e2ff967edc9b10529887b34bc2fc800d3212c329716c109014d351e16df7f2e
-  data.tar.gz: 20fcd4a6426ae2091cfae4b77aa545247258b0669faf8710542500475ee954d67cef348e7af29c7504c7640a5973f37962f5699802da96b84c35621a330f1700
+  metadata.gz: 7b0afb98a7cf337b2e1d58e3069c9da30e9ca3b79fd2fb76f54a88b10abd7064a122b79b3b17c067e0424166fd0d199b94623f7a6ae973fc5167e5455f63b10c
+  data.tar.gz: b003b87d6afdd589d4e1e026f2262d9ffd0be0fcff4c29d5b894833d9385cf070db9e875dc5d94135f10ec8be4f8f88236a3df8a75f1e26dbe07987b4301ac0b

data/README.md

@@ -1,11 +1,10 @@
 bread-calculator
 ---------
-
 A ruby gem to calculate baker's percentages
 
 Installation
 ---------
-
+gem install bakers_percentage
 
 Inspiration and History
 ---------
@@ -13,10 +12,4 @@ Inspiration and History
 License
 ---------
 © 2014 Noah Birnel
-BSD license
-
-
-
-
-
-
+MIT license

data/bin/bread-calc

@@ -0,0 +1,66 @@
+#!/usr/bin/env ruby
+
+require 'bread_calculator'
+
+@get = 'r'
+@help = nil
+
+def help
+  puts <<EOF
+NAME
+  bread-calc
+SYNOPSIS
+  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.
+OPTIONS:
+  --help 
+    print this help
+  --summary
+    print a baker's percentage summary
+  --weight
+    print the weight
+  --scale-by FACTOR
+    regenerate the recipe, scaling up or down by FACTOR
+FORMATS
+  The recipe format starts with a free-form prelude. Any line starting with a
+  hyphen ends the prelude and starts the first step. 
+
+  Each step is delimited by one or more blank lines.
+
+  Any line in a step starting with a space or a blank is an ingredient,
+  consisting of quantity, units, and the ingredient itself. bread-calc will
+  attempt to guess at the type of ingredient, but you can always force it by
+  including one of the words 'flour', 'liquid', or 'additive' in the line.
+BUGS
+  It is cheerfully assumed that all units are grams.
+
+  Output is rather ugly.
+
+  It is undefined how 'liquid flour additive' is parsed, but don't expect 
+  anything good.
+EOF
+  
+  exit
+end
+
+loop { case ARGV[0]
+  when /--help/     then             @help = 'help'     ;  ARGV.shift; break
+  when /--summary/  then             @get  = 'r.summary';  ARGV.shift; break
+  when /--weight/   then             @get  = 'r.weight';   ARGV.shift; break
+  when /--scale-by/ then ARGV.shift; @get  = "r.scale_by #{ARGV.shift}"; break
+  when /--/ then ARGV.shift; break
+  when /^-/ then usage("Unknown option: #{ARGV[0].inspect}")
+  else break
+end; }
+
+help if @help
+
+ARGV.each do |arg|
+  parser = BreadCalculator::Parser.new arg
+  r = parser.parse(arg)
+  puts eval("#{@get}")
+end

data/bread_calculator.gemspec

@@ -1,15 +1,15 @@
 Gem::Specification.new do |s|
   s.name        = 'bread_calculator'
-  s.version     = '0.0.0'
-  s.date        = '2014-02-28'
+  s.version     = '0.0.1'
+  s.date        = '2014-03-07'
   s.summary     = "calculate baker's percentages"
   s.description = "a gem and command-line wrapper to generate baker's
                    percentages from a bread recipe"
   s.authors     = ['Noah Birnel']
   s.email       = 'nbirnel@gmail.com'
   s.homepage    = 'http://github.com/nbirnel/bread-calculator'
-  s.files       = ['README.md', 'bread_calculator.gemspec', 'lib/bread_calculator.rb', 'spec/bread_calculator_spec.rb', 'bin/bread-calculator']
+  s.files       = ['README.md', 'bread_calculator.gemspec', 'lib/bread_calculator.rb', 'spec/bread_calculator_spec.rb', 'bin/bread-calc']
   s.has_rdoc    = true
-  s.executables = ['bread-calculator']
-  s.license     = 'DWTFYW'
+  s.executables = ['bread-calc']
+  s.license     = 'MIT'
 end

data/lib/bread_calculator.rb

@@ -267,9 +267,7 @@ module BreadCalculator
 
         #FIXME refactor
         h[:type] = :additives #if it doesn't match anything else
-        h[:type] = :flours    if ingredient =~ /flour/
         h[:type] = :flours    if ingredient =~ /meal/
-        h[:type] = :liquids   if ingredient =~ /liquid/
         h[:type] = :liquids   if ingredient =~ /water/
         h[:type] = :liquids   if ingredient =~ /egg/
         h[:type] = :liquids   if ingredient =~ /mashed/
@@ -277,6 +275,10 @@ module BreadCalculator
         h[:type] = :additives if ingredient =~ /dry/
         h[:type] = :additives if ingredient =~ /powdered/
 
+        h[:type] = :flours    if ingredient =~ /flour/
+        h[:type] = :liquids   if ingredient =~ /liquid/
+        h[:type] = :liquids   if ingredient =~ /additive/
+
         ing = BreadCalculator::Ingredient.new ingredient, h
       else
         line.strip

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: bread_calculator
 version: !ruby/object:Gem::Version
-  version: 0.0.0
+  version: 0.0.1
 platform: ruby
 authors:
 - Noah Birnel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-28 00:00:00.000000000 Z
+date: 2014-03-07 00:00:00.000000000 Z
 dependencies: []
 description: |-
   a gem and command-line wrapper to generate baker's
                      percentages from a bread recipe
 email: nbirnel@gmail.com
 executables:
-- bread-calculator
+- bread-calc
 extensions: []
 extra_rdoc_files: []
 files:
@@ -23,10 +23,10 @@ files:
 - bread_calculator.gemspec
 - lib/bread_calculator.rb
 - spec/bread_calculator_spec.rb
-- bin/bread-calculator
+- bin/bread-calc
 homepage: http://github.com/nbirnel/bread-calculator
 licenses:
-- DWTFYW
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []

data/bin/bread-calculator

@@ -1,20 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'bread_calculator'
-
-@format = 'r'
-
-loop { case ARGV[0]
-  when /-summary/  then             @format = 'r.summary'; ARGV.shift; break
-  when /-weight/   then             @format = 'r.weight';  ARGV.shift; break
-  when /-scale-by/ then ARGV.shift; @format = "r.scale_by #{ARGV.shift}"; break
-  when /--/ then ARGV.shift; break
-  when /^-/ then usage("Unknown option: #{ARGV[0].inspect}")
-  else break
-end; }
-
-ARGV.each do |arg|
-  parser = BreadCalculator::Parser.new arg
-  r = parser.parse(arg)
-  puts eval("#{@format}")
-end