svnignore 0.0.0 → 0.0.1

data/Rakefile

@@ -1,21 +1,6 @@
 require 'rubygems'
 require 'rake'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = 'svnignore'
-    gem.summary = 'git style ignores with subversion'
-    gem.description = 'git style ignores with subversion'
-    gem.email = 'shuber@huberry.com'
-    gem.homepage = 'http://github.com/shuber/svnignore'
-    gem.authors = ['Sean Huber']
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-rescue LoadError
-  puts 'Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler'
-end
-
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
@@ -36,8 +21,6 @@ rescue LoadError
   end
 end
 
-task :test => :check_dependencies
-
 task :default => :test
 
 require 'rake/rdoctask'
@@ -52,4 +35,5 @@ Rake::RDocTask.new do |rdoc|
   rdoc.title = "svnignore #{version}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('bin/**/*.rb')
+  rdoc.rdoc_files.include('lib/**/*.rb')
 end

data/VERSION

@@ -1 +1 @@
-0.0.0
+0.0.1

data/bin/svnignore

@@ -1,55 +1,17 @@
 #!/usr/bin/env ruby
 
-require 'tempfile'
+require 'rubygems' unless respond_to?(:gem)
+require 'optparse'
+begin
+  require 'svnignore'
+rescue LoadError
+  require File.join(File.dirname(File.dirname(__FILE__)), 'lib', 'svnignore')
+end
 
-Dir[File.join(Dir.pwd, '**', '.svnignore')].each do |file|
-  # Stores the parsed ignore patterns
-  #
-  ignores = Hash.new { |hash, key| hash[key] = [] }
-  
-  # Read the patterns from the svn ignore file
-  #
-  patterns = File.read(file).split("\n")
-  
-  patterns.each do |pattern|
-    # Figure out paths
-    #
-    path = File.join(File.dirname(file), pattern)
-    parent = File.dirname(path)
-    relative_path = (parent == Dir.pwd) ? '.' : File.join(parent.gsub(File.join(Dir.pwd, ''), ''), '')
-    
-    # Check for ** in path (recursive ignore)
-    #
-    if relative_path =~ /\*\*\//
-      relative_path.gsub!(/\*\*\/.*$/, '')
-      relative_path = '.' if relative_path.empty?
-      recursive = '-R '
-    else
-      recursive = ''
-    end
-    
-    ignores[relative_path] << { :pattern => File.basename(pattern), :recursive => recursive }
-  end
-  
-  # Ignore the patterns
-  # 
-  ignores.sort.each do |(relative_path, patterns)|
-    if patterns.length == 1
-      options = patterns.first[:recursive]
-      pattern = "'#{patterns.first[:pattern].gsub(/'/, "\\\\'")}'"
-    else
-      # Create a temporary file to store a newline separated list of files to ignore for this relative path
-      #
-      temp_file = Tempfile.new('svn-ignore-', Dir.pwd)
-      temp_file.print(patterns.map { |configuration| configuration[:pattern] }.join("\n"))
-      temp_file.flush
-      
-      options = '-F '
-      pattern = File.basename(temp_file.path)
-    end
-    
-    command = "svn propset svn:ignore #{options}#{pattern} #{relative_path}"
-    # puts command
-    system command
-  end
-end
+OptionParser.new do |opts|
+  opts.banner = 'Usage: svnignore [options]'
+  opts.on('-f', '--file [FILE]', String, 'The file to parse ignore rules from. Default: .svnigore') { |file| Svnignore.default_options[:file] = file }
+  opts.on('--no-recursive', 'Do not recursively look up files with ignore rules.') { |recursive| Svnignore.default_options[:recursive] = false }
+end.parse!
+
+Svnignore.ignore(Dir.pwd)

data/lib/svnignore.rb

@@ -0,0 +1,79 @@
+require 'tempfile'
+
+class Svnignore
+  
+  TEMPFILE_PREFIX = 'svnignore-'
+  
+  def self.default_options
+    @default_options ||= { :file => '.svnignore', :recursive => true }
+  end
+  
+  def self.ignore(current_working_directory, options = {})
+    options = default_options.merge(options)
+    files = find_files_with_ignore_rules(current_working_directory, options)
+    files.each do |file|
+      ignore_rules = parse_ignore_rules_from_file(file, current_working_directory)
+      commands = generate_svn_commands_for_ignore_rules(ignore_rules)
+      commands.each { |command| execute command }
+    end
+  end
+  
+  protected
+  
+    def self.create_tempfile_for_patterns(patterns)
+      tempfile = Tempfile.new(TEMPFILE_PREFIX, Dir.pwd)
+      tempfile.print(patterns.map { |configuration| configuration[:pattern] }.join("\n"))
+      tempfile.flush
+      tempfile
+    end
+    
+    def self.execute(command)
+      system command
+    end
+    
+    def self.find_files_with_ignore_rules(current_working_directory, options)
+      path = [current_working_directory]
+      path << '**' if options[:recursive]
+      path << options[:file]
+      Dir[File.join(*path)]
+    end
+    
+    def self.generate_svn_commands_for_ignore_rules(ignore_rules)
+      ignore_rules.sort.inject([]) do |commands, (relative_path, patterns)|
+        if patterns.length == 1
+          options = patterns.first[:recursive] ? '-R ' : ''
+          pattern = "'#{patterns.first[:pattern].gsub(/'/, "\\\\'")}'"
+        else
+          tempfile = create_tempfile_for_patterns(patterns)
+          options = '-F '
+          pattern = File.basename(tempfile.path)
+        end
+
+        commands << "svn propset svn:ignore #{options}#{pattern} #{relative_path}"
+      end
+    end
+    
+    def self.parse_ignore_rules_from_file(file, current_working_directory)
+      ignore_rules = Hash.new { |hash, key| hash[key] = [] }
+      patterns = File.read(file).split("\n")
+      
+      patterns.each do |pattern|
+        path = File.join(File.dirname(file), pattern)
+        parent = File.dirname(path)
+        relative_path = (parent == current_working_directory) ? '.' : File.join(parent.gsub(File.join(current_working_directory, ''), ''), '')
+
+        if relative_path =~ /\*\*\// # recursive ignore
+          relative_path.gsub!(/\*\*\/.*$/, '')
+          relative_path = '.' if relative_path.empty?
+          recursive = true
+        else
+          recursive = false
+        end
+
+        ignore_rules[relative_path] << { :pattern => File.basename(pattern), :recursive => recursive }
+      end
+      
+      ignore_rules
+    end
+  
+end

data/test/fixtures/.svnignore

@@ -0,0 +1,6 @@
+**/.DS_Store
+config/application_settings.yml
+config/database.yml
+db/*.sqlite3
+log/*.log
+tmp/*

data/test/fixtures/nested/.svnignore

@@ -0,0 +1 @@
+testing.txt

data/test/fixtures/svnignore.txt

@@ -0,0 +1 @@
+other_file.txt

data/test/svnignore_test.rb

@@ -0,0 +1,37 @@
+require 'test_helper'
+
+class SvnignoreTest < Test::Unit::TestCase
+
+  should 'have a TEMPFILE_PREFIX' do
+    assert Svnignore.const_defined?('TEMPFILE_PREFIX')
+    assert !Svnignore::TEMPFILE_PREFIX.nil?
+    assert !Svnignore::TEMPFILE_PREFIX.empty?
+  end
+  
+  should 'parse the correct ignore rules from file' do
+    assert_equal parsed_rules, Svnignore.send(:parse_ignore_rules_from_file, tempfile.path, Dir.pwd)
+  end
+  
+  should 'find files with ignore rules' do
+    assert_equal 2, Svnignore.send(:find_files_with_ignore_rules, fixtures_path, { :file => '.svnignore', :recursive => true }).size
+    assert_equal 1, Svnignore.send(:find_files_with_ignore_rules, fixtures_path, { :file => '.svnignore', :recursive => false }).size
+    assert_equal 1, Svnignore.send(:find_files_with_ignore_rules, fixtures_path, { :file => 'svnignore.txt', :recursive => true }).size
+  end
+  
+  should 'generate svn commands for ignore rules' do
+    parsed_svn_commands = Svnignore.send(:generate_svn_commands_for_ignore_rules, parsed_rules)
+    svn_commands.each_with_index do |command, index|
+      if command =~ / -F /
+        assert_equal command.gsub(/ -F (\S+)/, ' -F ' + parsed_svn_commands[index].match(/ -F (\S+)/).captures[0]), parsed_svn_commands[index]
+      else
+        assert_equal command, parsed_svn_commands[index]
+      end
+    end
+  end
+  
+  should 'execute svn commands' do
+    Svnignore.ignore(fixtures_path, :recursive => false)
+    assert_equal svn_commands.size, Svnignore.execute.size
+  end
+  
+end

data/test/test_helper.rb

@@ -0,0 +1,63 @@
+require 'rubygems'
+require 'test/unit'
+require 'shoulda'
+
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'svnignore'
+
+Svnignore.class_eval do
+  def self.execute(command = nil)
+    @commands ||= []
+    @commands << command unless command.nil?
+    @commands
+  end
+end
+
+class Test::Unit::TestCase
+  
+  def fixtures_path
+    File.join(File.dirname(__FILE__), 'fixtures')
+  end
+  
+  def parsed_rules
+    @parsed_rules ||= {
+      '.'      => [{ :pattern => '.DS_Store', :recursive => true }],
+      'config/' => [{ :pattern => 'application_settings.yml', :recursive => false }, { :pattern => 'database.yml', :recursive => false }],
+      'db/'    => [{ :pattern => '*.sqlite3', :recursive => false }],
+      'log/'    => [{ :pattern => '*.log', :recursive => false }],
+      'tmp/'    => [{ :pattern => '*', :recursive => false }]
+    }
+  end
+  
+  def rules
+    @rules ||= [
+      '**/.DS_Store',
+      'config/application_settings.yml',
+      'config/database.yml',
+      'db/*.sqlite3',
+      'log/*.log',
+      'tmp/*'
+    ]
+  end
+  
+  def svn_commands
+    @svn_commands ||= [
+      "svn propset svn:ignore -R '.DS_Store' .",
+      "svn propset svn:ignore -F some_temp_file config/",
+      "svn propset svn:ignore '*.sqlite3' db/",
+      "svn propset svn:ignore '*.log' log/",
+      "svn propset svn:ignore '*' tmp/"
+    ]
+  end
+  
+  def tempfile
+    if @tempfile.nil?
+      @tempfile = Tempfile.new('svnignore_test', Dir.pwd)
+      @tempfile.print(rules.join("\n"))
+      @tempfile.flush
+    end
+    @tempfile
+  end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: svnignore
 version: !ruby/object:Gem::Version 
-  version: 0.0.0
+  version: 0.0.1
 platform: ruby
 authors: 
 - Sean Huber
@@ -9,10 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-06 00:00:00 -08:00
+date: 2010-01-22 00:00:00 -08:00
 default_executable: svnignore
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: shoulda
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: git style ignores with subversion
 email: shuber@huberry.com
 executables: 
@@ -22,12 +31,17 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
-- CHANGELOG
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
 - VERSION
 - bin/svnignore
+- lib/svnignore.rb
+- test/fixtures/.svnignore
+- test/fixtures/nested/.svnignore
+- test/fixtures/svnignore.txt
+- test/svnignore_test.rb
+- test/test_helper.rb
 has_rdoc: true
 homepage: http://github.com/shuber/svnignore
 licenses: []
@@ -56,5 +70,9 @@ rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: git style ignores with subversion
-test_files: []
-
+test_files: 
+- test/fixtures/.svnignore
+- test/fixtures/nested/.svnignore
+- test/fixtures/svnignore.txt
+- test/svnignore_test.rb
+- test/test_helper.rb

data/CHANGELOG

@@ -1,6 +0,0 @@
-2009-03-05 - Sean Huber (shuber@huberry.com)
-  * Initial commit
-  * Change file permissions
-  * Add ignore logic
-  * Remove symlink to svnignore file
-  * Update README