briar 1.1.9 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98b56c933ad8e12df4177491aea5dc367e55ee2a
-  data.tar.gz: 31e4ec692d6bbe5eebca65c1692c9796e14c2daf
+  metadata.gz: c9ecc887fceb3c02359208fc806597581f774c02
+  data.tar.gz: 260cde8df439b3104b6175e314f745848ab84a7b
 SHA512:
-  metadata.gz: 7a7f35485b7c7dcf8e4358b1b2c51c3b8a0ec4fba1320ee7d206169b5ef0c7d10b68c37c5e3cbd11f7bd62f113a773feee74b6f336332d2c3abfd1f19b9440d4
-  data.tar.gz: b753a5d87d188341cc1ecc66beb72f0ab780145613346941462087b541485f2afacbf146b69a0556b234f3ed4ba366531becb35caad63d2ffeb5767b393de331
+  metadata.gz: bad3293859595a8d44de52650c17d88cc36d7926dda9807d4fb5000b525d96fd07f9353ad9970e5c8dd3f94d9e8284a7d80e4116f4d097ed74844fbbdea4a2d5
+  data.tar.gz: 0a85ce5093500a5920c139cb3ac1d2b00db42e45ae21613a7cd21fcb4ac55f77e55745c3e7a81b912cd08fe93a31c8b571ad20e366496118ee81a68e7ba2e5ec

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+### 1.2.0
+
+* Requires xamarin-test-cloud ~> 1.0; use 1.1.9 for older versions
+* Support for XTC teams and organizations
+* Obscure XTC API token and user name when logging
+
 ### 1.1.9
 
 * Fix errant include in lib/irbrc.rb

data/bin/briar_help.rb

@@ -328,6 +328,7 @@ def print_xtc_help
   #{help_env_var('                 IPA', 'path to the .ipa you submitting')}
   #{help_env_var('        XTC_PROFILES', 'cucumber profiles for the XTC')}
   #{help_env_var('         XTC_ACCOUNT', 'name of a directory in ~/.xamarin/test-cloud/<account> that contains the api token')}
+  #{help_env_var('         XTC_USER', 'your XTC email address')}
   #{help_example_comment('if a build script is defined, the .ipa will be built before submission')}
   #{help_env_var('    IPA_BUILD_SCRIPT', '(optional) script that generates the IPA')}
   #{help_example_comment('if you require other gems besides briar')}

data/bin/briar_xtc.rb

@@ -17,6 +17,7 @@ def briar_xtc_submit(device_set, profile, opts={})
                   :calabash_dev => ENV['XTC_CALABASH_GEM_DEV'] == '1',
                   :async_submit => ENV['XTC_WAIT_FOR_RESULTS'] == '0',
                   :series => ENV['XTC_SERIES'],
+                  :user => ENV['XTC_USER'],
                   :rebuild => true}
 
   opts = default_opts.merge(opts)
@@ -109,19 +110,45 @@ def briar_xtc_submit(device_set, profile, opts={})
     wait = '--no-async'
   end
 
+  ipa = File.expand_path(expect_ipa(opts[:ipa]))
+
+  args = [
+        'submit',
+        ipa,
+        api_key,
+        '-d', device_set,
+        '-c', 'cucumber.yml',
+        '-p', profile,
+        wait
+  ]
+
+  user = opts[:user]
+  if user
+    args << '--user'
+    args << user
+  end
+
   if opts[:series]
-    series = "--series #{opts[:series]}"
-  else
-    series = ''
+    args << '--series'
+    args << opts[:series]
   end
 
-  ipa = File.expand_path(expect_ipa(opts[:ipa]))
+  print_args = args.dup
+
+  obscured_key = "#{api_key[0,1]}***#{api_key[api_key.length-1,1]}"
+  print_args[args.index(api_key)] = obscured_key
+
+  if user
+    obscured_user = "#{user[0,1]}***#{user[user.length-1,1]}"
+    print_args[args.index(user)] = obscured_user
+  end
 
-  cmd = "test-cloud submit #{ipa} #{api_key} -d #{device_set} -c cucumber.yml -p #{profile} #{wait} #{series}"
+  puts Rainbow("EXEC: cd #{staging_dir}").cyan
+  puts Rainbow("EXEC: test-cloud version => #{`test-cloud version`.strip}").cyan
+  puts Rainbow("EXEC: test-cloud #{print_args.join(' ')}").cyan
 
-  puts Rainbow("cd #{staging_dir}; #{cmd}").green
   Dir.chdir(staging_dir) do
-    exec cmd
+    exec('test-cloud', *args)
   end
 end
 

data/briar.gemspec

@@ -30,21 +30,14 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version = '>= 1.9.3'
 
   gem.add_runtime_dependency 'rbx-require-relative', '~> 0.0'
-  gem.add_runtime_dependency 'calabash-cucumber', '>= 0.9.168'
-  gem.add_runtime_dependency 'dotenv', '~> 1.0.2'
-  gem.add_runtime_dependency 'ansi', '~> 1.4'
+  gem.add_runtime_dependency 'calabash-cucumber', '>= 0.12', '< 1.0'
+  gem.add_runtime_dependency 'dotenv', '~> 1.0'
+  gem.add_runtime_dependency 'ansi', '~> 1.5'
   gem.add_runtime_dependency 'rainbow', '~> 2.0'
-  # Downgrade because of xtc gem wants ~> 1.3.3.1.
-  gem.add_runtime_dependency 'retriable', '< 1.5', '>= 1.3'
-  # Test cloud requires 1.3.5.
-  gem.add_runtime_dependency 'bundler', '< 2.0', '>= 1.3.5'
-  gem.add_runtime_dependency 'xamarin-test-cloud', '< 1.0', '>= 0.9.35'
-  gem.add_runtime_dependency 'rake', '~> 10.3'
-
-  # Would like to use 1.2.
-  # https://github.com/xamarin/test-cloud-command-line/issues/3
-  # https://github.com/LessPainful/lesspainfulformatter/pull/1
-  gem.add_runtime_dependency 'syntax', '~> 1.0'
+  gem.add_runtime_dependency 'retriable'
+  gem.add_runtime_dependency 'bundler'
+  gem.add_runtime_dependency 'xamarin-test-cloud', '~> 1.0'
+  gem.add_runtime_dependency 'rake'
 
   gem.add_development_dependency 'travis', '~> 1.7'
   gem.add_development_dependency 'yard', '~> 0.8'

data/lib/briar/version.rb

@@ -1,3 +1,3 @@
 module Briar
-  VERSION = '1.1.9'
+  VERSION = '1.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: briar
 version: !ruby/object:Gem::Version
-  version: 1.1.9
+  version: 1.2.0
 platform: ruby
 authors:
 - Joshua Moody
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-22 00:00:00.000000000 Z
+date: 2015-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbx-require-relative
@@ -30,42 +30,48 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.168
+        version: '0.12'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.168
+        version: '0.12'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: ansi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
@@ -84,90 +90,58 @@ dependencies:
   name: retriable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: xamarin-test-cloud
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.35
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.35
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.3'
-- !ruby/object:Gem::Dependency
-  name: syntax
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: travis
   requirement: !ruby/object:Gem::Requirement
@@ -424,6 +398,6 @@ rubyforge_project:
 rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: briar-1.1.9
+summary: briar-1.2.0
 test_files: []
 has_rdoc: