dumbo 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82e2e9299fa177d4e41fdc7b8c3417476190fff8
-  data.tar.gz: 5cf24b1b10829fcacf94016bd2fd29e21ab005d1
+  metadata.gz: 903d02a43533f1f95400a32a0b0f0fdc230b032b
+  data.tar.gz: 2bcf26adc162ab1521515902618fc7759d003e11
 SHA512:
-  metadata.gz: d08e465e241b15fb5796af82ecbe8480e37e22be2728bf96255e7cd00fee75e9d17073889dcead4af350eb9a22755e628267e59b23ebdfdd2977e552e6d6a2ee
-  data.tar.gz: 23e9fa7f1b2433e0d4c0641fe432c08674bbb3171bf66083c5dc032d7655acec3b0c93a3bf4523cdab21961499526bdf66f009a431c87df0dbc573e6f6b6b319
+  metadata.gz: 33dbebf49a41de6a31803291e7153d6aa2ef04251ff46ce0b19c78bee24e703b863eee58f89ebf13e879e8dec28e573da870086cc818651c5ea7665dd410c6df
+  data.tar.gz: adb6de0010e5354250c4c59373827a0b5177516cbbe2f55cdb3e0662a0593b649510752fc2f01d963c825323bfe2e65cd6b1933c2e348c2716d6a07a00cf12da

data/bin/dumbo

@@ -6,8 +6,32 @@ require 'fileutils'
 require 'pathname'
 
 module Cli
+  class Generate < Thor
+    desc 'spec <name>', 'Add a new spec file named <name> as spec/<name>_spec.rb'
+    def spec(name)
+      file_name = "spec/#{name}_spec.rb"
+      if File.exist?(file_name)
+        say_status('already exists', file_name, :yellow)
+        return
+      end
+
+      File.open("spec/#{name}_spec.rb", 'w') do |f|
+        f.puts <<-EOF.gsub('          ','')
+          require 'spec_helper'
+
+          describe '#{name}' do
+            before do
+              install_extension
+            end
+          end
+        EOF
+      end
+      say_status('create', file_name)
+    end
+  end
+
   class Dumbo < Thor
-    desc 'new name', 'creates a new extension skeleton'
+    desc 'new <name>', 'creates a new extension skeleton'
 
     def new(name, initial_version = '0.0.1')
       mkdir("#{name}/sql")
@@ -51,6 +75,11 @@ module Cli
       STR
     end
 
+    desc "g GENERATOR args", "generates files for the given generator"
+    subcommand "g", Generate
+
+
+
     no_commands do
       def mkdir(path, silent_skip = false)
         if File.directory?(path)

data/lib/dumbo/rake_task.rb

@@ -24,7 +24,12 @@ module Dumbo
 
         desc 'installs the extension'
         task :install do
-          system('make clean && make && make install')
+          cmd = if ENV['DUMBO_USE_SUDO']
+            'make clean && make && sudo make install'
+          else
+            'make clean && make && make install'
+          end
+          system(cmd)
         end
 
         desc 'concatenates files'
@@ -70,6 +75,10 @@ module Dumbo
           desc 'creates regression tests from specs and runs them'
           task regression: ['all', 'db:test:prepare'] do
             ENV['DUMBO_REGRESSION'] = 'true'
+
+            FileUtils.mkdir_p('test/sql/')
+            FileUtils.mkdir_p('test/expected/')
+
             RSpec::Core::RakeTask.new(:spec).run_task(false)
 
             if $?.success?

data/lib/dumbo/test/helper.rb

@@ -40,7 +40,11 @@ module Dumbo
       end
 
       def query(sql)
-        ActiveRecord::Base.connection.select_all(sql, 'SQL', [])
+        begin
+          ActiveRecord::Base.connection.select_all(sql, 'SQL', [])
+        rescue ActiveRecord::StatementInvalid => e
+          e
+        end
       end
 
       def create(table_name, values)

data/lib/dumbo/test/matchers.rb

@@ -2,7 +2,7 @@ module Dumbo
   module Matchers
 
     # test a query result against an expectation
-    # e.g.
+    # example
     # query("SELECT COUNT(*) FROM users").should match '3'
     # query("SELECT id, name FROM users").should match ['1', 'foo'] ,['2', 'bar'] ,['3', 'baz']
     # query("SELECT id, name FROM users").should match_with_header ['id', 'name'], ['1', 'foo'] ,['2', 'bar'] ,['3', 'baz']
@@ -21,8 +21,42 @@ module Dumbo
       QueryMatcher.new(flat_expected(expected), ordered: true )
     end
 
+    # test a query result against an error
+    # example
+    # query("SELECT 'foo'::date").should throw_error('ERROR:  invalid input syntax for type date: "foo"')
+
+    def throw_error(expected)
+      ErrorMatcher.new(expected)
+    end
+
     def flat_expected(expected)
-      expected.size == 1 ? expected.first.to_s : expected.map(&:to_s)
+      expected = expected.map{|e| e.nil? || e.kind_of?(Array) ? e : e.to_s}
+      expected.size == 1 ? expected.first : expected
+    end
+
+    class ErrorMatcher < RSpec::Matchers::BuiltIn::BaseMatcher
+      attr_reader :actual, :expected, :options, :actual_message
+
+      private
+
+      def match(expected, actual)
+        return false unless is_error?
+        @actual_message = @actual.message.split("\n").first.gsub(/^PG::InternalError: */,'')
+        actual_message.gsub(/^ERROR: */,'') == expected.gsub(/^ERROR: */,'')
+      end
+
+      def is_error?
+        actual.kind_of?(ActiveRecord::StatementInvalid)
+      end
+
+      def failure_message_when_not_error
+        "\nexpected error #{expected} but nothing was raised"
+      end
+
+      def failure_message
+        return "\nexpected error #{expected} but nothing was raised" unless is_error?
+        "expected ERROR: #{expected} got #{actual_message}"
+      end
     end
 
     class QueryMatcher < RSpec::Matchers::BuiltIn::ContainExactly
@@ -34,6 +68,7 @@ module Dumbo
       end
 
       def matches?(actual)
+        raise actual if actual.kind_of?(Exception)
         @actual = actual
         convert_actual
         convert_expected

data/lib/dumbo/test/regression_helper.rb

@@ -1,4 +1,6 @@
 RSpec.configure do |config|
+  config.order = 'defined'
+
   config.before(:all) do |e|
     path =  self.class.metadata[:file_path]
     test_file = Pathname.new(path).basename.sub_ext('.sql').sub('_spec','')

data/lib/dumbo/version.rb

@@ -1,3 +1,3 @@
 module Dumbo
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/template/Makefile.erb

@@ -3,4 +3,10 @@ EXTENSION = <%=ext_name%>
 PG_CONFIG ?= pg_config
 DATA = $(wildcard *--*.sql)
 PGXS := $(shell $(PG_CONFIG) --pgxs)
-include $(PGXS)
+MODULE_big = <%=ext_name%>
+OBJS = $(patsubst %.c,%.o,$(wildcard src/*.c))
+TESTS        = $(wildcard test/sql/*.sql)
+REGRESS      = $(patsubst test/sql/%.sql,%,$(TESTS))
+REGRESS_OPTS = --inputdir=test --load-language=plpgsql
+include $(PGXS)
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dumbo
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Manuel Kniep
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-24 00:00:00.000000000 Z
+date: 2014-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -179,7 +179,6 @@ files:
 - spec/operator_spec.rb
 - spec/spec_helper.rb
 - spec/support/extension_helper.rb
-- spec/support/silence_unknown_oid.rb
 - spec/type_spec.rb
 - template/Gemfile
 - template/Makefile.erb
@@ -228,5 +227,4 @@ test_files:
 - spec/operator_spec.rb
 - spec/spec_helper.rb
 - spec/support/extension_helper.rb
-- spec/support/silence_unknown_oid.rb
 - spec/type_spec.rb

data/spec/support/silence_unknown_oid.rb

@@ -1,12 +0,0 @@
-module ActiveRecord
-  module ConnectionAdapters
-    class PostgreSQLAdapter
-      module DatabaseStatements
-        def warn(msg)
-          return if msg =~ /^unknown OID/
-          super
-        end
-      end
-    end
-  end
-end