merger 0.1.0 → 0.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. data/.gitignore +1 -0
  2. data/VERSION +1 -1
  3. data/merger.gemspec +66 -0
  4. metadata +2 -2
  5. data/init.rb +0 -3
data/.gitignore CHANGED
@@ -1 +1,2 @@
1
+ pkg
1
2
  test/debug.log
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.1.0
1
+ 0.1.1
@@ -0,0 +1,66 @@
1
+ # Generated by jeweler
2
+ # DO NOT EDIT THIS FILE DIRECTLY
3
+ # Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
4
+ # -*- encoding: utf-8 -*-
5
+
6
+ Gem::Specification.new do |s|
7
+ s.name = %q{merger}
8
+ s.version = "0.1.1"
9
+
10
+ s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
+ s.authors = ["Brandon Keepers"]
12
+ s.date = %q{2010-01-02}
13
+ s.email = %q{brandon@opensoul.org}
14
+ s.extra_rdoc_files = [
15
+ "LICENSE",
16
+ "README"
17
+ ]
18
+ s.files = [
19
+ ".gitignore",
20
+ "LICENSE",
21
+ "README",
22
+ "Rakefile",
23
+ "VERSION",
24
+ "lib/merger.rb",
25
+ "lib/merger/merge.rb",
26
+ "merger.gemspec",
27
+ "test/db/database.yml",
28
+ "test/db/schema.rb",
29
+ "test/fixtures/companies.yml",
30
+ "test/fixtures/people.yml",
31
+ "test/fixtures/phones.yml",
32
+ "test/fixtures/taggings.yml",
33
+ "test/fixtures/tags.yml",
34
+ "test/merger/merge_test.rb",
35
+ "test/merger_test.rb",
36
+ "test/test_helper.rb"
37
+ ]
38
+ s.homepage = %q{http://github.com/collectiveidea/merger}
39
+ s.rdoc_options = ["--charset=UTF-8"]
40
+ s.require_paths = ["lib"]
41
+ s.rubygems_version = %q{1.3.5}
42
+ s.summary = %q{A Rails plugin for merging Active Record models}
43
+ s.test_files = [
44
+ "test/db/schema.rb",
45
+ "test/merger/merge_test.rb",
46
+ "test/merger_test.rb",
47
+ "test/test_helper.rb"
48
+ ]
49
+
50
+ if s.respond_to? :specification_version then
51
+ current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
52
+ s.specification_version = 3
53
+
54
+ if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
55
+ s.add_runtime_dependency(%q<active_record>, [">= 0"])
56
+ s.add_development_dependency(%q<mocha>, [">= 0"])
57
+ else
58
+ s.add_dependency(%q<active_record>, [">= 0"])
59
+ s.add_dependency(%q<mocha>, [">= 0"])
60
+ end
61
+ else
62
+ s.add_dependency(%q<active_record>, [">= 0"])
63
+ s.add_dependency(%q<mocha>, [">= 0"])
64
+ end
65
+ end
66
+
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: merger
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.0
4
+ version: 0.1.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Brandon Keepers
@@ -47,9 +47,9 @@ files:
47
47
  - README
48
48
  - Rakefile
49
49
  - VERSION
50
- - init.rb
51
50
  - lib/merger.rb
52
51
  - lib/merger/merge.rb
52
+ - merger.gemspec
53
53
  - test/db/database.yml
54
54
  - test/db/schema.rb
55
55
  - test/fixtures/companies.yml
data/init.rb DELETED
@@ -1,3 +0,0 @@
1
- require 'merger'
2
-
3
- ActiveRecord::Base.send(:include, Merger)