pgbundle 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ebf6ec1a2970f27889a2247e0d322fdbe5d46fb
-  data.tar.gz: 0bdda0bf265ab6728c59d3b7251a6a551bb19eb1
+  metadata.gz: 4cff94f537fb6f373b28d7e6ff01f448366c8524
+  data.tar.gz: 3299cc561b8af266b0c6c184700a57fba1813efa
 SHA512:
-  metadata.gz: b1eb63c5dfe78a4beae56925b565813426fc2c1ff74ed63e1eecf83d4f25a615e31da646b977e2ddc184a46a1e630b525c3517c41f8e5f67087d7c1b035f1a6e
-  data.tar.gz: 3b1fd3c7f160642adfbda70aab1fed792e229ec607aaa9892901aaf6ac9088852cbde2401e1756224e0bd76ab27cea265f9e90bc38e30ef62ccc299d27d6db14
+  metadata.gz: 7fdb90bb57db89073e3da35f8058cb26d58989612b43224d580dedebb735bf12c18e7252153789f294204503cb9edd61a1b0dca35672796fb8017917d926d532
+  data.tar.gz: 719f623d6982d7d7e10d14b74bc292b6f09b80fcc1b30a0fe7d70b1026a19275499303a8550573cc154bec0fa1a7880eabbe1137d7d5ff9c87eef428e80cd6d9

data/bin/pgbundle

@@ -7,12 +7,17 @@ require 'pry'
 module PgBundle
   class Cli < Thor
     desc 'install', 'installs extensions'
+    method_options %w( force -f ) => :boolean
     def install(pgfile = 'Pgfile')
-      definition(pgfile).available_extensions.each do |dep|
-        say_status('exists', dep.name)
-      end
+      if options.force?
+        installed = definition(pgfile).install!
+      else
+        definition(pgfile).available_extensions.each do |dep|
+          say_status('exists', dep.name)
+        end
 
-      installed = definition(pgfile).install
+        installed = definition(pgfile).install
+      end
 
       installed.each do |d|
         say_status('install', d.name, :yellow)

data/lib/pgbundle/base_source.rb

@@ -4,6 +4,7 @@ module PgBundle
   # it defines how to get the code and run make install on a given host (e.g. database server)
   class BaseSource
     attr_accessor :path
+
     def initialize(path)
       @path = path
     end

data/lib/pgbundle/database.rb

@@ -89,7 +89,12 @@ module PgBundle
     end
 
     def make_install_cmd(name)
-      "cd #{load_destination(name)} && #{sudo} make clean && make install"
+      <<-CMD.gsub(/\s+/, ' ').strip
+        cd #{load_destination(name)} &&
+        #{sudo} make clean &&
+        #{sudo} make &&
+        #{sudo} make install
+      CMD
     end
 
     def make_uninstall_cmd(name)

data/lib/pgbundle/definition.rb

@@ -30,6 +30,16 @@ module PgBundle
       installed.select { |dep| dep.available?(database) }
     end
 
+    # installs all required extensions
+    def install!
+      installed = extensions.map do |_, dep|
+        dep.install(database)
+        dep
+      end
+
+      installed.select { |dep| dep.available?(database) }
+    end
+
     def init
       ["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|

data/lib/pgbundle/extension.rb

@@ -263,7 +263,7 @@ module PgBundle
       if opts[:path]
         @source = PathSource.new(opts[:path])
       elsif opts[:github]
-        @source = GithubSource.new(opts[:github])
+        @source = GithubSource.new(opts[:github], opts[:branch].to_s)
       end
     end
   end

data/lib/pgbundle/github_source.rb

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

data/lib/pgbundle/version.rb

@@ -1,3 +1,3 @@
 module Pgbundle
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

data/spec/Pgfile

@@ -4,3 +4,4 @@ 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'

data/spec/dsl_spec.rb

@@ -1,9 +1,15 @@
 require 'spec_helper'
 
 describe PgBundle::Dsl do
-
   subject { PgBundle::Dsl.new.eval_pgfile(File.expand_path('../Pgfile', __FILE__)) }
+
   its(:database) { should be_a PgBundle::Database }
   its('database.port') { should be 54321 }
   its(:extensions) { should be_a Hash }
+
+  context 'parsing options' do
+    let(:opts) { { :github => 'adjust/numhstore', :branch => 'topic' } }
+
+    specify { subject.extensions['myext'].source.branch.should eq 'topic' }
+  end
 end

data/spec/source_spec.rb

@@ -1,10 +1,26 @@
 require 'spec_helper'
+
 describe PgBundle::PathSource do
   subject { PgBundle::PathSource.new('./foo/bar') }
   its(:path) { should eq './foo/bar' }
 end
 
 describe PgBundle::GithubSource do
-  subject { PgBundle::GithubSource.new('foo/bar') }
-  its(:path) { should eq 'foo/bar' }
+  let(:git) { "git clone git@github.com:foo/bar.git -b #{branch} --quiet --depth=1" }
+
+  context 'default options' do
+    let(:branch) { 'master' }
+
+    subject { PgBundle::GithubSource.new('foo/bar') }
+
+    its(:git_command) { should match git }
+  end
+
+  context 'custom options' do
+    let(:branch) { 'topic' }
+
+    subject { PgBundle::GithubSource.new('foo/bar', 'topic') }
+
+    its(:git_command) { should match git }
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pgbundle
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Manuel Kniep
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-17 00:00:00.000000000 Z
+date: 2014-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -185,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: bundling postgres extension