fix_to_chix 0.0.3 → 0.0.5

data/Rakefile

@@ -8,9 +8,6 @@ $hoe = Hoe.spec('fix_to_chix') do |p|
   p.summary =  'convert existing yaml fixtures to factory_girl factories'
   p.changes              = p.paragraphs_of("History.txt", 0..1).join("\n\n")
   p.rubyforge_name       = p.name
-  # p.extra_deps         = [
-  #   ['activesupport','>= 2.0.2'],
-  # ]
   p.extra_dev_deps = [
     ['newgem', ">= #{::Newgem::VERSION}"], ['activesupport']
   ]

data/bin/fixtochix

@@ -1,4 +1,18 @@
 #!/usr/bin/env ruby
+begin  
+  require 'fix_to_chix'
+rescue LoadError
+  require File.dirname(__FILE__) + '/../lib/fix_to_chix'
+end
 
-require 'fix_to_chix'
-FixToChix.execute(ARGV)
+options = {}
+
+OptionParser.new do |opt|
+  opt.banner = "Usage: cd /your/app/base/dir; fixtochix [OPTIONS]"
+  opt.on("-m", "--match FILES", "Match file pattern") do |m|
+    options[:matching] = m
+  end
+  opt.parse!
+end
+
+FixToChix.execute(options)

data/lib/fix_to_chix.rb

@@ -4,10 +4,11 @@ $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname
 require 'rubygems'
 require 'activesupport'
 require 'fix_to_chix/controller'
+require 'optparse'
 
 module FixToChix
 
-  VERSION = '0.0.3'
+  VERSION = '0.0.5'
 
   APP_ROOT = "." # need to call fixtochix command from your app base
 
@@ -20,16 +21,8 @@ module FixToChix
   SPEC_TARGET_FILE = "#{SPEC_TARGET}/factories.rb"
   TEST_TARGET_FILE = "#{TEST_TARGET}/factories.rb"
 
-  def self.execute(args=nil)
-    FixToChix::Controller.parse_it_all!(parse_arguments(args))
-  end
-
-  def self.parse_arguments(args)
-    if args && args.index("-m")
-      { :matching => (args[args.index("-m") + 1]) }
-    else
-      {}
-    end
+  def self.execute(options)
+    FixToChix::Controller.parse_it_all!(options)
   end
 
 end

data/lib/fix_to_chix/controller.rb

@@ -4,16 +4,27 @@ require 'fix_to_chix/fixture_parser'
 
 module FixToChix
   class Controller
-    def self.parse_it_all!(options={})
-      matching_option = options[:matching] ? { :matching => Regexp.new(options[:matching]) } : {}
-      selector = FixtureSelector.new(matching_option)
-      %w[spec test].each do |type| 
-        selector.send("#{type}_fixtures").each do |fixture_file_name|
-          parser = FixtureParser.new(fixture_file_name)
-          parser.parse_fixture
-          FactoryWriter.write(parser.output_buffer, FixToChix.class_eval("#{type.upcase}_TARGET_FILE"))
+    
+    class << self
+    
+      def parse_it_all!(options)
+        matching_options = parse_matching_options(options)
+        selector = FixtureSelector.new(matching_options)
+        %w[spec test].each do |type| 
+          selector.send("#{type}_fixtures").each do |fixture_file_name|
+            parser = FixtureParser.new(fixture_file_name)
+            parser.parse_fixture
+            FactoryWriter.write(parser.output_buffer, FixToChix.class_eval("#{type.upcase}_TARGET_FILE"))
+          end
         end
       end
+      
+      def parse_matching_options(options)
+        return {} unless options[:matching]
+        { :matching => Regexp.new(options[:matching]) }
+      end
+    
     end
+  
   end
 end

data/lib/fix_to_chix/fixture_selector.rb

@@ -29,7 +29,11 @@ module FixToChix
     end
 
     def fetch_dir_files(dir)
-      Dir[dir] unless Dir[dir].empty?
+      if Dir[dir].empty?
+        []
+      else
+        Dir[dir]
+      end
     end
 
     def filter(all_fixtures)

data/spec/controller_spec.rb

@@ -1,31 +1,75 @@
 require File.dirname(__FILE__) + '/spec_helper.rb'
 
 describe FixToChix::Controller do
-
-  it "parses spec fixtures" do
-    selector = mock('FixtureSelector', :spec_fixtures => ["spec_fix"], :test_fixtures => [])
-    FixToChix::FixtureSelector.stub!(:new).and_return(selector)
-    FixToChix::FixtureParser.should_receive(:new).with("spec_fix").and_return(mock('selector', :parse_fixture => "", :output_buffer => "buff"))
-    FixToChix::FactoryWriter.should_receive(:write).with("buff", FixToChix::SPEC_TARGET_FILE)
-    FixToChix::Controller.parse_it_all!
+  
+  describe "parses spec fixtures" do
+    
+    it "parses spec fixtures" do
+      selector = mock('FixtureSelector', :spec_fixtures => ["spec_fix"], :test_fixtures => [])
+      FixToChix::FixtureSelector.stub!(:new).and_return(selector)
+      FixToChix::FixtureParser.should_receive(:new).with("spec_fix").and_return(mock('Parser', :parse_fixture => "", :output_buffer => "buff"))
+      FixToChix::FactoryWriter.stub!(:write).with("buff", FixToChix::SPEC_TARGET_FILE)
+      FixToChix::Controller.parse_it_all!({})
+    end
+    
+    it "writes to buffer" do
+      selector = mock('FixtureSelector', :spec_fixtures => ["spec_fix"], :test_fixtures => [])
+      FixToChix::FixtureSelector.stub!(:new).and_return(selector)
+      FixToChix::FixtureParser.stub!(:new).with("spec_fix").and_return(mock('Parser', :parse_fixture => "", :output_buffer => "buff"))
+      FixToChix::FactoryWriter.should_receive(:write).with("buff", FixToChix::SPEC_TARGET_FILE)
+      FixToChix::Controller.parse_it_all!({})
+    end
+    
   end
-
-  it "parses test fixtures" do
-    selector = mock('FixtureSelector', :spec_fixtures => [], :test_fixtures => ["test_fix"])
-    FixToChix::FixtureSelector.stub!(:new).and_return(selector)
-    FixToChix::FixtureParser.should_receive(:new).with("test_fix").and_return(mock('selector', :parse_fixture => "", :output_buffer => "buff"))
-    FixToChix::FactoryWriter.should_receive(:write).with("buff", FixToChix::TEST_TARGET_FILE)
-    FixToChix::Controller.parse_it_all!
+  
+  describe "parses test fixtures" do
+    
+    it "parses test fixtures" do
+      selector = mock('FixtureSelector', :spec_fixtures => [], :test_fixtures => ["test_fix"])
+      FixToChix::FixtureSelector.stub!(:new).and_return(selector)
+      FixToChix::FixtureParser.should_receive(:new).with("test_fix").and_return(mock('Parser', :parse_fixture => "", :output_buffer => "buff"))
+      FixToChix::FactoryWriter.stub!(:write).with("buff", FixToChix::TEST_TARGET_FILE)
+      FixToChix::Controller.parse_it_all!({})
+    end
+    
+    it "writes to buffer" do
+      selector = mock('FixtureSelector', :spec_fixtures => [], :test_fixtures => ["test_fix"])
+      FixToChix::FixtureSelector.stub!(:new).and_return(selector)
+      FixToChix::FixtureParser.stub!(:new).with("test_fix").and_return(mock('Parser', :parse_fixture => "", :output_buffer => "buff"))
+      FixToChix::FactoryWriter.should_receive(:write).with("buff", FixToChix::TEST_TARGET_FILE)
+      FixToChix::Controller.parse_it_all!({})
+    end
+    
   end
 
-  it "accepts matching file options for selector" do
+  it "accepts matching one file options for selector" do
     FixToChix::FixtureSelector.should_receive(:new).with(:matching => /anakin/).and_return(mock('Selector', :spec_fixtures => [], :test_fixtures => []))
     FixToChix::Controller.parse_it_all!(:matching => "anakin")
   end
+  
+  it "accepts matching many files options for selector" do
+    FixToChix::FixtureSelector.should_receive(:new).with(:matching => /anakin|yoda/).and_return(mock('Selector', :spec_fixtures => [], :test_fixtures => []))
+    FixToChix::Controller.parse_it_all!(:matching => "anakin|yoda")
+  end
 
-  it "receives empty hash if no arg" do
+  it "receives empty hash if no arguments for matching" do
     FixToChix::FixtureSelector.should_receive(:new).with({}).and_return(mock('Selector', :spec_fixtures => [], :test_fixtures => []))
-    FixToChix::Controller.parse_it_all!
+    FixToChix::Controller.parse_it_all!({:bla => "bla"})
   end
-
+  
+  it "parses hash from matching arguments if given one" do
+    matching_options = FixToChix::Controller.parse_matching_options(:matching => "blablabla")
+    matching_options.should == { :matching => /blablabla/ }
+  end
+  
+  it "parses hash from matching arguments if given two" do
+    matching_options = FixToChix::Controller.parse_matching_options(:matching => "blablabla|ble")
+    matching_options.should == { :matching => /blablabla|ble/ }
+  end
+  
+  it "parses empty hash from matching arguments if none given" do
+    matching_options = FixToChix::Controller.parse_matching_options({})
+    matching_options.should == {}
+  end
+  
 end

data/spec/fix_to_chix_spec.rb

@@ -1,20 +1,14 @@
 require File.dirname(__FILE__) + '/spec_helper.rb'
 
 describe FixToChix do
-
-  it "parses it all" do
-    FixToChix::Controller.should_receive(:parse_it_all!)
-    FixToChix.execute
+    
+  it "prints usage if no arguments passed" do
+    lambda{ FixToChix.execute }.should raise_error(ArgumentError)
   end
 
-  it "accepts arguments if given" do
+  it "accepts matching arguments" do
     FixToChix::Controller.should_receive(:parse_it_all!).with(:matching => "chewbacca")
-    FixToChix.execute(["-m", "chewbacca"])
-  end
-
-  it "accepts passes empty hash if no argument" do
-    FixToChix::Controller.should_receive(:parse_it_all!).with({})
-    FixToChix.execute()
+    FixToChix.execute(:matching => "chewbacca")
   end
 
 end

data/spec/fixture_selector_spec.rb

@@ -31,12 +31,21 @@ describe FixToChix::FixtureSelector do
   end
 
   describe "fetching fixtures" do
-
-    it "gets from default dirs" do
+    
+    before do
       @selector = FixToChix::FixtureSelector.new
+    end
+
+    it "gets from default test dir" do
       Dir.stub!(:[]).with(FixToChix::TEST_FIXTURES).and_return(["test/fixtures/space_guns.yml"])
+      Dir.stub!(:[]).with(FixToChix::SPEC_FIXTURES).and_return([])
+      @selector.send(:fetch_fixtures).to_set.should == Set.new(["test/fixtures/space_guns.yml"]) 
+    end
+    
+    it "gets from default spec dif" do
+      Dir.stub!(:[]).with(FixToChix::TEST_FIXTURES).and_return([])
       Dir.stub!(:[]).with(FixToChix::SPEC_FIXTURES).and_return(["spec/fixtures/user_items.yml"])
-      @selector.send(:fetch_fixtures).to_set.should == Set.new(["spec/fixtures/user_items.yml","test/fixtures/space_guns.yml"]) 
+      @selector.send(:fetch_fixtures).to_set.should == Set.new(["spec/fixtures/user_items.yml"]) 
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fix_to_chix
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors: 
 - Caike Souza
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-31 00:00:00 -04:00
+date: 2009-12-12 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency