calatrava 0.6.0 → 0.6.1

data/calatrava.gemspec

@@ -21,14 +21,14 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec"
   s.add_development_dependency "aruba"
 
-  s.add_runtime_dependency "rake"
-  s.add_runtime_dependency "thor"
-  s.add_runtime_dependency "haml"
-  s.add_runtime_dependency "sass"
-  s.add_runtime_dependency "mustache"
-  s.add_runtime_dependency "cucumber"
-  s.add_runtime_dependency "watir-webdriver"
-  s.add_runtime_dependency "frank-cucumber"
-  s.add_runtime_dependency "xcodeproj"
-  s.add_runtime_dependency "cocoapods"
+  s.add_runtime_dependency "rake", "~> 0.9.5"
+  s.add_runtime_dependency "thor", "~> 0.16.0"
+  s.add_runtime_dependency "haml", "~> 3.1.7"
+  s.add_runtime_dependency "sass", "~> 3.2.3"
+  s.add_runtime_dependency "mustache", "~> 0.99.4"
+  s.add_runtime_dependency "cucumber", "~> 1.2.1"
+  s.add_runtime_dependency "watir-webdriver", "~> 0.6.1"
+  s.add_runtime_dependency "frank-cucumber", "~> 1.1.1"
+  s.add_runtime_dependency "xcodeproj", "~> 0.4.0"
+  s.add_runtime_dependency "cocoapods", "~> 0.16.0"
 end

data/lib/calatrava/project_script.rb

@@ -93,9 +93,7 @@ module Calatrava
     end
 
     def create_ios_project
-      Xcodeproj::Project.new.tap do |proj|
-        %w{Foundation UIKit CoreGraphics}.each { |fw| proj.add_system_framework fw }
-      end
+      Xcodeproj::Project.new
     end
 
     def create_ios_project_groups(base_dir, proj, target)
@@ -104,71 +102,69 @@ module Calatrava
       walker = lambda do |item, group|
         if item.directory?
           group_name = item.basename
-          child_group = group.create_group group_name
+          child_group = group.new_group(group_name.to_s)
           item.each_child { |item| walker.call(item, child_group) }
         elsif item.file?
           file_path = item.relative_path_from(base_dir)
-          group.create_file file_path.to_s
-          source_files_for_target << Xcodeproj::Project::Object::PBXNativeTarget::SourceFileDescription.new(file_path, "", nil)
+          source_files_for_target << group.new_file(file_path.to_s)
         else
           raise 'what is it then?!'
         end
       end
       (base_dir + "src").each_child { |item| walker.call(item, proj.main_group) }
-      target.add_source_files source_files_for_target
+      target.add_file_references source_files_for_target
     end
 
     def create_ios_folder_references(base_dir, proj, target)
-      public_folder = proj.main_group.create_file "public"
+      public_folder = proj.main_group.new_file "public"
       public_folder.last_known_file_type = 'folder'
-      build_file = public_folder.build_files.new 
-
-      shared_phase = Xcodeproj::Project::Object::PBXResourcesBuildPhase.new(proj,nil,{})
 
-      shared_phase << build_file
+      shared_phase = Xcodeproj::Project::Object::PBXResourcesBuildPhase.new(proj, nil)
+      shared_phase.add_file_reference(public_folder)
       target.build_phases << shared_phase
 
     end
 
     def create_ios_project_target(proj)
-      target = Xcodeproj::Project::Object::PBXNativeTarget.new(proj,
-        nil,
-        'productType' => 'com.apple.product-type.application',
-        'productName' => @name)
-
-      target.build_configurations.each do |config|
-        config.build_settings.merge!(Xcodeproj::Project::Object::XCBuildConfiguration::COMMON_BUILD_SETTINGS[:ios])
-
-        # E.g. [:ios, :release]
-        extra_settings_key = [:ios, config.name.downcase.to_sym]
-        if extra_settings = Xcodeproj::Project::Object::XCBuildConfiguration::COMMON_BUILD_SETTINGS[extra_settings_key]
-          config.build_settings.merge!(extra_settings)
+      proj.new_target(:application, @name, :ios).tap do |target|
+
+        target.build_configurations.each do |config|
+          config.build_settings.merge!({
+                                         "GCC_PREFIX_HEADER" => "src/#{@name}-Prefix.pch",
+                                         "OTHER_LDFLAGS" => ['-ObjC', '-all_load'],
+                                         "INFOPLIST_FILE" => "src/#{@name}-Info.plist",
+                                         "SKIP_INSTALL" => "NO",
+                                         "IPHONEOS_DEPLOYMENT_TARGET" => "5.0",
+                                       })
+          config.build_settings.delete "DSTROOT"
+          config.build_settings.delete "INSTALL_PATH"
+
         end
 
-        config.build_settings.merge!({
-          "GCC_PREFIX_HEADER" => "src/#{@name}-Prefix.pch",
-          "OTHER_LDFLAGS" => ['-ObjC', '-all_load'],
-          "INFOPLIST_FILE" => "src/#{@name}-Info.plist",
-          "SKIP_INSTALL" => "NO",
-          "IPHONEOS_DEPLOYMENT_TARGET" => "5.0",
-        })
-        config.build_settings.delete "DSTROOT"
-        config.build_settings.delete "INSTALL_PATH"
+        %w{UIKit CoreGraphics}.each do |name|
+          fw = proj.frameworks_group.new_file("System/Library/Frameworks/#{name}.framework")
+          fw.name = "#{name}.framework"
+          fw.source_tree = 'SDKROOT'
+
+          bf = proj.new(Xcodeproj::Project::Object::PBXBuildFile)
+          bf.file_ref = fw
+          target.frameworks_build_phase.files << bf
+        end
 
-      end
 
-      calatrava_phase = Xcodeproj::Project::Object::PBXShellScriptBuildPhase.new(proj,nil,{})
-      target.build_phase_references.insert(0,calatrava_phase.uuid) # hacky manual way to get build phase inserted in the right place
+        calatrava_phase = proj.new(Xcodeproj::Project::Object::PBXShellScriptBuildPhase)
 
-      calatrava_phase.name = "Build Calatrava Kernel & Shell"
-      calatrava_phase.shell_path = '/bin/bash'
-      calatrava_phase.shell_script = <<-EOS.split("\n").collect(&:strip).join("\n")
-        source ${SRCROOT}/../build_env.sh
-        bundle exec rake ios:xcode:prebuild
-      EOS
+        # hacky manual way to get build phase inserted in the right place
+        target.build_phases.insert(0, calatrava_phase) 
+        calatrava_phase.add_referrer(target.build_phases.owner)
 
-      proj.targets << target
-      target
+        calatrava_phase.name = "Build Calatrava Kernel & Shell"
+        calatrava_phase.shell_path = '/bin/bash'
+        calatrava_phase.shell_script = <<-EOS.split("\n").collect(&:strip).join("\n")
+          source ${SRCROOT}/../build_env.sh
+          bundle exec rake ios:xcode:prebuild
+        EOS
+      end
     end
 
     def create_ios_tree(template)

data/lib/calatrava/templates/ios/Podfile.calatrava

@@ -3,7 +3,7 @@ platform :ios, '5.0'
 xcodeproj '{{ project_name}}.xcodeproj'
 
 {{^dev?}}
-pod 'calatrava', :git => 'https://github.com/calatrava/calatrava-ios', :commit => '7a57332b1bd74726240247f22d48dae89fdfce4a'
+pod 'calatrava', :git => 'https://github.com/calatrava/calatrava-ios', :commit => '51391eb66a605801351e65a670b9466082623a3c'
 {{/dev?}}
 {{#dev?}}
 pod 'calatrava', :local => '../../../calatrava-ios'

data/lib/calatrava/version.rb

@@ -1,3 +1,3 @@
 module Calatrava
-  Version = "0.6.0"
+  Version = "0.6.1"
 end

data/lib/calatrava.rb

@@ -14,6 +14,5 @@ require 'calatrava/manifest'
 require 'calatrava/mobile_web_app'
 require 'calatrava/project'
 require 'calatrava/project_script'
-require 'calatrava/resources_build_phase'
 require 'calatrava/shell'
 require 'calatrava/template'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calatrava
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-11 00:00:00.000000000 Z
+date: 2012-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70224599001040 !ruby/object:Gem::Requirement
+  requirement: &70320900615840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70224599001040
+  version_requirements: *70320900615840
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &70224599000620 !ruby/object:Gem::Requirement
+  requirement: &70320900638120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,117 +32,117 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70224599000620
+  version_requirements: *70320900638120
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70224599000200 !ruby/object:Gem::Requirement
+  requirement: &70320900637600 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.5
   type: :runtime
   prerelease: false
-  version_requirements: *70224599000200
+  version_requirements: *70320900637600
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70224598999780 !ruby/object:Gem::Requirement
+  requirement: &70320900637100 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.16.0
   type: :runtime
   prerelease: false
-  version_requirements: *70224598999780
+  version_requirements: *70320900637100
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70224598999360 !ruby/object:Gem::Requirement
+  requirement: &70320900636640 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.7
   type: :runtime
   prerelease: false
-  version_requirements: *70224598999360
+  version_requirements: *70320900636640
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &70224598998940 !ruby/object:Gem::Requirement
+  requirement: &70320900636180 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *70224598998940
+  version_requirements: *70320900636180
 - !ruby/object:Gem::Dependency
   name: mustache
-  requirement: &70224598998520 !ruby/object:Gem::Requirement
+  requirement: &70320900635720 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.99.4
   type: :runtime
   prerelease: false
-  version_requirements: *70224598998520
+  version_requirements: *70320900635720
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70224598998100 !ruby/object:Gem::Requirement
+  requirement: &70320900635240 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70224598998100
+  version_requirements: *70320900635240
 - !ruby/object:Gem::Dependency
   name: watir-webdriver
-  requirement: &70224598997680 !ruby/object:Gem::Requirement
+  requirement: &70320900634620 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *70224598997680
+  version_requirements: *70320900634620
 - !ruby/object:Gem::Dependency
   name: frank-cucumber
-  requirement: &70224598997260 !ruby/object:Gem::Requirement
+  requirement: &70320900634040 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70224598997260
+  version_requirements: *70320900634040
 - !ruby/object:Gem::Dependency
   name: xcodeproj
-  requirement: &70224598996840 !ruby/object:Gem::Requirement
+  requirement: &70320900633200 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70224598996840
+  version_requirements: *70320900633200
 - !ruby/object:Gem::Dependency
   name: cocoapods
-  requirement: &70224598996420 !ruby/object:Gem::Requirement
+  requirement: &70320900632700 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.16.0
   type: :runtime
   prerelease: false
-  version_requirements: *70224598996420
+  version_requirements: *70320900632700
 description: A framework to build cross-platform mobile apps with high quality native
   UIs.
 email:
@@ -180,7 +180,6 @@ files:
 - lib/calatrava/mobile_web_app.rb
 - lib/calatrava/project.rb
 - lib/calatrava/project_script.rb
-- lib/calatrava/resources_build_phase.rb
 - lib/calatrava/shell.rb
 - lib/calatrava/tasks.rb
 - lib/calatrava/tasks/artifact.rb

data/lib/calatrava/resources_build_phase.rb

@@ -1,19 +0,0 @@
-require 'xcodeproj'
-
-module Xcodeproj
-  class Project
-  	module Object
-
-  	  class PBXResourcesBuildPhase < PBXBuildPhase
-  	    has_many :files
-
-  	    def initialize(*)
-  	      super
-  	      self.file_references ||= []
-  	    end
-  	    
-  	  end
-
-  	end
-  end
-end