Merge branch 'develop' into feature/ensure-compatible-arch-before-lau…

…nching-on-device

Needed changes from develop to ensure passing rspec tests
on Xcode 6.2b and travis ci Xcode 6.1.1.

Also required behaviors from develop to complete task.

Conflicts:
	lib/run_loop/device.rb

lib/run_loop/device.rb

@@ -17,6 +17,28 @@ def initialize(name, version, udid)
       @udid = udid
     end
 
+    # Returns and instruments-ready device identifier that is a suitable value
+    # for DEVICE_TARGET environment variable.
+    #
+    # @return [String] An instruments-ready device identifier.
+    # @raise [RuntimeError] If trying to obtain a instruments-ready identifier
+    #  for a simulator when Xcode < 6.
+    def instruments_identifier(xcode_tools=RunLoop::XCTools.new)
+      if physical_device?
+        self.udid
+      else
+        unless xcode_tools.xcode_version_gte_6?
+          raise "Expected Xcode >= 6, but found version #{xcode_tools.version} - cannot create an identifier"
+        end
+        if self.version == RunLoop::Version.new('7.0.3')
+          version_part = self.version.to_s
+        else
+          version_part = "#{self.version.major}.#{self.version.minor}"
+        end
+        "#{self.name} (#{version_part} Simulator)"
+      end
+    end
+
     # Is this a physical device?
     # @return [Boolean] Returns true if this is a device.
     def physical_device?

spec/lib/device_spec.rb

@@ -27,28 +27,28 @@
     end
   end
 
-  describe '#simulator?' do
+  context '#simulator?' do
     subject { device.simulator? }
-    context 'physical device' do
-      let(:device) { RunLoop::Device.new('name', '8.1.1', 'e60ef9ae876ab4a218ee966d0525c9fb79e5606d') }
-      it { is_expected.to be == false }
+    context 'is a simulator' do
+      let(:device) {  RunLoop::Device.new('name', '7.1.2', '77DA3AC3-EB3E-4B24-B899-4A20E315C318') }
+      it { is_expected.to be == true }
     end
 
-    context 'simulator' do
-      let(:device) { RunLoop::Device.new('name', '8.1.1', 'not a device udid') }
-      it { is_expected.to be == true }
+    context 'is not a simulator' do
+      let(:device) { RunLoop::Device.new('name', '7.1.2', '30c4b52a41d0f6c64a44bd01ff2966f03105de1e') }
+      it { is_expected.to be == false }
     end
   end
 
-  describe '#physical_device?' do
+  context '#device?' do
     subject { device.physical_device? }
-    context 'physical device' do
-      let(:device) { RunLoop::Device.new('name', '8.1.1', 'e60ef9ae876ab4a218ee966d0525c9fb79e5606d') }
+    context 'is a physical device' do
+      let(:device) { RunLoop::Device.new('name', '7.1.2', '30c4b52a41d0f6c64a44bd01ff2966f03105de1e') }
       it { is_expected.to be == true }
     end
 
-    context 'simulator' do
-      let(:device) { RunLoop::Device.new('name', '8.1.1', 'not a device udid') }
+    context 'is not a physical device' do
+      let(:device) {  RunLoop::Device.new('name', '7.1.2', '77DA3AC3-EB3E-4B24-B899-4A20E315C318') }
       it { is_expected.to be == false }
     end
   end
@@ -82,32 +82,6 @@
     end
   end
 
-  context '#simulator?' do
-    subject { device.simulator? }
-    context 'is a simulator' do
-      let(:device) {  RunLoop::Device.new('name', '7.1.2', '77DA3AC3-EB3E-4B24-B899-4A20E315C318') }
-      it { is_expected.to be == true }
-    end
-
-    context 'is not a simulator' do
-      let(:device) { RunLoop::Device.new('name', '7.1.2', '30c4b52a41d0f6c64a44bd01ff2966f03105de1e') }
-      it { is_expected.to be == false }
-    end
-  end
-
-  context '#device?' do
-    subject { device.physical_device? }
-    context 'is a physical device' do
-      let(:device) { RunLoop::Device.new('name', '7.1.2', '30c4b52a41d0f6c64a44bd01ff2966f03105de1e') }
-      it { is_expected.to be == true }
-    end
-
-    context 'is not a physical device' do
-      let(:device) {  RunLoop::Device.new('name', '7.1.2', '77DA3AC3-EB3E-4B24-B899-4A20E315C318') }
-      it { is_expected.to be == false }
-    end
-  end
-
   describe '#instruction_set' do
     describe 'is a physical device' do
       it 'raises an error' do