aptible-cli 0.3.7 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8fdc0e031ed20f6fa6ace7447351b6390ca0570
-  data.tar.gz: 239283ab9b3631162c089d068392dfd50e4c708e
+  metadata.gz: 21e712a5221f979075e3b6f8db27ced161633d66
+  data.tar.gz: 37333c2bf6da584560dad729525432d41f758598
 SHA512:
-  metadata.gz: 97e7e0f9092b65921d299fa2ea0102ce90cf169e9e978fbe82c6c2f2de5abf81a21169faaf91597e374be53a0f942244ea1e35acda7a52cf0d84de9419703b9c
-  data.tar.gz: e26cd49d39e8d27b9f87149b7d2048da4028ae69e7944a61e06ad78e2ae9d4f8cefdc3bd20cf667ef0d69613509c12a061a5a9e44188da97124144c05d2cbff0
+  metadata.gz: 0a2ffa00c630b2f98538db568be48b7af5c9cb1449941c85d1b29f0c249187de755da7cb544aaa0b76322035a5663b5c2c2ccdb1dacee269a426b9cbfec8eaec
+  data.tar.gz: d6199b9c406489e3e36a87bf0f315a6070fdc22b4da9dccf5d42ee8b6cfffd34a8426b75054cc5f425d6bf1fc26b6c59b2507c722eb0103c5d1bffd03ce2026d

data/Gemfile

@@ -1,4 +1,6 @@
 source 'https://rubygems.org'
 
+gem 'pry', github: 'fancyremarker/pry', branch: 'aptible'
+
 # Specify your gem's dependencies in aptible-cli.gemspec
 gemspec

data/lib/aptible/cli/agent.rb

@@ -9,10 +9,10 @@ require_relative 'helpers/app'
 
 require_relative 'subcommands/apps'
 require_relative 'subcommands/config'
+require_relative 'subcommands/db'
 require_relative 'subcommands/rebuild'
 require_relative 'subcommands/restart'
 require_relative 'subcommands/ssh'
-require_relative 'subcommands/tunnel'
 
 module Aptible
   module CLI
@@ -22,10 +22,10 @@ module Aptible
       include Helpers::Token
       include Subcommands::Apps
       include Subcommands::Config
+      include Subcommands::DB
       include Subcommands::Rebuild
       include Subcommands::Restart
       include Subcommands::SSH
-      include Subcommands::Tunnel
 
       desc 'version', 'Print Aptible CLI version'
       def version

data/lib/aptible/cli/subcommands/apps.rb

@@ -6,6 +6,25 @@ module Aptible
         def self.included(thor)
           thor.class_eval do
             include Helpers::Account
+            include Helpers::Token
+
+            desc 'apps', 'List all applications'
+            option :account
+            def apps
+              if options[:account]
+                accounts = [account_from_handle(options[:account])]
+              else
+                accounts = Aptible::Api::Account.all(token: fetch_token)
+              end
+
+              accounts.each do |account|
+                say "=== #{account.handle}"
+                account.apps.each do |app|
+                  say app.handle
+                end
+                say ''
+              end
+            end
 
             desc 'apps:create HANDLE', 'Create a new application'
             option :account
@@ -14,7 +33,7 @@ module Aptible
               app = account.create_app(handle: handle)
 
               if app.errors.any?
-                fail app.errors.full_messages.first
+                fail Thor::Error, app.errors.full_messages.first
               else
                 say "App #{handle} created!"
               end

data/lib/aptible/cli/subcommands/db.rb

@@ -0,0 +1,124 @@
+module Aptible
+  module CLI
+    module Subcommands
+      module DB
+        # rubocop:disable MethodLength
+        # rubocop:disable CyclomaticComplexity
+        def self.included(thor)
+          thor.class_eval do
+            include Helpers::Operation
+            include Helpers::Token
+
+            desc 'db:create HANDLE', 'Create a new database'
+            option :type, default: 'postgresql'
+            option :size, default: 10
+            option :account
+            define_method 'db:create' do |handle|
+              account = ensure_account(options)
+              database = account.create_database(handle: handle,
+                                                 type: options[:type])
+
+              if database.errors.any?
+                fail Thor::Error, database.errors.full_messages.first
+              else
+                op = database.create_operation(type: 'provision',
+                                               disk_size: options[:size])
+                poll_for_success(op)
+                say database.reload.connection_url
+              end
+            end
+
+            desc 'db:clone SOURCE DEST', 'Clone a database to create a new one'
+            define_method 'db:clone' do |source_handle, dest_handle|
+              source = database_from_handle(source_handle)
+
+              unless source
+                fail Thor::Error, "Could not find database #{source_handle}"
+              end
+
+              op = database.create_operation(type: clone, handle: dest_handle)
+              poll_for_success(op)
+              dest = database_from_handle(dest_handle)
+              say dest.connection_url
+            end
+
+            desc 'db:dump HANDLE', 'Dump a remote database to file'
+            define_method 'db:dump' do |handle|
+              begin
+                database = database_from_handle(handle)
+                unless database
+                  fail Thor::Error, "Could not find database #{handle}"
+                end
+                unless database.type == 'postgresql'
+                  fail Thor::Error, 'db:dump only works for PostgreSQL'
+                end
+
+                local_port = random_port
+                pid = fork { establish_connection(database, local_port) }
+
+                # TODO: Better test for connection readiness
+                sleep 10
+
+                filename = "#{handle}.dump"
+                puts "Dumping to #{filename}"
+                url = "aptible:#{database.passphrase}@localhost:#{local_port}"
+                `pg_dump postgresql://#{url}/db > #{filename}`
+              ensure
+                Process.kill('HUP', pid) if pid
+              end
+            end
+
+            desc 'db:tunnel HANDLE', 'Create a local tunnel to a database'
+            option :port, type: :numeric
+            define_method 'db:tunnel' do |handle|
+              database = database_from_handle(handle)
+              unless database
+                fail Thor::Error, "Could not find database #{handle}"
+              end
+
+              local_port = options[:port] || random_port
+              puts "Creating tunnel at localhost:#{local_port}..."
+              establish_connection(database, local_port)
+            end
+
+            private
+
+            def establish_connection(database, local_port)
+              host = database.account.bastion_host
+              port = database.account.bastion_port
+
+              ENV['ACCESS_TOKEN'] = fetch_token
+              ENV['APTIBLE_DATABASE'] = database.handle
+              tunnel_args = "-L #{local_port}:localhost:#{remote_port}"
+              connection_args = "-o 'SendEnv=*' -p #{port} root@#{host}"
+              opts = " -o 'SendEnv=*' -o StrictHostKeyChecking=no " \
+                     '-o UserKnownHostsFile=/dev/null'
+              command = "ssh #{opts} #{tunnel_args} #{connection_args}"
+              Kernel.exec(command)
+            end
+
+            def database_from_handle(handle)
+              Aptible::Api::Database.all(token: fetch_token).find do |a|
+                a.handle == handle
+              end
+            end
+
+            def random_port
+              # Allocate a dummy server to discover an available port
+              dummy = TCPServer.new('127.0.0.1', 0)
+              port = dummy.addr[1]
+              dummy.close
+              port
+            end
+
+            def remote_port
+              8080
+            end
+          end
+        end
+        # rubocop:enable CyclomaticComplexity
+        # rubocop:enable MethodLength
+      end
+    end
+  end
+end

data/lib/aptible/cli/subcommands/ssh.rb

@@ -10,7 +10,7 @@ module Aptible
             include Helpers::Operation
             include Helpers::App
 
-            desc 'ssh COMMAND', 'Run a command against an app'
+            desc 'ssh [COMMAND]', 'Run a command against an app'
             long_desc <<-LONGDESC
               Runs an interactive command against a remote Aptible app
 

data/lib/aptible/cli/version.rb

@@ -1,5 +1,5 @@
 module Aptible
   module CLI
-    VERSION = '0.3.7'
+    VERSION = '0.4.0'
   end
 end

data/spec/aptible/cli/agent_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 
 describe Aptible::CLI::Agent do
   before { subject.stub(:ask) }
+  before { subject.stub(:save_token) }
 
   describe '#version' do
     it 'should print the version' do

data/spec/spec_helper.rb

@@ -8,3 +8,7 @@ end
 
 # Require library up front
 require 'aptible/cli'
+
+RSpec.configure do |config|
+  config.before {}
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aptible-cli
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.4.0
 platform: ruby
 authors:
 - Frank Macreery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-17 00:00:00.000000000 Z
+date: 2014-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aptible-api
@@ -147,10 +147,10 @@ files:
 - lib/aptible/cli/helpers/token.rb
 - lib/aptible/cli/subcommands/apps.rb
 - lib/aptible/cli/subcommands/config.rb
+- lib/aptible/cli/subcommands/db.rb
 - lib/aptible/cli/subcommands/rebuild.rb
 - lib/aptible/cli/subcommands/restart.rb
 - lib/aptible/cli/subcommands/ssh.rb
-- lib/aptible/cli/subcommands/tunnel.rb
 - lib/aptible/cli/version.rb
 - spec/aptible/cli/agent_spec.rb
 - spec/spec_helper.rb
@@ -181,4 +181,3 @@ summary: Command-line interface for Aptible services
 test_files:
 - spec/aptible/cli/agent_spec.rb
 - spec/spec_helper.rb
-has_rdoc: 

data/lib/aptible/cli/subcommands/tunnel.rb

@@ -1,57 +0,0 @@
-module Aptible
-  module CLI
-    module Subcommands
-      module Tunnel
-        # rubocop:disable MethodLength
-        def self.included(thor)
-          thor.class_eval do
-            include Helpers::Operation
-            include Helpers::Token
-
-            desc 'tunnel DATABASE', 'Create a local tunnel to a database'
-            def tunnel(handle)
-              database = database_from_handle(handle)
-              unless database
-                fail Thor::Error, "Could not find database #{handle}"
-              end
-              host = database.account.bastion_host
-              port = database.account.bastion_port
-
-              ENV['ACCESS_TOKEN'] = fetch_token
-              ENV['APTIBLE_DATABASE'] = handle
-              tunnel_args = "-L #{local_port}:localhost:#{remote_port}"
-              connection_args = "-o 'SendEnv=*' -p #{port} root@#{host}"
-              puts "Creating tunnel at localhost:#{local_port}..."
-              opts = " -o 'SendEnv=*' -o StrictHostKeyChecking=no " \
-                     '-o UserKnownHostsFile=/dev/null'
-              Kernel.exec "ssh #{opts} #{tunnel_args} #{connection_args}"
-            end
-
-            private
-
-            def database_from_handle(handle)
-              Aptible::Api::Database.all(token: fetch_token).find do |a|
-                a.handle == handle
-              end
-            end
-
-            def local_port
-              return @local_port if @local_port
-
-              # Allocate a dummy server to discover an available port
-              dummy = TCPServer.new('127.0.0.1', 0)
-              port = dummy.addr[1]
-              dummy.close
-              @local_port = port
-            end
-
-            def remote_port
-              8080
-            end
-          end
-        end
-        # rubocop:enable MethodLength
-      end
-    end
-  end
-end