pgxn_utils 0.1.3 → 0.1.4

data/lib/pgxn_utils/templates/sql/test/expected/base.out.tt

@@ -0,0 +1,49 @@
+\set ECHO 0
+-- You should write your tests
+SELECT <%= extension_name %>('foo', 'bar');
+ <%= extension_name %> 
+<%= '-' * (extension_name.length + 2) %>
+ (foo,bar)
+(1 row)
+
+SELECT 'foo' #? 'bar' AS arrowop;
+  arrowop  
+-----------
+ (foo,bar)
+(1 row)
+
+CREATE TABLE ab (
+    a_field <%= extension_name %>
+);
+INSERT INTO ab VALUES('foo' #? 'bar');
+SELECT (a_field).a, (a_field).b FROM ab;
+  a  |  b  
+-----+-----
+ foo | bar
+(1 row)
+
+SELECT (<%= extension_name %>('foo', 'bar')).a;
+  a  
+-----
+ foo
+(1 row)
+
+SELECT (<%= extension_name %>('foo', 'bar')).b;
+  b  
+-----
+ bar
+(1 row)
+
+SELECT ('foo' #? 'bar').a;
+  a  
+-----
+ foo
+(1 row)
+
+SELECT ('foo' #? 'bar').b;
+  b  
+-----
+ bar
+(1 row)
+
+ROLLBACK;

data/lib/pgxn_utils/templates/sql/test/sql/base.sql.tt

@@ -0,0 +1,25 @@
+\set ECHO 0
+BEGIN;
+\i sql/<%= extension_name %>.sql
+\set ECHO all
+
+-- You should write your tests
+
+SELECT <%= extension_name %>('foo', 'bar');
+
+SELECT 'foo' #? 'bar' AS arrowop;
+
+CREATE TABLE ab (
+    a_field <%= extension_name %>
+);
+
+INSERT INTO ab VALUES('foo' #? 'bar');
+SELECT (a_field).a, (a_field).b FROM ab;
+
+SELECT (<%= extension_name %>('foo', 'bar')).a;
+SELECT (<%= extension_name %>('foo', 'bar')).b;
+
+SELECT ('foo' #? 'bar').a;
+SELECT ('foo' #? 'bar').b;
+
+ROLLBACK;

data/lib/pgxn_utils/version.rb

@@ -1,3 +1,3 @@
 module PgxnUtils
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/pgxn_utils.rb

@@ -1,10 +1,10 @@
 require 'thor'
 require 'json'
 require 'zip/zip'
-require 'zippy'
 require 'net/http/post/multipart'
 require 'net/https'
 require 'highline/import'
+require 'grit'
 
 module PgxnUtils
  autoload :CLI, 'pgxn_utils/cli'

data/pgxn_utils.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.name        = "pgxn_utils"
   s.version     = PgxnUtils::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.date        = %q{2011-05-06}
+  s.date        = %q{2012-03-06}
   s.authors     = ["Dickson S. Guedes"]
   s.email       = ["guedes@guedesoft.net"]
   s.homepage    = "http://github.com/guedes/pgxn-utils"
@@ -26,20 +26,10 @@ Gem::Specification.new do |s|
 
   Issues? Please visit: https://github.com/guedes/pgxn-utils/issues
 
-  #{
-	unless `which pgxn`.nil?
-		"PGXN Client found. Cool!"
-	else
-		"PGXN Client is recommended but not found. You could install it if you want, just follow instructions: http://pgxnclient.projects.postgresql.org/"
-	end
-  }
-  #{
-	unless `which validate_pgxn_meta`.nil?
-		"PGXN Meta Validator found. Cool!"
-	else
-		"PGXN Meta Validator is recommended but not found! You could install it if you want, just type: cpan PGXN::Meta::Validator"
-	end
-  }
+  Recomended tools:
+
+  - PGXN Client: http://pgxnclient.projects.postgresql.org
+  - PGXN Meta Validator: https://github.com/pgxn/pgxn-meta-validator
 
   Thank you for use this tool!
 
@@ -51,28 +41,29 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency "json", "~> 1.5.2"
+      s.add_runtime_dependency "json", "~> 1.6.6"
       s.add_runtime_dependency "thor", "~> 0.14"
-      s.add_runtime_dependency "rubyzip", "~> 0.9.4"
-      s.add_runtime_dependency "zippy", "~> 0.1.0"
-      s.add_runtime_dependency "multipart-post", "~> 1.1.2"
-      s.add_runtime_dependency "highline", "~> 1.6.2"
+      s.add_runtime_dependency "rubyzip", "~> 0.9.7"
+      s.add_runtime_dependency "multipart-post", "~> 1.1.5"
+      s.add_runtime_dependency "highline", "~> 1.6.11"
+      s.add_runtime_dependency "grit", "~> 2.4.1"
       s.add_development_dependency "rspec"
+      s.add_development_dependency "mocha"
       s.add_development_dependency "simplecov", "~> 0.4.0"
     else
-      s.add_dependency "json", "~> 1.5.2"
+      s.add_dependency "json", "~> 1.6.6"
       s.add_dependency "thor", "~> 0.14"
-      s.add_dependency "rubyzip", "~> 0.9.4"
-      s.add_dependency "zippy", "~> 0.1.0"
-      s.add_dependency "multipart-post", "~> 1.1.2"
-      s.add_dependency "highline", "~> 1.6.2"
+      s.add_dependency "rubyzip", "~> 0.9.7"
+      s.add_dependency "multipart-post", "~> 1.1.5"
+      s.add_dependency "highline", "~> 1.6.11"
+      s.add_dependency "grit", "~> 2.4.1"
     end
   else
-    s.add_dependency "json", "~> 1.5.2"
+    s.add_dependency "json", "~> 1.6.6"
     s.add_dependency "thor", "~> 0.14"
-    s.add_dependency "rubyzip", "~> 0.9.4"
-    s.add_dependency "zippy", "~> 0.1.0"
-    s.add_dependency "multipart-post", "~> 1.1.2"
-    s.add_dependency "highline", "~> 1.6.2"
+    s.add_dependency "rubyzip", "~> 0.9.7"
+    s.add_dependency "multipart-post", "~> 1.1.5"
+    s.add_dependency "highline", "~> 1.6.11"
+    s.add_dependency "grit", "~> 2.4.1"
   end
 end

data/spec/cli_spec.rb

@@ -2,21 +2,27 @@ require File.expand_path('spec/spec_helper')
 
 describe PgxnUtils::CLI do
 
+  before(:all) do
+	FileUtils.mv "META.json", "meta.json"
+  end
+
   after(:all) do
+	FileUtils.mv "meta.json", "META.json"
     system "rm -rf /tmp/extension.*"
     system "rm -rf extension.*"
   end
 
   context "#skeleton" do
     before(:each) do
-      @cli = PgxnUtils::CLI.new
+		system "rm -rf /tmp/extension.*"
+		system "rm -rf extension.*"
     end
 
     it "should accepts or not a target" do
       expected_extension = next_extension
 
       File.should_not exist(expected_extension)
-      skeleton "#{expected_extension}", "-p /tmp"
+      skeleton "#{expected_extension}", %w|-p /tmp|
       File.should exist("/tmp/#{expected_extension}")
 
       File.should_not exist(expected_extension)
@@ -30,10 +36,9 @@ describe PgxnUtils::CLI do
       expected_mail = "guedes@none.here"
       expected_abstract = "Short description"
       expected_description = "Very Long description for my cool extension"
-      expected_tags = "one two tree"
       expected_version = "1.0.0"
 
-      skeleton expected_extension, "-p /tmp -m #{expected_name} -e #{expected_mail} -t #{expected_tags} -a '#{expected_abstract}' -d '#{expected_description}' -v #{expected_version}"
+      skeleton expected_extension, %W|-p /tmp -m #{expected_name} -e #{expected_mail} -t one two tree -a #{expected_abstract} -d #{expected_description} -v #{expected_version}|
 
       meta = File.read("/tmp/#{expected_extension}/META.json")
       meta.should match(/"name": "#{expected_extension}"/)
@@ -54,15 +59,16 @@ describe PgxnUtils::CLI do
       makefile.should match(/EXTENSION    = #{expected_extension}/)
 
       control = File.read("/tmp/#{expected_extension}/#{expected_extension}.control")
-      control.should match(/module_pathname = '\$libdir\/#{expected_extension}'/)
       control.should match(/default_version = '#{expected_version}'/)
     end
 
-    it "should generates a skeleton" do
+    it "should generates a default skeleton" do
       extension = next_extension
       skeleton extension
 
-      Dir["#{extension}/**/*"].sort.should == [
+      Dir["#{extension}/**/{*,.gitignore,.template}"].sort.should == [
+        "#{extension}/.gitignore",
+        "#{extension}/.template",
         "#{extension}/META.json",
         "#{extension}/Makefile",
         "#{extension}/README.md",
@@ -78,9 +84,68 @@ describe PgxnUtils::CLI do
         "#{extension}/test/sql/base.sql",
         "#{extension}/#{extension}.control"
       ].sort
+
+      template = File.read("#{extension}/.template").chomp
+	  template.should == "sql"
     end
 
-    it "should generates a git repo"
+    it "should generates a skeleton for C extensions" do
+      extension = next_extension
+      skeleton extension, %w|--template c|
+
+      Dir["#{extension}/**/{*,.gitignore,.template}"].sort.should == [
+        "#{extension}/.gitignore",
+        "#{extension}/.template",
+        "#{extension}/META.json",
+        "#{extension}/Makefile",
+        "#{extension}/README.md",
+        "#{extension}/doc",
+        "#{extension}/doc/#{extension}.md",
+        "#{extension}/sql",
+        "#{extension}/sql/#{extension}.sql",
+        "#{extension}/sql/uninstall_#{extension}.sql",
+        "#{extension}/src",
+        "#{extension}/src/#{extension}.c",
+        "#{extension}/test",
+        "#{extension}/test/expected",
+        "#{extension}/test/expected/base.out",
+        "#{extension}/test/sql",
+        "#{extension}/test/sql/base.sql",
+        "#{extension}/#{extension}.control"
+      ].sort
+      
+	  makefile = File.read("#{extension}/Makefile")
+	  makefile.should match(/EXTENSION    = #{extension}/)
+
+	  control = File.read("#{extension}/#{extension}.control")
+      control.should match(/module_pathname = '\$libdir\/#{extension}'/)
+	
+      template = File.read("#{extension}/.template").chomp
+	  template.should == "c"
+
+	  c_file = File.read("#{extension}/src/#{extension}.c")
+	  c_file.should match(/#include "postgres.h"/)
+	  c_file.should match(/#include "fmgr.h"/)
+	  c_file.should match(/PG_MODULE_MAGIC;/)
+	  c_file.should match(/PG_FUNCTION_INFO_V1\(#{extension}\);/)
+      c_file.should match(/Datum #{extension}\(PG_FUNCTION_ARGS\);/)
+    end
+
+	it "should generates a git repo with --git" do
+		expected_extension = next_extension
+		skeleton "#{expected_extension}", %w|--git|
+
+		File.should exist("#{expected_extension}/.git")
+		lambda{ Grit::Repo.new(expected_extension) }.should_not raise_error
+	end
+
+	it "should not generates a git repo with --no-git" do
+		expected_extension = next_extension
+		skeleton "#{expected_extension}", %w|--no-git|
+
+		File.should_not exist("#{expected_extension}/.git")
+		lambda{ Grit::Repo.new(expected_extension) }.should raise_error
+	end
   end
 
   context "#change" do

data/spec/no_tasks_spec.rb

@@ -7,6 +7,8 @@ describe PgxnUtils::NoTasks do
   after(:all) do
     rm_r("/tmp/teste")
     rm_r("/tmp/teste2")
+
+    PgxnUtils::NoTasks.send(:remove_method, :options)
   end
 
   context "#resolve_extension_path_and_name" do

data/spec/spec_helper.rb

@@ -14,19 +14,36 @@ BIN_PATH = File.expand_path('../../bin/pgxn-utils', __FILE__)
 DESTINATION_ROOT = File.expand_path('../pgxn_utils', __FILE__)
 FileUtils.rm_rf(DESTINATION_ROOT)
 
+RSpec.configure do |config|
+  # capture method from https://github.com/wycats/thor/blob/master/spec/spec_helper.rb#L36-47
+  def capture(stream)
+    begin
+      stream = stream.to_s
+      eval "$#{stream} = StringIO.new"
+      yield
+      result = eval("$#{stream}").string
+    ensure
+      eval("$#{stream} = #{stream.upcase}")
+    end
+
+    result
+  end
+end
+
+
 def next_extension
   $counter += 1
   "extension.#{$counter}"
 end
 
-def skeleton(extension_name, args=nil)
-  run_pgxn_utils(:skeleton, "#{extension_name} #{args}")
+def skeleton(extension_name, args=[])
+	capture(:stdout) { PgxnUtils::CLI.start([ "skeleton", extension_name ] + args) }
 end
 
 def change(extension_name, args=nil)
-  run_pgxn_utils(:skeleton, "#{extension_name} #{args}")
+  #run_pgxn_utils(:skeleton, "#{extension_name} #{args}")
 end
 
 def run_pgxn_utils(task, args)
-  system "#{BIN_PATH} #{task.to_s} #{args} >/dev/null"
+  #system "#{BIN_PATH} #{task.to_s} #{args}"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pgxn_utils
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-05-06 00:00:00.000000000Z
+date: 2012-03-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &74341240 !ruby/object:Gem::Requirement
+  requirement: &20698940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.6.6
   type: :runtime
   prerelease: false
-  version_requirements: *74341240
+  version_requirements: *20698940
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &74341010 !ruby/object:Gem::Requirement
+  requirement: &20698420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,54 +32,65 @@ dependencies:
         version: '0.14'
   type: :runtime
   prerelease: false
-  version_requirements: *74341010
+  version_requirements: *20698420
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &74340780 !ruby/object:Gem::Requirement
+  requirement: &20697900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.4
+        version: 0.9.7
   type: :runtime
   prerelease: false
-  version_requirements: *74340780
+  version_requirements: *20697900
 - !ruby/object:Gem::Dependency
-  name: zippy
-  requirement: &74340550 !ruby/object:Gem::Requirement
+  name: multipart-post
+  requirement: &20697340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 1.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *74340550
+  version_requirements: *20697340
 - !ruby/object:Gem::Dependency
-  name: multipart-post
-  requirement: &74340320 !ruby/object:Gem::Requirement
+  name: highline
+  requirement: &20696820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.6.11
   type: :runtime
   prerelease: false
-  version_requirements: *74340320
+  version_requirements: *20696820
 - !ruby/object:Gem::Dependency
-  name: highline
-  requirement: &74340090 !ruby/object:Gem::Requirement
+  name: grit
+  requirement: &20696320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: 2.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *74340090
+  version_requirements: *20696320
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &74339900 !ruby/object:Gem::Requirement
+  requirement: &20693300 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *20693300
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &20692800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *74339900
+  version_requirements: *20692800
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &74339630 !ruby/object:Gem::Requirement
+  requirement: &20692300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,28 +109,62 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *74339630
+  version_requirements: *20692300
 description: A PGXN set of tools to help developers create and publish your PostgreSQL
   extensions without pain
 email:
 - guedes@guedesoft.net
 executables:
+- pgxn-bundle
+- pgxn-change
+- pgxn-release
+- pgxn-skeleton
 - pgxn-utils
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
+- LICENSE
 - META.json
 - Makefile
 - README.md
 - Rakefile
+- bin/pgxn-bundle
+- bin/pgxn-change
+- bin/pgxn-release
+- bin/pgxn-skeleton
 - bin/pgxn-utils
 - lib/pgxn_utils.rb
 - lib/pgxn_utils/cli.rb
 - lib/pgxn_utils/constants.rb
 - lib/pgxn_utils/no_tasks.rb
+- lib/pgxn_utils/templates/c/%extension_name%.control.tt
+- lib/pgxn_utils/templates/c/.gitignore.tt
+- lib/pgxn_utils/templates/c/.template
+- lib/pgxn_utils/templates/c/META.json.tt
+- lib/pgxn_utils/templates/c/Makefile.tt
+- lib/pgxn_utils/templates/c/README.md.tt
+- lib/pgxn_utils/templates/c/doc/%extension_name%.md.tt
+- lib/pgxn_utils/templates/c/sql/%extension_name%.sql.tt
+- lib/pgxn_utils/templates/c/sql/uninstall_%extension_name%.sql.tt
+- lib/pgxn_utils/templates/c/src/%extension_name%.c.tt
+- lib/pgxn_utils/templates/c/test/expected/base.out.tt
+- lib/pgxn_utils/templates/c/test/sql/base.sql.tt
+- lib/pgxn_utils/templates/fdw/%extension_name%.control.tt
+- lib/pgxn_utils/templates/fdw/.gitignore.tt
+- lib/pgxn_utils/templates/fdw/.template
+- lib/pgxn_utils/templates/fdw/META.json.tt
+- lib/pgxn_utils/templates/fdw/Makefile.tt
+- lib/pgxn_utils/templates/fdw/README.md.tt
+- lib/pgxn_utils/templates/fdw/doc/%extension_name%.md.tt
+- lib/pgxn_utils/templates/fdw/sql/%extension_name%.sql.tt
+- lib/pgxn_utils/templates/fdw/sql/uninstall_%extension_name%.sql.tt
+- lib/pgxn_utils/templates/fdw/src/%extension_name%_fdw.c.tt
+- lib/pgxn_utils/templates/fdw/test/expected/base.out.tt
+- lib/pgxn_utils/templates/fdw/test/sql/base.sql.tt
 - lib/pgxn_utils/templates/root/%extension_name%.control.tt
+- lib/pgxn_utils/templates/root/.gitignore.tt
 - lib/pgxn_utils/templates/root/META.json.tt
 - lib/pgxn_utils/templates/root/Makefile.tt
 - lib/pgxn_utils/templates/root/README.md.tt
@@ -128,6 +173,17 @@ files:
 - lib/pgxn_utils/templates/root/sql/uninstall_%extension_name%.sql
 - lib/pgxn_utils/templates/root/test/expected/base.out
 - lib/pgxn_utils/templates/root/test/sql/base.sql.tt
+- lib/pgxn_utils/templates/sql/%extension_name%.control.tt
+- lib/pgxn_utils/templates/sql/.gitignore.tt
+- lib/pgxn_utils/templates/sql/.template
+- lib/pgxn_utils/templates/sql/META.json.tt
+- lib/pgxn_utils/templates/sql/Makefile.tt
+- lib/pgxn_utils/templates/sql/README.md.tt
+- lib/pgxn_utils/templates/sql/doc/%extension_name%.md.tt
+- lib/pgxn_utils/templates/sql/sql/%extension_name%.sql.tt
+- lib/pgxn_utils/templates/sql/sql/uninstall_%extension_name%.sql.tt
+- lib/pgxn_utils/templates/sql/test/expected/base.out.tt
+- lib/pgxn_utils/templates/sql/test/sql/base.sql.tt
 - lib/pgxn_utils/version.rb
 - pgxn_utils.gemspec
 - spec/cli_spec.rb
@@ -135,9 +191,10 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/guedes/pgxn-utils
 licenses: []
-post_install_message: ! "\n  PGXN Utils version 0.1.3 was installed!\n\n  Issues?
-  Please visit: https://github.com/guedes/pgxn-utils/issues\n\n  PGXN Client found.
-  Cool!\n  PGXN Meta Validator found. Cool!\n\n  Thank you for use this tool!\n\n
+post_install_message: ! "\n  PGXN Utils version 0.1.4 was installed!\n\n  Issues?
+  Please visit: https://github.com/guedes/pgxn-utils/issues\n\n  Recomended tools:\n\n
+  \ - PGXN Client: http://pgxnclient.projects.postgresql.org\n  - PGXN Meta Validator:
+  https://github.com/pgxn/pgxn-meta-validator\n\n  Thank you for use this tool!\n\n
   \ Regards, Dickson S. Guedes\n\n"
 rdoc_options: []
 require_paths:
@@ -156,7 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.7
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A PGXN set of tools to PostgreSQL extension's developers