pairwise 0.1.5 → 0.1.6

data/VERSION.yml

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

data/features/bugs/bad_arguments.feature

@@ -0,0 +1,32 @@
+Feature: Bad arguments
+
+  Scenario: Non existent file
+    When I run pairwise file_with_does_not_exist
+    And I should see in the errors
+    """
+    No such file or directory
+    """
+
+  Scenario: Existing folder
+    Given I have a folder "empty"
+    When I run pairwise empty/
+    Then I should see in the output
+    """
+    Usage: pairwise
+    """
+
+  Scenario: Unsupported input file type
+    Given I have the file "example.rar"
+    When I run pairwise example.rar
+    Then I should see in the errors
+    """
+    Unsupported file type: rar
+    """
+
+  Scenario: Unsupported input file without extension
+    Given I have the file "example"
+    When I run pairwise example
+    Then I should see in the errors
+    """
+    Cannot determine file type for: example
+    """

data/features/bugs/bad_yml.feature

@@ -1,25 +1,25 @@
 Feature: Bad yml
 
-Scenario: Empty yml
-  Given I have the yaml file "inputs.yml" containing:
-  """
+  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
-  And I should see in the output
-  """
-  Error: 'inputs.yml' does not contain the right yaml structure for me to generate the pairwise set!
-  """
+    """
+    When I run pairwise inputs.yml
+    Then it should not show any errors
+    And I should see in the output
+    """
+    Error: 'inputs.yml' does not contain the right structure for me to generate the pairwise set!
+    """
 
-Scenario: yml with no lists
-  Given I have the yaml file "listey_inputs.yml" containing:
-  """
-  mookey
-  """
-  When I run pairwise listey_inputs.yml
-  Then it should not show any errors
-  And I should see in the output
-  """
-  Error: 'listey_inputs.yml' does not contain the right yaml structure for me to generate the pairwise set!
-  """
+  Scenario: yml with no lists
+    Given I have the yaml file "listey_inputs.yml" containing:
+    """
+    mookey
+    """
+    When I run pairwise listey_inputs.yml
+    Then it should not show any errors
+    And I should see in the output
+    """
+    Error: 'listey_inputs.yml' does not contain the right structure for me to generate the pairwise set!
+    """

data/features/generating_pairwise_data.feature

@@ -3,45 +3,83 @@ Feature: Generating pairwise data
   As a tester
   I want a set of tests which is smaller than all the possible combinations of my specified inputs
 
-Scenario: No input file specified
-  When I run pairwise
-  Then I should see in the output
-  """
-  Usage: pairwise [options] FILE.yml
-  """
+  Scenario: No input file specified
+    When I run pairwise
+    Then I should see in the output
+    """
+    Usage: pairwise [options] FILE.[yml|csv]
+    """
+
+  Scenario: Ordered yaml inputs
+    Given I have the yaml file "inputs.yml" containing:
+      """
+      - event with image: [Football, Basketball, Soccer]
+      - event without image: [Football, Basketball, Soccer]
+      - media: [Image, Video, Music]
+      """
+    When I run pairwise inputs.yml
+    Then I should see the output
+      """
+      | event with image | event without image | media |
+      | Football         | Football            | Image |
+      | Football         | Basketball          | Video |
+      | Football         | Soccer              | Music |
+      | Basketball       | Football            | Music |
+      | Basketball       | Basketball          | Image |
+      | Basketball       | Soccer              | Video |
+      | Soccer           | Football            | Video |
+      | Soccer           | Basketball          | Music |
+      | Soccer           | Soccer              | Image |
+
+      """
+
+  Scenario: Unorderd yaml inputs
+    Given I have the yaml file "inputs.yml" containing:
+      """
+      event with image: [Football, Basketball, Soccer]
+      event without image: [Football, Basketball, Soccer]
+      media: [Image, Video, Music]
+      """
+    When I run pairwise inputs.yml
+    Then I should see the output
+      """
+      | media | event without image | event with image |
+      | Image | Football            | Football         |
+      | Image | Basketball          | Basketball       |
+      | Image | Soccer              | Soccer           |
+      | Video | Football            | Soccer           |
+      | Video | Basketball          | Football         |
+      | Video | Soccer              | Basketball       |
+      | Music | Football            | Basketball       |
+      | Music | Basketball          | Soccer           |
+      | Music | Soccer              | Football         |
+
+      """
 
-Scenario: Ordered yaml inputs
-  Given I have the yaml file "inputs.yml" containing:
+  Scenario: Single value yaml inputs
+    Given I have the yaml file "inputs.yml" containing:
     """
-    - event with image: [Football, Basketball, Soccer]
-    - event without image: [Football, Basketball, Soccer]
-    - media: [Image, Video, Music]
+    1: 1
+    2: 2
     """
-  When I run pairwise inputs.yml
-  Then I should see the output
+    When I run pairwise inputs.yml
+    Then I should see the output
     """
-    | event with image | event without image | media |
-    | Football         | Football            | Image |
-    | Football         | Basketball          | Video |
-    | Football         | Soccer              | Music |
-    | Basketball       | Football            | Music |
-    | Basketball       | Basketball          | Image |
-    | Basketball       | Soccer              | Video |
-    | Soccer           | Football            | Video |
-    | Soccer           | Basketball          | Music |
-    | Soccer           | Soccer              | Image |
+    | 1 | 2 |
+    | 1 | 2 |
 
     """
 
-Scenario: Unorderd yaml inputs
-  Given I have the yaml file "inputs.yml" containing:
-    """
-    event with image: [Football, Basketball, Soccer]
-    event without image: [Football, Basketball, Soccer]
-    media: [Image, Video, Music]
-    """
-  When I run pairwise inputs.yml
-  Then I should see the output
+  Scenario: inputing as csv
+    Given I have the csv file "inputs.csv" containing:
+      """
+      media, event with image, event without image
+      Image, Football, Football
+      Video, Basketball, Basketball
+      Music, Soccer, Soccer
+      """
+    When I run pairwise inputs.csv
+    Then I should see the output
     """
     | media | event without image | event with image |
     | Image | Football            | Football         |
@@ -56,38 +94,25 @@ Scenario: Unorderd yaml inputs
 
     """
 
-Scenario: Single value yaml inputs
-  Given I have the yaml file "inputs.yml" containing:
-  """
-  1: 1
-  2: 2
-  """
-  When I run pairwise inputs.yml
-  Then I should see the output
-  """
-  | 1 | 2 |
-  | 1 | 2 |
-
-  """
-Scenario: Not replacing wild cards
-  Given I have the yaml file "inputs.yml" containing:
-  """
-  - A: [A1, A2, A3]
-  - B: [B1, B2]
-  - C: [C1, C2, C3]
-  """
-  When I run pairwise inputs.yml --keep-wild-cards
-  Then I should see the output
-  """
-  | A  | B              | C  |
-  | A1 | B1             | C1 |
-  | A1 | B2             | C2 |
-  | A2 | B1             | C3 |
-  | A2 | B2             | C1 |
-  | A3 | B1             | C2 |
-  | A3 | B2             | C3 |
-  | A3 | any_value_of_B | C1 |
-  | A2 | any_value_of_B | C2 |
-  | A1 | any_value_of_B | C3 |
+  Scenario: Not replacing wild cards
+    Given I have the yaml file "inputs.yml" containing:
+    """
+    - A: [A1, A2, A3]
+    - B: [B1, B2]
+    - C: [C1, C2, C3]
+    """
+    When I run pairwise inputs.yml --keep-wild-cards
+    Then I should see the output
+    """
+    | A  | B              | C  |
+    | A1 | B1             | C1 |
+    | A1 | B2             | C2 |
+    | A2 | B1             | C3 |
+    | A2 | B2             | C1 |
+    | A3 | B1             | C2 |
+    | A3 | B2             | C3 |
+    | A3 | any_value_of_B | C1 |
+    | A2 | any_value_of_B | C2 |
+    | A1 | any_value_of_B | C3 |
 
-  """
+    """

data/features/step_definitions/pairwise_data_steps.rb

@@ -1,7 +1,15 @@
-Given /^I have the yaml file "([^\"]*)" containing:$/ do |file_name, file_contents|
+Given /^I have the (?:yaml |csv )?file "([^\"]*)" containing:$/ do |file_name, file_contents|
   create_file(file_name, file_contents)
 end
 
+Given /^I have the file "([^\"]*)"$/ do |filename|
+  Given %Q{I have the file "#{filename}" containing:}, ""
+end
+
+Given /^I have a folder "([^\"]*)"$/ do |folder_name|
+  create_folder(folder_name)
+end
+
 When /^I run (.+)$/ do |command|
   run(command)
 end
@@ -11,9 +19,14 @@ Then /^I should see the output$/ do |text|
 end
 
 Then /^I should see in the output$/ do |string|
+  Then "it should not show any errors"
   last_stdout.should include(string)
 end
 
+Then /^I should see in the errors$/ do |string|
+  last_stderr.should include(string)
+end
+
 Then /^it should not show any errors$/ do
   last_stderr.should == ""
 end

data/features/support/env.rb

@@ -34,7 +34,7 @@ class PairwiseWorld
   def last_stdout
     @last_stdout
   end
-  
+
   def create_file(file_name, file_content)
     in_current_dir do
       FileUtils.mkdir_p(File.dirname(file_name)) unless File.directory?(File.dirname(file_name))
@@ -42,9 +42,15 @@ class PairwiseWorld
     end
   end
 
+  def create_folder(folder_name)
+    in_current_dir do
+      FileUtils.mkdir_p(folder_name) unless File.directory?(folder_name)
+    end
+  end
+
   def set_env_var(variable, value)
     @original_env_vars ||= {}
-    @original_env_vars[variable] = ENV[variable] 
+    @original_env_vars[variable] = ENV[variable]
     ENV[variable]  = value
   end
 

data/lib/pairwise.rb

@@ -5,6 +5,8 @@ require 'pairwise/test_pair'
 require 'pairwise/pair_collection'
 require 'pairwise/builder'
 require 'pairwise/formatter'
+require 'pairwise/input_data'
+require 'pairwise/input_file'
 require 'pairwise/cli'
 
 require 'yaml'

data/lib/pairwise/cli.rb

@@ -1,5 +1,5 @@
-require 'yaml'
 require 'optparse'
+
 module Pairwise
   class Cli
     BUILTIN_FORMATS = {
@@ -27,7 +27,7 @@ module Pairwise
     def parse!
       @args.extend(::OptionParser::Arguable)
       @args.options do |opts|
-        opts.banner = ["Usage: pairwise [options] FILE.yml", "",
+        opts.banner = ["Usage: pairwise [options] FILE.[yml|csv]", "",
         "Example:",
             "pairwise data/inputs.yml", "", "",
           ].join("\n")
@@ -50,22 +50,19 @@ module Pairwise
         end
       end.parse!
 
-      @input_file = @args[0] unless @args.empty?
+      @filename_with_path = @args[0] unless @args.empty?
     end
 
     def execute!
       parse!
-      exit_with_help if @input_file.nil? || @input_file.empty?
-
-      inputs = YAML.load_file(@input_file)
-      if valid_inputs?(inputs)
-        input_data, input_labels = *parse_input_data!(inputs)
+      validate_options!
 
-        builder = Pairwise::Builder.new(input_data, @options)
+      if inputs = InputFile.load(@filename_with_path)
+        builder = Pairwise::Builder.new(inputs.data, @options)
 
-        formatter.display(builder.build, input_labels)
+        formatter.display(builder.build, inputs.labels)
       else
-        puts "Error: '#{@input_file}' does not contain the right yaml structure for me to generate the pairwise set!"
+        puts "Error: '#{@filename_with_path}' does not contain the right structure for me to generate the pairwise set!"
       end
     end
 
@@ -75,8 +72,10 @@ module Pairwise
         :format => 'cucumber' }
     end
 
-    def valid_inputs?(inputs)
-      inputs && (inputs.is_a?(Array) || inputs.is_a?(Hash))
+    def validate_options!
+      exit_with_help if @filename_with_path.nil? || @filename_with_path.empty?
+      raise Errno::ENOENT, @filename_with_path  unless File.exist?(@filename_with_path)
+      exit_with_help unless File.file?(@filename_with_path)
     end
 
     def exit_with_help
@@ -89,25 +88,5 @@ module Pairwise
       format.new(@out)
     end
 
-    def parse_input_data!(inputs)
-      inputs = hash_inputs_to_list(inputs) if inputs.is_a?(Hash)
-
-      raw_inputs = inputs.map {|input| input.values[0]}
-      input_labels = input_names(inputs)
-
-      [raw_inputs, input_labels]
-    end
-
-    def hash_inputs_to_list(inputs_hash)
-      inputs_hash.map do |key, value|
-        value = [value] unless value.is_a?(Array)
-        {key => value}
-      end
-    end
-
-    def input_names(inputs)
-      inputs.map{|input| input.keys}.flatten
-    end
-
   end
 end

data/lib/pairwise/input_data.rb

@@ -0,0 +1,25 @@
+module Pairwise
+  class InputData
+
+    def initialize(inputs)
+      @inputs = inputs.is_a?(Hash) ? hash_inputs_to_list(inputs) : inputs
+    end
+
+    def data
+      @data ||= @inputs.map {|input| input.values[0]}
+    end
+
+    def labels
+      @labels ||= @inputs.map{|input| input.keys}.flatten
+    end
+
+    private
+
+    def hash_inputs_to_list(inputs_hash)
+      inputs_hash.map do |key, value|
+        value = [value] unless value.is_a?(Array)
+        {key => value}
+      end
+    end
+  end
+end

data/lib/pairwise/input_file.rb

@@ -0,0 +1,59 @@
+module Pairwise
+  class InputFile
+
+    class << self
+      def load(filename)
+        inputs = self.new(filename).load_and_parse
+        InputData.new(inputs) if valid?(inputs)
+      end
+
+      def valid?(inputs)
+        inputs && (inputs.is_a?(Array) || inputs.is_a?(Hash))
+      end
+    end
+
+    def initialize(filename)
+      @filename = filename
+      self.extend(input_file_module)
+    end
+
+    private
+
+    def input_file_module
+      type = @filename[/\.(.+)$/, 1]
+      raise "Cannot determine file type for: #{@filename}" unless type
+      case type.downcase
+      when 'yaml', 'yml' then Yaml
+      else
+        Pairwise.const_get(type.capitalize) rescue raise "Unsupported file type: #{type}"
+      end
+    end
+
+  end
+
+  module Yaml
+    def load_and_parse
+      require 'yaml'
+
+      inputs = YAML.load_file(@filename)
+    end
+  end
+
+  module Csv
+    def load_and_parse
+      require 'csv'
+
+      csv_data = CSV.read @filename
+      headers = csv_data.shift.map {|head| head.to_s.strip }
+      string_data = csv_data.map {|row| row.map {|cell| cell.to_s.strip } }
+
+      inputs = Hash.new {|h,k| h[k] = []}
+
+      string_data.each do |row|
+        row.each_with_index { |value, index| inputs[headers[index]] << value }
+      end
+
+      inputs
+    end
+  end
+end

data/spec/pairwise/cli_spec.rb

@@ -51,7 +51,7 @@ module Pairwise
     context "--help" do
       it "displays usage" do
         after_parsing('--help') do
-          output_stream.string.should =~ /Usage: pairwise \[options\] FILE\.yml/
+          output_stream.string.should =~ /Usage: pairwise \[options\] FILE\.\[yml|csv\]/
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pairwise
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors: 
 - Joseph Wilk
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-21 00:00:00 +00:00
+date: 2010-02-27 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_arguments.feature
 - features/bugs/bad_yml.feature
 - features/customizing_pairwise_output_format.feature
 - features/generating_pairwise_data.feature
@@ -62,6 +63,8 @@ files:
 - lib/pairwise/formatter.rb
 - lib/pairwise/formatter/csv.rb
 - lib/pairwise/formatter/cucumber.rb
+- lib/pairwise/input_data.rb
+- lib/pairwise/input_file.rb
 - lib/pairwise/pair_collection.rb
 - lib/pairwise/test_pair.rb
 - spec/pairwise/builder_spec.rb