daddy 0.0.18 → 0.0.19

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 (8) hide show
  1. data/lib/daddy/capistrano/remote_cache_subdir.rb +32 -0
  2. data/lib/daddy/cucumber/diff.rb +42 -15
  3. data/lib/daddy/formatter/daddy.css +1 -1
  4. data/lib/daddy/formatter/html.rb +2 -2
  5. data/lib/daddy/git.rb +32 -1
  6. data/lib/daddy/railtie.rb +0 -1
  7. metadata +53 -44
  8. checksums.yaml +0 -15
data/lib/daddy/capistrano/remote_cache_subdir.rb ADDED
@@ -0,0 +1,32 @@
1
+ # coding: UTF-8
2
+
3
+ require 'capistrano/recipes/deploy/strategy/remote_cache'
4
+
5
+ module Daddy
6
+ module Capistrano
7
+ class RemoteCacheSubdir < ::Capistrano::Deploy::Strategy::RemoteCache
8
+
9
+ private
10
+
11
+ def repository_cache_subdir
12
+ if configuration[:deploy_subdir]
13
+ File.join(repository_cache, configuration[:deploy_subdir])
14
+ else
15
+ repository_cache
16
+ end
17
+ end
18
+
19
+ def copy_repository_cache
20
+ logger.trace "copying the cached version to #{configuration[:release_path]}"
21
+ if copy_exclude.empty?
22
+ run "cp -RPp #{repository_cache_subdir} #{configuration[:release_path]} && #{mark}"
23
+ else
24
+ exclusions = copy_exclude.map { |e| "--exclude=\"#{e}\"" }.join(' ')
25
+ run "rsync -lrpt #{exclusions} #{repository_cache_subdir}/* #{configuration[:release_path]} && #{mark}"
26
+ end
27
+ end
28
+
29
+ end
30
+ end
31
+ end
32
+
data/lib/daddy/cucumber/diff.rb CHANGED
@@ -4,32 +4,59 @@ module Daddy
4
4
  module Cucumber
5
5
  module Diff
6
6
 
7
- def git_diff(local_file, git_path)
7
+ def git_diff(local_file, git_path = nil)
8
8
  git = Daddy::Git.new
9
+ git_path ||= local_file
10
+
9
11
  a = File.read(local_file).gsub(/[<>]/, '<' => '&lt;', '>' => '&gt;')
10
12
  b = git.show_previous(git_path, true).gsub(/[<>]/, '<' => '&lt;', '>' => '&gt;')
11
- diff = Differ.diff(a, b)
13
+ diff = format_diff(Differ.diff(a, b))
12
14
 
13
- diff_lines = diff.to_s.split("\n")
15
+ puts local_file
16
+ puts "<pre>#{diff}</pre>"
17
+ end
18
+
19
+ def git_diff_name(*includes)
20
+ git = Daddy::Git.new
21
+ puts '<pre>' + git.git_diff_name(*includes) + '</pre>'
22
+ end
23
+
24
+ def diff(file_a, file_b)
25
+ a = File.read(file_a)
26
+ b = File.read(file_b)
27
+ diff = format_diff(Differ.diff(a, b))
28
+
29
+ puts file_a
30
+ puts "<pre>#{diff}</pre>"
31
+ end
32
+
33
+ def show(file)
34
+ puts file
35
+ puts "<pre>#{File.read(file).gsub(/[<>]/, '<' => '&lt;', '>' => '&gt;')}</pre>"
36
+ end
37
+
38
+ private
39
+
40
+ def format_diff(diff)
14
41
  lines = []
15
- puts diff_lines.size
42
+
43
+ diff_lines = diff.to_s.split("\n")
16
44
  diff_lines.each_with_index do |line, i|
17
- if line.index('<ins ') and line.index('<del ')
18
- split = line.split('<ins ')
45
+ if line.index('</del><ins class="differ">')
46
+ split = line.split('</del><ins class="differ">')
19
47
  lines << split[0]
20
- lines << '<ins ' + split[1]
48
+ if split[1].start_with?('"')
49
+ lines << '</del><ins class="differ">"'
50
+ lines << split[1][1..-1]
51
+ else
52
+ lines << '</del><ins class="differ">' + split[1]
53
+ end
21
54
  else
22
55
  lines << line
23
56
  end
24
57
  end
25
-
26
- puts local_file
27
- puts "<pre>#{lines.join("\n")}</pre>"
28
- end
29
-
30
- def show(file)
31
- puts file
32
- puts "<pre>#{File.read(file).gsub(/[<>]/, '<' => '&lt;', '>' => '&gt;')}</pre>"
58
+
59
+ lines.join("\n")
33
60
  end
34
61
 
35
62
  end
data/lib/daddy/formatter/daddy.css CHANGED
@@ -62,7 +62,7 @@
62
62
  border-bottom: 1px solid #999999;
63
63
  background: #F0F8FF;
64
64
  color: #001111;
65
- margin-left: 10px;
65
+ margin-left: 15px;
66
66
  }
67
67
 
68
68
  .feature_dir {
data/lib/daddy/formatter/html.rb CHANGED
@@ -161,9 +161,9 @@ module Daddy
161
161
  end
162
162
 
163
163
  lines = name.split(/\r?\n/)
164
- unless lines.empty?
164
+ if lines.size > 1
165
165
  @builder.p(:class => 'narrative') do
166
- lines.each do |line|
166
+ lines[1..-1].each do |line|
167
167
  @builder.text!(line.strip)
168
168
  @builder.br
169
169
  end
data/lib/daddy/git.rb CHANGED
@@ -7,6 +7,12 @@ end
7
7
  module Daddy
8
8
 
9
9
  class Git
10
+ @@sub_dir = nil
11
+
12
+ def self.sub_dir=(sub_dir)
13
+ @@sub_dir = sub_dir
14
+ end
15
+
10
16
  def branches(remote = false)
11
17
  branches = []
12
18
  `git branch -a`.split("\n").each do |b|
@@ -54,7 +60,32 @@ module Daddy
54
60
  end
55
61
 
56
62
  def show_previous(file, remote = false)
57
- `git show #{previous_branch(remote)}:#{file}`
63
+ if @@sub_dir
64
+ sub_dir = @@sub_dir
65
+ sub_dir += '/' unless @@sub_dir.end_with?('/')
66
+ `git show #{previous_branch(remote)}:#{sub_dir}#{file}`
67
+ else
68
+ `git show #{previous_branch(remote)}:#{file}`
69
+ end
70
+ end
71
+
72
+ def git_diff_name(*includes)
73
+ diff = `git diff origin/#{previous_branch} --name-only #{includes.join(' ')}`
74
+ return diff unless @@sub_dir
75
+
76
+ ret = []
77
+ diff.split("\n").each do |line|
78
+ index = line.index(@@sub_dir)
79
+ if index
80
+ sub_file = line[@@sub_dir.length..-1]
81
+ sub_file = sub_file[1..-1] if sub_file.start_with?('/')
82
+ ret << sub_file
83
+ else
84
+ ret << line
85
+ end
86
+ end
87
+
88
+ ret.join("\n")
58
89
  end
59
90
  end
60
91
 
data/lib/daddy/railtie.rb CHANGED
@@ -2,7 +2,6 @@
2
2
 
3
3
  require 'rails'
4
4
  require 'rails_i18n'
5
- require 'devise'
6
5
 
7
6
  if ENV["COVERAGE"]
8
7
  require 'simplecov'
metadata CHANGED
@@ -1,18 +1,20 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: daddy
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.18
4
+ version: 0.0.19
5
+ prerelease:
5
6
  platform: ruby
6
7
  authors:
7
8
  - ichy
8
9
  autorequire:
9
10
  bindir: bin
10
11
  cert_chain: []
11
- date: 2013-03-24 00:00:00.000000000 Z
12
+ date: 2013-03-27 00:00:00.000000000 Z
12
13
  dependencies:
13
14
  - !ruby/object:Gem::Dependency
14
15
  name: capybara
15
16
  requirement: !ruby/object:Gem::Requirement
17
+ none: false
16
18
  requirements:
17
19
  - - ! '>='
18
20
  - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
20
22
  type: :runtime
21
23
  prerelease: false
22
24
  version_requirements: !ruby/object:Gem::Requirement
25
+ none: false
23
26
  requirements:
24
27
  - - ! '>='
25
28
  - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
27
30
  - !ruby/object:Gem::Dependency
28
31
  name: capybara-webkit
29
32
  requirement: !ruby/object:Gem::Requirement
33
+ none: false
30
34
  requirements:
31
35
  - - '='
32
36
  - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
34
38
  type: :runtime
35
39
  prerelease: false
36
40
  version_requirements: !ruby/object:Gem::Requirement
41
+ none: false
37
42
  requirements:
38
43
  - - '='
39
44
  - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
41
46
  - !ruby/object:Gem::Dependency
42
47
  name: cucumber
43
48
  requirement: !ruby/object:Gem::Requirement
49
+ none: false
44
50
  requirements:
45
51
  - - ! '>='
46
52
  - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
48
54
  type: :runtime
49
55
  prerelease: false
50
56
  version_requirements: !ruby/object:Gem::Requirement
57
+ none: false
51
58
  requirements:
52
59
  - - ! '>='
53
60
  - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
55
62
  - !ruby/object:Gem::Dependency
56
63
  name: cucumber-rails
57
64
  requirement: !ruby/object:Gem::Requirement
65
+ none: false
58
66
  requirements:
59
67
  - - ! '>='
60
68
  - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
62
70
  type: :runtime
63
71
  prerelease: false
64
72
  version_requirements: !ruby/object:Gem::Requirement
73
+ none: false
65
74
  requirements:
66
75
  - - ! '>='
67
76
  - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
69
78
  - !ruby/object:Gem::Dependency
70
79
  name: ci_reporter
71
80
  requirement: !ruby/object:Gem::Requirement
81
+ none: false
72
82
  requirements:
73
83
  - - ! '>='
74
84
  - !ruby/object:Gem::Version
@@ -76,20 +86,7 @@ dependencies:
76
86
  type: :runtime
77
87
  prerelease: false
78
88
  version_requirements: !ruby/object:Gem::Requirement
79
- requirements:
80
- - - ! '>='
81
- - !ruby/object:Gem::Version
82
- version: '0'
83
- - !ruby/object:Gem::Dependency
84
- name: devise
85
- requirement: !ruby/object:Gem::Requirement
86
- requirements:
87
- - - ! '>='
88
- - !ruby/object:Gem::Version
89
- version: '0'
90
- type: :runtime
91
- prerelease: false
92
- version_requirements: !ruby/object:Gem::Requirement
89
+ none: false
93
90
  requirements:
94
91
  - - ! '>='
95
92
  - !ruby/object:Gem::Version
@@ -97,6 +94,7 @@ dependencies:
97
94
  - !ruby/object:Gem::Dependency
98
95
  name: differ
99
96
  requirement: !ruby/object:Gem::Requirement
97
+ none: false
100
98
  requirements:
101
99
  - - ! '>='
102
100
  - !ruby/object:Gem::Version
@@ -104,6 +102,7 @@ dependencies:
104
102
  type: :runtime
105
103
  prerelease: false
106
104
  version_requirements: !ruby/object:Gem::Requirement
105
+ none: false
107
106
  requirements:
108
107
  - - ! '>='
109
108
  - !ruby/object:Gem::Version
@@ -111,6 +110,7 @@ dependencies:
111
110
  - !ruby/object:Gem::Dependency
112
111
  name: rails
113
112
  requirement: !ruby/object:Gem::Requirement
113
+ none: false
114
114
  requirements:
115
115
  - - ~>
116
116
  - !ruby/object:Gem::Version
@@ -118,6 +118,7 @@ dependencies:
118
118
  type: :runtime
119
119
  prerelease: false
120
120
  version_requirements: !ruby/object:Gem::Requirement
121
+ none: false
121
122
  requirements:
122
123
  - - ~>
123
124
  - !ruby/object:Gem::Version
@@ -125,6 +126,7 @@ dependencies:
125
126
  - !ruby/object:Gem::Dependency
126
127
  name: rails-i18n
127
128
  requirement: !ruby/object:Gem::Requirement
129
+ none: false
128
130
  requirements:
129
131
  - - ! '>='
130
132
  - !ruby/object:Gem::Version
@@ -132,6 +134,7 @@ dependencies:
132
134
  type: :runtime
133
135
  prerelease: false
134
136
  version_requirements: !ruby/object:Gem::Requirement
137
+ none: false
135
138
  requirements:
136
139
  - - ! '>='
137
140
  - !ruby/object:Gem::Version
@@ -139,6 +142,7 @@ dependencies:
139
142
  - !ruby/object:Gem::Dependency
140
143
  name: simplecov
141
144
  requirement: !ruby/object:Gem::Requirement
145
+ none: false
142
146
  requirements:
143
147
  - - ! '>='
144
148
  - !ruby/object:Gem::Version
@@ -146,6 +150,7 @@ dependencies:
146
150
  type: :runtime
147
151
  prerelease: false
148
152
  version_requirements: !ruby/object:Gem::Requirement
153
+ none: false
149
154
  requirements:
150
155
  - - ! '>='
151
156
  - !ruby/object:Gem::Version
@@ -153,6 +158,7 @@ dependencies:
153
158
  - !ruby/object:Gem::Dependency
154
159
  name: simplecov-rcov
155
160
  requirement: !ruby/object:Gem::Requirement
161
+ none: false
156
162
  requirements:
157
163
  - - ! '>='
158
164
  - !ruby/object:Gem::Version
@@ -160,6 +166,7 @@ dependencies:
160
166
  type: :runtime
161
167
  prerelease: false
162
168
  version_requirements: !ruby/object:Gem::Requirement
169
+ none: false
163
170
  requirements:
164
171
  - - ! '>='
165
172
  - !ruby/object:Gem::Version
@@ -171,58 +178,60 @@ executables: []
171
178
  extensions: []
172
179
  extra_rdoc_files: []
173
180
  files:
174
- - lib/daddy.rb
175
- - lib/daddy/cucumber.rb
176
- - lib/daddy/cucumber/pause.rb
177
- - lib/daddy/cucumber/capture.rb
178
- - lib/daddy/cucumber/html.rb
179
- - lib/daddy/cucumber/step_definitions/common.rb
180
- - lib/daddy/cucumber/assert.rb
181
- - lib/daddy/cucumber/table.rb
182
- - lib/daddy/cucumber/diff.rb
183
- - lib/daddy/git.rb
184
- - lib/daddy/formatter/menu.html.erb
185
- - lib/daddy/formatter/html.rb
186
- - lib/daddy/formatter/daddy_html.rb
187
- - lib/daddy/formatter/daddy.css
188
- - lib/daddy/formatter/cucumber.css
189
- - lib/daddy/formatter/jquery-min.js
190
- - lib/daddy/railtie.rb
191
- - lib/tasks/jenkins
192
- - lib/tasks/jenkins.rake
193
181
  - lib/tasks/dad.rake
194
182
  - lib/tasks/db_config.rake
195
- - lib/tasks/publish.rake
196
- - lib/tasks/cucumber_steps.rake
197
- - lib/tasks/jenkins_install.sh
183
+ - lib/tasks/jenkins
198
184
  - lib/tasks/cucumber.rake
199
185
  - lib/tasks/jenkins.conf
200
186
  - lib/tasks/cucumber_install.rake
201
- - lib/tasks/diary.rake
202
- - lib/tasks/db_create.rake
203
- - lib/tasks/test.rake
204
187
  - lib/tasks/database.yml.erb
188
+ - lib/tasks/test.rake
189
+ - lib/tasks/db_create.rake
190
+ - lib/tasks/jenkins_install.sh
191
+ - lib/tasks/publish.rake
192
+ - lib/tasks/jenkins.rake
193
+ - lib/tasks/cucumber_steps.rake
194
+ - lib/tasks/diary.rake
195
+ - lib/daddy/railtie.rb
196
+ - lib/daddy/cucumber/diff.rb
197
+ - lib/daddy/cucumber/html.rb
198
+ - lib/daddy/cucumber/capture.rb
199
+ - lib/daddy/cucumber/assert.rb
200
+ - lib/daddy/cucumber/pause.rb
201
+ - lib/daddy/cucumber/step_definitions/common.rb
202
+ - lib/daddy/cucumber/table.rb
203
+ - lib/daddy/formatter/cucumber.css
204
+ - lib/daddy/formatter/html.rb
205
+ - lib/daddy/formatter/daddy.css
206
+ - lib/daddy/formatter/menu.html.erb
207
+ - lib/daddy/formatter/daddy_html.rb
208
+ - lib/daddy/formatter/jquery-min.js
209
+ - lib/daddy/git.rb
210
+ - lib/daddy/capistrano/remote_cache_subdir.rb
211
+ - lib/daddy/cucumber.rb
212
+ - lib/daddy.rb
205
213
  homepage: https://github.com/ichylinux/daddy
206
214
  licenses: []
207
- metadata: {}
208
215
  post_install_message:
209
216
  rdoc_options: []
210
217
  require_paths:
211
218
  - lib
212
219
  required_ruby_version: !ruby/object:Gem::Requirement
220
+ none: false
213
221
  requirements:
214
222
  - - ! '>='
215
223
  - !ruby/object:Gem::Version
216
224
  version: '0'
217
225
  required_rubygems_version: !ruby/object:Gem::Requirement
226
+ none: false
218
227
  requirements:
219
228
  - - ! '>='
220
229
  - !ruby/object:Gem::Version
221
230
  version: '0'
222
231
  requirements: []
223
232
  rubyforge_project:
224
- rubygems_version: 2.0.3
233
+ rubygems_version: 1.8.24
225
234
  signing_key:
226
- specification_version: 4
235
+ specification_version: 3
227
236
  summary: My rails dad
228
237
  test_files: []
checksums.yaml DELETED
@@ -1,15 +0,0 @@
1
- ---
2
- !binary "U0hBMQ==":
3
- metadata.gz: !binary |-
4
- ODU2YzdmNDk5ZWFhYzlmZWIzODgzY2I5YzM4NjgyM2QyYTlhMmI3OQ==
5
- data.tar.gz: !binary |-
6
- MDRkYmE3M2YzOWQ5NTBkNzYzYzBlMDE3ZTZlYzgzMmYxOGI3YTNmMw==
7
- !binary "U0hBNTEy":
8
- metadata.gz: !binary |-
9
- ZDdhYWE2NWZkZTc3ZWQxOThiOWZiM2VlMTA1MTM3OThlM2Q4MjFhZmI1NmU4
10
- ZjM5YjliZTdjZTU2ZDg0NWViMGU1NWE0ZTM2ZTViMDZiYjRlYTlkZDk2M2Zi
11
- ODIyMzQzYWQ1Y2FhYWJiZTgwNjUzOWUzN2QzNDE0MmZhZDg0ZWQ=
12
- data.tar.gz: !binary |-
13
- MTc4YTg3MDc4NmMwOTRkMDczMzA3MzUwMjZiYzVmYTFmZTc5Mzg5YzJkY2Jl
14
- YWEzNjQwYWQ2Mzg3OTlhYTEyYWVhMjhhZGNjODBhNmVlNmQ5NzA5ZjIwNmVl
15
- YWEwNWMwYTgyZDUxNzNjYjRlMjBiNjRiMjA1ODdjZjVhNzczYzE=