factory_toys 1.0.2 → 1.0.3

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.0.3

data/factory_toys.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "factory_toys"
-  s.version = "1.0.2"
+  s.version = "1.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Henry", "Thomas Brand"]

data/lib/factory_toys/f_factory.rb

@@ -48,14 +48,11 @@ module FactoryToys
       FileUtils.mkdir_p(dir)
       FileUtils.rm_r(Dir.glob(File.join(dir, "*.feature")))
 
-      @outputs.each_with_index do |output, i|
-        File.open(File.join(dir, "#{filename}_#{i}.feature"), 'w') do |f|
-          begin
-            f.puts (@header + output).join("\n")
-          rescue Exception => e
-            puts e
-            (debugger; puts '????')
-          end
+      @outputs.each_with_index do |output, i|        
+        output_file_name = File.join(dir, "#{filename}_#{i}.feature")
+        File.open(output_file_name, 'w') do |f|
+          output_str = (@header + output).join("\n")
+          f.puts output_str
         end
       end
     end
@@ -87,7 +84,7 @@ module FactoryToys
       scenario_name = self.get_scenario_name(feature_name)
       raise MissingScenarioError, scenario_name unless self.data[scenario_name]
       eval(self.data[scenario_name])
-      @output << eval(scenario_name.to_s)
+      @output += eval(scenario_name.to_s).split("\n")
       @output << ''
       check_output_length
     end

data/lib/factory_toys.rb

@@ -30,7 +30,7 @@ module FactoryToys
 
     protected
     def source_files
-      Dir.glob(self.source_location + '/*.rb')
+      Dir[File.join(self.source_location, '*.rb')]
     rescue Errno::ENOENT => e
       return "Source Directory Does not exist: #{self.source_directory}"
     end

data/spec/factory_toys_spec.rb

@@ -70,15 +70,13 @@ describe "FactoryToys" do
 
       it 'does not override file if no change' do
         Object.send(:remove_const, :RAILS_ROOT)
-        path = File.dirname(__FILE__)
-        path += Dir.pwd + '/' unless path[0..0] == '/'
-        Object.const_set(:RAILS_ROOT, path + '/../tmp')
+        path = File.expand_path(File.dirname(__FILE__))
+        Object.const_set(:RAILS_ROOT, File.join(path, '..', 'tmp'))
         FileUtils.rm_r(FactoryToys.features_location + '/*', :force => true)
         FactoryToys.update_features
-        init_files = Dir.glob(FactoryToys.features_location + '/*.feature').map{|f| [f, File.open(f){|file| file.read}]}
+        init_files = Dir.glob(File.join(FactoryToys.features_location, '**', '*.feature')).map{|f| [f, File.open(f){|file| file.read}]}
         FactoryToys.update_features
-        new_files = Dir.glob(FactoryToys.features_location + '/*.feature').map{|f| [f, File.open(f){|file| file.read}]}
-
+        new_files = Dir.glob(File.join(FactoryToys.features_location, '**', '*.feature')).map{|f| [f, File.open(f){|file| file.read}]}
         init_files.first.last.should == new_files.first.last
       end
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: factory_toys
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - David Henry