fwtoolkit 0.6.1 → 0.6.2

data/bin/fwt

@@ -23,17 +23,21 @@ class FWT < Thor
     
     @project = Xcodeproj::Project.new
     @project.root_object.build_configuration_list
-    @project.add_system_framework('UIKit')
-    @project.add_system_framework('CoreGraphics') # bug in latest RestKit pod?
 
     info_plist = "#{@app_name}-Info.plist"
     process_template("Info.plist.erb", info_plist, supporting_files)
     
     target = @project.new_target(:application, @app_name, :ios)
-    target.build_settings('Debug').merge!(:INFOPLIST_FILE => "$(SRCROOT)/#{@app_name}/#{@app_name}-Info.plist")
-    target.build_settings('Debug').merge!(:GCC_PREFIX_HEADER => "#{@app_name}/#{@app_name}-Prefix.pch")
-    target.build_settings('Release').merge!(:INFOPLIST_FILE => "$(SRCROOT)/#{@app_name}/#{@app_name}-Info.plist") 
-    target.build_settings('Release').merge!(:GCC_PREFIX_HEADER => "#{@app_name}/#{@app_name}-Prefix.pch")
+    
+    add_system_framework('UIKit')
+    add_system_framework('CoreGraphics')
+    
+    add_build_settings_to_target({
+      'INFOPLIST_FILE' => "$(SRCROOT)/#{@app_name}/#{@app_name}-Info.plist", 
+      'GCC_PREFIX_HEADER' => "#{@app_name}/#{@app_name}-Prefix.pch",
+      'SKIP_INSTALL' => 'NO',
+      'IPHONEOS_DEPLOYMENT_TARGET' => '6.0',
+      }, target)
     
     app_d_h = process_template("AppDelegate.h.erb", "#{@prefix}AppDelegate.h")    
     app_d_m = process_template("AppDelegate.m.erb", "#{@prefix}AppDelegate.m")
@@ -54,18 +58,32 @@ class FWT < Thor
     template 'templates/fwt/Podfile.erb', File.join(@path, 'Podfile')
     template 'templates/fwt/gitignore.erb', File.join(@path, '.gitignore')
     
-    sleep 5
+    sleep 2 # flushing issues?
     
     inside(@path) do
       run "rvm gemset create #{@app_name}", {:capture => true} 
       run "rvm gemset use #{@app_name}", {:capture => true} 
       run 'bundle', {:capture => true} 
-      run 'rake pod:clean_install', {:capture => true} 
+      #run 'rake pod:clean_install', {:capture => true} 
       run "rake frank:setup['#{@app_name}','#{@prefix}']", {:capture => true} 
     end
   end
   
   private
+    def add_build_settings_to_target(map, target)
+      target.build_settings('Debug').merge! map
+      target.build_settings('Release').merge! map
+      
+      puts target.build_settings('Debug')
+    end
+  
+    def add_system_framework(name)
+      framework = @project.add_system_framework(name)
+      target = @project.targets.first
+      build_phase = target.frameworks_build_phase
+      build_phase.add_file_reference framework
+    end
+  
     def setup_cocoapods
       unless Dir.exists?(File.join(Dir.home, '.cocoapods', 'fw'))
         run 'gem install cocoapods', {:capture => true} 
@@ -80,4 +98,20 @@ class FWT < Thor
   
 end
 
+module Xcodeproj
+  class Project
+    def add_system_framework(name)
+      path = "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS6.0.sdk/System/Library/Frameworks/#{name}.framework"
+      if file = frameworks_group.files.select { |f| f.path == path }.first
+        file
+      else
+        framework_ref = frameworks_group.new_file(path)
+        framework_ref.name = "#{name}.framework"
+        framework_ref.source_tree = 'SDKROOT'
+        framework_ref
+      end
+    end
+  end
+end
+
 FWT.start

data/lib/fwtoolkit/tasks/frank.rb

@@ -35,11 +35,11 @@ module FWToolkit
               @models.each do |entity|
                 @model = entity
                 @class_name = class_name(@model)
-                factory_template =  File.join 'models', 'model.rb.erb'        
+                factory_template =  File.join 'templates', 'models', 'model.rb.erb'        
                 template(factory_template, File.join(output_dir, "#{class_name(@model).ruby_format}.rb"))
               end
 
-              factory_template =  File.join 'models', 'factories.rb.erb'
+              factory_template =  File.join 'templates', 'models', 'factories.rb.erb'
               template(factory_template, File.join(output_dir, 'factories.rb'))
             end
 

data/lib/fwtoolkit/version.rb

@@ -1,3 +1,3 @@
 module FWToolkit
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fwtoolkit
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-12 00:00:00.000000000 Z
+date: 2012-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -326,7 +326,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 548593184535858224
+      hash: 4188321226862509111
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -335,7 +335,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 548593184535858224
+      hash: 4188321226862509111
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24