dumbo 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c38d6d2545804ea840a234c51c3d912fc2988a3
-  data.tar.gz: a1ace87c6b8469126e95a1eb94f9a503bcd93483
+  metadata.gz: 82e2e9299fa177d4e41fdc7b8c3417476190fff8
+  data.tar.gz: 5cf24b1b10829fcacf94016bd2fd29e21ab005d1
 SHA512:
-  metadata.gz: 6043bb12bfee32add950dd79093d41c3ea70732028749ccf8db79413d2e2219e8b3d5b197695255c4cba3d24ce4e38b3e3a2bdfc83522095ba9b85466fbf4623
-  data.tar.gz: ac5757b0c2dee69ecd5c0d962d3e0f4557b1937b5c08f63c0d3d3210134ef11975803a675e01f2770df35e250865e1331404577a42b246d8043406492394c778
+  metadata.gz: d08e465e241b15fb5796af82ecbe8480e37e22be2728bf96255e7cd00fee75e9d17073889dcead4af350eb9a22755e628267e59b23ebdfdd2977e552e6d6a2ee
+  data.tar.gz: 23e9fa7f1b2433e0d4c0641fe432c08674bbb3171bf66083c5dc032d7655acec3b0c93a3bf4523cdab21961499526bdf66f009a431c87df0dbc573e6f6b6b319

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+config/database.yml

data/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in dumbo.gemspec
-gemspec
+gemspec

data/bin/dumbo

@@ -3,25 +3,24 @@ require 'thor'
 require 'thor/group'
 require 'erubis'
 require 'fileutils'
+require 'pathname'
 
 module Cli
   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')
-      FileUtils.mkdir_p("#{name}/sql")
-      FileUtils.mkdir_p("#{name}/src")
-      FileUtils.mkdir_p("#{name}/spec/support")
-      FileUtils.mkdir_p("#{name}/config")
-      FileUtils.mkdir_p("#{name}/lib/tasks")
+    def new(name, initial_version = '0.0.1')
+      mkdir("#{name}/sql")
+      mkdir("#{name}/src")
+      mkdir("#{name}/spec")
+      mkdir("#{name}/config")
+      mkdir("#{name}/lib/tasks")
 
       spec_helper = Dir.glob(File.expand_path('../../spec/spec_helper.rb', __FILE__))
       spec_helper += Dir.glob(File.expand_path('../../spec/support', __FILE__))
 
-      FileUtils.cp_r spec_helper, "#{name}/spec/"
-
-      FileUtils.cp File.expand_path('../../config/boot.rb', __FILE__), "#{name}/config/"
+      cp spec_helper, "#{name}/spec"
+      cp File.expand_path('../../config/boot.rb', __FILE__), "#{name}/config"
 
       template_path = File.expand_path('../../template', __FILE__)
 
@@ -30,29 +29,71 @@ module Cli
         dest_name = pathname.relative_path_from Pathname.new(template_path)
 
         if pathname.directory?
-          FileUtils.mkdir_p("#{name}/#{dest_name}")
+          mkdir("#{name}/#{dest_name}", true)
           next
         end
 
-        if dest_name.extname =='.erb'
+        if dest_name.extname == '.erb'
           eruby = Erubis::Eruby.new(File.read(template))
-          File.open("#{name}/#{dest_name.sub_ext('')}",'w') do |f|
-            f.puts eruby.result({ext_name: name})
-          end
+          content = eruby.result(ext_name: name)
+          create "#{name}/#{dest_name.sub_ext('')}", content
+        else
+          cp template, "#{name}/#{dest_name}"
+        end
+      end
+
+      create "#{name}/#{name}.control", <<-STR
+        # #{name} extension
+        comment = 'my awesome extension'
+        default_version = '#{initial_version}'
+        relocatable = true
+        requires = ''
+      STR
+    end
+
+    no_commands do
+      def mkdir(path, silent_skip = false)
+        if File.directory?(path)
+          say_status('skip', "#{path}", :yellow) unless silent_skip
+        else
+          FileUtils.mkdir_p(path)
+          say_status('create', "#{path}")
+        end
+      end
+
+      def create(path, content, silent_skip = false)
+        if File.exist? path
+          say_status('skip', path, :yellow) unless silent_skip
         else
-          FileUtils.cp template, "#{name}/#{dest_name}"
+          File.open(path, 'w') do |f|
+            f.puts content
+          end
+          say_status('create', path)
         end
       end
 
-      File.open("#{name}/#{name}.control",'w') do |f|
-        f.puts "# #{name} extension"
-        f.puts "comment = 'my awesome extension'"
-        f.puts "default_version = '#{initial_version}'"
-        f.puts "relocatable = true"
-        f.puts "requires = ''"
+      def cp(src, dest, silent_skip = false)
+        Array(src).each do |p|
+          path = Pathname.new(p)
+          if File.directory?(dest)
+            if File.exist?("#{dest}/#{path.basename}")
+              say_status('skip', "#{dest}/#{path.basename}", :yellow) unless silent_skip
+            else
+              FileUtils.cp_r p, dest
+              say_status('create', "#{dest}/#{path.basename}")
+            end
+          else
+            if File.exist?(dest)
+              say_status('skip', dest, :yellow) unless silent_skip
+            else
+              FileUtils.cp_r p, dest
+              say_status('create', dest)
+            end
+          end
+        end
       end
     end
   end
 end
 
-Cli::Dumbo.start(ARGV)
+Cli::Dumbo.start(ARGV)

data/config/boot.rb

@@ -1,15 +1,14 @@
-$:.unshift File.expand_path('../..', __FILE__)
+$LOAD_PATH.unshift File.expand_path('../..', __FILE__)
 
 # Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
 ENV['DUMBO_ENV']  ||= 'development'
 
-require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
 Bundler.require(:default, ENV['DUMBO_ENV'].to_sym)
 
 def db_config
   @config ||= YAML.load_file('config/database.yml')
 end
 
-
 ActiveRecord::Base.establish_connection db_config[ENV['DUMBO_ENV']]

data/dumbo.gemspec

@@ -19,8 +19,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "rake"
   spec.add_dependency 'erubis'
-  spec.add_dependency 'rspec', '~> 2.14.0'
-  spec.add_dependency'factory_girl', '~> 4.0'
+  spec.add_dependency 'rspec', '~> 3.0.0'
   spec.add_dependency 'activerecord'
   spec.add_dependency 'pg', '> 0.17'
 

data/lib/dumbo.rb

@@ -1,20 +1,21 @@
 require 'active_record'
-require "dumbo/version"
-require "dumbo/pg_object"
-require "dumbo/type"
-require "dumbo/function"
-require "dumbo/cast"
-require "dumbo/base_type"
-require "dumbo/aggregate"
-require "dumbo/composite_type"
-require "dumbo/dependency_resolver"
-require "dumbo/enum_type"
-require "dumbo/extension"
-require "dumbo/extension_migrator"
-require "dumbo/extension_version"
-require "dumbo/operator"
-require "dumbo/range_type"
-require "dumbo/version"
+require 'dumbo/version'
+require 'dumbo/pg_object'
+require 'dumbo/type'
+require 'dumbo/function'
+require 'dumbo/cast'
+require 'dumbo/base_type'
+require 'dumbo/aggregate'
+require 'dumbo/composite_type'
+require 'dumbo/dependency_resolver'
+require 'dumbo/enum_type'
+require 'dumbo/extension'
+require 'dumbo/extension_migrator'
+require 'dumbo/extension_version'
+require 'dumbo/operator'
+require 'dumbo/range_type'
+require 'dumbo/version'
+require 'dumbo/binding_loader'
 
 module Dumbo
   # Your code goes here...

data/lib/dumbo/aggregate.rb

@@ -30,14 +30,13 @@ module Dumbo
         WHERE aggfnoid = #{oid}
       SQL
 
-      result.first.each do |k,v|
-        send("#{k}=",v) rescue nil
+      result.first.each do |k, v|
+        send("#{k}=", v) rescue nil
       end
 
       result.first
     end
 
-
     def to_sql
       attributes = []
       attributes << "SFUNC = #{sfunc}"
@@ -52,6 +51,5 @@ module Dumbo
       );
       SQL
     end
-
   end
-end
+end

data/lib/dumbo/base_type.rb

@@ -1,18 +1,18 @@
 module Dumbo
   class BaseType < Type
-    attr_accessor  :input_function,
-                    :output_function,
-                    :receive_function,
-                    :send_function,
-                    :analyze_function,
-                    :category,
-                    :default,
-                    :alignment,
-                    :storage,
-                    :type,
-                    :internallength,
-                    :attribute_name,
-                    :typrelid
+    attr_accessor :input_function,
+                  :output_function,
+                  :receive_function,
+                  :send_function,
+                  :analyze_function,
+                  :category,
+                  :default,
+                  :alignment,
+                  :storage,
+                  :type,
+                  :internallength,
+                  :attribute_name,
+                  :typrelid
 
     def load_attributes
       sql = <<-SQL
@@ -44,15 +44,15 @@ module Dumbo
       SQL
 
       result = execute sql
-      result.first.each do |k,v|
-        send("#{k}=",v) rescue nil
+      result.first.each do |k, v|
+        send("#{k}=", v) rescue nil
       end
 
       result.first
     end
 
     def to_sql
-        <<-SQL.gsub(/^ {8}/, '')
+      <<-SQL.gsub(/^ {8}/, '')
         CREATE TYPE #{name}(
           INPUT=#{input_function},
           OUTPUT=#{output_function},
@@ -68,4 +68,4 @@ module Dumbo
         SQL
     end
   end
-end
+end

data/lib/dumbo/binding_loader.rb

@@ -0,0 +1,50 @@
+require 'yaml'
+module Dumbo
+  class BindingLoader
+
+    def self.load_pattern
+      /\s*--\s*load +([^\s'";]+)/
+    end
+
+    def initialize(file)
+      @file = file
+    end
+
+    def load
+      load_list.reduce({}) do |result, file|
+        yaml = Pathname.new(file).sub_ext('.yml')
+        bind = YAML.load_file(yaml)
+
+        result.merge(bind)
+      end
+    end
+
+    private
+
+    def load_list
+      files = []
+      IO.foreach(@file) do |line|
+        catch(:done) do
+          load_file = parse(line)
+          files << load_file if load_file
+        end
+      end
+      files
+    end
+
+    def parse(line)
+      return Regexp.last_match[1] if encoded_line(line) =~ BindingLoader.load_pattern
+
+      # end of first commenting block we're done.
+      throw :done unless line =~ /--/
+    end
+
+    def encoded_line(line)
+      if String.method_defined?(:encode)
+        line.encode!('UTF-8', 'UTF-8', invalid: :replace)
+      else
+        line
+      end
+    end
+  end
+end

data/lib/dumbo/cast.rb

@@ -23,21 +23,21 @@ module Dumbo
       WHERE ca.oid = #{oid}
       SQL
 
-      result.first.each do |k,v|
-        send("#{k}=",v) rescue nil
+      result.first.each do |k, v|
+        send("#{k}=", v) rescue nil
       end
 
       result.first
     end
 
     def drop
-      "DROP CAST (#{source_type} AS #{target_type})"
+      "DROP CAST (#{source_type} AS #{target_type});"
     end
 
     def to_sql
       attributes = []
       attributes << "WITH FUNCTION #{function_name}(#{source_type})" if function_name
-      attributes << "WITHOUT FUNCTION" unless function_name
+      attributes << 'WITHOUT FUNCTION' unless function_name
       attributes << context if context
 
       <<-SQL.gsub(/^ {6}/, '')
@@ -46,4 +46,4 @@ module Dumbo
       SQL
     end
   end
-end
+end

data/lib/dumbo/composite_type.rb

@@ -1,6 +1,6 @@
 module Dumbo
   class CompositeType < Type
-    attr_accessor  :attributes
+    attr_accessor :attributes
 
     def load_attributes
       super
@@ -16,11 +16,11 @@ module Dumbo
       SQL
 
       attribute = Struct.new(:name, :type)
-      @attributes = res.map{|r| attribute.new(r['attname'],r['typname'])}
+      @attributes = res.map { |r| attribute.new(r['attname'], r['typname']) }
     end
 
     def to_sql
-      attr_str = attributes.map{|a| "#{a.name} #{a.type}"}.join(",\n  ")
+      attr_str = attributes.map { |a| "#{a.name} #{a.type}" }.join(",\n  ")
       <<-SQL.gsub(/^ {6}/, '')
       CREATE TYPE #{name} AS (
         #{attr_str}
@@ -28,4 +28,4 @@ module Dumbo
       SQL
     end
   end
-end
+end

data/lib/dumbo/db_task.rb

@@ -1,6 +1,7 @@
-require "rake"
+require 'rake'
 require 'rake/tasklib'
 require 'active_record'
+require 'yaml'
 
 module Dumbo
   class DbTask < ::Rake::TaskLib
@@ -9,7 +10,7 @@ module Dumbo
       @name = name
 
       namespace name do
-        task environment: ['db:configure_connection' ]
+        task environment: ['db:configure_connection']
 
         task :configuration do
           @config = YAML.load_file('config/database.yml')[ENV['DUMBO_ENV']]
@@ -33,16 +34,16 @@ module Dumbo
 
         namespace :test do
           task :environment do
-            ENV['DUMBO_ENV'] ||= 'test'
+            ENV['DUMBO_ENV'] = 'test'
             ActiveRecord::Schema.verbose = false
           end
 
           task load_structure: :environment do
-            filename = ENV['DB_STRUCTURE'] || File.join("db", "structure.sql")
+            filename = ENV['DB_STRUCTURE'] || File.join('db', 'structure.sql')
             ActiveRecord::Tasks::DatabaseTasks.structure_load(@config, filename)
           end
 
-          desc "Re-create and prepare test database"
+          desc 'Re-create and prepare test database'
           task prepare: [:environment, :drop, :create]
         end
       end

data/lib/dumbo/dependency_resolver.rb

@@ -2,7 +2,6 @@ require 'pathname'
 require 'active_support/core_ext/module/attribute_accessors'
 
 module Dumbo
-
   class DependencyNotFound < StandardError
     attr_accessor :dep, :file
 
@@ -23,7 +22,7 @@ module Dumbo
     end
 
     def resolve
-      list = dependency_list.sort{|a,b| a.last.size <=> b.last.size}
+      list = dependency_list.sort { |a, b| a.last.size <=> b.last.size }
       resolve_list(list)
     end
 
@@ -33,14 +32,13 @@ module Dumbo
       @resolve_list = []
       @temp_list = list
       loops = 0
-      until @temp_list.empty? || loops > 10 do
-        @temp_list.each do |(file, deps)|
-          _resolve(file, deps)
-        end
-        loops +=1
+      # TODO find a better way here
+      until @temp_list.empty? || loops * 10 > @temp_list.size
+        file, deps = @temp_list.first
+        loops += 1 unless _resolve(file, deps)
       end
 
-      raise "Can't resolve dependencies" if loops > 10
+      fail "Can't resolve dependencies" if loops > 10
 
       @resolve_list
     end
@@ -48,26 +46,26 @@ module Dumbo
     def _resolve(file, deps)
       if deps.empty?
         @resolve_list.push(@temp_list.shift.first)
-        return
+        return true
       end
 
       left = deps - @resolve_list
       if left.empty?
         @resolve_list.push(@temp_list.shift.first)
-        return
+        return true
       else
         @temp_list.push @temp_list.shift
+        return false
       end
     end
 
-
     def dependency_list
       @file_list.map do |file|
         deps = []
         IO.foreach(file) do |line|
           catch(:done) do
             dep = parse(line)
-            deps << relative_path(dep,file) if dep
+            deps << relative_path(dep, file) if dep
           end
         end
         [file, deps]
@@ -76,30 +74,31 @@ module Dumbo
 
     def encoded_line(line)
       if String.method_defined?(:encode)
-        line.encode!('UTF-8', 'UTF-8', :invalid => :replace)
+        line.encode!('UTF-8', 'UTF-8', invalid: :replace)
       else
         line
       end
     end
 
     def parse(line)
-      return $1 if encoded_line(line) =~ DependencyResolver.depends_pattern
+      return Regexp.last_match[1] if encoded_line(line) =~ DependencyResolver.depends_pattern
 
       # end of first commenting block we're done.
       throw :done unless line =~ /--/
     end
 
-    def relative_path(dep,file)
+    def relative_path(dep, file)
       p = Pathname.new(file).dirname.join(dep)
       if p.exist? && p.extname.present?
         return p.to_s
       elsif p.extname.empty?
-        %w(.sql .erb).each do |ext|
+        %w(.sql .erb .sql.erb).each do |ext|
           new_p = p.sub_ext(ext)
           return new_p.to_s if new_p.exist?
         end
       end
-      raise DependencyNotFound.new(dep, file)
+
+      fail DependencyNotFound.new(dep, file)
     end
   end
-end
+end