xamarin-test-cloud 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3bb3083c76ac65cf97cf48cb078a0fbaf4ca3c89
-  data.tar.gz: 37c34ea52400e49a5cfa3625cf9e46bd5b51ead3
+  metadata.gz: 9f60e55bbba9205215510389613c5c60672d9983
+  data.tar.gz: 237e950267809c66173d8d388593a5b598865c63
 SHA512:
-  metadata.gz: 55eaef0687df106aac48f41f00f8fee3d3bd1319b50e06368ee77787fd85be0fe08e0f99ed64f2a955d4fde7258bff3de35f566b2a00cf1f5f767fffc4a2eb16
-  data.tar.gz: ec10ec80d8bdb23942941d1627346c1a14d02b0a04e879d0a6bfb3250ee325a8eba534886053c1e7c10ba17713587180233873d19cd8f8d538881ce113d98e68
+  metadata.gz: c5696ca55bd8e3c6fde7043b000ffc8dd97d4bab99aa7f5a5e2aa4a7f8bdb52bbd7a64e31a7ea0443aaebb59bb1f8a6938e2a2901fc6c0ce680a647ee4b67390
+  data.tar.gz: a93037446d255ead1f82a3397fcf6cc879091d28cec34378ef03c3e95776478218e3b5053a6719d331142fd528c843e3ef2245e1e661069c6e6a7b726e136aa2

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

@@ -20,6 +20,7 @@ require "xamarin-test-cloud/calabash_version_detector"
 require 'securerandom'
 require 'open3'
 require "bundler"
+require 'pathname'
 
 trap "SIGINT" do
   puts "Exiting"
@@ -37,8 +38,11 @@ module XamarinTestCloud
     attr_accessor :app, :api_key, :appname, :test_parameters, :user,
                   :config, :profile, :skip_config_check, :dry_run,
                   :device_selection, :pretty, :async, :async_json, :priority, :endpoint_path,
+                  :include_files_input,
                   :locale, :series, :session_id
 
+    attr_writer   :included_files_map
+
     def self.exit_on_failure?
       true
     end
@@ -130,6 +134,16 @@ module XamarinTestCloud
                   :type => :boolean,
                   :default => false
 
+
+    #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 => []
+
     method_option 'dry-run',
                   :desc => "Sanity check only, don't upload",
                   :aliases => '-s',
@@ -218,6 +232,8 @@ module XamarinTestCloud
 
       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
 
@@ -243,6 +259,8 @@ module XamarinTestCloud
         end
       end
 
+      self.included_files_map = parse_included_folders
+
       if Environment.debug?
         puts "Host = #{self.host}"
         puts "User = #{self.user}"
@@ -255,6 +273,7 @@ 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
       end
 
 
@@ -761,7 +780,8 @@ and try submitting again.
       def collect_test_suite_files(tmpdir)
         files = collect_files_from_features +
           collect_files_from_tmpdir(tmpdir) +
-          collect_gemfile_files(tmpdir)
+          collect_gemfile_files(tmpdir) +
+          collect_included_files(tmpdir)
 
         if config
           files << config
@@ -806,6 +826,17 @@ and try submitting again.
         end
       end
 
+      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)
+          end
+        end
+        collected_files
+      end
+
       # Returns a list of digests
       # @param [Array<TestFile>] test_files A list of TestFile instances.
       def collect_test_suite_file_digests(test_files)
@@ -1018,6 +1049,51 @@ and try submitting again.
         self.config = TestFile.cucumber_config(config_path)
       end
 
+      def included_files_map
+        @included_files_map ||= parse_included_folders
+      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
+        end
+        parsed_included_folders
+      end
+
+      def validate_include_folder!(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?
+          raise ValidationError, %Q[
+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[
+Only expanded relative target paths are allowed.
+
+Requested target folder includes '..'.
+
+Specified include options: #{self.include_files_input}"
+        ]
+        end
+      end
+
       def expect_features_directory_in_workspace
         path = derived_workspace
         features = File.join(path, "features")

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xamarin-test-cloud
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Karl Krukow
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-06 00:00:00.000000000 Z
+date: 2016-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -103,16 +103,22 @@ dependencies:
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: 2.7.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: 2.7.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
@@ -316,6 +322,7 @@ 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
@@ -344,9 +351,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Command-line interface to Xamarin Test Cloud
 test_files: []
-has_rdoc: