deis-rails 1.0.9 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a26e3de617087db46be70072c1050e3cb80b0b71
-  data.tar.gz: 8d54648720abe39d4d99aeb68204d53dcb8593e6
+  metadata.gz: ad463eea94421dcb4c862d3f380662754c5fb4e0
+  data.tar.gz: 78be3f0f6959e59b2dcb1ff859b6102452f9ba97
 SHA512:
-  metadata.gz: 8ffc49c088988240519bc973da1ae0e9ef00c70eac7d4ec4320163ccc7fca6fd52cebc85a94bedf584b1c57e9c43f3ff83c98fbf8b6f7c06477efc40b409d4af
-  data.tar.gz: b466b6e0049bf5fcc00c3e09ee24424b7a0140ccfa66233423d1a623a3694089962047735a08df7bd760c896102b2235b2cf68827b3efb20595efc7cc743c0cf
+  metadata.gz: b930098220e801aa0280a3b146953853a6025fd332564f4b283478b094cf8dec2a0a96fc02aade387c2c5ba0f44b3f9111d2f51b90e6ed839eafbefc8ea6f5c1
+  data.tar.gz: bf169fbf0b60e307544ee6dfe0c3952f59ef4451e96330a91038faccb625a75827637acad9f4d770ad5d31f2ed671aa71f38bd8390412c17491eff7c7e495074

data/lib/deis/helpers.rb

@@ -1,10 +1,20 @@
-  require 'pty'
+require 'pty'
 require 'benchmark'
 
 module Deis
+
+  def self.retry_counter
+    @retry_counter ||= 0
+  end
+
+  def self.retry_counter=(int)
+    @retry_counter = int
+  end
+
   module Helpers
 
     def run_util(name, *args)
+      reset_retry!
       status = false
       time   = Benchmark.realtime do
         status = get_runner(name).new(*args).run
@@ -30,6 +40,19 @@ module Deis
       false
     end
 
+    def increment_retry!
+      Deis.retry_counter += 1
+    end
+
+    def reset_retry!
+      Deis.retry_counter == 0
+    end
+
+    def should_retry?
+      increment_retry!
+      Deis.retry_counter <= 3
+    end
+
     def status(msg)
       msg = "| #{msg} |"
       sep = ''.ljust(msg.size, '-')
@@ -75,20 +98,27 @@ module Deis
     rescue Errno::ENOENT
       deis_local_command *cmds
     rescue Deis::NonZeroExitError => e
-      deis_command :login, username: ENV['DEIS_USERNAME'], password: ENV['DEIS_PASSWORD']
-      (@retry_count += 1) > 3 ? raise(e) : retry
+      raise e unless should_retry?
+      deis_login!
+      retry
     end
 
     def deis_local_command(*cmds)
       @retry_count ||= 0
-      shell('./deis', *cmds).tap { @retry_count = nil }
+      shell('./deis', *cmds).tap { reset_retry! }
     rescue Errno::ENOENT => e
+      raise e unless should_retry?
       shell 'curl -sSL http://deis.io/deis-cli/install.sh | sh -s 1.6.1'
       singleton_class.send :alias_method, :deis_command, :deis_local_command
-      (@retry_count += 1) > 3 ? raise(e) : retry
+      retry
     rescue Deis::NonZeroExitError => e
-      deis_command :login, username: ENV['DEIS_USERNAME'], password: ENV['DEIS_PASSWORD']
-      (@retry_count += 1) > 3 ? raise(e) : retry
+      raise(e) unless should_retry?
+      deis_login!
+      retry
+    end
+
+    def deis_login!
+      deis_command :login, ENV['DEIS_CONTROLLER_URL'], username: ENV['DEIS_USERNAME'], password: ENV['DEIS_PASSWORD']
     end
 
     def git_clone(url, flags = {})

data/lib/deis/version.rb

@@ -1,3 +1,3 @@
 module Deis
-  VERSION = "1.0.9  "
+  VERSION = "1.0.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deis-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.10
 platform: ruby
 authors:
 - Jason Waldrip