frank-cucumber 0.9.5.pre5 → 0.9.5.pre6

data/.gitignore

@@ -1,3 +1,4 @@
 pkg/*
 *.gem
 .bundle
+Gemfile.lock

data/frank-cucumber.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   git_files = `git ls-files`.split("\n")
   symbiote_files = Dir[File.join('frank-skeleton','frank_static_resources.bundle','**','*')]
   s.files         = git_files+symbiote_files
-  puts s.files.join("\n")
+  #puts s.files.join("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]

data/frank-skeleton/{frankify.xcconfig → frankify.xcconfig.tt}

@@ -1,4 +1,4 @@
 INSTALL_PATH = /./
 
-FRANK_LDFLAGS = -all_load -ObjC -framework CFNetwork -framework Security -lShelley -lFrank
+FRANK_LDFLAGS = -all_load -ObjC -framework CFNetwork -framework Security -lShelley <%= @without_http_server ? "" : "-lCocoaHTTPServer" %> -lFrank
 GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = FRANKIFIED

data/lib/frank-cucumber/cli.rb

@@ -22,8 +22,12 @@ module Frank
       invoke :setup
     end
 
+    WITHOUT_SERVER = "without-cocoa-http-server"
     desc "setup", "set up your iOS app by adding a Frank subdirectory containing everything Frank needs"
+    method_option WITHOUT_SERVER, :type => :boolean
     def setup
+      @without_http_server = options[WITHOUT_SERVER]
+
       directory ".", "Frank"
 
       Frankifier.frankify!( File.expand_path('.') )
@@ -83,10 +87,18 @@ module Frank
 
     desc "launch", "open the Frankified app in the simulator"
     method_option :debug, :type => :boolean, :default => false
+    method_option :idiom, :banner => 'iphone|ipad', :type => :string, :default => (ENV['FRANK_SIM_IDIOM'] || 'iphone')
     def launch
       $DEBUG = options[:debug]
-
-      puts "debugging" if $DEBUG
+      launcher = case options[:idiom].downcase
+      when 'iphone'
+        SimLauncher::DirectClient.for_iphone_app( frankified_app_dir )
+      when 'ipad'
+        SimLauncher::DirectClient.for_ipad_app( frankified_app_dir )
+      else
+        say "idiom must be either iphone or ipad. You supplied '#{options[:idiom]}'", :red
+        exit 10
+      end
 
       in_root do
         unless File.exists? frankified_app_dir
@@ -97,7 +109,6 @@ module Frank
 
         say "LAUNCHING IN THE SIMULATOR..."
 
-        launcher = SimLauncher::DirectClient.new(frankified_app_dir, nil, nil )
         launcher.relaunch
       end
     end

data/lib/frank-cucumber/version.rb

@@ -1,5 +1,5 @@
 module Frank
   module Cucumber
-    VERSION = "0.9.5.pre5"
+    VERSION = "0.9.5.pre6"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: frank-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.9.5.pre5
+  version: 0.9.5.pre6
   prerelease: 6
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-30 00:00:00.000000000 Z
+date: 2012-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70201991417460 !ruby/object:Gem::Requirement
+  requirement: &70103090195680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70201991417460
+  version_requirements: *70103090195680
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70201991416820 !ruby/object:Gem::Requirement
+  requirement: &70103090195140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70201991416820
+  version_requirements: *70103090195140
 - !ruby/object:Gem::Dependency
   name: sim_launcher
-  requirement: &70201991416040 !ruby/object:Gem::Requirement
+  requirement: &70103090194480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -44,10 +44,10 @@ dependencies:
         version: 0.3.8
   type: :runtime
   prerelease: false
-  version_requirements: *70201991416040
+  version_requirements: *70103090194480
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70201991415420 !ruby/object:Gem::Requirement
+  requirement: &70103090191340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70201991415420
+  version_requirements: *70103090191340
 - !ruby/object:Gem::Dependency
   name: plist
-  requirement: &70201991430820 !ruby/object:Gem::Requirement
+  requirement: &70103090188120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70201991430820
+  version_requirements: *70103090188120
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70201991430220 !ruby/object:Gem::Requirement
+  requirement: &70103090186540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70201991430220
+  version_requirements: *70103090186540
 - !ruby/object:Gem::Dependency
   name: dnssd
-  requirement: &70201991429120 !ruby/object:Gem::Requirement
+  requirement: &70103090183240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70201991429120
+  version_requirements: *70103090183240
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70201991427520 !ruby/object:Gem::Requirement
+  requirement: &70103090181540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70201991427520
+  version_requirements: *70103090181540
 - !ruby/object:Gem::Dependency
   name: xcodeproj
-  requirement: &70201991426100 !ruby/object:Gem::Requirement
+  requirement: &70103090179260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70201991426100
+  version_requirements: *70103090179260
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &70201991424400 !ruby/object:Gem::Requirement
+  requirement: &70103090177080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70201991424400
+  version_requirements: *70103090177080
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70201991436800 !ruby/object:Gem::Requirement
+  requirement: &70103090176640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70201991436800
+  version_requirements: *70103090176640
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70201991435100 !ruby/object:Gem::Requirement
+  requirement: &70103090176160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70201991435100
+  version_requirements: *70103090176160
 - !ruby/object:Gem::Dependency
   name: pry-debugger
-  requirement: &70201991433920 !ruby/object:Gem::Requirement
+  requirement: &70103090175540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,7 +154,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70201991433920
+  version_requirements: *70103090175540
 description: Use cucumber to test native iOS apps via Frank
 email:
 - gems@thepete.net
@@ -166,7 +166,6 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
-- Gemfile.lock
 - Rakefile
 - bin/frank
 - bin/frank-skeleton
@@ -174,7 +173,8 @@ files:
 - frank-skeleton/features/my_first.feature
 - frank-skeleton/features/step_definitions/launch_steps.rb
 - frank-skeleton/features/support/env.rb
-- frank-skeleton/frankify.xcconfig
+- frank-skeleton/frankify.xcconfig.tt
+- frank-skeleton/libCocoaHTTPServer.a
 - frank-skeleton/libFrank.a
 - frank-skeleton/libShelley.a
 - lib/frank-cucumber.rb
@@ -266,3 +266,4 @@ test_files:
 - test/keyboard_helper_test.rb
 - test/launcher_test.rb
 - test/test_helper.rb
+has_rdoc: 

data/Gemfile.lock

@@ -1,58 +0,0 @@
-PATH
-  remote: .
-  specs:
-    frank-cucumber (0.9.5.pre2)
-      cucumber
-      dnssd
-      i18n
-      json
-      plist
-      rspec (>= 2.0)
-      sim_launcher (= 0.3.8)
-      thor
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    builder (3.0.0)
-    cucumber (1.2.1)
-      builder (>= 2.1.2)
-      diff-lcs (>= 1.1.3)
-      gherkin (~> 2.11.0)
-      json (>= 1.4.6)
-    diff-lcs (1.1.3)
-    dnssd (2.0)
-    gherkin (2.11.1)
-      json (>= 1.4.6)
-    i18n (0.6.0)
-    json (1.7.3)
-    plist (3.1.0)
-    rack (1.4.1)
-    rack-protection (1.2.0)
-      rack
-    rr (1.0.4)
-    rspec (2.10.0)
-      rspec-core (~> 2.10.0)
-      rspec-expectations (~> 2.10.0)
-      rspec-mocks (~> 2.10.0)
-    rspec-core (2.10.1)
-    rspec-expectations (2.10.0)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.10.1)
-    sim_launcher (0.3.8)
-      sinatra
-    sinatra (1.3.2)
-      rack (~> 1.3, >= 1.3.6)
-      rack-protection (~> 1.2)
-      tilt (~> 1.3, >= 1.3.3)
-    thor (0.15.4)
-    tilt (1.3.3)
-    yard (0.8.2.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  frank-cucumber!
-  rr
-  yard