Merge pull request #38 from Swinject/fix_pod

Fix pod

Author: Lutzifer

ExampleProject/CodeGenerationExample/CodeGenerationExample.xcodeproj/project.xcworkspace/xcuserdata/admin.xcuserdatad/UserInterfaceState.xcuserstate

@@ -1,9 +1,9 @@
 #/bin/sh
-../codegen/swinject_codegen -i example.csv -o containerExtension.swift
-../codegen/swinject_codegen -i example.yml -o containerExtension2.swift
-../codegen/swinject_codegen -i example.csv  -c -o example.csv.yml
-../codegen/swinject_codegen -i example.yml  -c -o example.yml.csv
-../codegen/swinject_codegen -i example.csv  -m
-../codegen/swinject_codegen -i example.yml  -m
-../codegen/swinject_codegen -i example.csv.yml -o containerExtension3.swift
-../codegen/swinject_codegen -i example.yml.csv -o containerExtension4.swift
+../bin/swinject_codegen -i example.csv -o containerExtension.swift
+../bin/swinject_codegen -i example.yml -o containerExtension2.swift
+../bin/swinject_codegen -i example.csv  -c -o example.csv.yml
+../bin/swinject_codegen -i example.yml  -c -o example.yml.csv
+../bin/swinject_codegen -i example.csv  -m
+../bin/swinject_codegen -i example.yml  -m
+../bin/swinject_codegen -i example.csv.yml -o containerExtension3.swift
+../bin/swinject_codegen -i example.yml.csv -o containerExtension4.swift

ExampleScript/generateCode.sh

@@ -29,7 +29,7 @@ to your podfile.
 2. Add a call to generate the code as build script phase:
 
 ```Shell
-$PODS_ROOT/Swinject-CodeGen/swinject_codegen -i baseInput.csv -o extensions/baseContainerExtension.swift
+$PODS_ROOT/Swinject-CodeGen/bin/swinject_codegen -i baseInput.csv -o extensions/baseContainerExtension.swift
 ```
 
 3. Add the generated file (here: `extensions/baseContainerExtension.swift`) to xcode

README.md

@@ -29,7 +29,7 @@ to your podfile.
 2. Add a call to generate the code as build script phase:
 
 ```Shell
-$PODS_ROOT/Swinject-CodeGen/swinject_codegen -i baseInput.csv -o extensions/baseContainerExtension.swift
+$PODS_ROOT/Swinject-CodeGen/bin/swinject_codegen -i baseInput.csv -o extensions/baseContainerExtension.swift
 ```
 
 3. Add the generated file (here: `extensions/baseContainerExtension.swift`) to xcode
@@ -120,7 +120,7 @@ Example for a .yml definition:
 
 #### Output
 ```Swift
-<%= %x(./../codegen/swinject_codegen -i ../Tests/Examples/ExampleA.csv).chomp %>
+<%= %x(./../bin/swinject_codegen -i ../Tests/Examples/ExampleA.csv).chomp %>
 ```
 
 ### Example B: Different source and target
@@ -132,7 +132,7 @@ Example for a .yml definition:
 
 #### Output
 ```Swift
-<%= %x(./../codegen/swinject_codegen -i ../Tests/Examples/ExampleB.csv).chomp %>
+<%= %x(./../bin/swinject_codegen -i ../Tests/Examples/ExampleB.csv).chomp %>
 ```
 
 ### Example C: Different source and target class with name
@@ -144,7 +144,7 @@ Example for a .yml definition:
 
 #### Output
 ```Swift
-<%= %x(./../codegen/swinject_codegen -i ../Tests/Examples/ExampleC.csv).chomp %>
+<%= %x(./../bin/swinject_codegen -i ../Tests/Examples/ExampleC.csv).chomp %>
 ```
 
 ### Example D: Different source and target with a single, explicitly named argument
@@ -155,7 +155,7 @@ Example for a .yml definition:
 
 #### Output
 ```Swift
-<%= %x(./../codegen/swinject_codegen -i ../Tests/Examples/ExampleD.csv).chomp %>
+<%= %x(./../bin/swinject_codegen -i ../Tests/Examples/ExampleD.csv).chomp %>
 ```
 
 ### Example E: Different source and target with multiple arguments, both explicitly named and not
@@ -168,7 +168,7 @@ If no explicit name is given, the lowercase type is used as argumentname.
 
 #### Output
 ```Swift
-<%= %x(./../codegen/swinject_codegen -i ../Tests/Examples/ExampleE.csv).chomp %>
+<%= %x(./../bin/swinject_codegen -i ../Tests/Examples/ExampleE.csv).chomp %>
 ```
 
 ### Example F:  Different source and target with name with multiple arguments, both explicitly named and not
@@ -179,7 +179,7 @@ If no explicit name is given, the lowercase type is used as argumentname.
 
 #### Output
 ```Swift
-<%= %x(./../codegen/swinject_codegen -i ../Tests/Examples/ExampleF.csv).chomp %>
+<%= %x(./../bin/swinject_codegen -i ../Tests/Examples/ExampleF.csv).chomp %>
 ```
 
 ## Usage Examples

Support/README.erb

@@ -17,7 +17,7 @@ Pod::Spec.new do |s|
 
   s.ios.deployment_target = '8.0'
   s.tvos.deployment_target = '9.0'
-  s.source_files   = '*.erb', '*.rb', 'swinject_codegen'
+  s.preserve_paths = ['erb', 'source', 'bin']
 
   s.dependency "Swinject"
 

Swinject-CodeGen.podspec

@@ -2,7 +2,7 @@
 
 class TestCodegeneration < MiniTest::Unit::TestCase
   def buildCSV(fileName)
-    %x(./../codegen/swinject_codegen -i #{fileName}).chomp
+    %x(./../bin/swinject_codegen -i #{fileName}).chomp
   end
 
   def readFile(fileName)

Tests/test.rb

@@ -2,9 +2,9 @@
 require "erb"
 require "Shellwords"
 require "optparse"
-require_relative "./CSVParser"
-require_relative "./YMLParser"
-require_relative "./YMLSerializer"
+require_relative "../source/CSVParser"
+require_relative "../source/YMLParser"
+require_relative "../source/YMLSerializer"
 
 @options = {
   :MIGRATION  => false,
@@ -85,7 +85,7 @@ def parse_input_file(input_filename)
 end
 
 def templates_folder
-  File.expand_path(File.dirname(__FILE__))
+  "#{File.expand_path(File.dirname(__FILE__))}/../erb"
 end
 
 def write_container_file(input_hash, output_filename)