spaceship 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6a3c818e30dc1104176737eb6b122347a533a4d
-  data.tar.gz: 0cdad36a2f668ea79dff96eb82c40d9a2a8e31f8
+  metadata.gz: 86c6e8217bad88bfdb0c32ab0e02fd732a95ca36
+  data.tar.gz: 606504429db1051598fd6e7b0bcfeab99c477ab2
 SHA512:
-  metadata.gz: bc714965c65ca0e17be95cd9a9825cedef4c3708100b05862db1ff60be617426efdc0d4e9943566c90c5a6913ccc5e8ed692105463eb0df814f646418f4f9b3c
-  data.tar.gz: 7c30613baa1293ccba3a33e744c952e2e05b24eb05d3cb42ab8937cd68a006e5711e7b3e9c7e61b4677809cd1467f8f140a6f47ca9186214ae64f8f31641b156
+  metadata.gz: d3f690107bdde045e9db60a376260adfe6b78e11a06483ca08022971e3aa523d1cb7f1399683f4cd6f60164bce86a8c3edf95ef7e391709c96c9df6d8e84769a
+  data.tar.gz: b59835d27eeb8024631863ac30891bbf60a451e4a419573ffb74224249cb8cb22ac373d878b71e7f3cc39170326b7a5da41fb1c99d19a7752b5158b10fd7c056

data/lib/spaceship/client.rb

@@ -366,7 +366,7 @@ module Spaceship
 
         return @client.send(method, url_or_path, params, headers, &block)
 
-      rescue Faraday::TimeoutError => ex
+      rescue Faraday::Error::TimeoutError => ex # New Farday version: Faraday::TimeoutError => ex
         unless (tries -= 1).zero?
           sleep 3
           retry

data/lib/spaceship/ui/select_team.rb

@@ -36,14 +36,24 @@ module Spaceship
 
         raise "Your account is in no teams" if teams.count == 0
 
-        user_team = (ENV['FASTLANE_TEAM_ID'] || '').strip
-        if user_team
+        team_id = (ENV['FASTLANE_TEAM_ID'] || '').strip
+        team_name = (ENV['FASTLANE_TEAM_NAME'] || '').strip
+
+        if team_id.length > 0
+          # User provided a value, let's see if it's valid
+          teams.each_with_index do |team, i|
+            return team_id if (team['teamId'].strip == team_id)
+            return team_id if (team['currentTeamMember']['teamMemberId'].to_s.strip == team_id)
+          end
+          puts "Couldn't find team with ID '#{team_id}'"
+        end
+
+        if team_name.length > 0
           # User provided a value, let's see if it's valid
-          puts "Looking for team with ID '#{user_team}'"
           teams.each_with_index do |team, i|
-            return user_team if (team['teamId'].strip == user_team)
+            return team['teamId'] if (team['name'].strip == team_name)
           end
-          puts "Couldn't find team with ID '#{user_team}'"
+          puts "Couldn't find team with Name '#{team_name}'"
         end
 
 
@@ -58,7 +68,7 @@ module Spaceship
             puts "#{i + 1}) #{team['teamId']} #{team['name']} (#{team['type']})"
           end
 
-          selected = $stdin.gets.strip.to_i - 1
+          selected = ($stdin.gets || '').strip.to_i - 1
           team_to_use = teams[selected] if selected >= 0
 
           return team_to_use['teamId'] if team_to_use

data/lib/spaceship/version.rb

@@ -1,3 +1,3 @@
 module Spaceship
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spaceship
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Stefan Natchev
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-27 00:00:00.000000000 Z
+date: 2015-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: credentials_manager