lib/nakal/ios/screen.rb in nakal-1.0.2 vs lib/nakal/ios/screen.rb in nakal-1.0.3

@@ -2,23 +2,30 @@
   module Ios
     class Screen < Common::BaseScreen
 
       private
 
-      CAPTURE_SCRIPT = 'osascript <<EOF
-      tell application "iOS Simulator"
-      activate
-      delay 1
-      tell application "System Events" to keystroke "s" using {command down}
-      end tell
-      EOF'
+      def capture_script
+        xcode_7 = !(%x(instruments -s devices ; echo)).match(' Simulator\)')
+        simulator_app_name = xcode_7 ? "Simulator" : "iOS Simulator"
+        "osascript <<EOF
+        tell application \"#{simulator_app_name}\"
+        activate
+        delay 0.5
+        tell application \"System Events\" to keystroke \"1\" using {command down}
+        delay 0.5
+        tell application \"System Events\" to keystroke \"s\" using {command down}
+        end tell
+        EOF"
+      end
 
+
       def capture
-        `#{CAPTURE_SCRIPT}`
+        `#{capture_script}`
         sleep 1
-        Dir.glob(File.expand_path('~/Desktop/iOS\\ Simulator\\ Screen\\ Shot - Apple\\ Watch*')).each{|f| FileUtils.rm(f)}
+        Dir.glob(File.expand_path('~/Desktop/iOS\\ Simulator\\ Screen\\ Shot - Apple\\ Watch*')).each { |f| FileUtils.rm(f) }
         latest_file = Dir.glob(File.expand_path('~/Desktop/iOS\\ Simulator\\ Screen\\ Shot*')).max_by { |f| File.mtime(f) }
-        File.rename(latest_file,"#{Nakal.image_location}/#{@name}.png")
+        File.rename(latest_file, "#{Nakal.image_location}/#{@name}.png")
       end
 
     end
   end
 end