cuesmash 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c36e405e7913aac8f74cfead621aed03042e134
-  data.tar.gz: 92cf770512a727db44de69656ae2be89c0ccfa12
+  metadata.gz: 9f5afcc77195c37550088258b91cc798effe35cd
+  data.tar.gz: 82a4396920644a9287d48c21f9fd586f4d3a3bd8
 SHA512:
-  metadata.gz: 95c7053653f4301113b695ab165e31497a5ba57dfdd85cd871234feab371684e9400b74ef08edebe53e18c5efd0999fc1821616f4e440238f3340604f73456fe
-  data.tar.gz: d65680d7d616249ae8ee301e12ea7411bd8691da122d75d30c9e3bc812e45257ab2ae0abb32615181e179c6311bff4d0aaa322e33662521c0b6b071c86127d8b
+  metadata.gz: d45d408c5e264941d3008790e599cf56cc352bc6c80ca4da8c2cc450289e8aca887362076a64591d3914f757011ce509fe01b35dfc3c180647a977566972b734
+  data.tar.gz: 77d98e64e724916e0a8098a446d66d78f943aacd4d4230250f659fffaf1a40995d7b931f030a46287ff35cd2c8153733fd0806b019abca9301651c850a58a9d0

data/.cuesmash.yml

@@ -2,24 +2,29 @@
 # iOS Example
 devices:
   iPhone 6:
-    [8.3]
+    8.3: 'bd79098904d9b93a418ac821db8372ee7374cf82'
+    9.0:
 
   iPhone 5s:
-    [7.1, 8.3]
+    7.1:
+    8.3:
 
   iPhone 4s:
-    [7.1, 8.3]
+    7.1:
+    8.3:
 
   iPhone 5:
-    [7.1, 8.3]
+    7.1:
+    8.3:
 
   iPhone 6 Plus:
-    [8.3]
+    8.3:
 
 default:
   os: iPhone 6
   version: 8.3
   test_timeout: 120
+  uuid: 'bd79098904d9b93a418ac821db8372ee7374cf82'
 
 platform: 'iOS'
 build_configuration: 'Debug'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cuesmash (0.3.0)
+    cuesmash (0.4.0)
       rest-client (~> 1.7.2)
       thor (>= 0.19.1)
       xcpretty (>= 0.1.10)

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Alex Fish
+Copyright (c) 2015 ustwo
 
 MIT License
 

data/cuesmash.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "cuesmash"
-  spec.version       = "0.3.0"
+  spec.version       = "0.4.0"
   spec.authors       = ["Alex Fish", "Jarod McBride", "Tiago Castro"]
   spec.email         = ["fish@ustwo.co.uk", "jarod@ustwo.com", "castro@ustwo.com"]
   spec.description   = "Appium project manager"

data/lib/cuesmash/appium_server.rb

@@ -14,10 +14,14 @@ module Cuesmash
     # Public: the output format for the tests
     attr_accessor :format
 
+    # Public: uuid of ios device to run test on.
+    attr_accessor :ios_uuid
+
     #
     # Create a new instance of AppiumServer
     #
-    def initialize
+    def initialize(ios_uuid: nil)
+      @ios_uuid = ios_uuid
     end
 
     #
@@ -26,7 +30,8 @@ module Cuesmash
     def start_server
       started
 
-      command = 'appium --log-level debug'
+      command = 'appium --log-level debug '
+      command << "--udid #{@ios_uuid} --session-override " unless @ios_uuid.nil?
 
       @stdin, @stdout, @stderr, @wait_thr = Open3.popen3(command)
       Logger.info "Appium running with pid: #{@wait_thr.pid}"

data/lib/cuesmash/command.rb

@@ -36,7 +36,8 @@ module Cuesmash
                      app:,
                      profile:,
                      quiet: false,
-                     timeout:)
+                     timeout:,
+                     ios_uuid: nil)
       if debug
         Logger.level = ::Logger::DEBUG
         Logger.formatter = proc do |serverity, time, _progname, msg|
@@ -51,7 +52,11 @@ module Cuesmash
       create_appium_txt(app: app.app_path, device_name: device, platform_version: os, timeout: timeout)
 
       # start the appium server
-      app_server = AppiumServer.new
+      if @ios_uuid
+        app_server = AppiumServer.new(ios_uuid: ios_uuid)
+      else
+        app_server = AppiumServer.new
+      end
       app_server.start_server
 
       # Run the tests

data/lib/cuesmash/ios_app.rb

@@ -11,7 +11,8 @@ module Cuesmash
     # Public: the path to the dir containing the built app i.e. /tmp/MyAppQWERQW/Build/Products/Debug-iphonesimulator/
     attr_reader :app_dir
 
-    # Public: the full path including the built app i.e. /tmp/MyAppQWERQW/Build/Products/Debug-iphonesimulator/MyApp.app"
+    # Public: the full path including the built app
+    # i.e. /tmp/MyAppQWERQW/Build/Products/Debug-iphonesimulator/MyApp.app"
     attr_reader :app_path
 
     # Public: the app name i.e. MyApp.app
@@ -23,18 +24,23 @@ module Cuesmash
     #
     # Create a new App instance
     #
-    # @param  file_name [String] The usually is the scheme of the xcode project
-    # @param build_configuration [String] which iOS build configuration to run i.e. Release, Debug
+    # @param [String] file_name: This usually is the scheme of the xcode project
+    # @param [String] build_configuration: which iOS build configuration to run i.e. Release, Debug
+    # @param [String] app_name: name of the app
+    # @param [String] device: nil the UUID of the device to run on or nil if running on simulator
     #
-    # @return [App] A app instance
-    def initialize(file_name:, build_configuration:, app_name:)
+    def initialize(file_name:, build_configuration:, app_name:, device: nil)
       app_name = file_name if app_name.nil?
 
       @app_name = "#{app_name}" << '.app'
       @tmp_dir = Dir.mktmpdir(app_name)
       @build_configuration = build_configuration
 
-      @app_dir = "#{@tmp_dir}" << "/#{@build_configuration}-iphonesimulator/"
+      if device.nil?
+        @app_dir = "#{@tmp_dir}" << "/#{@build_configuration}-iphonesimulator/"
+      else
+        @app_dir = "#{@tmp_dir}" << "/#{@build_configuration}-iphoneos/"
+      end
 
       @app_path = "#{@app_dir}" << "#{@app_name}"
     end

data/lib/cuesmash/ios_compiler.rb

@@ -11,10 +11,11 @@ module Cuesmash
     attr_accessor :tmp_dir
     attr_accessor :build_configuration
 
-    def initialize(scheme:, tmp_dir:, build_configuration:)
+    def initialize(scheme:, tmp_dir:, build_configuration:, device: nil)
       @scheme = scheme
       @tmp_dir = tmp_dir
       @build_configuration = build_configuration
+      @device = device
     end
 
     #
@@ -23,7 +24,16 @@ module Cuesmash
     #
     # @return [String] The full xcode build command with args
     def command
-      xcode_command = "set -o pipefail && xcodebuild #{workspace} -scheme '#{@scheme}' -derivedDataPath #{@tmp_dir.shellescape} -configuration #{@build_configuration} OBJROOT=#{@tmp_dir.shellescape} SYMROOT=#{@tmp_dir.shellescape} -sdk iphonesimulator build | bundle exec xcpretty -c"
+      xcode_command = 'set -o pipefail '
+      xcode_command << "&& xcodebuild #{workspace} "
+      xcode_command << "-scheme '#{@scheme}' "
+      xcode_command << "-derivedDataPath #{@tmp_dir.shellescape} "
+      xcode_command << "-configuration #{@build_configuration} "
+      xcode_command << "OBJROOT=#{@tmp_dir.shellescape} "
+      xcode_command << "SYMROOT=#{@tmp_dir.shellescape} "
+      xcode_command << '-sdk iphonesimulator ' if @device.nil?
+      xcode_command << 'build '
+      xcode_command << '| bundle exec xcpretty -c'
 
       Logger.info "xcode_command == #{xcode_command}"
       xcode_command

data/lib/cuesmash/start.rb

@@ -16,6 +16,9 @@ module Cuesmash
 
   # For information on how this class works see the thor documentation https://github.com/erikhuda/thor/wiki
   class Start < Thor
+    package_name 'cuesmash'
+    class_option :version, aliases: '-v', desc: 'The version of cuesmash running'
+
     desc 'init', 'set up the project'
     def init
       Cuesmash::Setup.setup
@@ -62,26 +65,36 @@ module Cuesmash
 
       # Compile the project
       if @config['platform'] == 'iOS'
-
-        setup_ios
-
         # enumerate over each device / OS combination and run the tests.
         @config['devices'].each do |device, oses|
-          oses.each do |os|
-            say 'Cleaning up iOS Simulator'
-            reset_ios_simulator
-
-            say "\n============================\ntesting iOS #{os} on #{device}", :green
-            Cuesmash::Command.execute(device: device,
-                                      os: os,
-                                      scheme: options[:scheme],
-                                      tags: options[:tags],
-                                      debug: options[:debug],
-                                      app: @app,
-                                      profile: options[:profile],
-                                      quiet: options[:quiet],
-                                      timeout: @config['default']['test_timeout'].to_s)
-          end
+          oses.each do |os_number, ios_uuid|
+            setup_ios(device: ios_uuid)
+            case
+            when ios_uuid.nil?
+              say "\n============================\ntesting iOS #{os_number} on #{device}", :green
+              Cuesmash::Command.execute(device: device,
+                                        os: os_number,
+                                        scheme: options[:scheme],
+                                        tags: options[:tags],
+                                        debug: options[:debug],
+                                        app: @app,
+                                        profile: options[:profile],
+                                        quiet: options[:quiet],
+                                        timeout: @config['default']['test_timeout'].to_s)
+            else
+              say "\n============================\ntesting iOS #{os_number} on #{device}", :green
+              Cuesmash::Command.execute(device: device,
+                                        os: os_number,
+                                        scheme: options[:scheme],
+                                        tags: options[:tags],
+                                        debug: options[:debug],
+                                        app: @app,
+                                        profile: options[:profile],
+                                        quiet: options[:quiet],
+                                        timeout: @config['default']['test_timeout'].to_s,
+                                        ios_uuid: @config)
+            end # case
+          end # os each
         end # device each
 
         # clean up the temp dir
@@ -151,7 +164,7 @@ module Cuesmash
       end
 
       if @config['platform'] == 'iOS'
-        setup_ios
+        setup_ios(device: @config['default']['uuid'])
       elsif @config['platform'] == 'Android'
         say 'Setting up android'
         setup_android
@@ -179,21 +192,25 @@ module Cuesmash
       end # load_config
 
       #
-      # helper methods
+      # helper method to setup and compile the iOS app
+      #
+      # @param [string] device: nil <the UUID of the device to run on or nil if running on simulator>
       #
-      def setup_ios
+      def setup_ios(device: nil)
         @app = IosApp.new(file_name: options[:scheme].join(' '),
                           build_configuration: @config['build_configuration'],
-                          app_name: @config['app_name'])
+                          app_name: @config['app_name'],
+                          device: device)
 
         # Compile the project
         compiler = Cuesmash::IosCompiler.new(scheme: options[:scheme].join(' '),
                                              tmp_dir: @app.tmp_dir,
-                                             build_configuration: @config['build_configuration'])
+                                             build_configuration: @config['build_configuration'],
+                                             device: device)
         compiler.compile
 
         ios_appium_text
-      end
+      end # setup_ios
 
       #
       # helper method for setting up android build
@@ -208,7 +225,7 @@ module Cuesmash
         compiler.compile
 
         android_appium_text
-      end
+      end # setup_android
 
       #
       # iOS Appium text file set up
@@ -220,7 +237,7 @@ module Cuesmash
                                           app: @app.app_path,
                                           new_command_timeout: @config['default']['test_timeout'].to_s)
         appium.execute
-      end
+      end # ios_appium_text
 
       #
       # Android Appium text file set up
@@ -231,16 +248,7 @@ module Cuesmash
                                                  app: @app.app_path,
                                                  new_command_timeout: @config['default']['test_timeout'].to_s)
         appium.execute
-      end
-
-      # android_appium_text
-
-      #
-      # Removes the settings and contents for the iOS simulator.
-      #
-      # @return [type] [description]
-      def reset_ios_simulator
-      end
+      end # android_appium_text
     end # no_commands
   end # Start class
 end # module Cuesmash

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cuesmash
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Alex Fish
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-30 00:00:00.000000000 Z
+date: 2015-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler