pgbundle 0.0.13 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 99aec1b0d91ba3849d87a5b292084e7c9349d8f2
-  data.tar.gz: 459f0a15b90b4f85f2d300da29fba1bd7479646e
+SHA256:
+  metadata.gz: 15dfb28b9fdc9700e097a5a57391cf3177ddb20fbcb12535335df559429e2ce5
+  data.tar.gz: e961ee85cbea6731f1a8358f1291ac102ad39b15c7e7540cd323716bbedfde4b
 SHA512:
-  metadata.gz: 3cc7c2f7a9aabd61863fe38b50939e2acb897cf5636b46cf3073c6a7d54d6b33e7dbddaecdf9577e1743e2e4824bb60dfa644cb542695c4feece06f3c810d4a5
-  data.tar.gz: dc2163ec515938293c89c4e99b2409c6a56035785f7773b9d5e7f498cdc6cd0d6293363d630dfdbc742378390450d80da3a1558088a87a1d2f9766925f258c59
+  metadata.gz: d2f24410fe6dd3bedf3622786caac2ec63055f2bda8452b2445fe55261c222a9e40e09582d155e5b70518cbb3b2ad1be148905f0ed37027e1236f8f8edef48a7
+  data.tar.gz: 99bb423f0d8a0daac1c8b3f1cd4e45820e223260749793007a6d4b4034edaaa89e56c5c43f485f7d9c1b7b524a0f6e73673353c92cdf2b0855a59865e1da65e7

data/.travis.yml

@@ -1,11 +1,19 @@
 language: ruby
 rvm:
-  - 1.9.3
   - rbx-2
   - 2.0.0
   - 2.1.1
+  - 2.2.3
 matrix:
   allow_failures:
     - rvm: rbx-2
-addons:
-  postgresql: "9.3"
+before_install:
+  - wget https://gist.github.com/petere/5893799/raw/apt.postgresql.org.sh
+  - wget https://gist.github.com/petere/6023944/raw/pg-travis-test.sh
+  - sudo sh ./apt.postgresql.org.sh
+env:
+  - PGVERSION=9.1
+  - PGVERSION=9.2
+  - PGVERSION=9.3
+  - PGVERSION=9.4
+script: bash ./cibuild.sh

data/CHANGELOG.md

@@ -0,0 +1,5 @@
+# CHANGELOG
+
+## 0.1.0
+
+* Added `password` option for database connection options

data/README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/adjust/pgbundle.svg?branch=master)](https://travis-ci.org/adjust/pgbundle)
+
 # pgbundle
 
 bundling postgres extension
@@ -11,35 +13,162 @@ bundling postgres extension
 define your dependent postgres extensions in a Pgfile like this:
 
 ```
-#Pgfile
+# Pgfile
 
 database 'my_database', host: 'my.db.server', use_sudo: true, system_user: 'postgres'
 
 pgx 'hstore'
 pgx 'my_extension', '1.0.2', github: me/my_extension
 pgx 'my_other_extionsion', :git => 'https://github.com/me/my_other_extionsion.git'
-pgx 'my_ltree_dependend_extension', github: me/my_ltree_dependend_extension, require: 'ltree'
+pgx 'my_ltree_dependend_extension', github: me/my_ltree_dependend_extension, requires: 'ltree'
+```
+
+**database**
+
+`database` defines on which database(s) the extensions should be installed. The first
+argument is the database name the additional options may specify your setup but
+come with reasonable default values.
+
+option        | default     | desciption
+-------       | -------     | -----------
+user          | 'postgres'  | the database user (needs privilege to `CREATE EXTENSION`)
+host          | 'localhost' | the database host (needs to be accessible from where `pgbundle` runs)
+use_sudo      | false       | if true use `sudo` to run `make install` if needed
+system_user   | 'postgres'  | the (os) system user that is allowed to install an extension (through make)
+port          | 5432        | the database port
+force_ssh     | false       | run commands via ssh even if host is `localhost`
+slave         | false       | defines if the database runs as a read-only slave thus skips any `CREATE` command
+
+**pgx**
+
+The `pgx` command defines you actual Extension. The first argument specifies the Extension name,
+the second optional parameter defines the required Version. If the Extension is not yet
+installed on the server you may wish to define how `pgbundle` can find it's source to build
+and install it. And which Extensions may be required
+
+option      | description
+------      | -----------
+git         | any git repository pgbundle can clone from
+github      | any github repository in the form `user/repository`
+branch      | an optional branch name for git or github sources defaults to `master`
+requires    | an optional extension that the extension depends on
+path        | any absolute or relative local path e.g. './foo/bar'
+pgxn        | any repository available on http://pgxn.org/
+flags       | optional string used for make results in "make flags && make flags install"
+
+
+Some Extensions may require other Extensions to allow `pgbundle` to resolve dependencies
+and install it in the right order you can define them with `requires`.
+If the required Extension is not yet available on the target server or the Extension
+requires a specific Version you should define it as well.
+E.g.
+
+```
+# Pgfile
+
+database ...
+
+pgx 'foo', '0.1.2', github: me/foo
+
+# set foo as dependency for bar
+pgx 'bar', '1.2.3', github: me/bar, requires: 'foo'
+
+# set bar and boo as dependency for baz
+# will automatically set foo as dependency as well
+pgx 'baz', '0.2.3', github: me/baz, requires: ['bar', 'boo']
+# installs jsquery with flag 'USE_PGXS=1'
+# i.e. running make USE_PGXS=1 && make USE_PGXS=1 install
+pgx 'jsquery', github: 'postgrespro/jsquery', flags: 'USE_PGXS=1'
+```
+
+## pgbundle commands
+
+`pgbundle` comes with four commands. If the optional `pgfile` is not given it assumes
+to find a file named `Pgfile` in the current directory.
+
+**check**
+
+checks availability of required extensions.
+
+```
+pgbundle check [pgfile]
 ```
 
-### install your extension
+`check` does not change anything on your system, it only checks which
+of your specified extensions are available and which are missing.
+It returns with exitcode `1` if any Extension is missing and `0` otherwise.
 
-  pgbundle install
 
-installs the extensions and dependencies on your database server
+**install**
 
-### check your dependencies
+installs extensions
 
-  pgbundle check
+```
+pgbundle install [pgfile] [-f]
+```
+
+`install` tries to install missing Extensions. If `--force` is given it installs
+all Extension even if they are already installed.
+
+**create**
+
+create the extension at the desired version
+
+```
+pgbundle create [pgfile]
+```
 
-checks whether all dependencies are available for creation on the database server
+`create` runs the `CREATE EXTENSION` command on the specified databases. If a version
+is specified in the `Pgfile` it tries to install with `CREATE EXTENSION VERSION version`.
+If the Extension is already created but with a wrong version, it will run
+`ALTER EXTENSION extension_name UPDATE TO new_version`.
 
-## getting started
+**init**
+
+write an initial pgfile to stdout
+
+```
+pgbundle init db_name -u user -h host -p port
+```
+
+`init` is there to help you get started. If you have already a database with installed
+Extensions you get the content for an initial `Pgfile`. Pgbundle will figure out
+which Extension at which Version are already in use and print a reasonable starting
+point for you Pgfile.
+However this is only to help you get started you may wish to specify sources and
+dependencies correctly.
+
+### How it works
+
+You may already have noticed that using Extensions on postgres requires two different
+steps. Building the extension on the database cluster with `make install`
+and creating the extension into the database with `CREATE/ALTER EXTENSION`.
+Pgbundle reflects that with the two different commands `install` and `create`.
+
+Usually `pgbundle` runs along with your application on your application server
+which often is different from your database machine. Thus the `install` step
+will (if necessary) try to download the source code of the extension into a
+temporary folder and then copy it to your database servers into `/tmp/pgbundle`.
+From there it will run `make clean && make && make install` for each database.
+You may specify as which user you want these commands to run with the `system_user`
+option. Although for security reasons not recommended you can specify to run the
+install step with sudo `use_sudo: true`, but we suggest to give write permission
+for the postgres system user to the install targets. If you are not sure which these
+are run
+
+```
+pg_config
+```
 
-if your already have some database on your current project you can get a starting point with
+and find the `LIBDIR`, `SHAREDIR` and `DOCDIR`
 
-  pgbundle init
+#### master - slave
 
-lets say your database named 'my_project' runs on localhost with user postges
+Every serious production database cluster usually has a slave often ran as Hot Standby.
+You should make sure that all your Extension are also installed on all slaves.
+Because database slaves run as read-only servers any attempt to `CREATE` or `ALTER`
+Extension will fail, these commands should only run on the master server and will
+be replicated to the slave from there. You can tell `pgbundle` that it should skip
+these steps with `slave: true`.
 
-  pgbundle init my_project -u postgres -h localhost
 

data/bin/pgbundle

@@ -2,7 +2,6 @@
 require 'thor'
 require 'thor/group'
 require 'pgbundle'
-require 'pry'
 
 module PgBundle
   class Cli < Thor
@@ -10,17 +9,21 @@ module PgBundle
     method_options %w( force -f ) => :boolean
     def install(pgfile = 'Pgfile')
       if options.force?
-        installed = definition(pgfile).install!
+        installed = definitions(pgfile).inject({}){|m, d| m[d.database] = d.install!; m}
       else
-        definition(pgfile).available_extensions.each do |dep|
-          say_status('exists', dep.name)
+        definitions(pgfile).each do |d|
+          d.available_extensions.each do |dep|
+            say_status('exists', "#{d.database}: #{dep.name}")
+          end
         end
 
-        installed = definition(pgfile).install
+        installed = definitions(pgfile).inject({}){|m, d| m[d.database] = d.install; m}
       end
 
-      installed.each do |d|
-        say_status('install', d.name, :yellow)
+      installed.each do |db, deps|
+        deps.each do |d|
+          say_status('install', "#{db}: #{d.name}", :yellow)
+        end
       end
     rescue InstallError, ExtensionCreateError, CircularDependencyError => e
       say_status('error', e.message, :red)
@@ -30,15 +33,17 @@ module PgBundle
     desc 'check', 'checks availability of required extensions'
     def check(pgfile = 'Pgfile')
       missing = false
-      definition(pgfile).check.each do |d|
-        if d[:created]
-          say_status('created', d[:name])
-        else
-          unless d[:installed]
-            say_status('missing', d[:name], :red)
-            missing = true
+      definitions(pgfile).each do |df|
+        df.check.each do |d|
+          if d[:created]
+            say_status('created', "#{df.database}: #{d[:name]}")
+          else
+            unless d[:installed]
+              say_status('missing', "#{df.database}: #{d[:name]}", :red)
+              missing = true
+            end
+            say_status('installed', "#{df.database}: #{d[:name]}", :yellow) if d[:installed]
           end
-          say_status('installed', d[:name], :yellow) if d[:installed]
         end
       end
       exit 1 if missing
@@ -46,14 +51,17 @@ module PgBundle
 
     desc 'create', 'create the extension at the desired version'
     def create(pgfile = 'Pgfile')
-      definition(pgfile).create.each do | d |
-        say_status('created', d.name)
+      definitions(pgfile).each do |df|
+        df.create.each do | d |
+          say_status('created', "#{df.database}: #{d.name}")
+        end
       end
     end
 
     desc 'init', 'write an initial pgfile to stdout'
     method_options %w( user -u ) => :string
     method_options %w( host -h ) => :string
+    method_options %w( port -p ) => :string
     def init(db_name)
       definition = PgBundle::Definition.new
       definition.database = PgBundle::Database.new(db_name, options)
@@ -62,9 +70,9 @@ module PgBundle
     end
 
     no_commands do
-      def definition(pgfile)
-        definition = Dsl.new.eval_pgfile(pgfile)
-        definition.link_dependencies
+      def definitions(pgfile)
+        definitions = Dsl.new.eval_pgfile(pgfile)
+        definitions.map(&:link_dependencies)
       end
     end
   end

data/cibuild.sh

@@ -0,0 +1,28 @@
+#!/bin/bash
+
+set -eux
+
+sudo apt-get update
+
+packages="postgresql-$PGVERSION postgresql-server-dev-$PGVERSION postgresql-common"
+
+# bug: http://www.postgresql.org/message-id/20130508192711.GA9243@msgid.df7cb.de
+sudo update-alternatives --remove-all postmaster.1.gz
+
+# stop all existing instances (because of https://github.com/travis-ci/travis-cookbooks/pull/221)
+sudo service postgresql stop
+# and make sure they don't come back
+echo 'exit 0' | sudo tee /etc/init.d/postgresql
+sudo chmod a+x /etc/init.d/postgresql
+
+sudo apt-get -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install $packages
+
+status=0
+sudo pg_createcluster --start $PGVERSION test -p 55435 -- -A trust
+# make all PG_CONFIG=/usr/lib/postgresql/$PGVERSION/bin/pg_config
+# sudo make install PG_CONFIG=/usr/lib/postgresql/$PGVERSION/bin/pg_config
+# PGPORT=55435 make installcheck PGUSER=postgres PG_CONFIG=/usr/lib/postgresql/$PGVERSION/bin/pg_config || status=$?
+
+# if test -f regression.diffs; then cat regression.diffs; fi
+# exit $status
+PGPORT=55435 rake

data/lib/pgbundle.rb

@@ -7,7 +7,9 @@ module PgBundle
   autoload :Extension, 'pgbundle/extension'
   autoload :BaseSource, 'pgbundle/base_source'
   autoload :PathSource, 'pgbundle/path_source'
+  autoload :GitSource, 'pgbundle/git_source'
   autoload :GithubSource, 'pgbundle/github_source'
+  autoload :PgxnSource, 'pgbundle/pgxn_source'
 
   class PgfileError < StandardError
   end
@@ -44,6 +46,12 @@ module PgBundle
     end
   end
 
+  class ReadOnlyDb < ExtensionCreateError
+    def initialize(db, base_name)
+      super "Can't install Extension #{base_name}, Database #{db} is read only"
+    end
+  end
+
   class MissingDependency < ExtensionCreateError
     def initialize(base_name, dependen_msg)
       required = dependen_msg[/required extension \"(.*?)\" is not installed/, 1]
@@ -52,8 +60,14 @@ module PgBundle
   end
 
   class GitCommandError < InstallError
-    def initialize(dest)
-      super "Failed to load git repository cmd: '#{dest}'"
+    def initialize(dest, details = nil)
+      super "Failed to load git repository cmd: '#{dest}'\n failed: #{details}"
+    end
+  end
+
+  class PgxnError < InstallError
+    def initialize(dest, message = nil)
+      super "Failed to load from pgxn: '#{dest}'\n failed: #{message}"
     end
   end
 end

data/lib/pgbundle/base_source.rb

@@ -13,6 +13,10 @@ module PgBundle
       fail NotImplementedError
     end
 
+    def clean
+      fail NotImplementedError
+    end
+
     private
 
     def copy_local(source, dest)

data/lib/pgbundle/database.rb

@@ -1,29 +1,49 @@
 require 'pg'
 require 'net/ssh'
-require 'pry'
+
 module PgBundle
   # The Database class defines on which database the extensions should be installed
   # Note to install an extension the code must be compiled on the database server
   # on a typical environment ssh access is needed if the database host differs from
   # the Pgfile host
   class Database
-    attr_accessor :name, :user, :host, :system_user, :use_sudo, :port, :force_ssh
+    attr_accessor :name, :user, :password, :host, :system_user, :use_sudo, :port, :force_ssh
+
     def initialize(name, opts = {})
       @name        = name
       @user        = opts[:user]        || 'postgres'
+      @password    = opts[:password]
       @host        = opts[:host]        || 'localhost'
       @use_sudo    = opts[:use_sudo]    || false
       @system_user = opts[:system_user] || 'postgres'
       @port        = opts[:port]        || 5432
       @force_ssh   = opts[:force_ssh]   || false
+      @slave       = opts[:slave]       || false
     end
 
     def connection
       @connection ||= begin
-        PG.connect(dbname: name, user: user, host: host, port: port)
+        PG.connect(connection_opts)
       end
     end
 
+    def connection_opts
+      {
+        dbname: name,
+        user: user,
+        password: password,
+        host: host,
+        port: port
+      }.compact
+    end
+
+    def to_s
+      "host: #{@host}:#{port} db: #{@name}"
+    end
+
+    def slave?
+      @slave
+    end
     # executes the given sql on the database connections
     # redirects all noise to /dev/null
     def execute(sql)
@@ -52,19 +72,22 @@ module PgBundle
     end
 
     # loads the source, runs make install and removes the source afterwards
-    def make_install(source, ext_name)
+    def make_install(source, ext_name, flags)
+      run("mkdir -p -m 0777 /tmp/pgbundle/")
       remove_source(ext_name)
       source.load(host, system_user, load_destination(ext_name))
-      run(make_install_cmd(ext_name))
+      run(make_install_cmd(ext_name, flags))
       remove_source(ext_name)
+      source.clean
     end
 
     # loads the source and runs make uninstall
-    def make_uninstall(source, ext_name)
+    def make_uninstall(source, ext_name, flags)
       remove_source(ext_name)
       source.load(host, system_user, load_destination(ext_name))
-      run(make_uninstall_cmd(ext_name))
+      run(make_uninstall_cmd(ext_name, flags))
       remove_source(ext_name)
+      source.clean
     end
 
     def drop_extension(name)
@@ -90,17 +113,17 @@ module PgBundle
       run("rm -rf #{load_destination(name)}")
     end
 
-    def make_install_cmd(name)
+    def make_install_cmd(name, flags)
       <<-CMD.gsub(/\s+/, ' ').strip
         cd #{load_destination(name)} &&
-        #{sudo} make clean &&
-        #{sudo} make &&
-        #{sudo} make install
+        #{sudo} make #{flags} clean &&
+        #{sudo} make #{flags} &&
+        #{sudo} make #{flags} install
       CMD
     end
 
-    def make_uninstall_cmd(name)
-      "cd #{load_destination(name)} && #{sudo} make uninstall"
+    def make_uninstall_cmd(name, flags)
+      "cd #{load_destination(name)} && #{sudo} make #{flags} uninstall"
     end
 
     def run(cmd)
@@ -112,7 +135,8 @@ module PgBundle
     end
 
     def local(cmd)
-      %x(#{cmd})
+      res = %x((#{cmd}) 2>&1 )
+      raise res unless $?.success?
     end
 
     def remote(cmd)

data/lib/pgbundle/definition.rb

@@ -49,7 +49,7 @@ module PgBundle
     end
 
     def init
-      ["database '#{database.name}', host: '#{database.host}', user: #{database.user}, system_user: #{database.system_user}, use_sudo: #{database.use_sudo}"] +
+      ["database '#{database.name}', host: '#{database.host}', user: '#{database.user}', system_user: '#{database.system_user}', use_sudo: #{database.use_sudo}"] +
       database.current_definition.map do |r|
         name, version = r['name'], r['version']
         requires = r['requires'] ? ", requires: " + r['requires'].gsub(/[{},]/,{'{' => '%w(', '}' =>')', ','=> ' '}) : ''
@@ -57,7 +57,7 @@ module PgBundle
       end
     end
 
-    # returns an array hashes with dependency information
+    # returns an array of hashes with dependency information
     # [{name: 'foo', installed: true, created: false }]
     def check
       link_dependencies

data/lib/pgbundle/dsl.rb

@@ -4,13 +4,14 @@ module PgBundle
   class Dsl
     def initialize
       @definition = Definition.new
-      @extensions = []
+      @databases = []
     end
 
     def eval_pgfile(pgfile, contents=nil)
       contents ||= File.read(pgfile.to_s)
       instance_eval(contents)
-      @definition
+      raise PgfileError, "no databases defined" if @databases.size == 0
+      @databases.map{|d| df = @definition.clone; df.database = d; df}
     rescue SyntaxError => e
       syntax_msg = e.message.gsub("#{pgfile}:", 'on line ')
       raise PgfileError, "Pgfile syntax error #{syntax_msg}"
@@ -24,7 +25,7 @@ module PgBundle
 
     def database(*args)
       opts = extract_options!(args)
-      @definition.database = Database.new(args.first, opts)
+      @databases << Database.new(args.first, opts)
     end
 
     def pgx(*args)

data/lib/pgbundle/extension.rb

@@ -10,11 +10,13 @@ module PgBundle
   #   or install it along with it's dependencies
   #   extension.install(database)
   class Extension
-    attr_accessor :name, :version, :source, :resolving_dependencies
+    attr_accessor :name, :version, :source, :resolving_dependencies,:flags
     def initialize(*args)
       opts = args.last.is_a?(Hash) ? args.pop : {}
       @name, @version = args
+      validate(opts)
       self.dependencies = opts[:requires]
+      self.flags = opts[:flags]
       set_source(opts)
     end
 
@@ -108,7 +110,6 @@ module PgBundle
       unless dependencies.empty?
         install_dependencies(database, force)
       end
-
       make_install(database, force)
       raise ExtensionNotFound.new(name, version) unless installed?(database)
 
@@ -126,6 +127,7 @@ module PgBundle
     # create the extension along with it's dependencies in a transaction
     def create_with_dependencies(database)
       return true if created?(database)
+      return false if database.slave?
 
       database.transaction do |con|
         begin
@@ -181,6 +183,21 @@ module PgBundle
 
     private
 
+    # validates the options hash
+    def validate(opts)
+      opts = opts.clone
+      opts.delete(:requires)
+      opts.delete(:branch)
+      opts.delete(:flags)
+      if opts.size > 1
+        fail PgfileError.new "multiple sources given for #{name} #{opts}"
+      end
+
+      unless opts.empty? || [:path, :git, :github, :pgxn].include?(opts.keys.first)
+        fail PgfileError.new "invalid source #{opts.keys.first} for #{name}"
+      end
+    end
+
     # adds dependencies that are required but not defined yet
     def add_missing_required_dependencies(database)
       requires = requires(database)
@@ -218,12 +235,12 @@ module PgBundle
     # loads the source and runs make uninstall
     # returns: self
     def make_uninstall(database)
-      database.make_uninstall(source, name)
+      database.make_uninstall(source, name, flags)
       self
     end
 
     def drop_extension(database)
-      database.drop_extension(name)
+      database.drop_extension(name) unless database.slave?
     end
 
     # loads the source and runs make install
@@ -233,7 +250,7 @@ module PgBundle
 
       fail SourceNotFound, name if source.nil?
 
-      database.make_install(source, name)
+      database.make_install(source, name, flags)
       self
     end
 
@@ -266,6 +283,7 @@ module PgBundle
 
     # hard checks that the dependency can be created running CREATE command in a transaction
     def creatable!(database)
+      return false if database.slave?
       database.transaction_rollback do |con|
         begin
           create_dependencies(con)
@@ -274,6 +292,8 @@ module PgBundle
           raise ExtensionNotFound.new(name, version)
         rescue PG::UndefinedObject => err
           raise MissingDependency.new(name, err.message)
+        rescue PG::ReadOnlySqlTransaction
+          raise ReadOnlyDb.new(database, name)
         end
       end
 
@@ -286,7 +306,7 @@ module PgBundle
       database.execute 'BEGIN'
       begin
         database.execute update_stmt
-      rescue PG::UndefinedFile, PG::UndefinedObject => err
+      rescue PG::UndefinedFile, PG::UndefinedObject, PG::ReadOnlySqlTransaction => err
         @error = err.message
         result = false
       end
@@ -298,8 +318,12 @@ module PgBundle
     def set_source(opts)
       if opts[:path]
         @source = PathSource.new(opts[:path])
+      elsif opts[:git]
+        @source = GitSource.new(opts[:git], opts[:branch])
       elsif opts[:github]
         @source = GithubSource.new(opts[:github], opts[:branch])
+      elsif opts[:pgxn]
+        @source = PgxnSource.new(name, version)
       end
     end
   end

data/lib/pgbundle/git_source.rb

@@ -0,0 +1,43 @@
+require 'tmpdir'
+module PgBundle
+  # The GithubSource class defines a Github Source
+  class GitSource < BaseSource
+    attr_reader :branch
+
+    def initialize(path, branch = 'master')
+      @branch = branch || 'master'
+      super(path)
+    end
+
+    def load(host, user, dest)
+      clone
+      if host == 'localhost'
+        copy_local("#{clone_dir}/", dest)
+      else
+        copy_to_remote(host, user, "#{clone_dir}/", dest)
+      end
+    end
+
+    def clean
+      FileUtils.remove_dir(clone_dir, true)
+    end
+
+    private
+
+    def clone
+      res = %x((rm -rf #{clone_dir} && #{git_command} && rm -rf #{clone_dir}/.git}) 2>&1)
+      unless $?.success?
+        fail GitCommandError, git_command, res
+      end
+    end
+
+    # git clone user@git-server:project_name.git -b branch_name /some/folder
+    def git_command
+      "git clone #{path} -b #{branch} --quiet --depth=1 #{clone_dir}"
+    end
+
+    def clone_dir
+      @clone_dir ||= Dir.mktmpdir
+    end
+  end
+end

data/lib/pgbundle/github_source.rb

@@ -1,39 +1,13 @@
 require 'tmpdir'
 module PgBundle
   # The GithubSource class defines a Github Source
-  class GithubSource < BaseSource
+  class GithubSource < GitSource
     attr_reader :branch
 
     def initialize(path, branch = 'master')
-      @branch = branch || 'master'
-      super(path)
-    end
-
-    def load(host, user, dest)
-      clone
-      if host == 'localhost'
-        copy_local("#{clone_dir}/", dest)
-      else
-        copy_to_remote(host, user, "#{clone_dir}/", dest)
-      end
-    end
-
-    private
-
-    def clone
-      %x((rm -rf #{clone_dir} && #{git_command} && rm -rf #{clone_dir}/.git}) 2>&1)
-      unless $?.success?
-        fail GitCommandError, git_command
-      end
-    end
-
-    # git clone user@git-server:project_name.git -b branch_name /some/folder
-    def git_command
-      "git clone git@github.com:#{path}.git -b #{branch} --quiet --depth=1 #{clone_dir}"
-    end
-
-    def clone_dir
-      @clone_dir ||= Dir.mktmpdir
+      branch = branch || 'master'
+      path = "git@github.com:#{path}.git"
+      super(path, branch)
     end
   end
 end

data/lib/pgbundle/path_source.rb

@@ -11,5 +11,8 @@ module PgBundle
         copy_to_remote(host, user, path, dest)
       end
     end
+
+    def clean
+    end
   end
 end

data/lib/pgbundle/pgxn_source.rb

@@ -0,0 +1,61 @@
+require 'tmpdir'
+require 'open-uri'
+require 'zip'
+
+module PgBundle
+  # The GithubSource class defines a Github Source
+  class PgxnSource < BaseSource
+
+    def initialize(dist, version)
+      @dist, @version = dist, version
+      path = "http://master.pgxn.org/dist/%{dist}/%{version}/%{dist}-%{version}.zip" % {dist: dist, version: version}
+      super(path)
+    end
+
+    def load(host, user, dest)
+      download
+      unzip
+      if host == 'localhost'
+        copy_local("#{download_dir}/#{@dist}-#{@version}", dest)
+      else
+        copy_to_remote(host, user, "#{download_dir}/#{@dist}-#{@version}", dest)
+      end
+    end
+
+    def clean
+      FileUtils.remove_dir(download_dir, true)
+    end
+
+    private
+
+    def download
+      begin
+      File.open(zipfile, "wb") do |saved_file|
+        open(@path, "rb") do |read_file|
+          saved_file.write(read_file.read)
+        end
+      end
+      rescue OpenURI::HTTPError => e
+        raise PgxnError.new(path, e.message)
+      end
+    end
+
+    def zipfile
+      "#{download_dir}/#{@dist}.zip"
+    end
+
+    def unzip
+      Zip::ZipFile.open(zipfile) do |zip_file|
+        zip_file.each do |f|
+            f_path=File.join(download_dir, f.name)
+            FileUtils.mkdir_p(File.dirname(f_path))
+            zip_file.extract(f, f_path) unless File.exist?(f_path)
+        end
+      end
+    end
+
+    def download_dir
+      @clone_dir ||= Dir.mktmpdir
+    end
+  end
+end

data/lib/pgbundle/version.rb

@@ -1,3 +1,3 @@
 module Pgbundle
-  VERSION = '0.0.13'
+  VERSION = '0.1.0'
 end

data/pgbundle.gemspec

@@ -21,10 +21,10 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'thor'
   spec.add_dependency 'net-ssh'
   spec.add_dependency 'net-scp'
+  spec.add_dependency 'zip'
   #https://bitbucket.org/ged/ruby-pg/wiki/Home
   spec.add_dependency 'pg', '> 0.17'
   spec.add_development_dependency 'rspec', '~> 2.14.0'
-  spec.add_development_dependency "bundler", "~> 1.5"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "pry"
+  spec.add_development_dependency "bundler", ">= 1.5.0"
+  spec.add_development_dependency "rake", "<= 11.0.0"
 end

data/spec/Pgfile

@@ -1,7 +1,8 @@
-database 'pgbundle_test', host: 'localhost', port: 54321
+database 'pgbundle_test', host: 'localhost'
 
 pgx 'hstore'
 pgx 'bar', path: './spec/sample_extensions/bar', requires: 'ltree'
 pgx 'baz', '0.0.2', path: './spec/sample_extensions/baz', requires: 'foo'
 pgx 'foo', '0.0.1', path: './spec/sample_extensions/foo'
 pgx 'myext', github: 'adjust/numhstore', branch: 'topic'
+pgx 'jsquery', github: 'postgrespro/jsquery', flags: 'USE_PGXS=1'

data/spec/dsl_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
 describe PgBundle::Dsl do
-  subject { PgBundle::Dsl.new.eval_pgfile(File.expand_path('../Pgfile', __FILE__)) }
+  subject { PgBundle::Dsl.new.eval_pgfile(File.expand_path('../Pgfile', __FILE__)).first }
 
   its(:database) { should be_a PgBundle::Database }
-  its('database.port') { should be 54321 }
+  its('database.host') { should eq 'localhost' }
   its(:extensions) { should be_a Hash }
 
   context 'parsing options' do

data/spec/extension_spec.rb

@@ -65,6 +65,22 @@ describe PgBundle::Extension  do
       end
     end
 
+    context 'installing from github' do
+      subject { PgBundle::Extension.new('ltree', '1.0', git: 'https://github.com/adjust/ltree.git') }
+
+      before do
+        allow_any_instance_of(PgBundle::GithubSource)
+          .to receive(:clone_dir)
+          .and_return('/tmp/pgbundle/tree_tmp')
+
+        subject.install(database, true)
+      end
+
+      it 'cleans the tmp directory after install' do
+        expect(Dir.exists?('/tmp/pgbundle/tree_tmp')).to be_false
+      end
+    end
+
     context 'require not found'  do
       subject { PgBundle::Extension.new('foo', '0.0.2', path: './spec/sample_extensions/foo', requires: PgBundle::Extension.new('noope')) }
 

data/spec/spec_helper.rb

@@ -1,7 +1,6 @@
 require 'rubygems'
 require 'pgbundle'
 require 'pg'
-require 'pry'
 
 Dir.glob('spec/support/**/*.rb').each { |f| require f }
 
@@ -12,14 +11,19 @@ RSpec.configure do |config|
   config.filter_run focus: true
   config.run_all_when_everything_filtered                 = true
   config.before(:suite) do
-    conn = PG.connect(dbname: 'postgres', user: 'postgres')
+    system "mkdir -p -m 0777 /tmp/pgbundle/"
+    conn = PG.connect(dbname: 'postgres', user: 'postgres', host: 'localhost', port: ENV['PGPORT'] || 5432)
     conn.exec('CREATE DATABASE pgbundle_test')
     conn.close
   end
 
   config.after(:suite) do
-    conn = PG.connect(dbname: 'postgres', user: 'postgres')
-    conn.exec("SELECT pg_terminate_backend(pid) from pg_stat_activity WHERE datname ='pgbundle_test'")
+    conn = PG.connect(dbname: 'postgres', user: 'postgres', host: 'localhost', port: ENV['PGPORT'] || 5432)
+    if ENV['PGVERSION']=='9.1'
+      conn.exec("SELECT pg_terminate_backend(procpid) from pg_stat_activity WHERE datname ='pgbundle_test'")
+    else
+      conn.exec("SELECT pg_terminate_backend(pid) from pg_stat_activity WHERE datname ='pgbundle_test'")
+    end
     conn.exec('DROP DATABASE IF EXISTS pgbundle_test')
     conn.close
   end
@@ -42,6 +46,6 @@ RSpec.configure do |config|
   end
 
   def database
-    @db ||= PgBundle::Database.new('pgbundle_test')
+    @db ||= PgBundle::Database.new('pgbundle_test', user: 'postgres', host: 'localhost', port: ENV['PGPORT'] || 5432, use_sudo: ENV['TRAVIS'])
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pgbundle
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.1.0
 platform: ruby
 authors:
 - Manuel Kniep
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-07-08 00:00:00.000000000 Z
+date: 2020-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: zip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -82,46 +96,32 @@ dependencies:
         version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
-- !ruby/object:Gem::Dependency
-  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 11.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 11.0.0
 description: bundler like postgres extension manager
 email:
 - manuel@adjust.com
@@ -132,19 +132,23 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/pgbundle
+- cibuild.sh
 - lib/pgbundle.rb
 - lib/pgbundle/base_source.rb
 - lib/pgbundle/database.rb
 - lib/pgbundle/definition.rb
 - lib/pgbundle/dsl.rb
 - lib/pgbundle/extension.rb
+- lib/pgbundle/git_source.rb
 - lib/pgbundle/github_source.rb
 - lib/pgbundle/path_source.rb
+- lib/pgbundle/pgxn_source.rb
 - lib/pgbundle/version.rb
 - pgbundle.gemspec
 - spec/Pgfile
@@ -169,7 +173,7 @@ homepage: http://github.com/adjust/pgbundle
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -184,9 +188,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.1
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: bundling postgres extension
 test_files: