xamarin-test-cloud 2.0.3 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f60e55bbba9205215510389613c5c60672d9983
-  data.tar.gz: 237e950267809c66173d8d388593a5b598865c63
+  metadata.gz: 7179d836cc88e3266185b3d9cd68afa6b8272681
+  data.tar.gz: 50bb75d45e930271faaa5a28ae6f718895790a6d
 SHA512:
-  metadata.gz: c5696ca55bd8e3c6fde7043b000ffc8dd97d4bab99aa7f5a5e2aa4a7f8bdb52bbd7a64e31a7ea0443aaebb59bb1f8a6938e2a2901fc6c0ce680a647ee4b67390
-  data.tar.gz: a93037446d255ead1f82a3397fcf6cc879091d28cec34378ef03c3e95776478218e3b5053a6719d331142fd528c843e3ef2245e1e661069c6e6a7b726e136aa2
+  metadata.gz: 2adca474985c4505d9dbe98b5ae5c0e0da1365d921578328f2a3a21a7f13d84fdc8ef07e405cb638b8042bb3543602b49b642bac55117bc37fb9c796d5ed9573
+  data.tar.gz: 2ed5fcd3105e9622d69c1e88318b4c64bf4fced3bc516877c7cc6804385739f46337fe7acafba81e2f80a0fb2681b8531b09f7d35d6eda65c1f9f739bde642f9

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+### 2.1.0
+
+* CLI#collect\_files\_with\_glob should collect . files and skip anything
+  under \_\_MACOSX #89
+* Fix the collection of included files #87
+* Add `prepare` command to generate an upload manifest #85
+
+### 2.0.3
+
+* CLI: add calabash=true to upload data #82
+* Support --include flag #81
+* Gem: force HTTPClient 2.7.1 or higher #80
+
 ### 2.0.2
 
 * Use otool-classic to check for the CalabashServer whenever it is

data/lib/xamarin-test-cloud/cli.rb

@@ -41,7 +41,7 @@ module XamarinTestCloud
                   :include_files_input,
                   :locale, :series, :session_id
 
-    attr_writer   :included_files_map
+    attr_reader   :included_files_map
 
     def self.exit_on_failure?
       true
@@ -63,6 +63,7 @@ module XamarinTestCloud
     FILE_UPLOAD_ENDPOINT = 'upload2'
     FORM_URL_ENCODED_ENDPOINT = 'upload'
 
+    MANIFEST_SCHEMA_VERSION = "1.0.0"
 
     def self.source_root
       File.join(File.dirname(__FILE__), '..')
@@ -134,8 +135,7 @@ module XamarinTestCloud
                   :type => :boolean,
                   :default => false
 
-
-    #A list of items which are files or folders in the workspace.
+    # A list of items which are files or folders in the workspace.
     # Must be a path relative to workspace and
     # must not refer outside (e.g. no usage of ../ etc).  Example --include .xtc foo
     method_option 'include',
@@ -188,27 +188,8 @@ module XamarinTestCloud
         $stdout = @async_log
       end
 
-      app_path = File.expand_path(app)
-      unless File.exist?(app_path)
-        raise ValidationError, "App is not a file: #{app_path}"
-      end
-
-      if shared_runtime?(app_path)
-        puts "Xamarin Test Cloud doesn't yet support shared runtime apps."
-        puts "To test your app it needs to be compiled for release."
-        puts "You can learn how to compile you app for release here:"
-        puts "http://docs.xamarin.com/guides/android/deployment%2C_testing%2C_and_metrics/publishing_an_application/part_1_-_preparing_an_application_for_release"
-        # TODO Change this to: "Shared runtime apps are not supported."
-        raise ValidationError, "Aborting"
-      end
-
-      app_extension = File.extname(app_path)
-      unless /ipa/i.match(app_extension) || /apk/i.match(app_extension)
-        raise ValidationError, "App #{app_path} must be an .ipa or .apk file"
-      end
-
-
-      self.app = app_path
+      # Verifies the app argument and sets the @app instance variable
+      verify_app!(app)
 
       self.user = options['user']
 
@@ -230,36 +211,15 @@ module XamarinTestCloud
 
       self.priority = options['priority']
 
-      self.skip_config_check = options['skip-config-check']
 
       self.include_files_input = options['include']
 
       # Resolves the workspace and sets the @derived_workspace variable.
       expect_features_directory_in_workspace
 
-      # TODO: extract this method and the configuration branch below to a module
-      parse_and_set_config_and_profile
-      unless self.skip_config_check
-        default_config = File.join(derived_workspace, 'config', 'cucumber.yml')
-        # TODO .config/cucumber.yml is valid
-        # TODO cucumber.yaml is valid
-        if File.exist?(default_config) && self.config.nil?
-          # TODO Reword the header.
-          log_header 'Warning: Detected cucumber.yml config file, but no --config specified'
-
-          # TODO Reword the message and pass to raise as message.
-          puts "Please specify --config #{default_config}"
-          puts 'and specify a profile via --profile'
-          puts 'If you know what you are doing you can skip this check with'
-          puts '--skip-config-check'
-
-          # TODO This error message is wrong.
-          # It should be cucumber.yml detected by no --config option set.
-          raise ValidationError, "#{default_config} detected but no profile selected."
-        end
-      end
-
-      self.included_files_map = parse_included_folders
+      # Verifies the --config and --profile options and sets these variables:
+      # @config, @profile, @skip_config_check
+      verify_cucumber_config_and_profile!
 
       if Environment.debug?
         puts "Host = #{self.host}"
@@ -273,11 +233,10 @@ module XamarinTestCloud
         puts "Config = #{self.config}"
         puts "Profile = #{self.profile}"
         puts "dSym = #{self.dsym}"
-        puts "Include = #{self.included_files_map}" if self.included_files_map
+        puts "Include = #{included_files_map}"
       end
 
-
-      #Argument parsing done
+      # Argument parsing done
 
       test_jon_data = submit_test_job(device_selection_data)
       if self.dry_run
@@ -332,11 +291,197 @@ module XamarinTestCloud
       end
     end
 
+    desc "prepare <APP>",
+         "Prepares workspace and creates a manifest of files to be uploaded for test"
+    method_option :config,
+                  :desc => "Cucumber configuration file (cucumber.yml)",
+                  :aliases => "-c",
+                  :type => :string
+
+    method_option :profile,
+                  :desc => "Profile to run (profile from Cucumber configuration file)",
+                  :aliases => "-p",
+                  :type => :string
+
+    method_option :workspace,
+                  :desc => "Alternate path to your Calabash workspace",
+                  :aliases => "-w",
+                  :type => :string
+
+    method_option "test-parameters",
+                  :desc => "Example: -params username:nat@xamarin.com password:xamarin)",
+                  :aliases => "-params",
+                  :type => :hash,
+                  :default => {}
+
+    method_option "skip-config-check",
+                  :desc => "Force running without Cucumber profile (cucumber.yml)",
+                  :type => :boolean,
+                  :default => false
+
+    method_option "artifacts-dir",
+                  :desc => "Directory where the test files should be staged.",
+                  :type => :string,
+                  :required => true
+
+    # A list of items which are files or folders in the workspace.
+    # Must be a path relative to workspace and
+    # must not refer outside (e.g. no usage of ../ etc).  Example --include .xtc foo
+    method_option 'include',
+                  :desc => 'Include folders or files in workspace in addition the features folder.',
+                  :aliases => '-i',
+                  :type => :array,
+                  :default => []
+
+    def prepare(app)
+      @include_files_input = options[:include]
+      artifact_directory = File.expand_path(options["artifacts-dir"])
+
+      # Validates and sets the @app instance variable.
+      verify_app!(app)
+
+      # Resolves the workspace and sets the @derived_workspace variable.
+      expect_features_directory_in_workspace
+
+      # Verifies the --config and --profile options and sets these variables:
+      # @config, @profile, @skip_config_check
+      verify_cucumber_config_and_profile!
+
+      require "xamarin-test-cloud/tmpdir"
+      bundle_package_dir = XamarinTestCloud::TmpDir.mktmpdir
+
+      stage_gemfile_and_bundle_package(bundle_package_dir)
+
+      files = collect_test_suite_files(bundle_package_dir)
+
+      FileUtils.mkdir_p(artifact_directory)
+      manifest_file = File.join(artifact_directory, "manifest.json")
+
+      log_header("Preparing the Artifact Directory")
+      test_parameters = options["test-parameters"]
+
+      manifest = generate_manifest_hash(files, test_parameters)
+      write_manifest_to_file(manifest, manifest_file)
+
+      puts ""
+      puts "Copied files to:"
+      puts "  #{File.expand_path(artifact_directory)}"
+      puts ""
+      puts "Wrote upload manifest to:"
+      puts "  #{File.expand_path(manifest_file)}"
+
+      files.each do |test_file|
+        target = File.join(artifact_directory, test_file.remote_path)
+        basedir = File.dirname(target)
+        FileUtils.mkdir_p(basedir)
+        FileUtils.cp(test_file.path, target)
+      end
+
+    end
 
     default_task :submit
 
     no_tasks do
 
+      # TODO: move to separate module/class
+      def expect_app_exists_at_path(app_path)
+        unless File.exist?(File.expand_path(app_path))
+          raise ValidationError, %Q[
+App does not exist at path:
+
+#{File.expand_path(app_path)}
+
+]
+        end
+      end
+
+      # TODO: move to separate module/class
+      def expect_apk_or_ipa(app_path)
+        app_extension = File.extname(app_path)
+        unless /ipa/i.match(app_extension) || /apk/i.match(app_extension)
+          raise ValidationError, %Q[
+App must be an .ipa or .apk file.  Found:
+
+#{app_path}
+
+with extension: #{app_extension}
+
+]
+        end
+      end
+
+      # TODO: move to separate module/class
+      def expect_no_shared_runtime(app_path)
+        if shared_runtime?(app_path)
+          raise ValidationError, %Q[
+Xamarin Test Cloud does not support shared runtime apps.
+
+To test your app it needs to be compiled for release.
+
+You can learn how to compile your app for release here:
+
+http://docs.xamarin.com/guides/android/deployment%2C_testing%2C_and_metrics/publishing_an_application/part_1_-_preparing_an_application_for_release
+
+]
+        end
+      end
+
+      # TODO: move to separate module/class
+      def expect_ipa_linked_with_calabash(app_path)
+        # Cannot use #is_ios because that method depends on the @app instance
+        # variable which is not set when this method is called.
+        return nil if !app_path.end_with?(".ipa")
+
+        # otool does not exist in non-macOS environments.  We have to rely on
+        # the Test Cloud to perform the validation.
+        return nil if !Environment.macos_env?
+
+        require "xamarin-test-cloud/tmpdir"
+        tmpdir = TmpDir.mktmpdir
+
+        unzip_file(app_path, tmpdir)
+
+        payload_dir = File.join(tmpdir, "Payload")
+
+        if !File.directory?(payload_dir)
+          raise ValidationError, %Q[
+Did not find a Payload directory after expanding the ipa.
+
+#{app_path}
+
+The .ipa was not packaged correctly.
+
+]
+        end
+
+        app_dir = Dir.foreach("#{tmpdir}/Payload").find { |d| /\.app$/.match(d) }
+        res = check_for_calabash_server(tmpdir, app_dir)
+
+        if /CalabashServer/.match(res)
+          puts "ipa: #{app_path} *contains* calabash.framework"
+        else
+          raise ValidationError, %Q[
+
+The ipa does not contain an app that is linked with Calabash.
+
+Your app must link the calabash.framework at compile time or it must dynamically
+load (in code) a Calabash dylib.
+
+https://github.com/calabash/calabash-ios/wiki/Tutorial%3A-How-to-add-Calabash-to-Xcode
+]
+        end
+      end
+
+      def verify_app!(app_path)
+        expanded = File.expand_path(app_path)
+        expect_app_exists_at_path(expanded)
+        expect_apk_or_ipa(expanded)
+        expect_no_shared_runtime(expanded)
+        expect_ipa_linked_with_calabash(expanded)
+
+        @app = expanded
+      end
+
       def dsym
         if @dsym.nil?
           value = options["dsym-file"]
@@ -437,10 +582,6 @@ module XamarinTestCloud
           log "Packaging gems in: #{tmpdir}"
         end
 
-        # TODO Move to common expect_valid_application
-        # TODO Rename: does not need to extract a test server
-        verify_app_and_extract_test_server
-
         stage_gemfile_and_bundle_package(tmpdir)
 
         log_header('Verifying dependencies')
@@ -469,6 +610,7 @@ module XamarinTestCloud
         log_header('Uploading negotiated files')
 
         upload_data = {
+          'calabash' => true,
           'files' => digests_and_files,
           'paths' => remote_paths,
           'user' => self.user,
@@ -794,10 +936,16 @@ and try submitting again.
         files
       end
 
+      def collect_file?(path)
+        File.file?(path) &&
+          File.basename(path) != ".DS_Store" &&
+          !path[/__MACOSX/]
+      end
+
       # Returns file paths as Strings
       def collect_files_with_glob(glob)
-        Dir.glob(glob).select do |path|
-          File.file?(path)
+        Dir.glob(glob, File::FNM_DOTMATCH).select do |path|
+          collect_file?(path)
         end
       end
 
@@ -828,10 +976,26 @@ and try submitting again.
 
       def collect_included_files(tmpdir)
         collected_files = []
-        self.included_files_map.each_pair do |src, dest|
-          FileUtils.cp_r(src, File.join(tmpdir,dest))
-          collect_files_with_glob(File.join(tmpdir,dest,"**","*")).map do |file|
-            collected_files << TestFile.new(file, tmpdir)
+        included_files_map.each_pair do |source, target|
+          # Use File.expand_path to handle the Windows case where the user passes:
+          # --workspace "test-cloud\ios"
+          # --include ".xtc\sample.txt"
+          #
+          # A File.join will result in:
+          #   /path/to/test-cloud/ios/.xtc\sample.txt
+          # because the join naively appends the ".xtc\sample.txt"
+          # Use File.expand_path to handle the /
+          tmp_target = File.expand_path(File.join(tmpdir, target))
+
+          FileUtils.mkdir_p(File.dirname(tmp_target))
+          FileUtils.cp_r(source, tmp_target)
+
+          if File.directory?(tmp_target)
+            collect_files_with_glob(File.join(tmpdir,target,"**","*")).map do |file|
+              collected_files << TestFile.new(file, tmpdir)
+            end
+          else
+            collected_files << TestFile.new(tmp_target, tmpdir)
           end
         end
         collected_files
@@ -893,30 +1057,6 @@ and try submitting again.
         end
       end
 
-      # TODO: move to separate module/class
-      # TODO: fix the detection algorithm - it is broken
-      # TODO: remove the Frank check
-      # https://github.com/xamarinhq/test-cloud-command-line/issues/19
-      def validate_ipa(ipa)
-        result = false
-        dir = Dir.mktmpdir #do |dir|
-
-        unzip_file(ipa, dir)
-        unless File.directory?("#{dir}/Payload") #macos only
-          raise ValidationError, "Unzipping #{ipa} to #{dir} failed: Did not find a Payload directory (invalid .ipa)."
-        end
-        app_dir = Dir.foreach("#{dir}/Payload").find { |d| /\.app$/.match(d) }
-        res = check_for_calabash_server(dir, app_dir)
-
-        if /CalabashServer/.match(res)
-          puts "ipa: #{ipa} *contains* calabash.framework"
-          result = :calabash
-        end
-
-        result
-      end
-
-
       def log(message)
         if message.is_a? Array
           message.each { |m| log(m) }
@@ -934,27 +1074,6 @@ and try submitting again.
         end
       end
 
-      # TODO: rename: does not need to extract or return the server
-      def verify_app_and_extract_test_server
-        server = nil
-
-        unless File.exist?(app)
-          raise ValidationError, "No such file: #{app}"
-        end
-        unless (/\.(apk|ipa)$/ =~ app)
-          raise ValidationError, '<APP> should be either an ipa or apk file.'
-        end
-        if is_ios? && Environment.macos_env?
-          log_header('Checking ipa for linking with Calabash')
-          server = validate_ipa(app)
-          abort_unless(server) do
-            puts 'The .ipa file does not seem to be linked with Calabash.'
-            puts 'Verify that your app is linked correctly.'
-          end
-        end
-        server
-      end
-
       # TODO Rename or remove; abort is not the right verb - use exit
       # +1 for remove
       def abort(&block)
@@ -982,12 +1101,15 @@ and try submitting again.
       end
 
       # TODO Move to a module
+      # TODO Needs tests
       def shared_runtime?(app_path)
         f = files(app_path)
         f.any? do |file|
           filename = file[:filename]
           if filename.end_with?("libmonodroid.so")
-            file[:size] < 120 * 1024 && f.none? { |x| x[:filename] == filename.sub("libmonodroid.so", "libmonosgen-2.0.so") }
+            file[:size] < 120 * 1024 && f.none? do |x|
+              x[:filename] == filename.sub("libmonodroid.so", "libmonosgen-2.0.so")
+            end
           end
         end
       end
@@ -1001,52 +1123,186 @@ and try submitting again.
         end
       end
 
-      # TODO: extract to a module
-      # TODO: replace unless/else branches
-      def parse_and_set_config_and_profile
-        config_path = options[:config]
 
-        if !config_path
-          self.config = false
-          return
+      # TODO: extract this method to a module
+      # TODO: .config/cucumber.yml is a valid cucumber profile
+      # TODO: cucumber.yaml and cucumber.yml are both valid names
+      #
+      # Raises if there is config/cucumber.yml file but no --config option is
+      # passed.
+      #
+      # Check can be skipped by passing --skip-config-check.
+      #
+      # This method, sadly, has a preconditions: @config and @skip_config_check
+      # must be set correctly before calling this method.
+      def expect_config_option_if_cucumber_config_file_exists
+        return nil if config
+        return nil if skip_config_check
+
+        default_config = File.join(derived_workspace, "config", "cucumber.yml")
+        if File.exist?(default_config)
+          raise ValidationError, %Q[
+Detected a cucumber configuration file, but no --config option was specified.
+
+#{default_config}
+
+You can pass the cucumber configuration file to the uploader using:
+
+--config #{default_config}
+
+and specify a profile using the --profile option.
+
+You can skip this check using the --skip-config-check option, but this is not
+recommended.
+
+]
         end
+      end
 
-        if config_path
-          config_path = File.expand_path(config_path)
-          unless File.exist?(config_path)
-            raise ValidationError, "Config file does not exist #{config_path}"
-          end
+      # TODO: extract this method to a module
+      def resolve_cucumber_config_path(path)
+        return nil if !path
 
-          begin
-            config_yml = YAML.load(ERB.new(File.read(config_path)).result)
-          rescue Exception => e
-            puts "Unable to parse #{config_path} as yml. Is this your Cucumber.yml file?"
-            raise ValidationError, e
-          end
+        expanded = File.expand_path(path)
+        return expanded if expanded == path
 
-          if Environment.debug?
-            puts 'Parsed Cucumber config as:'
-            puts config_yml.inspect
+        workspace = derived_workspace
+        # Use File.expand_path to handle the Windows case where the user passes:
+        # --workspace "test-cloud\ios"
+        # --config "config\cucumber.yml"
+        #
+        # A File.join will result in:
+        #   /path/to/test-cloud/ios/config\cucumber.yml
+        # because the join naively appends the "config\cucumber.yml".
+        File.expand_path(File.join(workspace, path))
+      end
+
+      # TODO: extract this method to a module
+      #
+      # Sets @config to a TestFile instance
+      # Sets @skip_config_check to option passed on the CLI
+      # Sets @profile to option passed on the CLI
+      #
+      # Raises if there is problem parsing or interpreting the profile with
+      # respect to the configuration file.
+      #
+      # Raises if there is config/cucumber.yml file but no --config option is
+      # passed.
+      def verify_cucumber_config_and_profile!
+        config = options[:config]
+        profile = options[:profile]
+
+        if profile && !config
+          raise ValidationError, %Q[
+
+The --profile option was set without a --config option.
+
+If a --profile is specified, then a cucumber configuration file is required.
+
+https://github.com/cucumber/cucumber/wiki/cucumber.yml
+
+]
+        end
+
+        # Defaults to false
+        @skip_config_check = options["skip-config-check"]
+
+        if !config
+          @config = nil
+          @profile = nil
+          expect_config_option_if_cucumber_config_file_exists
+        else
+          config_path = resolve_cucumber_config_path(config)
+
+          if !File.exist?(config_path)
+            raise ValidationError, %Q[
+File specified by --config option does not exist:
+
+#{config_path}
+
+]
           end
 
-          profile = options[:profile]
-          unless profile
-            raise ValidationError, 'Config file provided but no profile selected.'
+          if profile
+            expect_profile_exists_in_cucumber_config(config_path, profile)
+            @profile = profile
           else
-            unless config_yml[profile]
-              raise ValidationError, "Config file provided did not contain profile #{profile}."
-            else
-              puts "Using profile #{profile}..."
-              self.profile = profile
-            end
-          end
-        else
-          if options[:profile]
-            raise ValidationError, 'Profile selected but no config file provided.'
+            @profile = nil
           end
+          @config = TestFile.cucumber_config(config_path)
+        end
+      end
+
+      # TODO: extract this method to a module
+      def expect_profile_exists_in_cucumber_config(config_path, profile)
+        config_yml = {}
+
+        begin
+          config_yml = YAML.load(ERB.new(File.read(config_path)).result)
+        rescue => e
+          raise ValidationError, %Q[
+
+#{e.message}
+
+Unable to parse --config option as yml:
+
+#{config_path}
+
+]
+        end
+
+        if Environment.debug?
+          puts "Parsed Cucumber config as:"
+          puts config_yml.inspect
+        end
+
+        if !config_yml[profile]
+          raise ValidationError, %Q[
+The cucumber configuration file specified by the --config option does not
+contain the profile specified by --profile option:
+
+   :config => #{config_path}
+  :profile => #{profile}
+
+]
         end
+      end
+
+      # TODO Make --include'd paths generic when possible (see code comment below)
+      def generate_manifest_hash(test_files, test_parameters)
+        files = test_files.map do |test_file|
+          path = test_file.remote_path
+          if path[/features/]
+            "features"
+          elsif path[/vendor/]
+            "vendor"
+          else
+            # --include'd files.  It is not possible to filter these to a single
+            # directory without inspecting the --include option itself.
+            # Consider the example where --include is `config/xtc-users.json`.
+            # We cannot filter to `config` because the config directory might
+            # include a cucumber.yml or some other file that the user does _not_
+            # want to upload.
+            path
+          end
+        end.uniq!
+
+        {
+          schemaVersion: MANIFEST_SCHEMA_VERSION,
+          files: files,
+          testFramework: {
+            name: "calabash",
+            data: test_parameters
+          }
+        }
+      end
+
+      def write_manifest_to_file(manifest, manifest_file)
+        json = JSON.pretty_generate(manifest)
 
-        self.config = TestFile.cucumber_config(config_path)
+        File.open(manifest_file, "w:UTF-8") do |file|
+          file.write(json)
+        end
       end
 
       def included_files_map
@@ -1054,24 +1310,24 @@ and try submitting again.
       end
 
       def parse_included_folders
-        return {} unless self.include_files_input
         basedir = derived_workspace
-        parsed_included_folders = {}
-        self.include_files_input.each do |folder|
-          src = File.join(basedir, folder)
-          validate_include_folder!(src, folder)
-          parsed_included_folders[src]=folder
+        source_target_map = {}
+        include_files_input.each do |file|
+          source = File.join(basedir, file)
+          expect_valid_included_file(source, file)
+          source_target_map[source] = file
         end
-        parsed_included_folders
+        source_target_map
       end
 
-      def validate_include_folder!(src, tgt)
+      def expect_valid_included_file(src, tgt)
         unless File.exists?(src)
           raise ValidationError, %Q[
 Requested include folder: #{src} does not exist.
 
 Specified include options: #{self.include_files_input}
-          ]
+
+]
         end
         tgt_pathname = Pathname.new(tgt)
         if tgt_pathname.absolute?
@@ -1081,7 +1337,8 @@ Only relative target path names are allowed.
 Requested target folder: #{tgt} is an absolute file name.
 
 Specified include options: #{self.include_files_input}"
-          ]
+
+]
         end
         if /\.\./.match(tgt)
           raise ValidationError, %Q[
@@ -1090,10 +1347,12 @@ Only expanded relative target paths are allowed.
 Requested target folder includes '..'.
 
 Specified include options: #{self.include_files_input}"
-        ]
+
+]
         end
       end
 
+      # TODO rename to verify_workspace!
       def expect_features_directory_in_workspace
         path = derived_workspace
         features = File.join(path, "features")
@@ -1114,6 +1373,7 @@ You have two options:
 See also
 
 $ test-cloud help submit
+
 ])
       end
 
@@ -1134,7 +1394,7 @@ $ test-cloud help submit
       end
 
       def detect_workspace(options)
-        options["workspace"] || File.expand_path(".")
+        options[:workspace] || File.expand_path(".")
       end
 
       def expect_workspace_directory(path)
@@ -1233,6 +1493,8 @@ Check your local Gemfile and and the remote Gemfile at:
         $?.exitstatus == 0
       end
 
+      # TODO: Server detection algorithm might be broken.
+      # https://github.com/xamarinhq/test-cloud-command-line/issues/19
       def check_for_calabash_server(dir, app_dir)
         if system("xcrun --find otool-classic &> /dev/null")
           otool_cmd = "xcrun otool-classic"

data/lib/xamarin-test-cloud/dsym.rb

@@ -1,13 +1,11 @@
 module XamarinTestCloud
 
   # TODO validate dsym against the current application.
-  # 1. put the dSYM.zip and .ipa in a directory
-  # 2. $ unzip <the>.ipa
-  # 3. $ unzip <the>.dSYM.zip
-  # 4. $ xcrun dwarfdump --uuid Payload/My.app/My
-  # 5. $ xcrun dwarfdump --uuid My.app.dSYM
-  # 6. confirm that they match.
-  class Dsym
+  # https://github.com/xamarinhq/test-cloud-command-line/issues/91
+  #
+  # TODO dsym-file can be relative to workspace
+  # https://github.com/xamarinhq/test-cloud-command-line/issues/92
+class Dsym
 
     attr_reader :path
 

data/lib/xamarin-test-cloud/test_file.rb

@@ -76,13 +76,13 @@ expanded: #{expanded}
     end
 
     def remote_path
-      @remote_path ||= lambda do
+      @remote_path ||= begin
         require "pathname"
         absolute = Pathname.new(path)
         root  = Pathname.new(basedir)
         relative = absolute.relative_path_from(root)
         relative.to_s
-      end.call
+      end
     end
 
     private

data/lib/xamarin-test-cloud/version.rb

@@ -1,3 +1,3 @@
 module XamarinTestCloud
-  VERSION = "2.0.3"
+  VERSION = "2.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xamarin-test-cloud
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.1.0
 platform: ruby
 authors:
 - Karl Krukow
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-28 00:00:00.000000000 Z
+date: 2016-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -322,7 +322,6 @@ files:
 - bin/test-cloud
 - lib/xamarin-test-cloud/calabash_version_detector.rb
 - lib/xamarin-test-cloud/cli.rb
-- lib/xamarin-test-cloud/cli.rb alias
 - lib/xamarin-test-cloud/dsym.rb
 - lib/xamarin-test-cloud/environment.rb
 - lib/xamarin-test-cloud/http/payload.rb
@@ -351,7 +350,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Command-line interface to Xamarin Test Cloud