calabash-cucumber 0.9.25 → 0.9.26

data/bin/calabash-ios-setup.rb

@@ -262,20 +262,6 @@ def setup_project(project_name, project_path, path)
 
 
 
-  cfnet = pbx.find_item :name => "CFNetwork.framework", :type => PBXProject::PBXTypes::PBXFileReference
-
-  unless cfnet
-    f = PBXProject::PBXTypes::PBXFileReference.new(:path => "System/Library/Frameworks/CFNetwork.framework", :lastKnownFileType => "wrapper.framework", :sourceTree => 'SDKROOT')
-    f.comment = "CFNetwork.framework"
-    f.name = f.comment
-    pbx.add_item f
-    bf = PBXProject::PBXTypes::PBXBuildFile.new(:comment => "CFNetwork.framework in Frameworks", :fileRef => f.guid)
-    bf.comment = "CFNetwork.framework in Frameworks"
-    pbx.add_item bf
-    group.add_children f
-    build_phase_entry = PBXProject::PBXTypes::BasicValue.new(:value => bf.guid, :comment => bf.comment)
-    pbx.sections['PBXFrameworksBuildPhase'][0].files << build_phase_entry
-  end
 
 
   targets = pbx.sections['PBXNativeTarget']
@@ -318,6 +304,28 @@ def setup_project(project_name, project_path, path)
     end
   end
 
+  #CFNetwork
+  cfnet = pbx.find_item :name => "CFNetwork.framework", :type => PBXProject::PBXTypes::PBXFileReference
+
+  if cfnet
+    msg("Warning") do
+      puts "You are already using CFNetwork.framework"
+      puts "Please make sure you have added it to your target #{target.name.value}."
+    end
+  else
+    f = PBXProject::PBXTypes::PBXFileReference.new(:path => "System/Library/Frameworks/CFNetwork.framework", :lastKnownFileType => "wrapper.framework", :sourceTree => 'SDKROOT')
+    f.comment = "CFNetwork.framework"
+    f.name = f.comment
+    pbx.add_item f
+    bf = PBXProject::PBXTypes::PBXBuildFile.new(:comment => "CFNetwork.framework in Frameworks", :fileRef => f.guid)
+    bf.comment = "CFNetwork.framework in Frameworks"
+    pbx.add_item bf
+    group.add_children f
+    build_phase_entry = PBXProject::PBXTypes::BasicValue.new(:value => bf.guid, :comment => bf.comment)
+    pbx.sections['PBXFrameworksBuildPhase'][0].files << build_phase_entry
+  end
+
+
   ##project level build conf
   project_bc_id = pbx.sections['PBXProject'][0].buildConfigurationList.value
   project_bc_list = pbx.find_item :guid => project_bc_id, :type => PBXProject::PBXTypes::XCConfigurationList

data/lib/calabash-cucumber/version.rb

@@ -1,6 +1,6 @@
 module Calabash
   module Cucumber
-    VERSION = "0.9.25"
+    VERSION = "0.9.26"
     FRAMEWORK_VERSION = "0.9.23"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calabash-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.9.25
+  version: 0.9.26
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70142197416520 !ruby/object:Gem::Requirement
+  requirement: &70164419060240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70142197416520
+  version_requirements: *70164419060240
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70142197415940 !ruby/object:Gem::Requirement
+  requirement: &70164419059660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70142197415940
+  version_requirements: *70164419059660
 - !ruby/object:Gem::Dependency
   name: CFPropertyList
-  requirement: &70142197415400 !ruby/object:Gem::Requirement
+  requirement: &70164419059040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70142197415400
+  version_requirements: *70164419059040
 - !ruby/object:Gem::Dependency
   name: sim_launcher
-  requirement: &70142197414680 !ruby/object:Gem::Requirement
+  requirement: &70164419074740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70142197414680
+  version_requirements: *70164419074740
 - !ruby/object:Gem::Dependency
   name: slowhandcuke
-  requirement: &70142197414020 !ruby/object:Gem::Requirement
+  requirement: &70164419074180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70142197414020
+  version_requirements: *70164419074180
 - !ruby/object:Gem::Dependency
   name: net-http-persistent
-  requirement: &70142197413560 !ruby/object:Gem::Requirement
+  requirement: &70164419073280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70142197413560
+  version_requirements: *70164419073280
 - !ruby/object:Gem::Dependency
   name: pbxproject
-  requirement: &70142197413000 !ruby/object:Gem::Requirement
+  requirement: &70164419072820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70142197413000
+  version_requirements: *70164419072820
 description: calabash-cucumber drives tests for native iOS apps. You must link your
   app with calabash-ios-server framework to execute tests.
 email: