duostack 0.3.0 → 0.4.0

data/Rakefile

@@ -13,5 +13,5 @@ Jeweler::Tasks.new do |gem|
   gem.authors = "Todd Eichel"
   gem.require_paths = ['.'] # default is ["lib"] but we don't have that
   
-  gem.executables = ["duostack", ".duostack-console-expect"]
+  gem.executables = ["duostack", ".duostack-expect", ".duostack-console-expect"]
 end

data/bin/.duostack-console-expect

@@ -1,3 +1,4 @@
 #!/usr/bin/env ruby
 
-exec(File.join(File.dirname(__FILE__), 'bash', File.basename(__FILE__)) + ' ' + ARGV[0])
+args_string = ARGV.collect { |a| "'#{a}'" }.join(' ')
+exec(File.join(File.dirname(__FILE__), 'bash', File.basename(__FILE__)) + ' ' + args_string)

data/bin/.duostack-expect

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+
+args_string = ARGV.collect { |a| "'#{a}'" }.join(' ')
+exec(File.join(File.dirname(__FILE__), 'bash', File.basename(__FILE__)) + ' ' + args_string)

data/bin/bash/.duostack-console-expect

@@ -1,7 +1,18 @@
 #!/usr/bin/env expect
-set appname [lindex $argv 0]
 
-spawn -noecho ssh cli-console@duostack.net 
-expect "Connecting to Ruby console for "
-send "$appname...\n"
-interact
+set timeout 3600
+
+set client  [lindex $argv 0]
+set type    [lindex $argv 1]
+set prompt  [lindex $argv 2]
+set command [lindex $argv 3]
+set appname [lindex $argv 4]
+
+spawn $client console $type --app $appname
+expect $prompt
+send "\r"
+send -- "[read [open $command r]]"
+send "\r"
+expect $prompt
+send "exit\r"
+expect eof

data/bin/bash/.duostack-expect

@@ -0,0 +1,9 @@
+#!/usr/bin/env expect
+set target   [lindex $argv 0]
+set message  [lindex $argv 1]
+set response [lindex $argv 2]
+
+spawn -noecho ssh $target
+expect $message
+send "$response...\n"
+interact

data/bin/duostack

@@ -28,13 +28,14 @@ $client = File.basename(__FILE__)
 module Duostack
   class Client
     
-    VERSION = '0.3.0'
+    VERSION = '0.4.0'
     DEPENDENCIES_LAST_MODIFIED = 1298683372
     USER_AGENT = "duostack-#{VERSION}"
     
     DEFAULTS = {
       :credentials_location => '~/.duostack',
-      :remote_name => 'duostack'
+      :remote_name => 'duostack',
+      :console_type => 'app'
     }
     
     FLAGS = [                        # app and remote get special handling
@@ -53,6 +54,7 @@ module Duostack
         'billing_reset'
       ],
       :app     => [                  # commands requiring an app to be specified (either by git inference or flag)
+        'info',
         'logs',
         'restart',
         'ps',
@@ -68,6 +70,7 @@ module Duostack
       :compound => [                 # mult-part commands that expect subsequent arguments, must validate extra args on their own
         'help',
         'create',
+        'console',
         'rake',
         'config',
         'env',
@@ -77,6 +80,28 @@ module Duostack
       ]
     }
     
+    CONSOLES = {
+      :app => {
+        :target => 'cli-console@duostack.net',
+        :display_type => 'Ruby',
+        :display_name_suffix => '',
+        :prompt => '>> '
+      },
+      :mysql => {
+        :target => 'cli-dbconsole@duostack.net',
+        :display_type => 'database',
+        :display_name_suffix => ' (mysql)',
+        :prompt => 'mysql> '
+      },
+      :mongodb => {
+        :target => 'cli-dbconsole@duostack.net',
+        :display_type => 'database',
+        :display_name_suffix => ' (mongodb)',
+        :prompt => '> '
+      }
+    }
+    
+    
     def initialize(args=[], client='duostack')
       @args = args
       @client = client
@@ -225,8 +250,15 @@ module Duostack
         puts "First-time Duostack client setup"
         print "Email: "
         username = $stdin.gets.chomp
-        password = `bash -c 'read -sp "Password: " passwd; echo $passwd'`.chomp
-        puts '' # clears the line after
+        print "Password: "
+        begin
+          # http://stackoverflow.com/questions/133719/how-to-read-a-password-in-ruby
+          system "stty -echo"
+          password = $stdin.gets.chomp
+          puts '' # clears the line after
+        ensure
+          system "stty echo" # this is important
+        end
         
         username = CGI::escape(username)
         password = CGI::escape(password)
@@ -574,6 +606,11 @@ module Duostack
     end
     
     
+    def info
+      puts api_get('get_info')
+    end
+    
+    
     def logs
       puts api_get('get_logs')
     end
@@ -609,12 +646,65 @@ module Duostack
     def console
       # TODO: just use ruby expect lib
       
-      # first check for expect dependency
+      # get console and ensure it's valid
+      arg = (@args.shift || DEFAULTS[:console_type]).downcase
+      console = CONSOLES.fetch(arg.to_sym) do |invalid_type|
+        exit_with "invalid console type given ('#{invalid_type}'), try #{sentencize(CONSOLES.keys.collect { |k| k.to_s})}"
+      end
+      
+      # take piped input first as command, fall back to using remaining command line args
+      if $stdin.tty?
+        console_command = @args.join(' ') unless @args.empty?
+        @args.clear
+      else
+        console_command = ''
+        $stdin.each_line { |line| console_command << line }
+      end
+      
+      # we're finished processing args any remaning ones are invalid
+      unless @args.empty?
+        exit_with("unrecognized argument: '#{@args.first}', run '#{@client} help #{@command}' for usage")
+      end
+      
+      # check for expect dependency
       if `which expect`.empty?
         exit_with "missing dependency, please install Expect (http://expect.sourceforge.net/)"
       end
       
-      exec("#{$dir}/.duostack-console-expect #{@app_name}")
+      if console_command
+        
+        # generate console command filename
+        timestamp = begin
+          t = Time.now
+          "#{t.to_i}.#{t.usec}"
+        end
+        console_command_file = File.join('/tmp', "ds-#{timestamp}.txt")
+        
+        # write console command to file
+        file = File.new(console_command_file, 'w+')
+        file.chmod(0600)
+        file.write(console_command)
+        file.close
+        
+        result = `#{$dir}/.duostack-console-expect '#{File.join($dir, $client)}' '#{arg}' '#{console[:prompt]}' '#{console_command_file}' '#{@app_name}'`
+        
+        # clean up command file
+        File.delete(console_command_file)
+        
+        # munge results
+        result = result.split("\r\n")
+        start  = (result.index("#{console[:prompt]}")     || 0) + 2
+        stop   = (result.index("#{console[:prompt]}exit") || 0) - 1
+        result = result.slice(start..stop)
+        
+        # clean up ruby return value marker
+        result[-1] = result[-1][3..-1] if arg == 'app'
+        
+        puts result.join("\r\n")
+        
+      else
+        exec("#{$dir}/.duostack-expect '#{console[:target]}' 'Connecting to #{console[:display_type]} console for ' '#{@app_name}#{console[:display_name_suffix]}'")
+      end
     end
     
     
@@ -789,10 +879,12 @@ module Duostack
               version                       Show version of this Duostack client
             
             App Commands:
+              info                          Show app summary information
               logs                          Retrieve server logs
               restart                       Restart instances
               ps                            List instances with current status
               destroy                       Destroy Duostack App and associated data
+              console [<type> [command]]    Connect to app or database console, run command
               config [<name> [<setting>]]   Show or set configuration options
               env [<operation>]             Manage environment variables
               access [<operation>]          Manage app collaborator access
@@ -800,7 +892,6 @@ module Duostack
               instances [<operation>]       Manage app instance count
             
             App Commands - Ruby:
-              console                       Connect to IRB/Rails console
               rake [<command>]              Run a Rake command
             
           EOF
@@ -856,12 +947,22 @@ module Duostack
           EOF
         end
         
+        def info
+          <<-EOF
+            
+            Usage: #{$client} info
+            
+            Retrieves a summary of app data, e.g. Git remote URL, instance count, etc.
+            
+          EOF
+        end
+        
         def logs
           <<-EOF
             
             Usage: #{$client} logs
             
-            Retreives aggregate logs from all of the app's instances.
+            Retrieves aggregate logs from all of the app's instances.
             
           EOF
         end
@@ -888,7 +989,7 @@ module Duostack
             
             Usage: #{$client} ps
             
-            Retreives a listing of all of the app's instances with status information
+            Retrieves a listing of all of the app's instances with status information
             (uptime) for each.
             
           EOF
@@ -1039,7 +1140,7 @@ module Duostack
             
             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.
+            greater than 0.
             
           EOF
         end
@@ -1047,12 +1148,56 @@ module Duostack
         def console
           <<-EOF
             
-            Usage: #{$client} console
+            Usage:
+              #{$client} console [<type> [<command>]]
+                                           launches console session of <type> (defaults to
+                                           'app' console), optionally runs specified
+                                           <command> in console and prints the result
+              
+              #{$client} console <type> <command> > <output-file>
+                                           pipes the output from running <command> to the
+                                           specified <output-file>
+              
+              #{$client} console <type> < <input-file>
+                                           pipes the contents of <input-file> into the
+                                           specified console <type>, prints the result
+            
+            Examples:
+              #{$client} console           same as running "#{$client} console app"
+              #{$client} console app       launches interactive app console (Ruby apps only)
+              #{$client} console mysql     launches interactive MySQL database console
+              #{$client} console mongodb   launches interactive MongoDB database console
+              
+              #{$client} console app "puts('hello world')"
+              #{$client} console mysql "SHOW TABLES;"
+                                           runs the specified command and prints the result
+              
+              #{$client} console mysql "SHOW TABLES;" > tables.txt
+                                           runs "SHOW TABLES;" in the app's MySQL console,
+                                           piping output into the file "tables.txt"
+              
+              #{$client} console mysql < import.sql
+                                           (EXPERIMENTAL) pipes the contents of "import.sql"
+                                           into the app's MySQL console, printing the result
+            
+            The "console" command can operate in three ways:
+            
+            1. Launching an interactive console session with your app or one of its
+            databases. If no argument is given, it connects to the app console itself
+            (applicable only to Ruby apps). If a database name is given, connects to a
+            database console session for that database. Valid database names are: mysql,
+            mongodb.
+            
+            You can use then use these interactive console sessions to make any action you
+            would normally make in your app or database console.
             
-            Launches an interactive IRB/console session with your app. You can use this to
-            make any action you would normally make in your app's console.
+            2. Running an ad-hoc command specified on the command line in the remaining
+            arguments, and printing the result. You could also then pipe the output into an
+            arbitrary file.
             
-            Applicable only to Ruby applications.
+            3. (EXPERIMENTAL) Sending the contents of a piped-in file to the specified (app
+            or database) console. The resulting output will be collected and printed to your
+            terminal.
             
           EOF
         end
@@ -1069,7 +1214,7 @@ module Duostack
             Passing of environment variables if your rake task requires them is supported
             (e.g. rake db:seed MODEL=Posts).
             
-            Applicable only to Ruby applications.
+            Applicable only to Ruby apps.
             
           EOF
         end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: duostack
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Todd Eichel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-03 00:00:00 -05:00
+date: 2011-03-20 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -23,6 +23,7 @@ description: "Duostack command line client: create and manage Duostack apps"
 email: todd@toddeichel.com
 executables: 
 - duostack
+- .duostack-expect
 - .duostack-console-expect
 extensions: []
 
@@ -31,7 +32,9 @@ extra_rdoc_files: []
 files: 
 - Rakefile
 - bin/.duostack-console-expect
+- bin/.duostack-expect
 - bin/bash/.duostack-console-expect
+- bin/bash/.duostack-expect
 - bin/duostack
 - vendor/duostack-startcom.pem
 has_rdoc: true