logic 0.1.5 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 965fd071223b09ac8aa8d4f719408704bdac0e2b
-  data.tar.gz: c8e46370bc8d75a62a4a4f3409990acc1da9abec
+SHA256:
+  metadata.gz: dc59412e7a4c95a2104f101dbe57fd5b9aacc6250ac885b8e64f58f139852bad
+  data.tar.gz: 8a97b64638e50d50ee0fd36827afb60e2771cfbf84e61765e435d2e7ac2f8918
 SHA512:
-  metadata.gz: 2564f0a1559a6ad21910653098215d575157b852195f24d863706ec930fbddd770c90003dd2a976612a61f02680bf2ec28562ea77457174327dcf95585d017d6
-  data.tar.gz: ab25c1d65a5691b05b1c6d2032b065c6f9a7bf21842ecfd6955de812ddd2f81afccd985e81757e7e13f221b39cc94afa289db3d16d8af42e33e3b55ecc80961e
+  metadata.gz: 185427c28647b5124e6efd34ce2c114ccba5d5e881a411afcb5458ed6c39b5d1addedc816a99414bdfd64df6d4f2f5df9c473a621f4cedb3489a528096f2e244
+  data.tar.gz: 18a97e43de0ea689fdb053e8e455f2db7b629fe868d26a8a8940b689bb6ff0ad8dd88e62992efd897f4248e34ebd82fb0bab2d28b46c2d0d4ae9a69281e62659

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2017 Bryan Ash
+Copyright (c) 2019 Bryan Ash
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -46,4 +46,4 @@ The syntax understands: 'and', '&&', 'or', '||', 'xor', '^', 'not', '!', and par
 
 == Copyright
 
-Copyright (c) 2017 Bryan Ash. See LICENSE for details.
+Copyright (c) 2019 Bryan Ash. See LICENSE for details.

data/lib/integer.rb

@@ -1,5 +1,4 @@
 class Integer
-
   def to_array_of_bits(width)
     ("%0#{width}b" % self).split(//).map(&:to_i)
   end
@@ -7,5 +6,4 @@ class Integer
   def negate
     self + 1 & 1
   end
-
 end

data/lib/logic_operations.rb

@@ -37,13 +37,24 @@ module BinaryDecision
   include Decision
 
   def condition_identifiers
-    elements.map(&:condition_identifiers).flatten
+    elements.flat_map(&:condition_identifiers)
   end
 
   def evaluate(conditions)
-    left  = operand_1.evaluate(conditions)
-    right = operand_2.evaluate(conditions)
-    operator.apply(left, right)
+    left_value = left.evaluate(conditions)
+    return left_value unless tail.elements.any?
+
+    tail.elements.reduce(left_value) do |value, tail|
+      tail.operator.apply(value, tail.operand.evaluate(conditions))
+    end
+  end
+end
+
+module Tail
+  def condition_identifiers
+    elements.flat_map do |element|
+      element.elements.flat_map(&:condition_identifiers)
+    end
   end
 end
 

data/lib/logic_parser.treetop

@@ -1,20 +1,36 @@
 grammar Logic
-  rule decision
-    binary_decision / unary_decision
+  rule disjunction
+    left:conjunction tail:or_tail <BinaryDecision>
   end
 
-  rule binary_decision
-    operand_1:unary_decision
-    operator
-    operand_2:decision <BinaryDecision>
+  rule conjunction
+    left:primitive tail:and_tail <BinaryDecision>
   end
 
-  rule unary_decision
+  rule and_tail
+    (operator:and operand:primitive)* <Tail>
+  end
+
+  rule or_tail
+    (operator:or operand:conjunction)* <Tail>
+  end
+
+  rule and
+    (space 'and' space / space? '&&' space?) <And>
+  end
+
+  rule or
+    (space 'or' space / space? '||' space?) <Or>
+    /
+    (space 'xor' space / space? '^' space?) <Xor>
+  end
+
+  rule primitive
     negation / condition / parenthesized
   end
 
   rule negation
-    ('not' space / '!' space?) operand:unary_decision <Negation>
+    ('not' space / '!' space?) operand:primitive <Negation>
   end
 
   rule condition
@@ -22,15 +38,7 @@ grammar Logic
   end
 
   rule parenthesized
-    '(' space? contents:decision space? ')' <Parenthesized>
-  end
-
-  rule operator
-    (space 'and' space / space? '&&' space?) <And>
-    /
-    (space 'or' space / space? '||' space?) <Or>
-    /
-    (space 'xor' space / space? '^' space?) <Xor>
+    '(' space? contents:disjunction space? ')' <Parenthesized>
   end
 
   rule space

data/lib/range.rb

@@ -1,7 +1,5 @@
 class Range
-
   def take(number_of_elements)
     to_a[0,number_of_elements]
   end
-
 end

data/lib/test_case.rb

@@ -2,7 +2,6 @@ require 'integer'
 require 'range'
 
 class TestCase
-
   def initialize(number, condition_count, decision)
     @condition_value = number - 1
     @condition_count = condition_count
@@ -15,11 +14,11 @@ class TestCase
   end
 
   def conditions
-    @conditions ||= (@condition_value).to_array_of_bits(@condition_count)
+    @conditions ||= @condition_value.to_array_of_bits(@condition_count)
   end
 
   def number
-    conditions.join.to_i(base = 2) + 1
+    conditions.join.to_i(_base = 2) + 1
   end
 
   def output
@@ -48,5 +47,4 @@ class TestCase
   def formatted(format)
     "%2d) %s | %3d\n" % [number, conditions.join(' '), output]
   end
-
 end

data/lib/test_case_set.rb

@@ -1,8 +1,6 @@
-require 'array'
 require 'test_case'
 
 class TestCaseSet
-
   def initialize(condition_identifiers, decision)
     @condition_identifiers = condition_identifiers
     @decision = decision
@@ -64,5 +62,4 @@ class TestCaseSet
       output += test_case.formatted(format)
     end
   end
-
 end

data/lib/truth_table.rb

@@ -1,5 +1,4 @@
 class TruthTable
-
   def initialize(test_cases)
     @test_cases = test_cases
   end
@@ -21,5 +20,4 @@ class TruthTable
   def formatted_cases
     @test_cases.formatted("%2d) %s | %3d\n")
   end
-
 end

data/spec/features/help_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+RSpec.describe 'Help', type: :aruba do
+  it 'shows help given no command line options' do
+    run_command 'logic'
+    should_see_help
+  end
+
+  it 'shows help given --help' do
+    run_command 'logic --help'
+    should_see_help
+  end
+
+  it 'shows help given -h' do
+    run_command 'logic -h'
+    should_see_help
+  end
+
+  def should_see_help
+    should_see_output 'Usage: logic [options] <decision>'
+  end
+end

data/spec/features/mcdc_pairs_spec.rb

@@ -0,0 +1,49 @@
+require 'spec_helper'
+
+RSpec.describe 'MC/DC Pairs', type: :aruba do
+  it 'a single condition' do
+    run_command "logic --no-truth-table --mcdc_pairs 'a'"
+    should_see_output <<~STR
+      a => [[1, 2]]
+    STR
+  end
+
+  it 'MC/DC pairs are not mandatory output' do
+    run_command "logic --no-truth-table --no-mcdc_pairs 'a'"
+    should_not_see_output <<~STR
+      a => [[1, 2]]
+    STR
+  end
+
+  it 'MC/DC pairs are output by default' do
+    run_command "logic --no-truth-table 'a'"
+    should_see_output <<~STR
+      a => [[1, 2]]
+    STR
+  end
+
+  it "'a and b' decision" do
+    run_command "logic --no-truth-table --mcdc_pairs 'a and b'"
+    should_see_output <<~STR
+      a => [[2, 4]]
+      b => [[3, 4]]
+    STR
+  end
+
+  it "'a or b' decision" do
+    run_command "logic --no-truth-table --mcdc_pairs 'a or b'"
+    should_see_output <<~STR
+      a => [[1, 3]]
+      b => [[1, 2]]
+    STR
+  end
+
+  it "'a and (b or c)' decision" do
+    run_command "logic --no-truth-table --mcdc_pairs 'a and (b or c)'"
+    should_see_output <<~STR
+      a => [[2, 6], [3, 7], [4, 8]]
+      b => [[5, 7]]
+      c => [[5, 6]]
+    STR
+  end
+end

data/spec/features/truth_table_spec.rb

@@ -0,0 +1,148 @@
+require 'spec_helper'
+
+RSpec.describe 'Truth Table', type: :aruba do
+  it 'input names are related to condition names' do
+    run_command "logic Jennifer or Juliette"
+    should_see_output <<~STR
+      a <= Jennifer
+      b <= Juliette
+    STR
+  end
+
+  it 'a single condition' do
+    run_command "logic --truth_table --no-mcdc-pairs 'a'"
+    should_see_output <<~STR
+      a <= a
+
+          a | output
+       1) 0 |   0
+       2) 1 |   1
+    STR
+  end
+
+  it 'Truth table output is not mandatory' do
+    run_command "logic --no-truth_table 'a'"
+    should_not_see_output 'a | output'
+  end
+
+  it 'Truth table is output by default' do
+    run_command "logic --no-mcdc-pairs 'a'"
+    should_see_output <<~STR
+      a <= a
+
+          a | output
+       1) 0 |   0
+       2) 1 |   1
+    STR
+  end
+
+  it 'a negated condition' do
+    run_command "logic --truth_table --no-mcdc-pairs 'not a'"
+    should_see_output <<~STR
+      a <= a
+
+          a | output
+       1) 0 |   1
+       2) 1 |   0
+    STR
+  end
+
+  it "'a or b' decision" do
+    run_command "logic --truth_table --no-mcdc-pairs 'a or b'"
+    should_see_output <<~STR
+      a <= a
+      b <= b
+
+          a b | output
+       1) 0 0 |   0
+       2) 0 1 |   1
+       3) 1 0 |   1
+       4) 1 1 |   1
+    STR
+  end
+
+  it "'a xor b' decision" do
+    run_command "logic --truth_table --no-mcdc-pairs 'a xor b'"
+    should_see_output <<~STR
+      a <= a
+      b <= b
+
+          a b | output
+       1) 0 0 |   0
+       2) 0 1 |   1
+       3) 1 0 |   1
+       4) 1 1 |   0
+    STR
+  end
+
+  it "'not a or not b' decision" do
+    run_command "logic --truth_table --no-mcdc-pairs 'not a or not b'"
+    should_see_output <<~STR
+      a <= a
+      b <= b
+
+          a b | output
+       1) 0 0 |   1
+       2) 0 1 |   1
+       3) 1 0 |   1
+       4) 1 1 |   0
+    STR
+  end
+
+  it "'a or b or c' decision" do
+    run_command "logic --truth_table --no-mcdc-pairs 'a or b or c'"
+    should_see_output <<~STR
+      a <= a
+      b <= b
+      c <= c
+
+          a b c | output
+       1) 0 0 0 |   0
+       2) 0 0 1 |   1
+       3) 0 1 0 |   1
+       4) 0 1 1 |   1
+       5) 1 0 0 |   1
+       6) 1 0 1 |   1
+       7) 1 1 0 |   1
+       8) 1 1 1 |   1
+    STR
+  end
+
+  it "'a and b and c' decision" do
+    run_command "logic --truth_table --no-mcdc-pairs 'a and b and c'"
+    should_see_output <<~STR
+      a <= a
+      b <= b
+      c <= c
+
+          a b c | output
+       1) 0 0 0 |   0
+       2) 0 0 1 |   0
+       3) 0 1 0 |   0
+       4) 0 1 1 |   0
+       5) 1 0 0 |   0
+       6) 1 0 1 |   0
+       7) 1 1 0 |   0
+       8) 1 1 1 |   1
+    STR
+  end
+
+  it "'(a and b) or c' decision" do
+    run_command "logic --truth_table --no-mcdc-pairs '(a and b) or c'"
+    should_see_output <<~STR
+      a <= a
+      b <= b
+      c <= c
+
+          a b c | output
+       1) 0 0 0 |   0
+       2) 0 0 1 |   1
+       3) 0 1 0 |   0
+       4) 0 1 1 |   1
+       5) 1 0 0 |   0
+       6) 1 0 1 |   1
+       7) 1 1 0 |   1
+       8) 1 1 1 |   1
+    STR
+  end
+end

data/spec/logic_parser_spec.rb

@@ -65,17 +65,20 @@ describe LogicParser, :parsing do
     'A or B' =>
     { [0, 0] => 0,
       [0, 1] => 1,
-      [1, 0] => 1
+      [1, 0] => 1,
+      [1, 1] => 1
     },
     'A || B' =>
     { [0, 0] => 0,
       [0, 1] => 1,
-      [1, 0] => 1
+      [1, 0] => 1,
+      [1, 1] => 1
     },
     'A||B' =>
     { [0, 0] => 0,
       [0, 1] => 1,
-      [1, 0] => 1
+      [1, 0] => 1,
+      [1, 1] => 1
     },
     'A xor B' =>
     { [0, 0] => 0,
@@ -96,54 +99,126 @@ describe LogicParser, :parsing do
       [1, 1] => 0
     },
     'A and B' =>
-    { [1, 1] => 1,
+    { [0, 0] => 0,
       [0, 1] => 0,
-      [1, 0] => 0
+      [1, 0] => 0,
+      [1, 1] => 1
     },
     'A && B' =>
-    { [1, 1] => 1,
+    { [0, 0] => 0,
       [0, 1] => 0,
-      [1, 0] => 0
+      [1, 0] => 0,
+      [1, 1] => 1
     },
     'A&&B' =>
-    { [1, 1] => 1,
+    { [0, 0] => 0,
       [0, 1] => 0,
-      [1, 0] => 0
+      [1, 0] => 0,
+      [1, 1] => 1
     },
     'A and not B' =>
-    { [1, 1] => 0,
+    { [0, 0] => 0,
       [0, 1] => 0,
-      [1, 0] => 1
+      [1, 0] => 1,
+      [1, 1] => 0
     },
     'A or B or C' =>
     { [0, 0, 0] => 0,
-      [1, 0, 0] => 1,
+      [0, 0, 1] => 1,
       [0, 1, 0] => 1,
-      [0, 0, 1] => 1
+      [1, 0, 0] => 1,
+      [1, 0, 1] => 1,
+      [1, 1, 0] => 1,
+      [1, 1, 0] => 1,
+      [1, 1, 1] => 1,
     },
     'A and B and C' =>
-    { [1, 1, 1] => 1,
+    { [0, 0, 0] => 0,
+      [0, 0, 1] => 0,
+      [0, 1, 0] => 0,
+      [1, 0, 0] => 0,
+      [1, 0, 1] => 0,
+      [1, 1, 0] => 0,
+      [1, 1, 0] => 0,
+      [1, 1, 1] => 1,
+    },
+    'A and B or C' =>
+    { [0, 0, 0] => 0,
+      [0, 0, 1] => 1,
+      [0, 1, 0] => 0,
+      [0, 1, 1] => 1,
+      [1, 0, 0] => 0,
+      [1, 0, 1] => 1,
+      [1, 1, 0] => 1,
+      [1, 1, 1] => 1
+    },
+    'A and B or not C' =>
+    { [0, 0, 0] => 1,
+      [0, 0, 1] => 0,
+      [0, 1, 0] => 1,
       [0, 1, 1] => 0,
+      [1, 0, 0] => 1,
       [1, 0, 1] => 0,
-      [1, 1, 0] => 0
+      [1, 1, 0] => 1,
+      [1, 1, 1] => 1
     },
     '(A and B) or C' =>
-    { [1, 1, 0] => 1,
+    { [0, 0, 0] => 0,
+      [0, 0, 1] => 1,
       [0, 1, 0] => 0,
+      [0, 1, 1] => 1,
       [1, 0, 0] => 0,
-      [0, 0, 1] => 1
+      [1, 0, 1] => 1,
+      [1, 1, 0] => 1,
+      [1, 1, 1] => 1
     },
     'A and (B or C)' =>
-    { [1, 0, 0] => 0,
-      [1, 1, 0] => 1,
+    { [0, 0, 0] => 0,
+      [0, 0, 1] => 0,
+      [0, 1, 0] => 0,
+      [0, 1, 1] => 0,
+      [1, 0, 0] => 0,
       [1, 0, 1] => 1,
-      [0, 1, 1] => 0
+      [1, 1, 0] => 1,
+      [1, 1, 1] => 1
     },
     '( A and (B or C) )' =>
-    { [1, 0, 0] => 0,
+    { [0, 0, 0] => 0,
+      [0, 0, 1] => 0,
+      [0, 1, 0] => 0,
+      [0, 1, 1] => 0,
+      [1, 0, 0] => 0,
+      [1, 0, 1] => 1,
       [1, 1, 0] => 1,
+      [1, 1, 1] => 1
+    },
+    'A or B and C' =>
+    { [0, 0, 0] => 0,
+      [0, 0, 1] => 0,
+      [0, 1, 0] => 0,
+      [0, 1, 1] => 1,
+      [1, 0, 0] => 1,
       [1, 0, 1] => 1,
-      [0, 1, 1] => 0
+      [1, 1, 0] => 1,
+      [1, 1, 1] => 1
+    },
+    'A or B and C or D' =>
+    { [0, 0, 0, 0] => 0,
+      [0, 0, 0, 1] => 1,
+      [0, 0, 1, 0] => 0,
+      [0, 0, 1, 1] => 1,
+      [0, 1, 0, 0] => 0,
+      [0, 1, 0, 1] => 1,
+      [0, 1, 1, 0] => 1,
+      [0, 1, 1, 1] => 1,
+      [1, 0, 0, 0] => 1,
+      [1, 0, 0, 1] => 1,
+      [1, 0, 1, 0] => 1,
+      [1, 0, 1, 1] => 1,
+      [1, 1, 0, 0] => 1,
+      [1, 1, 0, 1] => 1,
+      [1, 1, 1, 0] => 1,
+      [1, 1, 1, 1] => 1
     }
   }.each do |logic, cases|
     describe "'#{logic}'" do

data/spec/spec_helper.rb

@@ -0,0 +1,7 @@
+require 'aruba/rspec'
+
+require 'support/aruba_helpers'
+
+RSpec.configure do |c|
+  c.include ArubaHelpers
+end

data/spec/support/aruba_helpers.rb

@@ -0,0 +1,11 @@
+module ArubaHelpers
+  def should_not_see_output(partial_output)
+    expect(last_command_started)
+      .to_not have_output(/#{Regexp.quote(partial_output.strip)}/)
+  end
+
+  def should_see_output(partial_output)
+    expect(last_command_started)
+      .to have_output(/#{Regexp.quote(partial_output.strip)}/)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logic
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 1.0.0
 platform: ruby
 authors:
 - Bryan Ash
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-08 00:00:00.000000000 Z
+date: 2019-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.14'
-- !ruby/object:Gem::Dependency
-  name: cucumber
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -78,7 +64,6 @@ files:
 - LICENSE
 - README.rdoc
 - bin/logic
-- lib/array.rb
 - lib/integer.rb
 - lib/logic_operations.rb
 - lib/logic_parser.treetop
@@ -86,8 +71,13 @@ files:
 - lib/test_case.rb
 - lib/test_case_set.rb
 - lib/truth_table.rb
+- spec/features/help_spec.rb
+- spec/features/mcdc_pairs_spec.rb
+- spec/features/truth_table_spec.rb
 - spec/logic_parser_spec.rb
 - spec/spec.opts
+- spec/spec_helper.rb
+- spec/support/aruba_helpers.rb
 - spec/test_case_set_spec.rb
 homepage: 
 licenses:
@@ -109,8 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Taking the pain out of MC/DC testing

data/lib/array.rb

@@ -1,11 +0,0 @@
-class Array
-
-  def count
-    length
-  end
-
-  def to_s
-    inspect
-  end
-
-end