Make constants less horrible.

rhgills · May 20, 2013 · d4c758a · d4c758a
1 parent 5fd923a
commit d4c758a
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/lib/sim_launcher/client.rb b/lib/sim_launcher/client.rb
@@ -16,11 +16,11 @@ def initialize( app_path, options = {} )
     end
 
     def self.for_ipad_app( app_path, sdk = nil )
-      self.new( app_path, :sdk => sdk, :device => DeviceType::iPad )
+      self.new( app_path, :sdk => sdk, :device => DeviceType::Pad )
     end
 
     def self.for_iphone_app( app_path, sdk = nil )
-      self.new( app_path, :sdk => sdk, :device => DeviceType::iPhone )
+      self.new( app_path, :sdk => sdk, :device => DeviceType::Phone )
     end
 
     def server_uri=(uri)

diff --git a/lib/sim_launcher/direct_client.rb b/lib/sim_launcher/direct_client.rb
@@ -10,11 +10,11 @@ def initialize( app_path, options = {} )
     end
 
     def self.for_ipad_app( app_path, sdk = nil )
-      self.new( app_path, :sdk => sdk, :device => DeviceType::iPad )
+      self.new( app_path, :sdk => sdk, :device => DeviceType::Pad )
     end
 
     def self.for_iphone_app( app_path, sdk = nil )
-      self.new( app_path, :sdk => sdk, :device => DeviceType::iPhone )
+      self.new( app_path, :sdk => sdk, :device => DeviceType::Phone )
     end
 
     def launch

diff --git a/lib/sim_launcher/simulator.rb b/lib/sim_launcher/simulator.rb
@@ -1,21 +1,21 @@
 module SimLauncher
 
 module DeviceType
-  IPHONE = 'iphone'
-  RETINA_3_5_INCH_IPHONE = 'retina iphone (3.5 inch)'
-  RETINA_4_INCH_IPHONE = 'retina iphone (4 inch)'
+  Phone = 'iphone'
+  PhoneRetina3_5Inch = 'retina iphone (3.5 inch)'
+  PhoneRetina4Inch = 'retina iphone (4 inch)'
 
-  IPAD = 'ipad'
-  RETINA_IPAD = 'retina ipad'
+  Pad = 'ipad'
+  PadRetina = 'retina ipad'
 
-  IPHONE_DEVICES = [IPHONE, RETINA_3_5_INCH_IPHONE, RETINA_4_INCH_IPHONE]
-  IPAD_DEVICES = [IPAD, RETINA_IPAD]
-  RETINA_DEVICES = [RETINA_3_5_INCH_IPHONE, RETINA_4_INCH_IPHONE, RETINA_IPAD]
+  PhoneDevices = [Phone, PhoneRetina3_5Inch, PhoneRetina4Inch]
+  PadDevices = [Pad, PadRetina]
+  RetinaDevices = [PhoneRetina3_5Inch, PhoneRetina4Inch, PadRetina]
 end
 
 module DeviceFamily
-  IPHONE = 'iphone'
-  IPAD = 'ipad'
+  Phone = 'iphone'
+  Pad = 'ipad'
 end
 
 class Simulator
@@ -83,10 +83,10 @@ def launch_ios_app( app_path, options = {} )
   def args_to_select_device( device )
     args = ['--family', family_for_device(device)]
 
-    if DeviceType::RETINA_DEVICES.include? device
+    if DeviceType::RetinaDevices.include? device
       args = args + ['--retina']
 
-      if device == DeviceType::RETINA_4_INCH_IPHONE
+      if device == DeviceType::PhoneRetina4Inch
         args = args + ['--tall']
       end
     end
@@ -95,10 +95,10 @@ def args_to_select_device( device )
   end
 
   def family_for_device( device )
-    if DeviceType::IPHONE_DEVICES.include? device
-      DeviceFamily::IPHONE
+    if DeviceType::PhoneDevices.include? device
+      DeviceFamily::Phone
     else
-      DeviceFamily::IPAD
+      DeviceFamily::Pad
     end
   end