cuesmash 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f5afcc77195c37550088258b91cc798effe35cd
-  data.tar.gz: 82a4396920644a9287d48c21f9fd586f4d3a3bd8
+  metadata.gz: 64fb64cfd64a715d20a245bdd11dab76d43a4d80
+  data.tar.gz: 4698fac6718292286666145a5d374ad9e3d93c06
 SHA512:
-  metadata.gz: d45d408c5e264941d3008790e599cf56cc352bc6c80ca4da8c2cc450289e8aca887362076a64591d3914f757011ce509fe01b35dfc3c180647a977566972b734
-  data.tar.gz: 77d98e64e724916e0a8098a446d66d78f943aacd4d4230250f659fffaf1a40995d7b931f030a46287ff35cd2c8153733fd0806b019abca9301651c850a58a9d0
+  metadata.gz: fda9f12a26e4f467fdc4fee22e384aa67c53e02be418cdb44da9113f0802f030e1388a2783146e7e33e7a5d2b07fe26dcb3eb755bc91967cda780493ff31c2d6
+  data.tar.gz: b41ec3fc8e42f9ef94ed99062e1abe6a5e5145e22b31df294fd21ed129acc4bbe1b388024b06a01ed9ad85080a65b5de612581a7558368fd8ea26925ad4dd5d1

data/.cuesmash.yml

@@ -24,7 +24,7 @@ default:
   os: iPhone 6
   version: 8.3
   test_timeout: 120
-  uuid: 'bd79098904d9b93a418ac821db8372ee7374cf82'
+  udid: 'bd79098904d9b93a418ac821db8372ee7374cf82'
 
 platform: 'iOS'
 build_configuration: 'Debug'

data/.travis.yml

@@ -1,7 +1,8 @@
 language: ruby
 rvm:
-  - 2.1.2
+  - 2.2.2
 script: bundle exec rspec spec
 notifications:
   email:
     - jarod@ustwo.com
+sudo: false

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cuesmash (0.4.0)
+    cuesmash (0.4.1)
       rest-client (~> 1.7.2)
       thor (>= 0.19.1)
       xcpretty (>= 0.1.10)
@@ -36,7 +36,7 @@ GEM
       rb-inotify (>= 0.9)
     lumberjack (1.0.9)
     method_source (0.8.2)
-    mime-types (2.4.3)
+    mime-types (2.6.1)
     netrc (0.10.3)
     pry (0.10.1)
       coderay (~> 1.1.0)
@@ -87,4 +87,4 @@ DEPENDENCIES
   simplecov (~> 0.10.0)
 
 BUNDLED WITH
-   1.10.4
+   1.10.5

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.4.0"
+  spec.version       = "0.4.1"
   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,37 +14,29 @@ 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(ios_uuid: nil)
-      @ios_uuid = ios_uuid
-    end
-
     #
     # Run the appium server
     #
     def start_server
       started
 
-      command = 'appium --log-level debug '
-      command << "--udid #{@ios_uuid} --session-override " unless @ios_uuid.nil?
+      command = 'appium --log-level debug'
 
       @stdin, @stdout, @stderr, @wait_thr = Open3.popen3(command)
-      Logger.info "Appium running with pid: #{@wait_thr.pid}"
+      Logger.info "Appium started with pid: #{@wait_thr.pid}"
 
       if Logger.debug?
         [@stdout, @stderr].each do |stream|
           Thread.new do
             until (line = stream.gets).nil?
-              Logger.debug line
+              Logger.debug "[Appium] #{line}"
             end
           end
         end
       end
+      # looks like the we need to wait for the service to start up
+      # This isn't good, we should create a check to verify first.
+      sleep 3
     end
 
     #

data/lib/cuesmash/appium_text.rb

@@ -14,6 +14,7 @@ module Cuesmash
     attr_accessor :device_name
     attr_accessor :new_command_timeout
     attr_accessor :appium_text_for_file
+    attr_accessor :udid
 
     #
     # Create a new appium_text instance. These params are based off the appium.txt
@@ -25,12 +26,13 @@ module Cuesmash
     # @param  app [String] path to built .app file
     #
     # @return [AppiumText] A appiumtext instance
-    def initialize(platform_name:, device_name:, platform_version: nil, app:, new_command_timeout: 60)
+    def initialize(platform_name:, device_name:, platform_version: nil, app:, new_command_timeout: 60, udid: nil)
       @platform_name = platform_name
       @device_name = device_name
       @platform_version = platform_version
       @app = app
       @new_command_timeout = new_command_timeout
+      @udid = udid
     end
 
     def execute
@@ -66,6 +68,7 @@ module Cuesmash
       text << "platformVersion = \"#{platform_version}\"\n" unless platform_version.nil?
       text << "app = \"#{app}\"\n"
       text << "newCommandTimeout = \"#{new_command_timeout}\"\n"
+      text << "udid = \"#{udid}\"\n" unless udid.nil?
       Logger.debug "appium.text == #{text}"
       text
     end

data/lib/cuesmash/command.rb

@@ -37,7 +37,7 @@ module Cuesmash
                      profile:,
                      quiet: false,
                      timeout:,
-                     ios_uuid: nil)
+                     ios_udid: nil)
       if debug
         Logger.level = ::Logger::DEBUG
         Logger.formatter = proc do |serverity, time, _progname, msg|
@@ -45,18 +45,11 @@ module Cuesmash
         end
       end
 
-      # Update the plist
-      # update_plist(scheme, app.app_path)
-
       # Update the appium.txt file
-      create_appium_txt(app: app.app_path, device_name: device, platform_version: os, timeout: timeout)
+      create_appium_txt(app: app.app_path, device_name: device, platform_version: os, timeout: timeout, udid: ios_udid)
 
       # start the appium server
-      if @ios_uuid
-        app_server = AppiumServer.new(ios_uuid: ios_uuid)
-      else
-        app_server = AppiumServer.new
-      end
+      app_server = AppiumServer.new
       app_server.start_server
 
       # Run the tests
@@ -92,12 +85,13 @@ module Cuesmash
     # @param app [String] path to built .app file
     # @param timeout [String] time in seconds to set the newCommandTimeout to.
     #
-    def self.create_appium_txt(platform_name: 'iOS', device_name:, platform_version:, app:, timeout:)
+    def self.create_appium_txt(platform_name: 'iOS', device_name:, platform_version:, app:, timeout:, udid: nil)
       appium = AppiumText.new(platform_name: platform_name,
                               device_name: device_name,
                               platform_version: platform_version,
                               app: app,
-                              new_command_timeout: timeout)
+                              new_command_timeout: timeout,
+                              udid: udid)
       appium.execute
     end
   end # class Command

data/lib/cuesmash/cucumber.rb

@@ -42,21 +42,18 @@ module Cuesmash
 
       status = nil
 
-      Logger.debug "cucumber_command == #{command}"
-
-      Open3.popen3 command do |_stdin, out, err, wait_thr|
-        [out, err].each do |stream|
+      Open3.popen3(command) do |_stdin, stdout, stderr, wait_thr|
+        [stdout, stderr].each do |stream|
           Thread.new do
             until (line = stream.gets).nil?
-              Logger.info line
+              Logger.info "[Cucumber] #{line}"
             end
           end
         end
-
         wait_thr.join
         status = wait_thr.value.exitstatus
       end
-
+      
       if status != 0
         Logger.info 'Cucumber failed'
         status

data/lib/cuesmash/ios_app.rb

@@ -27,7 +27,7 @@ module Cuesmash
     # @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
+    # @param [String] device: nil the UDID of the device to run on or nil if running on simulator
     #
     def initialize(file_name:, build_configuration:, app_name:, device: nil)
       app_name = file_name if app_name.nil?

data/lib/cuesmash/start.rb

@@ -67,10 +67,10 @@ module Cuesmash
       if @config['platform'] == 'iOS'
         # enumerate over each device / OS combination and run the tests.
         @config['devices'].each do |device, oses|
-          oses.each do |os_number, ios_uuid|
-            setup_ios(device: ios_uuid)
+          oses.each do |os_number, ios_udid|
+            setup_ios(device: ios_udid)
             case
-            when ios_uuid.nil?
+            when ios_udid.nil?
               say "\n============================\ntesting iOS #{os_number} on #{device}", :green
               Cuesmash::Command.execute(device: device,
                                         os: os_number,
@@ -92,7 +92,7 @@ module Cuesmash
                                         profile: options[:profile],
                                         quiet: options[:quiet],
                                         timeout: @config['default']['test_timeout'].to_s,
-                                        ios_uuid: @config)
+                                        ios_udid: ios_udid)
             end # case
           end # os each
         end # device each
@@ -164,7 +164,7 @@ module Cuesmash
       end
 
       if @config['platform'] == 'iOS'
-        setup_ios(device: @config['default']['uuid'])
+        setup_ios(device: @config['default']['udid'])
       elsif @config['platform'] == 'Android'
         say 'Setting up android'
         setup_android
@@ -194,7 +194,7 @@ module Cuesmash
       #
       # 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>
+      # @param [string] device: nil <the UDID of the device to run on or nil if running on simulator>
       #
       def setup_ios(device: nil)
         @app = IosApp.new(file_name: options[:scheme].join(' '),
@@ -235,7 +235,8 @@ module Cuesmash
                                           device_name: @config['default']['os'],
                                           platform_version: @config['default']['version'].to_s,
                                           app: @app.app_path,
-                                          new_command_timeout: @config['default']['test_timeout'].to_s)
+                                          new_command_timeout: @config['default']['test_timeout'].to_s,
+                                          udid: @config['default']['udid'])
         appium.execute
       end # ios_appium_text
 

data/spec/appium_text_spec.rb

@@ -4,10 +4,10 @@ describe Cuesmash::AppiumText do
 
   describe "when creating a new instance" do
     before(:all) do
-      @appiumtext = Cuesmash::AppiumText.new(platform_name: "iOS", device_name: "iPhone Simulator", platform_version: "7.1", app: "MyApp", new_command_timeout: "90")
+      @appiumtext = Cuesmash::AppiumText.new(platform_name: "iOS", device_name: "iPhone Simulator", platform_version: "7.1", app: "MyApp", new_command_timeout: "90", udid: "XXXX")
     end
 
-    expected = "[caps]\nplatformName = \"iOS\"\ndeviceName = \"iPhone Simulator\"\nplatformVersion = \"7.1\"\napp = \"MyApp\"\nnewCommandTimeout = \"90\"\n"
+    expected = "[caps]\nplatformName = \"iOS\"\ndeviceName = \"iPhone Simulator\"\nplatformVersion = \"7.1\"\napp = \"MyApp\"\nnewCommandTimeout = \"90\"\nudid = \"XXXX\"\n"
 
     it "should have a platform name" do
       expect(@appiumtext.platform_name).to match("iOS")

data/spec/cucumber_spec.rb

@@ -1,105 +1,82 @@
 require 'spec_helper'
 
 describe Cuesmash::Cucumber do
-
   before(:each) do
     Cuesmash::Cucumber.any_instance.stub(:puts)
   end
 
-  describe "when running the tests" do
-
-    before(:each) do
-      wait = double
-      @value = double
-      wait.stub(:value){@value}
-      wait.stub(:join)
-      Open3.stub(:popen3).and_yield(nil, nil, nil, wait)
-
-      @cucumber = Cuesmash::Cucumber.new(nil, nil, nil)
-      @cucumber.stub(:command)
-    end
-
-    it "should complete if all is well" do
-      @value.stub(:exitstatus){0}
-      @cucumber.should_receive(:completed)
-      @cucumber.test
-    end
-  end
-
-  describe "when generating the command" do
-
-    it "should not add the ios version if missing" do
+  describe 'when generating the command' do
+    it 'should not add the ios version if missing' do
       @cucumber = Cuesmash::Cucumber.new(nil, nil, nil)
       @cucumber.stub(:tag_arguments)
 
-      expect(@cucumber.instance_eval{command}).not_to match(/DEVICE_TARGET/)
+      expect(@cucumber.instance_eval { command }).not_to match(/DEVICE_TARGET/)
     end
 
-    it "should add the format" do
+    it 'should add the format' do
       @cucumber = Cuesmash::Cucumber.new(nil, nil, nil)
-      @cucumber.format = "test-format"
+      @cucumber.format = 'test-format'
 
-      expect(@cucumber.instance_eval{command}).to match(/--format test-format/)
+      expect(@cucumber.instance_eval { command }).to match(/--format test-format/)
     end
 
-    it "should not add the format if missing" do
+    it 'should not add the format if missing' do
       @cucumber = Cuesmash::Cucumber.new(nil, nil, nil)
 
-      expect(@cucumber.instance_eval{command}).not_to match(/--format/)
+      expect(@cucumber.instance_eval { command }).not_to match(/--format/)
     end
 
-    it "should add the output" do
+    it 'should add the output' do
       @cucumber = Cuesmash::Cucumber.new(nil, nil, nil)
-      @cucumber.output = "test-output"
+      @cucumber.output = 'test-output'
 
-      expect(@cucumber.instance_eval{command}).to match(/--out test-output/)
+      expect(@cucumber.instance_eval { command }).to match(/--out test-output/)
     end
 
-    it "should not add the output if missing" do
+    it 'should not add the output if missing' do
       @cucumber = Cuesmash::Cucumber.new(nil, nil, nil)
 
-      expect(@cucumber.instance_eval{command}).not_to match(/--out/)
+      expect(@cucumber.instance_eval { command }).not_to match(/--out/)
     end
 
-    it "should add the tags" do
-      @cucumber = Cuesmash::Cucumber.new(["tag1", "tag2"], nil, nil)
-      expect(@cucumber.instance_eval{command}).to match(/--tags tag1 --tags tag2/)
+    it 'should add the tags' do
+      @cucumber = Cuesmash::Cucumber.new(['tag1', 'tag2'], nil, nil)
+      expect(@cucumber.instance_eval { command }).to match(/--tags tag1 --tags tag2/)
     end
 
-    it "should not add tags if missing" do
+    it 'should not add tags if missing' do
       @cucumber = Cuesmash::Cucumber.new(nil, nil, nil)
-      expect(@cucumber.instance_eval{command}).not_to match(/--tags/)
+      expect(@cucumber.instance_eval { command }).not_to match(/--tags/)
     end
 
-    it "should add the profile" do
-      @cucumber = Cuesmash::Cucumber.new(nil, "test", nil)
-      expect(@cucumber.instance_eval{command}).to match(/--profile test/)
+    it 'should add the profile' do
+      @cucumber = Cuesmash::Cucumber.new(nil, 'test', nil)
+      expect(@cucumber.instance_eval { command }).to match(/--profile test/)
     end
 
-    it "should not add tags if missing" do
+    it 'should not add tags if missing' do
       @cucumber = Cuesmash::Cucumber.new(nil, nil, nil)
-      expect(@cucumber.instance_eval{command}).not_to match(/--profile/)
+      expect(@cucumber.instance_eval { command }).not_to match(/--profile/)
     end
 
-    it "should add the color flag" do
+    it 'should add the color flag' do
       @cucumber = Cuesmash::Cucumber.new(nil, nil, nil)
-      expect(@cucumber.instance_eval{command}).to match(/-c/)
+      expect(@cucumber.instance_eval { command }).to match(/-c/)
     end
 
-    it "should not add quiet if missing" do
+    it 'should not add quiet if missing' do
       @cucumber = Cuesmash::Cucumber.new(nil, nil, nil)
-      expect(@cucumber.instance_eval{command}).not_to match(/--quiet/)
+      expect(@cucumber.instance_eval { command }).not_to match(/--quiet/)
     end
 
-    it "should not add quiet if false" do
+    it 'should not add quiet if false' do
       @cucumber = Cuesmash::Cucumber.new(nil, nil, false)
-      expect(@cucumber.instance_eval{command}).not_to match(/--quiet/)
+      expect(@cucumber.instance_eval { command }).not_to match(/--quiet/)
     end
 
-    it "should add the quiet flag" do
+    it 'should add the quiet flag' do
       @cucumber = Cuesmash::Cucumber.new(nil, nil, true)
-      expect(@cucumber.instance_eval{command}).to match(/--quiet/)
+      expect(@cucumber.instance_eval { command }).to match(/--quiet/)
     end
-
   end
 end

data/spec/test.json

@@ -1 +1 @@
-{"url_preference":"10.1.20.99","port_preference":"4567"}
+{"url_preference":"10.1.19.106","port_preference":"4567"}

metadata

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