appli 0.0.1 → 0.0.3

data/lib/appli/command.rb

@@ -5,6 +5,10 @@ module Appli
       (class << self;self end).send :define_method, :command, &block
     end
     
+    def debug?
+      false
+    end
+    
     def call(options, *args)
       @options = options
       arity = method(:command).arity
@@ -14,14 +18,10 @@ module Appli
       puts "An error occured while excuting your command...\n#{e.message}"
     end
     
-    def use_hirb
-      begin
-        require 'hirb'
-        extend Hirb::Console
-      rescue LoadError
-        puts "Hirb is not installed. Install hirb using '[sudo] gem install hirb' to get cool ASCII tables"
-        Process.exit(1)
-      end
+    private
+    
+    def host
+      application['host']
     end
     
     def application
@@ -36,28 +36,15 @@ module Appli
       @options || Hash.new
     end
 
-    def execute_commands(array)
-      for command in array
-        puts "\e[44;33m" + command + "\e[0m"
-        exit_code = 0
-        IO.popen(command) do |f|
-          output = f.read
-          exit_code = Process.waitpid2(f.pid)[1]
-        end
-        if exit_code != 0
-          $stderr.puts "An error occured running: #{command}"
-          Process.exit(1)
-        end
-      end
-    end
-    
     def git_config_variable(name)
-      if name.is_a?(Symbol)
-        r = `git config appli.#{name.to_s}`.chomp
+      @config_variables = Hash.new if @config_variables.nil?
+      if @config_variables[name]
+        @config_variables[name]
       else
-        r = `git config #{name.to_s}`.chomp
+        r = `git config appli.#{name.to_s}`.chomp
+        puts "Getting configuration variable: appli.#{name.to_s} (was: '#{r}')" if debug?
+        @config_variables[name] = (r.empty? ? nil : r)
       end
-      r.empty? ? nil : r
     end
     
     def api_request(url, username, password, data = nil)
@@ -78,10 +65,14 @@ module Appli
         res.use_ssl = true
         res.verify_mode = OpenSSL::SSL::VERIFY_NONE
       end
+      puts "Requesting '#{url}' on as #{data ? 'POST' : 'GET'}" if debug?
       res = res.request(req, data)
       case res
       when Net::HTTPSuccess
         return res.body
+      when Net::HTTPNotFound
+        puts "Resource not found"
+        Process.exit(1)
       when Net::HTTPServiceUnavailable
         puts "The API is currently unavailable. Please check your codebase account has been enabled for API access."
         Process.exit(1)
@@ -113,14 +104,21 @@ module Appli
     def domain
       git_config_variable(:domain) || 'applihq.com'
     end
-    
-    def get_from_ssh(command)
-      `ssh -p #{application['ssh_port']} app@mercury.uk.applihq.com \"#{command}\"`
-    end
-    
+        
     def ssh(command, filter = //)
-      puts get_from_ssh(command).gsub(filter, '')
+      puts remote_exec(command).gsub(filter, '')
     end
     
+    def remote_exec(command)
+      command = "ssh -p #{application['ssh_port']} app@#{host['name']} \"#{command}\""
+      puts "Executing: #{command}" if debug?
+      `#{command}`
+    end
+        
+    def error(command, exit_code = 1)
+      $stderr.puts command
+      Process.exit(exit_code)
+    end
+        
   end
 end

data/lib/appli.rb

@@ -14,36 +14,36 @@ module Appli
   class NotConfiguredError < StandardError; end
   class MustBeInRepositoryError < StandardError; end
   
-  VERSION = "4.0.0"
+  VERSION = "0.0.3"
   
   def run(command, args = [])
     load_commands
     command = 'help' if command.nil?
-    application = nil
-    commands_array = @global_commands
     
     if @global_commands[command]
-      ## nothing to do...
+      run_command(command, :global, args)
     elsif @application_commands[args.first]
-      application = command
-      command = args.shift
-      commands_array = @application_commands
-    elsif !command.empty?
-      puts "usage: appli #{command} {command}\n\n"
-      command = 'help'
+      run_command(args.shift, :app, ([command] + args))
     else
-      puts "Command not found. Check 'cb help' for full information."
+      puts "usage: appli [command]"
+      puts "Command not found. Check 'appli help' for full information."
       Process.exit(1)
     end  
+  end
+  
+  def run_command(command, type, args = [])
+    array = (type == :global ? @global_commands : @application_commands)
+    
+    options = parse_options(args)    
+    options.merge!({:application => args.shift}) if type == :app
 
-    options = parse_options(args)
-    if args.size < commands_array[command][:required_args].to_i
+    if args.size < array[command][:required_args].to_i
       puts "error: #{commands_array[command][:usage]}"
       puts "See 'cb help #{command}' for usage."
       Process.exit(1)
     end
-    options.merge!({:application => application})
-    commands_array[command][:block].call(options, *args)
+
+    array[command][:block].call(options, *args)
   end
   
   def command(command, options = {}, &block)
@@ -74,6 +74,10 @@ module Appli
     @application_commands
   end
   
+  def commands
+    global_commands.merge(application_commands)
+  end
+  
   def desc(value)
     @next_description = Array.new if @next_description.nil?
     @next_description << value
@@ -88,6 +92,11 @@ module Appli
     @next_flags[key] = value
   end
   
+  def alias(a, b)
+    @aliases = Hash.new if @aliases.nil?
+    @aliases[a] = b
+  end
+  
   def load_commands
     Dir[File.join(File.dirname(__FILE__), 'commands', '*.rb')].each do |path|
       Appli.module_eval File.read(path), path
@@ -139,7 +148,7 @@ Appli.command "help", :global => true do |command|
     puts "For more information see http://www.applihq.com/gem"
     puts "See 'appli help [command]' for usage information."
   else
-    if c = Appli.global_commands[command]
+    if c = Appli.commands[command]
       puts c[:description]
       if c[:usage]
         puts
@@ -164,3 +173,6 @@ Appli.usage "cb version"
 Appli.command "version", :global => true do
   puts "Appli Gem Version #{Appli::VERSION}"
 end
+
+Appli.alias '-v', 'version'
+Appli.alias '-s', 'ssh'

data/lib/commands/mysql.rb

@@ -0,0 +1,50 @@
+desc 'Create a MySQL console connection for your first database'
+usage "appli [application] mysql"
+command "db:console" do
+  database = get("applications/#{@options[:application]}/databases").first
+  if database
+    database = database['database']
+    puts "Connecting to database '#{database['name']}' on '#{database['host']['name']}'"
+    exec("ssh -t -p #{application['ssh_port']} app@#{host['name']} mysql -u #{database['username']} -p#{database['password']} -h #{database['host']['name']} #{database['name']}")
+  else
+    error("No database was not found for this application.")
+  end
+end
+
+desc 'Import a named MySQL file'
+usage "appli [application] db:import {database number} {path to import mysql dump}"
+command "db:import" do |number, path|  
+  error("Import file not found at '#{path}'") unless File.exist?(path)
+  database = get("applications/#{@options[:application]}/databases/#{number}")
+  if database
+    database = database['database']
+    puts "Uploading MySQL export to server..."
+    remote_exec("rm -f ~/.appli_import.sql")
+    system("scp -P #{application['ssh_port']} #{path} app@#{host['name']}:~/.appli_import.sql")
+    puts "Importing database into '#{database['name']}' on '#{database['host']['name']}'..."
+    remote_exec("mysql -u #{database['username']} -p#{database['password']} -h #{database['host']['name']} #{database['name']} < ~/.appli_import.sql")
+  else
+    error "No database was found with number '#{number}'"
+  end
+end
+
+desc 'List all databases on this application'
+usage "appli [application] db"
+command "db" do
+  puts '-' * 85
+  print 'Name'.ljust(15)
+  print 'Username'.ljust(15)
+  print 'Password'.ljust(15)
+  print 'Host'.ljust(30)
+  puts
+  puts '-' * 85
+
+  for database in get("applications/#{@options[:application]}/databases")
+    database = database['database']
+    print database['name'].ljust(15)
+    print database['username'].ljust(15)
+    print database['password'].ljust(15)
+    print database['host']['name'].ljust(30)
+    puts
+  end
+end

data/lib/commands/system.rb

@@ -1,7 +1,7 @@
 desc "Display system memory usage"
 usage "appli mem:system"
 command "mem:system" do
-  puts get_from_ssh("free -m").split("\n")[0,2].join("\n")
+  puts remote_exec("free -m").split("\n")[0,2].join("\n")
 end
 
 desc 'Display passenger memory statistics'
@@ -13,7 +13,7 @@ end
 desc 'Display your current disk space usage'
 usage "appli diskusage"
 command "diskusage" do
-  output = get_from_ssh("df -h").split("\n")[1]
+  output = remote_exec("df -h").split("\n")[1]
   output = output.split(/\s+/)
   fs, size, usage, available, usage_percent, mountpoint = output
   puts "You are using #{usage} (including system files)."
@@ -32,9 +32,21 @@ command "settings", :global => true do
   puts "Domain..........: #{git_config_variable(:domain) || 'unknown'}"
 end
 
-
 desc 'SSH to the named server'
 usage "appli [application] ssh"
 command "ssh" do
-  exec "ssh -p #{application['ssh_port']} app@mercury.uk.applihq.com"
+  exec "ssh -p #{application['ssh_port']} app@#{host['name']}"
+end
+
+desc 'Create a MySQL console connection for your first database'
+usage "appli [application] mysql"
+command "mysql" do
+  database = get("applications/#{@options[:application]}/databases").first
+  if database
+    database = database['database']
+    puts "Connecting to database '#{database['name']}' on '#{database['host']['name']}'"
+    exec("ssh -t -p #{application['ssh_port']} app@#{host['name']} mysql -u #{database['username']} -p#{database['password']} -h #{database['host']['name']} #{database['name']}")
+  else
+    error("No database was not found for this application.")
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: appli
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors: 
 - Adam Cooke
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-04 00:00:00 +00:00
+date: 2010-02-15 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -35,6 +35,7 @@ files:
 - lib/appli/command.rb
 - lib/appli.rb
 - lib/commands/gems.rb
+- lib/commands/mysql.rb
 - lib/commands/system.rb
 has_rdoc: true
 homepage: http://www.atechmedia.com