pairwise 0.1.1 → 0.1.2

data/VERSION.yml

@@ -1,4 +1,4 @@
 ---
-:patch: 1
+:patch: 2
 :major: 0
 :minor: 1

data/features/bugs/bad_yml.feature

@@ -0,0 +1,9 @@
+Feature: Bad yml
+
+Scenario: Empty yml
+  Given I have the yaml file "inputs.yml" containing:
+  """
+
+  """
+  When I run pairwise inputs.yml
+  Then it should not show any errors

data/features/step_definitions/pairwise_data_steps.rb

@@ -13,3 +13,7 @@ end
 Then /^I should see in the output$/ do |string|
   last_stdout.should include(string)
 end
+
+Then /^it should not show any errors$/ do
+  last_stderr.should == ""
+end

data/lib/pairwise/builder.rb

@@ -85,7 +85,7 @@ module Pairwise
     def replace_wild_cards(input_combinations)
       map_each_input_value(input_combinations) do |input_value, index|
         if input_value == WILD_CARD
-          pick_random_value(@inputs[index])
+          pick_random_value(@list_of_input_values[index])
         else
           input_value
         end
@@ -101,7 +101,7 @@ module Pairwise
     end
 
     def pick_random_value(input_combination)
-      input_combination[rand(input_combination.size)]
+      input_combination[Kernel.rand(input_combination.size)]
     end
 
     def generate_pairs_between(parameter_i, input_lists, p_index)

data/lib/pairwise/cli.rb

@@ -39,11 +39,15 @@ module Pairwise
     def execute!
       parse!
       exit_with_help if @input_file.nil? || @input_file.empty?
-      input_data, input_labels = *load_and_parse_input_file!
 
-      builder = Pairwise::Builder.new(input_data, @options)
+      inputs = YAML.load_file(@input_file)
+      if inputs
+        input_data, input_labels = *parse_input_data!(inputs)
+
+        builder = Pairwise::Builder.new(input_data, @options)
 
-      @formatter.display(builder.build, input_labels)
+        @formatter.display(builder.build, input_labels)
+      end
     end
 
     private
@@ -56,8 +60,7 @@ module Pairwise
       Kernel.exit(0)
     end
 
-    def load_and_parse_input_file!
-      inputs = YAML.load_file(@input_file)
+    def parse_input_data!(inputs)
       inputs = hash_inputs_to_list(inputs) if inputs.is_a?(Hash)
 
       raw_inputs = inputs.map {|input| input.values[0]}

data/spec/pairwise_spec.rb

@@ -51,7 +51,7 @@ describe Pairwise do
       end
     end
 
-    context "which are unequal lenghts" do
+    context "which are unequal lengths" do
       it "should generate all pairs for 3 parameters of 1,1,2 values" do
         data = [[:A1], [:B1], [:C1, :C2]]
 
@@ -107,7 +107,7 @@ describe Pairwise do
         #:A2, :B1, :C1, :D2
       end
 
-      it "should generate pairs for three paramters" do
+      it "should generate pairs for three parameters" do
         data = [[:A1, :A2],
                 [:B1, :B2],
                 [:C1 , :C2 , :C3 ]]
@@ -119,7 +119,23 @@ describe Pairwise do
                                            [:A2, :B1, :C2],
                                            [:A1, :B2, :C3]]
       end
+
+      describe "replacing wildcards which could have more than one option" do
+        it "should generate pairs for 2 parameters of 3,2,3 values" do
+          Pairwise.combinations([:A1, :A2, :A3],
+                                [:B1, :B2],
+                                [:C1, :C2, :C3]).should == [[:A1, :B1, :C1],
+                                                            [:A1, :B2, :C2],
+                                                            [:A2, :B1, :C3],
+                                                            [:A2, :B2, :C1],
+                                                            [:A3, :B1, :C2],
+                                                            [:A3, :B2, :C3],
+                                                            [:A3, :B1, :C1], #B1 is a wildcard replacement
+                                                            [:A2, :B1, :C2], #B1 is a wildcard replacement
+                                                            [:A1, :B1, :C3]] #B1 is a wildcard replacement
+        end
+      end
     end
-  end
 
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pairwise
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Joseph Wilk
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-07 00:00:00 +00:00
+date: 2010-01-08 00:00:00 +00:00
 default_executable: pairwise
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -48,6 +48,7 @@ files:
 - Rakefile
 - VERSION.yml
 - bin/pairwise
+- features/bugs/bad_yml.feature
 - features/generating_pairwise_data.feature
 - features/step_definitions/pairwise_data_steps.rb
 - features/support/env.rb