wvanbergen-scoped_search 0.7.2 → 0.7.3

data/Rakefile

@@ -1,70 +1,6 @@
 require 'rubygems'
 
-load 'test/tasks.rake'
+Dir['tasks/*.rake'].each { |file| load(file) }
  
 desc 'Default: run unit tests.'
-task :default => :test
-
-namespace :gem do
-
-  desc "Sets the version and date of the scoped_search gem. Requires the VERSION environment variable."
-  task :version => [:manifest] do
-    
-    require 'date'
-    
-    new_version = ENV['VERSION']
-    raise "VERSION is required" unless /\d+(\.\d+)*/ =~ new_version
-    
-    spec_file = Dir['*.gemspec'].first
-    
-    spec = File.read(spec_file)
-    spec.gsub!(/^(\s*s\.version\s*=\s*)('|")(.+)('|")(\s*)$/) { "#{$1}'#{new_version}'#{$5}" }
-    spec.gsub!(/^(\s*s\.date\s*=\s*)('|")(.+)('|")(\s*)$/) { "#{$1}'#{Date.today.strftime('%Y-%m-%d')}'#{$5}" }    
-    File.open(spec_file, 'w') { |f| f << spec }
-  end
-  
-  task :tag => [:version] do
-    
-    new_version = ENV['VERSION']
-    raise "VERSION is required" unless /\d+(\.\d+)*/ =~ new_version
-        
-    sh "git add scoped_search.gemspec .manifest"
-    sh "git commit -m \"Set gem version to #{new_version}\""
-    sh "git push origin"    
-    sh "git tag -a \"scoped_search-#{new_version}\" -m \"Tagged version #{new_version}\""
-    sh "git push --tags"
-  end
-
-  desc "Builds a ruby gem for scoped_search"
-  task :build => [:manifest] do
-    system %[gem build scoped_search.gemspec]
-  end
-
-  desc %{Update ".manifest" with the latest list of project filenames. Respect\
-  .gitignore by excluding everything that git ignores. Update `files` and\
-  `test_files` arrays in "*.gemspec" file if it's present.}
-  task :manifest do
-    list = Dir['**/*'].sort
-    spec_file = Dir['*.gemspec'].first
-    list -= [spec_file] if spec_file
-  
-    File.read('.gitignore').each_line do |glob|
-      glob = glob.chomp.sub(/^\//, '')
-      list -= Dir[glob]
-      list -= Dir["#{glob}/**/*"] if File.directory?(glob) and !File.symlink?(glob)
-      puts "excluding #{glob}"
-    end
- 
-    if spec_file
-      spec = File.read spec_file
-      spec.gsub! /^(\s* s.(test_)?files \s* = \s* )( \[ [^\]]* \] | %w\( [^)]* \) )/mx do
-        assignment = $1
-        bunch = $2 ? list.grep(/^test.*_test\.rb$/) : list
-        '%s%%w(%s)' % [assignment, bunch.join(' ')]
-      end
-      
-      File.open(spec_file,   'w') {|f| f << spec }
-    end
-    File.open('.manifest', 'w') {|f| f << list.join("\n") }
-  end
-end
+task :default => :test

data/lib/scoped_search.rb

@@ -9,36 +9,39 @@ module ScopedSearch
     end
   
     # Creates a named scope in the class it was called upon
-    def searchable_on(*fields)      
-      if fields.first.class.to_s == 'Hash'
-        if fields.first.has_key?(:only)
-          fields = fields.first[:only]
-        elsif fields.first.has_key?(:except)
-          fields = self.column_names.collect { |column| 
+    def searchable_on(*fields)
+      # Make sure that the table to be searched actually exists
+      if self.table_exists?
+        if fields.first.class.to_s == 'Hash'
+          if fields.first.has_key?(:only)
+            fields = fields.first[:only]
+          elsif fields.first.has_key?(:except)
+            fields = self.column_names.collect { |column| 
                      fields.first[:except].include?(column.to_sym) ? nil : column.to_sym }.compact
+          end
         end
-      end
-
-      assoc_models = self.reflections.collect { |m| m[0] }
-      assoc_fields = fields - self.column_names.collect { |column| column.to_sym }
-      fields -= assoc_fields
-
-      assoc_groupings = {}
-      assoc_models.each do |assoc_model|
-        assoc_groupings[assoc_model] = []
-      	assoc_fields.each do |assoc_field|
-      	  unless assoc_field.to_s.match(/^#{assoc_model.to_s}_/).nil?
-            assoc_groupings[assoc_model] << assoc_field.to_s.sub(/^#{assoc_model.to_s}_/, '').to_sym 
+        
+        assoc_models = self.reflections.collect { |m| m[0] }
+        assoc_fields = fields - self.column_names.collect { |column| column.to_sym }
+        fields -= assoc_fields
+        
+        assoc_groupings = {}
+        assoc_models.each do |assoc_model|
+          assoc_groupings[assoc_model] = []
+        	assoc_fields.each do |assoc_field|
+        	  unless assoc_field.to_s.match(/^#{assoc_model.to_s}_/).nil?
+              assoc_groupings[assoc_model] << assoc_field.to_s.sub(/^#{assoc_model.to_s}_/, '').to_sym 
+            end
           end
         end
+        
+        assoc_groupings = assoc_groupings.delete_if {|group, field_group| field_group.empty?}
+        
+        self.cattr_accessor :scoped_search_fields, :scoped_search_assoc_groupings
+        self.scoped_search_fields = fields
+        self.scoped_search_assoc_groupings = assoc_groupings
+        self.named_scope :search_for, lambda { |keywords| self.build_scoped_search_conditions(keywords) }
       end
-      
-      assoc_groupings = assoc_groupings.delete_if {|group, field_group| field_group.empty?}
-
-      self.cattr_accessor :scoped_search_fields, :scoped_search_assoc_groupings
-      self.scoped_search_fields = fields
-      self.scoped_search_assoc_groupings = assoc_groupings
-      self.named_scope :search_for, lambda { |keywords| self.build_scoped_search_conditions(keywords) }
     end
   
     # Build a hash that is used for the named_scope search_for.

data/tasks/github-gem.rake

@@ -0,0 +1,177 @@
+require 'rubygems'
+require 'rake'
+require 'rake/tasklib'
+require 'date'
+
+module Rake 
+  
+  class GithubGem < TaskLib
+    
+    attr_accessor :name
+    attr_accessor :specification
+   
+    def self.define_tasks!
+      gem_task_builder = Rake::GithubGem.new      
+      gem_task_builder.register_all_tasks!
+    end
+    
+
+    def initialize
+      reload_gemspec!
+    end
+
+    def register_all_tasks!
+      namespace(:gem) do
+        desc "Updates the file lists for this gem"
+        task(:manifest) { manifest_task }
+        
+        desc "Builds a ruby gem for #{@name}"
+        task(:build => [:manifest]) { build_task }
+        
+        desc "Installs the ruby gem for #{@name} locally"
+        task(:install => [:build]) { install_task }
+        
+        desc "Uninstalls the ruby gem for #{@name} locally"
+        task(:uninstall) { uninstall_task }             
+        
+        desc "Releases a new version of #{@name}"
+        task(:release) { release_task } 
+      end
+    end
+    
+
+    
+    protected 
+
+    def reload_gemspec!
+      raise "No gemspec file found!" if gemspec_file.nil?      
+      spec = File.read(gemspec_file)
+      @specification = eval(spec)
+      @name = specification.name  
+    end
+
+    def run_command(command)
+      lines = []
+      IO.popen(command) { |f| lines = f.readlines }
+      return lines
+    end
+    
+    def git_modified?(file)
+      return !run_command('git status').detect { |line| Regexp.new(Regexp.quote(file)) =~ line }.nil?
+    end
+    
+    def git_commit_file(file, message, branch = nil)
+      verify_current_branch(branch) unless branch.nil?
+      if git_modified?(file)
+        sh "git add #{file}"
+        sh "git commit -m \"#{message}\""
+      else
+        raise "#{file} is not modified and cannot be committed!"
+      end
+    end
+    
+    def git_create_tag(tag_name, message)
+      sh "git tag -a \"#{tag_name}\" -m \"#{message}\""
+    end
+    
+    def git_push(remote = 'origin', branch = 'master', options = [])
+      verify_clean_status(branch)
+      options_str = options.map { |o| "--#{o}"}.join(' ')
+      sh "git push #{options_str} #{remote} #{branch}"
+    end
+    
+    def gemspec_version=(new_version)
+      spec = File.read(gemspec_file)
+      spec.gsub!(/^(\s*s\.version\s*=\s*)('|")(.+)('|")(\s*)$/) { "#{$1}'#{new_version}'#{$5}" }
+      spec.gsub!(/^(\s*s\.date\s*=\s*)('|")(.+)('|")(\s*)$/) { "#{$1}'#{Date.today.strftime('%Y-%m-%d')}'#{$5}" }    
+      File.open(gemspec_file, 'w') { |f| f << spec }
+      reload_gemspec!      
+    end
+    
+    def gemspec_date=(new_date)
+      spec = File.read(gemspec_file)
+      spec.gsub!(/^(\s*s\.date\s*=\s*)('|")(.+)('|")(\s*)$/) { "#{$1}'#{new_date.strftime('%Y-%m-%d')}'#{$5}" }    
+      File.open(gemspec_file, 'w') { |f| f << spec }
+      reload_gemspec!       
+    end
+    
+    def gemspec_file 
+      @gemspec_file ||= Dir['*.gemspec'].first
+    end
+    
+    def verify_current_branch(branch)
+      run_command('git branch').detect { |line| /^\* (.+)/ =~ line }
+      raise "You are currently not working in the master branch!" unless branch == $1
+    end
+    
+    def verify_clean_status(on_branch = nil)
+      sh "git fetch"
+      lines = run_command('git status')
+      raise "You don't have the most recent version available. Run git pull first." if /^\# Your branch is behind/ =~ lines[1]
+      raise "You are currently not working in the #{on_branch} branch!" unless on_branch.nil? || (/^\# On branch (.+)/ =~ lines.first && $1 == on_branch)
+      raise "Your master branch contains modifications!" unless /^nothing to commit \(working directory clean\)/ =~ lines.last
+    end
+    
+    def verify_version(new_version)
+      newest_version = run_command('git tag').map { |tag| tag.split(name + '-').last }.compact.map { |v| Gem::Version.new(v) }.max
+      raise "This version number (#{new_version}) is not higher than the highest tagged version (#{newest_version})" if !newest_version.nil? && newest_version >= Gem::Version.new(new_version.to_s)
+    end
+
+    def manifest_task
+      verify_current_branch('master')
+      
+      list = Dir['**/*'].sort
+      list -= [gemspec_file]
+
+      if File.exist?('.gitignore')
+        File.read('.gitignore').each_line do |glob|
+          glob = glob.chomp.sub(/^\//, '')
+          list -= Dir[glob]
+          list -= Dir["#{glob}/**/*"] if File.directory?(glob) and !File.symlink?(glob)
+        end
+      end
+      
+      # update the spec file
+      spec = File.read(gemspec_file)
+      spec.gsub! /^(\s* s.(test_)?files \s* = \s* )( \[ [^\]]* \] | %w\( [^)]* \) )/mx do
+        assignment = $1
+        bunch = $2 ? list.grep(/^test.*_test\.rb$/) : list
+        '%s%%w(%s)' % [assignment, bunch.join(' ')]
+      end
+
+      File.open(gemspec_file, 'w') { |f| f << spec }
+      reload_gemspec!
+    end
+    
+    def build_task
+      sh "gem build #{gemspec_file}"
+    end
+    
+    def install_task
+      raise "#{name} .gem file not found" unless File.exist?("#{name}-#{specification.version}.gem")
+      sh "gem install #{name}-#{specification.version}.gem"
+    end
+    
+    def uninstall_task
+      raise "#{name} .gem file not found" unless File.exist?("#{name}-#{specification.version}.gem")
+      sh "gem uninstall #{name}"
+    end    
+    
+    def release_task
+      verify_clean_status('master')
+      verify_version(ENV['VERSION'] || @specification.version)
+      
+      # update gemspec file
+      self.gemspec_version = ENV['VERSION'] if Gem::Version.correct?(ENV['VERSION'])
+      self.gemspec_date    = Date.today
+      manifest_task      
+      git_commit_file(gemspec_file, "Updated #{gemspec_file} for release of version #{@specification.version}") if git_modified?(gemspec_file)
+
+      # create tag and push changes
+      git_create_tag("#{@name}-#{@specification.version}", "Tagged version #{@specification.version}")
+      git_push('origin', 'master', [:tags])
+    end
+  end
+end
+
+Rake::GithubGem.define_tasks!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: wvanbergen-scoped_search
 version: !ruby/object:Gem::Version 
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors: 
 - Willem van Bergen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-24 00:00:00 -07:00
+date: 2008-11-24 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -37,11 +37,13 @@ files:
 - lib/scoped_search/query_conditions_builder.rb
 - lib/scoped_search/query_language_parser.rb
 - lib/scoped_search/reg_tokens.rb
+- tasks
+- tasks/github-gem.rake
+- tasks/test.rake
 - test
 - test/query_conditions_builder_test.rb
 - test/query_language_test.rb
 - test/search_for_test.rb
-- test/tasks.rake
 - test/test_helper.rb
 has_rdoc: false
 homepage: http://github.com/wvanbergen/scoped_search/wikis