duostack 0.2.1 → 0.3.0

data/bin/duostack

@@ -28,7 +28,7 @@ $client = File.basename(__FILE__)
 module Duostack
   class Client
     
-    VERSION = '0.2.1'
+    VERSION = '0.3.0'
     DEPENDENCIES_LAST_MODIFIED = 1298683372
     USER_AGENT = "duostack-#{VERSION}"
     
@@ -49,7 +49,8 @@ module Duostack
       :user    => [                  # commands requiring credentials (first-time setup)
         'create',
         'list',
-        'sync'
+        'sync',
+        'billing_reset'
       ],
       :app     => [                  # commands requiring an app to be specified (either by git inference or flag)
         'logs',
@@ -61,7 +62,8 @@ module Duostack
         'config',
         'env',
         'access',
-        'domains'
+        'domains',
+        'instances'
       ],
       :compound => [                 # mult-part commands that expect subsequent arguments, must validate extra args on their own
         'help',
@@ -70,7 +72,8 @@ module Duostack
         'config',
         'env',
         'access',
-        'domains'
+        'domains',
+        'instances'
       ]
     }
     
@@ -419,6 +422,9 @@ module Duostack
     
     def api_get(endpoint, params=nil, timeout=20)
       
+      # store previous request
+      @previous_request = [endpoint, params, timeout]
+      
       url = "#{api_host}/api/#{endpoint}?#{@credentials}"
       
       url += "&app_name=#{@app_name}" if @app_name
@@ -427,6 +433,23 @@ module Duostack
       curl_get(url, timeout)
     end
     
+    # just retries last api_get, optionally passing additional params
+    def api_retry(params=nil)
+      exit false if @previous_request.empty?
+      
+      # add in additional params
+      if params
+        if @previous_request[1]
+          @previous_request[1] = "#{@previous_request[1]}&#{params}"
+        else
+          @previous_request[1] = params
+        end
+      end
+      
+      # retry
+      api_get(*@previous_request)
+    end
+    
     def curl_get(url, timeout=nil)
       command = "curl -s -A '#{USER_AGENT}' -w '\n%{http_code}'" # use w flag to append http status code, set user-agent header
       command += " --cacert #{ca_cert_location}" if ca_cert_location # use our own certificate if present
@@ -448,6 +471,11 @@ module Duostack
         exit_with result
       end
       
+      if status == 402
+        print result          # prints error message and prompt
+        return verify_account # handles input and retrying
+      end
+      
       case (status / 100) # just get the class of status, e.g. any 4xx code will become 4
       when 2 # success, return result sans status code
         return result
@@ -458,6 +486,15 @@ module Duostack
       end
     end
     
+    def verify_account
+      response = $stdin.gets.chomp.downcase
+      
+      # unless response is yes or blank (default yes), exit
+      exit unless response == 'yes'
+      
+      api_retry("billing_confirmed=1")
+    end
+    
     def sentencize(array, conjunction='or')
       # http://stackoverflow.com/questions/2038787/join-array-contents-into-an-english-list
       case array.length
@@ -504,6 +541,11 @@ module Duostack
       # empty method, just makes sure credentials are set
     end
     
+    # internal method for testing, just resets the billing confirmation prompt
+    def billing_reset
+      puts api_get('test_reset_billing_verification')
+    end
+    
     def list
       puts api_get('list_apps')
     end
@@ -654,6 +696,56 @@ module Duostack
       })
     end
     
+    def instances
+      
+      arg = @args.shift || 'show' # show is the default
+      
+      # instance only takes one arg so any remaning ones are invalid
+      unless @args.empty?
+        exit_with("unrecognized argument: '#{@args.first}', run '#{@client} help #{@command}' for usage")
+      end
+      
+      action = if arg == 'show'
+        :show
+      else
+        case arg[0..0]
+        when '+' then :add
+        when '-' then :remove
+        else :set
+        end
+      end
+      
+      # process numerical argument unless listing
+      if action != :show
+        # drop the plus/minus sign to get qty (if add/remove)
+        qty = if action == :set
+          arg
+        else
+          arg[1..-1]
+        end
+      end
+      
+      # ensure qty is a plain integer at this point
+      begin
+        qty = Integer(qty)
+      rescue ArgumentError # this is what Integer() throws if its arg isn't convertible to an int
+        exit_with "'#{@command}' requires a numerical argument, try '#{@command} [+/-]<quantity>'"
+      end
+      
+      
+      # finally, process action
+      case action
+      when :show
+        puts api_get("count_instances")
+      when :add
+        puts api_get("set_instances", "qty=#{qty}&type=inc")
+      when :remove
+        puts api_get("set_instances", "qty=#{qty}&type=dec")
+      when :set
+        puts api_get("set_instances", "qty=#{qty}")
+      end
+    end
+    
     
     module Help
       
@@ -705,6 +797,7 @@ module Duostack
               env [<operation>]             Manage environment variables
               access [<operation>]          Manage app collaborator access
               domains [<operation>]         Manage custom domains
+              instances [<operation>]       Manage app instance count
             
             App Commands - Ruby:
               console                       Connect to IRB/Rails console
@@ -926,6 +1019,31 @@ module Duostack
           EOF
         end
         
+        def instances
+          <<-EOF
+            
+            Usage:
+              #{$client} instances                  shows current instance count
+              #{$client} instances <qty>            sets instance count to <qty>
+              #{$client} instances +<qty>           increments instance count by <qty> 
+              #{$client} instances -<qty>           decrements instance count by <qty>
+            
+            Examples:
+              #{$client} instances                  shows current instance count
+              #{$client} instances 5                sets instance count to 5
+              #{$client} instances +2               increments instance count by 2
+              #{$client} instances -2               decrements instance count by 2
+            
+            Adjusts instance count, either setting absolutely, or incrementing/decrementing
+            by a given quantity.
+            
+            Any increment, decrement, or set command that would result in an invalid 
+            instance count will be rejected with an error message. Instance counts must be
+            greater than 0 and not greater than 15.
+            
+          EOF
+        end
+        
         def console
           <<-EOF
             

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: duostack
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 1
-  version: 0.2.1
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Todd Eichel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-28 00:00:00 -05:00
+date: 2011-03-03 00:00:00 -05:00
 default_executable: 
 dependencies: []