appli 0.0.6 → 0.0.7

data/lib/appli/command.rb

@@ -47,16 +47,27 @@ module Appli
       end
     end
     
-    def api_request(url, username, password, data = nil)
+    def api_request(url, username, password, data = nil, method = nil)
       require 'uri'
       require 'net/http'
       require 'net/https'
       uri = URI.parse(url)
-      if data
-        req = Net::HTTP::Post.new(uri.path)
+      
+      if method.nil?
+        method = (data ? :post : :get)
+      end
+            
+      req = case method
+      when :post
+        Net::HTTP::Post.new(uri.path)
+      when :delete
+        Net::HTTP::Delete.new(uri.path)
+      when :put
+        Net::HTTP::Put.new(uri.path)
       else
-        req = Net::HTTP::Get.new(uri.path)
+        Net::HTTP::Get.new(uri.path)
       end
+
       req.basic_auth(username, password)
       req.add_field("Accept", "application/json")
       req.add_field("Content-type", "application/json")
@@ -65,7 +76,7 @@ module Appli
         res.use_ssl = true
         res.verify_mode = OpenSSL::SSL::VERIFY_NONE
       end
-      puts "Requesting '#{url}' on as #{data ? 'POST' : 'GET'}" if debug?
+      puts "Requesting '#{url}' on as #{method.to_s.upcase}" if debug?
       res = res.request(req, data)
       case res
       when Net::HTTPSuccess
@@ -93,12 +104,12 @@ module Appli
       JSON.parse(api(path))
     end
     
-    def api(path, data = nil)
-      api_request("http://#{domain}/#{path}", git_config_variable(:username), git_config_variable(:apikey), data)
+    def api(path, data = nil, method = nil)
+      api_request("http://#{domain}/#{path}", git_config_variable(:username), git_config_variable(:apikey), data, method)
     end
     
-    def api_on_app(path, data = nil)
-      api("applications/#{@options[:application]}/#{path}", data)
+    def api_on_app(path, data = nil, method = nil)
+      api("applications/#{@options[:application]}/#{path}", data, method)
     end
     
     def domain
@@ -114,11 +125,20 @@ module Appli
       puts "Executing: #{command}" if debug?
       `#{command}`
     end
+    
+    def ssh_exec(command)
+      exec("ssh -p #{application['ssh_port']} app@#{host['name']} \"#{command}\"")
+    end
         
     def error(command, exit_code = 1)
       $stderr.puts command
       Process.exit(exit_code)
     end
-        
+    
+    def display_errors
+      for key, value in JSON.parse(errors)
+        puts " * #{key.capitalize} #{value}"
+      end
+    end
   end
 end

data/lib/appli.rb

@@ -14,7 +14,7 @@ module Appli
   class NotConfiguredError < StandardError; end
   class MustBeInRepositoryError < StandardError; end
   
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
   
   def run(command, args = [])
     load_commands
@@ -173,6 +173,3 @@ 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/apps.rb

@@ -1,6 +1,6 @@
 desc 'Display a list of all applications which you have access to'
-usage "appli apps"
-command "apps", :global => true do
+usage "appli list"
+command "list", :global => true do
   apps = get("applications")
   
   hash = [[:name, "Name", 30], [:identifier , "Identifier", 30], [:ssh_port, "SSH Port", 12], [:host, "Host", 30]]
@@ -34,9 +34,7 @@ command "create", :global => true, :required_args => 1 do |identifier|
   result = api('applications', {:application => {:identifier => identifier, :name => identifier}}.to_json)
   if errors
     puts "\nAn error occured while creating your application:"
-    for e in JSON.parse(errors)
-      puts "  * #{e.join(' ')}"
-    end
+    display_errors
     puts
     Process.exit(1)
   else

data/lib/commands/domains.rb

@@ -0,0 +1,40 @@
+desc 'List all domains configured for this application'
+usage "appli [application] domains:list"
+command "domains:list" do 
+  domains = JSON.parse(api_on_app("domains"))
+  for domain in domains
+    extra = ''
+    extra = '(primary)' if domain['domain']['primary']
+    extra = '(redirect)' if domain['domain']['redirect']
+    puts " * #{domain['domain']['domain']} #{extra}"
+  end
+end
+
+desc "Add a new domain for this application"
+usage "appli [application] domains:add {domain} {options}"
+command "domains:add", :required_args => 1 do |name, options|
+  options = "" if options.nil?
+  if api_on_app("domains", {:domain => {:domain => name, :redirect => options.include?('redirect')}}.to_json)
+    puts "Domain '#{name}' added successfully."
+  else
+    puts "An error occured while adding your domain:"
+    display_errors
+  end
+end
+
+desc 'Remove a domain from this application'
+usage "appli [application] domains:remove {domain}"
+command "domains:remove", :required_args => 1 do |name|
+  domains = JSON.parse(api_on_app('domains'))
+  domain  = domains.select{|d| d['domain']['domain'] == name}.first
+  if domain
+    if api_on_app("domains/#{domain['domain']['id']}", nil, :delete)
+      puts "Domain ('#{name}') removed successfully"
+    else
+      error "Domain could not be removed at this time."
+    end
+  else
+    error "Domain ('#{name}') does not exist within this application"
+  end
+end
+

data/lib/commands/gems.rb

@@ -15,7 +15,7 @@ class FakeGemfile
 end
 
 desc "Read in the specified Gemfile and install all the required gems on your application"
-usage "appli gems:import"
+usage "appli [application] gems:import {path to file}"
 command "gems:import" do |file|
   file_to_import = File.expand_path(file || 'Gemfile')
   unless File.exist?(file_to_import)
@@ -38,9 +38,9 @@ command "gems:import" do |file|
   end
 end
 
-desc "Install the named gem"
-usage "appli gems:install [gem name] [version]"
-command "gems:install" do |name, version|
+desc "Install the provided gem on your application's container"
+usage "appli [application] gems:install {gem name} {version]"
+command "gems:install", :required_args => 1 do |name, version|
   puts "Installing #{name} (#{version || 'latest'})"
   data = {:ruby_gem => {:name => name, :version => version || ''}}.to_json
   if a = api_on_app("ruby_gems", data)
@@ -51,7 +51,7 @@ command "gems:install" do |name, version|
   end
 end
 
-desc "List all installed gems on your application"
+desc "List all installed gems for your application"
 usage "appli gems"
 command "gems" do
   ssh "gem list"

data/lib/commands/keys.rb

@@ -0,0 +1,14 @@
+desc "Upload your local public key to your appli user account"
+usage "appli keys:add {key file}"
+command "keys:add", :global => true do |file|
+  file = "#{ENV['HOME']}/.ssh/id_rsa.pub" if file.nil?
+  error("Key file not found at '#{file}'") unless File.file?(file)
+  key_data = File.read(file).chomp
+  data = {:key => {:key => key_data}}.to_json
+  if api("settings/keys", data)
+    puts "SSH key uploaded successfully from '#{file}'"
+  else
+    puts "Sorry, an error occured while adding your key. Please check the errors below:"
+    display_errors
+  end
+end

data/lib/commands/logs.rb

@@ -0,0 +1,6 @@
+desc "View a log file on the remote system locally"
+usage "appli [application] log {log file}"
+command "log" do |file|
+  file = "~/app/current/log/production.log" if file.nil?
+  ssh_exec "tail -f -n 200 #{file}"  
+end

data/lib/commands/mysql.rb

@@ -30,7 +30,7 @@ end
 
 desc 'List all databases on this application'
 usage "appli [application] db"
-command "db" do
+command "db:list" do
   puts '-' * 85
   print 'Name'.ljust(15)
   print 'Username'.ljust(15)

data/lib/commands/ssh.rb

@@ -0,0 +1,5 @@
+desc 'Create an SSH connection to the application'
+usage "appli [application] ssh"
+command "ssh" do
+  exec "ssh -p #{application['ssh_port']} app@#{host['name']}"
+end

data/lib/commands/{system.rb → stats.rb}

@@ -24,16 +24,3 @@ command "diskusage" do
   puts "Your system is limited to #{size} however if you need additional"
   puts "space, please just contact support."
 end
-
-desc "Display the current settings"
-command "settings", :global => true do
-  puts "Username........: #{git_config_variable(:username) || 'unknown'}"
-  puts "API Key.........: #{git_config_variable(:apikey) || 'unknown'}"
-  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@#{host['name']}"
-end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: appli
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - Adam Cooke
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-16 00:00:00 +00:00
+date: 2010-02-19 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -36,9 +36,13 @@ files:
 - lib/appli.rb
 - lib/commands/apps.rb
 - lib/commands/cap.rb
+- lib/commands/domains.rb
 - lib/commands/gems.rb
+- lib/commands/keys.rb
+- lib/commands/logs.rb
 - lib/commands/mysql.rb
-- lib/commands/system.rb
+- lib/commands/ssh.rb
+- lib/commands/stats.rb
 has_rdoc: true
 homepage: http://www.atechmedia.com
 licenses: []