active_git 0.0.9 → 0.0.10
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +7 -0
- data/.ruby-gemset +1 -0
- data/.ruby-version +1 -0
- data/.travis.yml +1 -0
- data/active_git.gemspec +8 -8
- data/lib/active_git/commands.rb +2 -3
- data/lib/active_git/version.rb +1 -1
- metadata +25 -51
checksums.yaml
ADDED
@@ -0,0 +1,7 @@
|
|
1
|
+
---
|
2
|
+
SHA1:
|
3
|
+
metadata.gz: 1e95bdc2d36b96cfb8b389e72432eddd4e13a7dc
|
4
|
+
data.tar.gz: 34717288b0557eef3d2cef83cadfbfbbb140ebd3
|
5
|
+
SHA512:
|
6
|
+
metadata.gz: 0a190e499ca62962593b867f696cc14042e58be92235f617491749408cea467890fb877a064b9fa67d43390ba065012bff2a8465c0d91fbadb62f45ae2e6b83a
|
7
|
+
data.tar.gz: e6892e017b6413906ba5b18490614f980590cb89fb2f53209d195051b4f4acdc6f8ba7a4864609d5ffa6a104176d8db5cdb69951657655b85489c51cad3f9f61
|
data/.ruby-gemset
ADDED
@@ -0,0 +1 @@
|
|
1
|
+
active_git
|
data/.ruby-version
ADDED
@@ -0,0 +1 @@
|
|
1
|
+
ruby 2.0
|
data/.travis.yml
CHANGED
data/active_git.gemspec
CHANGED
@@ -2,10 +2,10 @@
|
|
2
2
|
require File.expand_path('../lib/active_git/version', __FILE__)
|
3
3
|
|
4
4
|
Gem::Specification.new do |s|
|
5
|
-
s.name =
|
5
|
+
s.name = 'active_git'
|
6
6
|
s.version = ActiveGit::VERSION
|
7
|
-
s.authors = [
|
8
|
-
s.email = [
|
7
|
+
s.authors = ['Gabriel Naiman']
|
8
|
+
s.email = ['gabynaiman@gmail.com']
|
9
9
|
s.description = 'DB and GIT synchronization via ActiveRecord and GitWrapper'
|
10
10
|
s.summary = 'DB and GIT synchronization via ActiveRecord and GitWrapper'
|
11
11
|
s.homepage = 'https://github.com/gabynaiman/active_git'
|
@@ -14,17 +14,17 @@ Gem::Specification.new do |s|
|
|
14
14
|
s.files = `git ls-files`.split($\)
|
15
15
|
s.executables = s.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
|
16
16
|
s.test_files = s.files.grep(%r{^(test|spec|features)/})
|
17
|
-
s.require_paths = [
|
17
|
+
s.require_paths = ['lib']
|
18
18
|
|
19
19
|
s.add_dependency 'activerecord', '~> 3.2'
|
20
20
|
s.add_dependency 'git_wrapper', '~> 1.1'
|
21
21
|
s.add_dependency 'activerecord-import'
|
22
22
|
s.add_dependency 'easy_diff'
|
23
23
|
|
24
|
-
s.add_development_dependency
|
25
|
-
s.add_development_dependency
|
26
|
-
s.add_development_dependency 'rspec'
|
27
|
-
s.add_development_dependency
|
24
|
+
s.add_development_dependency 'bundler', '~> 1.3'
|
25
|
+
s.add_development_dependency 'rake'
|
26
|
+
s.add_development_dependency 'rspec', '~> 2.14.0'
|
27
|
+
s.add_development_dependency 'simplecov'
|
28
28
|
if RUBY_ENGINE == 'jruby'
|
29
29
|
s.add_development_dependency 'activerecord-jdbcsqlite3-adapter'
|
30
30
|
s.add_development_dependency 'activerecord-jdbcpostgresql-adapter'
|
data/lib/active_git/commands.rb
CHANGED
@@ -49,16 +49,15 @@ module ActiveGit
|
|
49
49
|
|
50
50
|
unless repository.merge(commit)
|
51
51
|
resolve_conflicts
|
52
|
-
diffs = diff 'HEAD'
|
53
52
|
commit_all 'Resolve conflicts'
|
54
53
|
end
|
55
54
|
|
56
|
-
diffs ||= repository.diff(last_log.commit_hash)
|
55
|
+
diffs ||= repository.diff("#{last_log.commit_hash}..HEAD")
|
57
56
|
begin
|
58
57
|
synchronize_diffs diffs
|
59
58
|
rescue => e
|
60
59
|
ActiveGit.configuration.logger.error "[ActiveGit] #{e}"
|
61
|
-
|
60
|
+
repository.reset mode: :hard, commit: last_log.commit_hash || 'HEAD'
|
62
61
|
return false
|
63
62
|
end
|
64
63
|
|
data/lib/active_git/version.rb
CHANGED
metadata
CHANGED
@@ -1,20 +1,18 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: active_git
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.
|
5
|
-
prerelease:
|
4
|
+
version: 0.0.10
|
6
5
|
platform: ruby
|
7
6
|
authors:
|
8
7
|
- Gabriel Naiman
|
9
8
|
autorequire:
|
10
9
|
bindir: bin
|
11
10
|
cert_chain: []
|
12
|
-
date:
|
11
|
+
date: 2014-12-04 00:00:00.000000000 Z
|
13
12
|
dependencies:
|
14
13
|
- !ruby/object:Gem::Dependency
|
15
14
|
name: activerecord
|
16
15
|
requirement: !ruby/object:Gem::Requirement
|
17
|
-
none: false
|
18
16
|
requirements:
|
19
17
|
- - ~>
|
20
18
|
- !ruby/object:Gem::Version
|
@@ -22,7 +20,6 @@ dependencies:
|
|
22
20
|
type: :runtime
|
23
21
|
prerelease: false
|
24
22
|
version_requirements: !ruby/object:Gem::Requirement
|
25
|
-
none: false
|
26
23
|
requirements:
|
27
24
|
- - ~>
|
28
25
|
- !ruby/object:Gem::Version
|
@@ -30,7 +27,6 @@ dependencies:
|
|
30
27
|
- !ruby/object:Gem::Dependency
|
31
28
|
name: git_wrapper
|
32
29
|
requirement: !ruby/object:Gem::Requirement
|
33
|
-
none: false
|
34
30
|
requirements:
|
35
31
|
- - ~>
|
36
32
|
- !ruby/object:Gem::Version
|
@@ -38,7 +34,6 @@ dependencies:
|
|
38
34
|
type: :runtime
|
39
35
|
prerelease: false
|
40
36
|
version_requirements: !ruby/object:Gem::Requirement
|
41
|
-
none: false
|
42
37
|
requirements:
|
43
38
|
- - ~>
|
44
39
|
- !ruby/object:Gem::Version
|
@@ -46,39 +41,34 @@ dependencies:
|
|
46
41
|
- !ruby/object:Gem::Dependency
|
47
42
|
name: activerecord-import
|
48
43
|
requirement: !ruby/object:Gem::Requirement
|
49
|
-
none: false
|
50
44
|
requirements:
|
51
|
-
- -
|
45
|
+
- - '>='
|
52
46
|
- !ruby/object:Gem::Version
|
53
47
|
version: '0'
|
54
48
|
type: :runtime
|
55
49
|
prerelease: false
|
56
50
|
version_requirements: !ruby/object:Gem::Requirement
|
57
|
-
none: false
|
58
51
|
requirements:
|
59
|
-
- -
|
52
|
+
- - '>='
|
60
53
|
- !ruby/object:Gem::Version
|
61
54
|
version: '0'
|
62
55
|
- !ruby/object:Gem::Dependency
|
63
56
|
name: easy_diff
|
64
57
|
requirement: !ruby/object:Gem::Requirement
|
65
|
-
none: false
|
66
58
|
requirements:
|
67
|
-
- -
|
59
|
+
- - '>='
|
68
60
|
- !ruby/object:Gem::Version
|
69
61
|
version: '0'
|
70
62
|
type: :runtime
|
71
63
|
prerelease: false
|
72
64
|
version_requirements: !ruby/object:Gem::Requirement
|
73
|
-
none: false
|
74
65
|
requirements:
|
75
|
-
- -
|
66
|
+
- - '>='
|
76
67
|
- !ruby/object:Gem::Version
|
77
68
|
version: '0'
|
78
69
|
- !ruby/object:Gem::Dependency
|
79
70
|
name: bundler
|
80
71
|
requirement: !ruby/object:Gem::Requirement
|
81
|
-
none: false
|
82
72
|
requirements:
|
83
73
|
- - ~>
|
84
74
|
- !ruby/object:Gem::Version
|
@@ -86,7 +76,6 @@ dependencies:
|
|
86
76
|
type: :development
|
87
77
|
prerelease: false
|
88
78
|
version_requirements: !ruby/object:Gem::Requirement
|
89
|
-
none: false
|
90
79
|
requirements:
|
91
80
|
- - ~>
|
92
81
|
- !ruby/object:Gem::Version
|
@@ -94,81 +83,71 @@ dependencies:
|
|
94
83
|
- !ruby/object:Gem::Dependency
|
95
84
|
name: rake
|
96
85
|
requirement: !ruby/object:Gem::Requirement
|
97
|
-
none: false
|
98
86
|
requirements:
|
99
|
-
- -
|
87
|
+
- - '>='
|
100
88
|
- !ruby/object:Gem::Version
|
101
89
|
version: '0'
|
102
90
|
type: :development
|
103
91
|
prerelease: false
|
104
92
|
version_requirements: !ruby/object:Gem::Requirement
|
105
|
-
none: false
|
106
93
|
requirements:
|
107
|
-
- -
|
94
|
+
- - '>='
|
108
95
|
- !ruby/object:Gem::Version
|
109
96
|
version: '0'
|
110
97
|
- !ruby/object:Gem::Dependency
|
111
98
|
name: rspec
|
112
99
|
requirement: !ruby/object:Gem::Requirement
|
113
|
-
none: false
|
114
100
|
requirements:
|
115
|
-
- -
|
101
|
+
- - ~>
|
116
102
|
- !ruby/object:Gem::Version
|
117
|
-
version:
|
103
|
+
version: 2.14.0
|
118
104
|
type: :development
|
119
105
|
prerelease: false
|
120
106
|
version_requirements: !ruby/object:Gem::Requirement
|
121
|
-
none: false
|
122
107
|
requirements:
|
123
|
-
- -
|
108
|
+
- - ~>
|
124
109
|
- !ruby/object:Gem::Version
|
125
|
-
version:
|
110
|
+
version: 2.14.0
|
126
111
|
- !ruby/object:Gem::Dependency
|
127
112
|
name: simplecov
|
128
113
|
requirement: !ruby/object:Gem::Requirement
|
129
|
-
none: false
|
130
114
|
requirements:
|
131
|
-
- -
|
115
|
+
- - '>='
|
132
116
|
- !ruby/object:Gem::Version
|
133
117
|
version: '0'
|
134
118
|
type: :development
|
135
119
|
prerelease: false
|
136
120
|
version_requirements: !ruby/object:Gem::Requirement
|
137
|
-
none: false
|
138
121
|
requirements:
|
139
|
-
- -
|
122
|
+
- - '>='
|
140
123
|
- !ruby/object:Gem::Version
|
141
124
|
version: '0'
|
142
125
|
- !ruby/object:Gem::Dependency
|
143
126
|
name: sqlite3
|
144
127
|
requirement: !ruby/object:Gem::Requirement
|
145
|
-
none: false
|
146
128
|
requirements:
|
147
|
-
- -
|
129
|
+
- - '>='
|
148
130
|
- !ruby/object:Gem::Version
|
149
131
|
version: '0'
|
150
132
|
type: :development
|
151
133
|
prerelease: false
|
152
134
|
version_requirements: !ruby/object:Gem::Requirement
|
153
|
-
none: false
|
154
135
|
requirements:
|
155
|
-
- -
|
136
|
+
- - '>='
|
156
137
|
- !ruby/object:Gem::Version
|
157
138
|
version: '0'
|
158
139
|
- !ruby/object:Gem::Dependency
|
159
140
|
name: pg
|
160
141
|
requirement: !ruby/object:Gem::Requirement
|
161
|
-
none: false
|
162
142
|
requirements:
|
163
|
-
- -
|
143
|
+
- - '>='
|
164
144
|
- !ruby/object:Gem::Version
|
165
145
|
version: '0'
|
166
146
|
type: :development
|
167
147
|
prerelease: false
|
168
148
|
version_requirements: !ruby/object:Gem::Requirement
|
169
|
-
none: false
|
170
149
|
requirements:
|
171
|
-
- -
|
150
|
+
- - '>='
|
172
151
|
- !ruby/object:Gem::Version
|
173
152
|
version: '0'
|
174
153
|
description: DB and GIT synchronization via ActiveRecord and GitWrapper
|
@@ -180,6 +159,8 @@ extra_rdoc_files: []
|
|
180
159
|
files:
|
181
160
|
- .coveralls.yml
|
182
161
|
- .gitignore
|
162
|
+
- .ruby-gemset
|
163
|
+
- .ruby-version
|
183
164
|
- .travis.yml
|
184
165
|
- Gemfile
|
185
166
|
- LICENSE
|
@@ -230,33 +211,26 @@ files:
|
|
230
211
|
homepage: https://github.com/gabynaiman/active_git
|
231
212
|
licenses:
|
232
213
|
- MIT
|
214
|
+
metadata: {}
|
233
215
|
post_install_message:
|
234
216
|
rdoc_options: []
|
235
217
|
require_paths:
|
236
218
|
- lib
|
237
219
|
required_ruby_version: !ruby/object:Gem::Requirement
|
238
|
-
none: false
|
239
220
|
requirements:
|
240
|
-
- -
|
221
|
+
- - '>='
|
241
222
|
- !ruby/object:Gem::Version
|
242
223
|
version: '0'
|
243
|
-
segments:
|
244
|
-
- 0
|
245
|
-
hash: 3436893494460006310
|
246
224
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
247
|
-
none: false
|
248
225
|
requirements:
|
249
|
-
- -
|
226
|
+
- - '>='
|
250
227
|
- !ruby/object:Gem::Version
|
251
228
|
version: '0'
|
252
|
-
segments:
|
253
|
-
- 0
|
254
|
-
hash: 3436893494460006310
|
255
229
|
requirements: []
|
256
230
|
rubyforge_project:
|
257
|
-
rubygems_version:
|
231
|
+
rubygems_version: 2.2.2
|
258
232
|
signing_key:
|
259
|
-
specification_version:
|
233
|
+
specification_version: 4
|
260
234
|
summary: DB and GIT synchronization via ActiveRecord and GitWrapper
|
261
235
|
test_files:
|
262
236
|
- spec/active_record_extension_spec.rb
|