bin/briar_xtc.rb in briar-1.1.9 vs bin/briar_xtc.rb in briar-1.2.0

@@ -15,10 +15,11 @@
                   :xtc_staging_dir => expect_xtc_staging_dir(),
                   :briar_dev => ENV['XTC_BRIAR_GEM_DEV'] == '1',
                   :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)
 
   build_script = opts[:build_script]
@@ -107,22 +108,48 @@
     wait = '--async'
   else
     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
 
-  cmd = "test-cloud submit #{ipa} #{api_key} -d #{device_set} -c cucumber.yml -p #{profile} #{wait} #{series}"
+  obscured_key = "#{api_key[0,1]}***#{api_key[api_key.length-1,1]}"
+  print_args[args.index(api_key)] = obscured_key
 
-  puts Rainbow("cd #{staging_dir}; #{cmd}").green
+  if user
+    obscured_user = "#{user[0,1]}***#{user[user.length-1,1]}"
+    print_args[args.index(user)] = obscured_user
+  end
+
+  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
+
   Dir.chdir(staging_dir) do
-    exec cmd
+    exec('test-cloud', *args)
   end
 end
 
 
 def briar_xtc(args)