aptible-cli 0.5.2 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2873265292d7a6e0b2fdca4c295ec26b4a376178
-  data.tar.gz: d63b904efdb8c50141197671fff9fe91f4d5e51e
+  metadata.gz: eb9dfc6735786325e67752acf288b43d9ebf21a3
+  data.tar.gz: fa7dcfac1d1eefecd10a7ae268d47a7ed379c44b
 SHA512:
-  metadata.gz: 11dffb5566df015f9afdc1b0107645819a6e453c7ae54be92cec857bdd5c44828215f76b50fa7b66ae4a217bb4a6e9b3e26ef7361db9b96200b5f15ff62cbf13
-  data.tar.gz: c69135c258a8c3fd7a3bf012544136fd0e7382d278593aca3db67c275180b2edb1e66fecb37123d0ad9cef631c844e50730d25c88c108092ec8cca080ca5b39e
+  metadata.gz: b8e773b844383936d986e66d708001e745b02bc125037c484d66dc6c7ad0286cc36922c7c53eacc1e0ea2568e92dc4fc48b62b3e784af2a1e779448665b0d91e
+  data.tar.gz: 9a1f29d08c93c330aeb442cd6352b6b9c0e2d938b8d1241198eee7d2e2be4863390131014a84239c97eb939c9bc0fc44cc985237818ee4314b47d63daff3c649

data/.gitignore

@@ -1,5 +1,6 @@
 *.gem
 *.rbc
+*.dump
 .bundle
 .config
 .yardoc
@@ -15,3 +16,5 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+/.idea
+

data/README.md

@@ -22,22 +22,25 @@ From `aptible help`:
 
 ```
 Commands:
-  aptible apps                  # List all applications
-  aptible apps:create HANDLE    # Create a new application
-  aptible config                # Print an app's current configuration
-  aptible config:add            # Add an ENV variable to an app
-  aptible config:rm             # Remove an ENV variable from an app
-  aptible config:set            # Alias for config:add
-  aptible config:unset          # Alias for config:rm
-  aptible db:clone SOURCE DEST  # Clone a database to create a new one
-  aptible db:create HANDLE      # Create a new database
-  aptible db:dump HANDLE        # Dump a remote database to file
-  aptible db:tunnel HANDLE      # Create a local tunnel to a database
-  aptible login                 # Log in to Aptible
-  aptible rebuild               # Rebuild an app, and restart its services
-  aptible restart               # Restart all services associated with an app
-  aptible ssh [COMMAND]         # Run a command against an app
-  aptible version               # Print Aptible CLI version
+  aptible apps                        # List all applications
+  aptible apps:create HANDLE          # Create a new application
+  aptible config                      # Print an app's current configuration
+  aptible config:add                  # Add an ENV variable to an app
+  aptible config:rm                   # Remove an ENV variable from an app
+  aptible config:set                  # Alias for config:add
+  aptible config:unset                # Alias for config:rm
+  aptible db:clone SOURCE DEST        # Clone a database to create a new one
+  aptible db:create HANDLE            # Create a new database
+  aptible db:dump HANDLE              # Dump a remote database to file
+  aptible db:execute HANDLE SQL_FILE  # Executes sql against a database
+  aptible db:tunnel HANDLE            # Create a local tunnel to a database
+  aptible help [COMMAND]              # Describe available commands or one specific command
+  aptible login                       # Log in to Aptible
+  aptible logs                        # Follows logs from a running app
+  aptible rebuild                     # Rebuild an app, and restart its services
+  aptible restart                     # Restart all services associated with an app
+  aptible ssh [COMMAND]               # Run a command against an app
+  aptible version                     # Print Aptible CLI version
 ```
 
 ## Contributing
@@ -48,10 +51,18 @@ Commands:
 1. If you add a command, update this README with the output of `aptible help | grep -v help`.
 1. Create a new pull request on GitHub.
 
+## Contributors
+
+* Frank Macreery ([@fancyremarker](https://github.com/fancyremarker))
+* Graham Melcher ([@melcher](https://github.com/melcher))
+* Pete Browne ([@petebrowne](https://github.com/petebrowne))
+* Rich Humphrey ([@rdh](https://github.com/rdh))
+
+
 ## Copyright and License
 
 MIT License, see [LICENSE](LICENSE.md) for details.
 
-Copyright (c) 2014 [Aptible](https://www.aptible.com) and contributors.
+Copyright (c) 2015 [Aptible](https://www.aptible.com) and contributors.
 
 [<img src="https://s.gravatar.com/avatar/f7790b867ae619ae0496460aa28c5861?s=60" style="border-radius: 50%;" alt="@fancyremarker" />](https://github.com/fancyremarker)

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

@@ -28,41 +28,20 @@ module Aptible
 
             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 = source.create_operation(type: 'clone', handle: dest_handle)
-              poll_for_success(op)
-              dest = database_from_handle(dest_handle)
+              dest = clone_database(source_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_local_port
-                pid = fork { establish_connection(database, local_port) }
-
-                # TODO: Better test for connection readiness
-                sleep 10
+              dump_database(handle)
+            end
 
-                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
+            desc 'db:execute HANDLE SQL_FILE', 'Executes sql against a database'
+            define_method 'db:execute' do |handle, sql_path|
+              execute_local_tunnel(handle) do |url|
+                puts "Executing #{sql_path} against #{handle}"
+                `psql #{url} < #{sql_path}`
               end
             end
 
@@ -70,10 +49,6 @@ module Aptible
             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_local_port
               puts "Creating tunnel at localhost:#{local_port}..."
               establish_connection(database, local_port)
@@ -93,10 +68,55 @@ module Aptible
               Kernel.exec(command)
             end
 
-            def database_from_handle(handle)
-              Aptible::Api::Database.all(token: fetch_token).find do |a|
-                a.handle == handle
+            def database_from_handle(handle, options = { postgres_only: false })
+              all = Aptible::Api::Database.all(token: fetch_token)
+              database = all.find { |a|  a.handle == handle }
+
+              unless database
+                fail Thor::Error, "Could not find database #{handle}"
+              end
+
+              if options[:postgres_only] && database.type != 'postgresql'
+                fail Thor::Error, 'This command only works for PostgreSQL'
               end
+
+              database
+            end
+
+            def clone_database(source_handle, dest_handle)
+              puts "Cloning #{source_handle} to #{dest_handle}"
+
+              source = database_from_handle(source_handle)
+              op = source.create_operation(type: 'clone', handle: dest_handle)
+              poll_for_success(op)
+
+              database_from_handle(dest_handle)
+            end
+
+            def dump_database(handle)
+              execute_local_tunnel(handle) do |url|
+                filename = "#{handle}.dump"
+                puts "Dumping to #{filename}"
+                `pg_dump #{url} > #{filename}`
+              end
+            end
+
+            # Creates a local tunnel and yields the url to it
+
+            def execute_local_tunnel(handle)
+              database = database_from_handle(handle, postgres_only: true)
+
+              local_port = random_local_port
+              pid = fork { establish_connection(database, local_port) }
+
+              # TODO: Better test for connection readiness
+              sleep 10
+
+              auth = "aptible:#{database.passphrase}"
+              host = "localhost:#{local_port}"
+              yield "postgresql://#{auth}@#{host}/db"
+            ensure
+              Process.kill('HUP', pid) if pid
             end
 
             def random_local_port

data/lib/aptible/cli/version.rb

@@ -1,5 +1,5 @@
 module Aptible
   module CLI
-    VERSION = '0.5.2'
+    VERSION = '0.5.4'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aptible-cli
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.4
 platform: ruby
 authors:
 - Frank Macreery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-19 00:00:00.000000000 Z
+date: 2015-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aptible-api