sim_launcher 0.4.8.pre1 → 0.4.9

data/bin/sim_launcher

@@ -17,7 +17,7 @@ shared_simulator = SimLauncher::Simulator.new
 
 get '/' do
   <<EOS
-  <h1>SimLauncher is up and running</h1>
+  <h1>SimLauncher is up and running...</h1>
   <a href="/showsdks">Here's a list of sdks that SimLauncher has detected</a>
 EOS
 end
@@ -30,22 +30,35 @@ end
 
 get '/launch_ipad_app' do
   app_path = params[:app_path]
-  raise 'no app_path provided' if app_path.nil?
-
+  app_name = params[:app_name]  
+  
   sdk = params[:sdk]
   restart_requested = ("true" == params[:restart])
   
   shared_simulator.quit_simulator if restart_requested
-  shared_simulator.launch_ipad_app( app_path, sdk )
+
+  if (!app_name.nil? && !app_name.empty?)
+    shared_simulator.launch_ipad_app_with_name( app_name, sdk )
+  else
+    raise 'no app_path provided' if app_path.nil?
+    shared_simulator.launch_ipad_app( app_path, sdk )
+  end
+
 end
 
 get '/launch_iphone_app' do
   app_path = params[:app_path]
-  raise 'no app_path provided' if app_path.nil?
+  app_name = params[:app_name]
 
   sdk = params[:sdk]
   restart_requested = ("true" == params[:restart])
 
   shared_simulator.quit_simulator if restart_requested
-  shared_simulator.launch_iphone_app( app_path, sdk )
+
+  if (!app_name.nil? && !app_name.empty?)
+    shared_simulator.launch_iphone_app_with_name( app_name, sdk )
+  else
+    raise 'no app_path provided' if app_path.nil?
+    shared_simulator.launch_iphone_app( app_path, sdk )
+  end
 end

data/lib/sim_launcher.rb

@@ -4,6 +4,10 @@ require 'sim_launcher/simulator'
 require 'sim_launcher/sdk_detector'
 
 module SimLauncher
+
+  DERIVED_DATA = File.expand_path("~/Library/Developer/Xcode/DerivedData")
+  DEFAULT_DERIVED_DATA_INFO = File.expand_path("#{DERIVED_DATA}/*/info.plist")
+
   def self.check_app_path( app_path )
     unless File.exists?( app_path )
       return "The specified app path doesn't seem to exist:  #{app_path}"
@@ -24,4 +28,81 @@ module SimLauncher
 
     nil
   end
+
+  def self.derived_data_dir_for_project_name(project_name)
+
+    build_dirs = Dir.glob("#{DERIVED_DATA}/*").find_all do |xc_proj|
+      File.basename(xc_proj).start_with?(project_name)
+    end
+
+    if (build_dirs.count == 0 && !project_name.empty?)
+      # check for directory named "workspace-{deriveddirectoryrandomcharacters}"
+      build_dirs = Dir.glob("#{DERIVED_DATA}/*").find_all do |xc_proj|
+        File.basename(xc_proj).downcase.start_with?(project_name)
+      end
+    end
+
+    puts build_dirs
+
+    if (build_dirs.count == 0)
+      msg = ["Unable to find your built app."]
+      msg << "This means that sim_launcher can't automatically launch the build for the #{project_name}."
+      msg << "Searched in Xcode 4.x default: #{DERIVED_DATA}"
+      raise msg.join("\n")
+
+    elsif (build_dirs.count > 1)
+      msg = ["Unable to auto detect bundle."]
+      msg << "You have several projects with the same name: #{project_name} in #{DERIVED_DATA}:\n"
+      msg << build_dirs.join("\n")
+
+      msg << "\n\nThis means that sim_launcher can't automatically launch iOS simulator."
+      msg << "Searched in Xcode 4.x default: #{DEFAULT_DERIVED_DATA_INFO}\n"
+      raise msg.join("\n")
+    else
+      puts "Found potential build dir: #{build_dirs.first}"
+      puts "Checking..."
+      return build_dirs.first
+    end
+  end
+
+  def self.app_bundle_or_raise(path)
+    bundle_path = nil
+
+    if path and not File.directory?(path)
+      puts "Unable to find .app bundle at #{path}. It should be an .app directory."
+      dd_dir = derived_data_dir_for_project_name(path)
+      app_bundles = Dir.glob(File.join(dd_dir, "Build", "Products", "*", "*.app"))
+      msg = "sim_launcher found the following bundles:\n\n"
+      msg << app_bundles.join("\n")
+      raise msg
+    elsif path
+      bundle_path = path
+    else
+      dd_dir = derived_data_dir_for_project_name(path)
+      sim_dirs = Dir.glob(File.join(dd_dir, "Build", "Products", "*-iphonesimulator", "*.app"))
+      if sim_dirs.empty?
+        msg = ["Unable to auto detect bundle."]
+        msg << "Have you built your app for simulator?."
+        msg << "Searched dir: #{dd_dir}/Build/Products"
+        msg << "Please build your app from Xcode\n"
+        raise msg.join("\n")
+      end
+      preferred_dir = find_preferred_dir(sim_dirs)
+      if preferred_dir.nil?
+        msg = ["Error... Unable to find bundle."]
+        msg << "Cannot find a built app that is linked with calabash.framework"
+        msg << "Please build your app from Xcode"
+        msg << "You should build your calabash target.\n"
+        raise msg.join("\n")
+      end
+      puts("-"*37)
+      puts "Auto detected bundle:\n\n"
+      puts "bundle = #{preferred_dir || sim_dirs[0]}\n\n"
+      puts "Please verify!"
+      puts("-"*37)
+      bundle_path = sim_dirs[0]
+    end
+    bundle_path
+  end
+
 end

data/lib/sim_launcher/simulator.rb

@@ -1,8 +1,9 @@
 module SimLauncher
+
 class Simulator
 
   def initialize( iphonesim_path_external = nil )
-    @iphonesim_path = iphonesim_path_external || iphonesim_path(xcode_version)
+    @iphonesim_path = iphonesim_path_external || iphonesim_path
   end
 
   def showsdks
@@ -58,15 +59,26 @@ class Simulator
     launch_ios_app( app_path, sdk, 'ipad' )
   end
 
+  def launch_ipad_app_with_name( app_name, sdk )
+    app_path = SimLauncher.app_bundle_or_raise(app_name)
+    launch_ios_app( app_path, sdk, 'iphone' )
+  end
+
   def launch_iphone_app( app_path, sdk )
     launch_ios_app( app_path, sdk, 'iphone' )
   end
 
+  def launch_iphone_app_with_name( app_name, sdk )
+    app_path = SimLauncher.app_bundle_or_raise(app_name)
+    launch_ios_app( app_path, sdk, 'iphone' )
+  end
+
   def quit_simulator
     `echo 'application "iPhone Simulator" quit' | osascript`
   end
 
   def run_synchronous_command( *args )
+    args.compact!
     cmd = cmd_line_with_args( args )
     puts "executing #{cmd}" if $DEBUG
     `#{cmd}`
@@ -76,21 +88,32 @@ class Simulator
     cmd_sections = [@iphonesim_path] + args.map{ |x| "\"#{x.to_s}\"" } << '2>&1'
     cmd_sections.join(' ')
   end
-  
+
   def xcode_version
-    version = `xcodebuild -version`
-    raise "xcodebuild not found" unless $? == 0
-    version[/([0-9]\.[0-9])/, 1].to_f
+    version_out = `xcodebuild -version`
+    begin
+      Float(version_out[/([0-9]\.[0-9])/, 1])
+    rescue => ex
+      raise "Cannot determine xcode version: #{ex}"
+    end
   end
-  
-  def iphonesim_path(version)
-    installed = `which ios-sim`
+
+  def iphonesim_path
+    binary_name = 'ios-sim'
+
+    framework_dir = `xcode-select -p`.chomp + 'Platforms/iPhoneSimulator.platform/Developer/Library/PrivateFrameworks/iPhoneSimulatorRemoteClient.framework'
+
+    if File.directory?(framework_dir)
+      binary_name = 'ios-sim-old'
+    end
+
+    installed = `which #{binary_name}`
     if installed =~ /(.*ios-sim)/
-      puts "Using installed ios-sim at #{$1}"
+      puts "Using installed #{binary_name} at #{$1}"
       return $1
     end
 
-    File.join( File.dirname(__FILE__), '..', '..', 'native', 'ios-sim' )
+    File.join( File.dirname(__FILE__), '..', '..', 'native', binary_name )
   end
 end
 end

data/lib/sim_launcher/version.rb

@@ -1,3 +1,3 @@
 module SimLauncher
-  VERSION = "0.4.8.pre1"
+  VERSION = "0.4.9"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: sim_launcher
 version: !ruby/object:Gem::Version
-  version: 0.4.8.pre1
-  prerelease: 6
+  version: 0.4.9
+  prerelease: 
 platform: ruby
 authors:
 - Pete Hodgson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-08 00:00:00.000000000 Z
+date: 2014-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -47,6 +47,7 @@ files:
 - lib/sim_launcher/simulator.rb
 - lib/sim_launcher/version.rb
 - native/ios-sim
+- native/ios-sim-old
 - native/iphonesim
 - scripts/reset_simulator.applescript
 - scripts/rotate_simulator_left.applescript
@@ -67,14 +68,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: tiny HTTP server to launch an app in the iOS simulator
 test_files: []
-has_rdoc: