pasqual 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fa2a389b07160cc2665fb9479244fb58105c6a8
-  data.tar.gz: 96f7e56d1826db3f006e6c9ab051ad14bbd6ab31
+  metadata.gz: 63f57b1365c84d913c39985c0673762ba445638f
+  data.tar.gz: 317c78bc15c24a6deb002976a0987b1bcd3b9d03
 SHA512:
-  metadata.gz: 2f784dd7884782c5936fdefa1aa83fdbbc750fa9c2883fb097cf340c9cd91203eb30bfecd3172e9874c0b1480b03b99937aed7f7a3363d1be0f3e2d938f5bc87
-  data.tar.gz: feadca25da1227f4228a4ab624188987cbb8e93afdeef5b4792c732d83892b922c0efda700fd7d1a38d0150f7383e5cc27536e55374e871e503b5f8666745ed4
+  metadata.gz: a489963175a7d98be65d4eac1f9855bccf3040150be608d9cae3d3515c0f947e18ba998dd82d351949ff910c835f1d046d07f1de52c6dd75167ded514f1685c9
+  data.tar.gz: 5e6ad4fe9c88ca80bd60f499f55139b0299fc9a69e2b37a03945f8b3799af2bb07a4d0e9e3b7ee829799b9b1c13d7c1533a987673816f959c40b10cec27f904c

data/CHANGELOG

@@ -1,3 +1,9 @@
+* 0.2.0 - 2015-05-06
+
+  * Enhancements
+
+    * Add pasqual bin
+
 * 0.1.3 - 2015-03-16
 
   * Added more detailed failure message on createdb

data/bin/pasqual

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+
+require 'bundler/setup'
+
+require 'pasqual/cli'
+Pasqual::CLI.start ARGV

data/lib/pasqual/cli.rb

@@ -0,0 +1,118 @@
+require 'thor'
+
+require 'pasqual'
+
+module Pasqual
+  class CLI < Thor
+    def self.exit_on_failure?
+      true
+    end
+
+    desc "create DATABASE_URL", "create database"
+    def create(url = nil)
+      puts "Creating #{pasqual(url).name}"
+      pasqual(url).createdb
+    rescue Pasqual::Createdb::AlreadyExists
+      puts "#{pasqual(url).name} already exists, skipped creation"
+    end
+
+    desc "drop DATABASE_URL", "drop database"
+    def drop(url = nil)
+      puts "Dropping #{pasqual(url).name}"
+      pasqual(url).dropdb
+    rescue Pasqual::Dropdb::Failed
+      puts "Could not drop #{pasqual(url).name}, skipped"
+    end
+
+    desc "poll DATABASE_URL", "poll for the existence of a database server"
+    def poll(url = nil)
+      say "Waiting for Postgres to come available"
+      if attempt_connect(url)
+        say "Connected!"
+        exit 0
+      else
+        say "Failed to connect"
+        exit 1
+      end
+    end
+
+    desc "reset [SQL_FILE] [DATABASE_URL]", "drop, create, structure"
+    def reset(path = nil, url = nil)
+      drop(url)
+      create(url)
+      file(path, url) if path
+    end
+
+    desc "psql [SQL] [DATABASE_URL]", "start a psql console or run an SQL statement"
+    def psql(*cmd_args)
+      url = nil
+      sql_args = []
+      cmd_args.each do |arg|
+        if arg =~ /postgres:/
+          url = arg
+        else
+          sql_args << arg
+        end
+      end
+      db = pasqual(url)
+      args = Pasqual::Arglist.
+        args(db.username, db.password, db.host, db.port, db.name)
+      if sql_args.any?
+        args << '-c'
+        args += sql_args.map(&:inspect)
+        puts "Executing in #{db.name}: #{sql_args.inspect}"
+      else
+        cmd = "psql #{args.join(' ')}"
+      end
+      puts "Running #{cmd}"
+      Kernel.exec({ 'PGPASSWORD' => db.password }, "psql #{args.join(' ')}")
+    end
+
+    
+    desc "file PATH [DATABASE_URL]", "execute an SQL script in a file"
+    def file(path, url = nil)
+      puts "Structuring #{pasqual(url).name}"
+      pasqual(url).pipe_sql path
+    rescue Errno::EPIPE
+      puts "#{pasqual(url).name} doesn't exist, skipped structure"
+    end
+
+    private
+
+    def pasqual(url)
+      @pasqual ||= Pasqual.for(url || ENV['DATABASE_URL'])
+    end
+
+    def pg_connection(url, no_db: false)
+      db = pasqual(url)
+      conn = PG::Connection.connect_start(
+        host: db.host,
+        port: db.port,
+        dbname: no_db ? nil : db.name,
+        user: db.username,
+        password: db.password,
+        connect_timeout: (60 * 5))
+    end
+
+    def attempt_connect(url)
+      require 'pg'
+
+      timeout = Time.now.to_i + (60 * 5)
+
+      # Don't connect to a specific database because we may be polling the
+      # the server to know whether we can _create_ a database yet.
+      conn = pg_connection(url, no_db: true)
+      status = conn.connect_poll
+      while(Time.now.to_i < timeout && status != PG::PGRES_POLLING_OK) do
+        sleep 2
+        status = conn.connect_poll
+
+        conn = pg_connection(url, no_db: true) if status == PG::PGRES_POLLING_FAILED
+        puts "Status: #{status.inspect}, Timeout: #{Time.now.to_i - timeout}" if ENV['DEBUG']
+      end
+      conn.finish
+      status == PG::PGRES_POLLING_OK
+    end
+
+  end
+end

data/lib/pasqual/version.rb

@@ -1,3 +1,3 @@
 module Pasqual
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

data/pasqual.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "childprocess", "~> 0.5"
+  spec.add_runtime_dependency "thor", "~> 0.5"
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pasqual
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Derek Kastner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-16 00:00:00.000000000 Z
+date: 2015-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -70,7 +84,8 @@ description: Shortcuts for postgres commands, with option to use ENV-configured
   URLs
 email:
 - dkastner@gmail.com
-executables: []
+executables:
+- pasqual
 extensions: []
 extra_rdoc_files: []
 files:
@@ -81,8 +96,10 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/pasqual
 - lib/pasqual.rb
 - lib/pasqual/arglist.rb
+- lib/pasqual/cli.rb
 - lib/pasqual/command.rb
 - lib/pasqual/createdb.rb
 - lib/pasqual/database.rb