daddy 0.5.12 → 0.5.13

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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 579a0828199198496d56a2646e0ade28a1af3049
4
- data.tar.gz: afdfc1e20ebbd83651237af7c5e7d75b8da1b1ae
3
+ metadata.gz: 26a219b53e199fbb5c3461d7311c2bc12c3eefb7
4
+ data.tar.gz: 227e0a98edf7913f363374ccdf287f1eada8b7a1
5
5
  SHA512:
6
- metadata.gz: 5137c02e93414a0507a580f817f0272ce03d503e47ada61f4222af8aac29969058c82413794a0b22c4acb4cdb168f64e8c7661b8a3cdf93ee7a04e736c1ceedd
7
- data.tar.gz: fb6a3facc78426c63cbd7b72e623a7a6803c336df0bf6ec23b3c9728870ff08cd2090f5aca8072091d2b2f4099a522d1a82c6cdbf8b75c340df6e44150cbaf03
6
+ metadata.gz: ae8e32c0a43a35622347f4b63602a50aede0c2a87b5df863d0491ce0fa43e6a67936b3a4c00e17cd308f88a96335a93343d05f98054e4fd4c8c7ba3380db4757
7
+ data.tar.gz: 8592d9c232dcfd71812c578e20218ad1c0a293e1f75612a40a3288c9aaaa7c1a77c3be2b115d7cc8ff63ab7752870d6610c539f94762d2679e887d6a0410fffa
data/bin/dad CHANGED
@@ -6,7 +6,7 @@ DADDY_HOME = File.dirname(File.dirname(__FILE__))
6
6
 
7
7
  case action = ARGV[0]
8
8
  when 'new'
9
- RAILS_VERSION = '4.2.6'
9
+ RAILS_VERSION = '4.2.7.1'
10
10
  puts "using rails #{RAILS_VERSION}"
11
11
 
12
12
  APP_NAME = ARGV[1]
@@ -1,8 +1,8 @@
1
1
  require 'daddy/itamae'
2
2
 
3
- execute '/etc/init.d/god stop' do
3
+ service 'god' do
4
4
  user 'root'
5
- only_if '-e /var/run/god.pid'
5
+ action :stop
6
6
  end
7
7
 
8
8
  gem_package 'god' do
@@ -12,6 +12,9 @@ when /rhel-6\.(.*?)/
12
12
 
13
13
  template '/etc/my.cnf' do
14
14
  user 'root'
15
+ owner 'root'
16
+ group 'root'
17
+ mode '644'
15
18
  end
16
19
 
17
20
  service 'mysqld' do
@@ -30,6 +33,9 @@ when /rhel-7\.(.*?)/
30
33
 
31
34
  template '/etc/my.cnf.d/daddy.cnf' do
32
35
  user 'root'
36
+ owner 'root'
37
+ group 'root'
38
+ mode '644'
33
39
  end
34
40
 
35
41
  service 'mariadb' do
@@ -19,7 +19,9 @@ case "$1" in
19
19
  RETVAL=$?
20
20
  ;;
21
21
  stop)
22
- god quit
22
+ if test -e $PID ; then
23
+ god quit
24
+ fi
23
25
  RETVAL=$?
24
26
  ;;
25
27
  restart)
@@ -0,0 +1,43 @@
1
+ require 'itamae/resource/file'
2
+
3
+ module Itamae
4
+ module Resource
5
+ class File < Base
6
+
7
+ private
8
+
9
+ def send_tempfile
10
+ if !attributes.content && !content_file
11
+ @temppath = nil
12
+ return
13
+ end
14
+
15
+ begin
16
+ src = if content_file
17
+ content_file
18
+ else
19
+ f = Tempfile.open('itamae')
20
+ f.write(attributes.content)
21
+ f.close
22
+ f.path
23
+ end
24
+
25
+ @temppath = ::File.join(runner.tmpdir, Time.now.to_f.to_s)
26
+
27
+ if backend.is_a?(Itamae::Backend::Docker)
28
+ run_command(["mkdir", @temppath])
29
+ backend.send_file(src, @temppath)
30
+ @temppath = ::File.join(@temppath, ::File.basename(src))
31
+ else
32
+ backend.send_file(src, @temppath)
33
+ end
34
+
35
+ run_specinfra(:change_file_mode, @temppath, '0600')
36
+ ensure
37
+ f.unlink if f
38
+ end
39
+ end
40
+
41
+ end
42
+ end
43
+ end
@@ -1,8 +1,8 @@
1
- require 'itamae/resource/template'
1
+ require 'itamae/resource/remote_file'
2
2
 
3
3
  module Itamae
4
4
  module Resource
5
- class Template
5
+ class RemoteFile
6
6
 
7
7
  def find_source_file_with_daddy_convention
8
8
  begin
data/lib/daddy/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Daddy
2
- VERSION = '0.5.12'
2
+ VERSION = '0.5.13'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: daddy
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.12
4
+ version: 0.5.13
5
5
  platform: ruby
6
6
  authors:
7
7
  - ichy
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-07-13 00:00:00.000000000 Z
11
+ date: 2016-09-27 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: capybara
@@ -98,16 +98,16 @@ dependencies:
98
98
  name: itamae
99
99
  requirement: !ruby/object:Gem::Requirement
100
100
  requirements:
101
- - - '='
101
+ - - "~>"
102
102
  - !ruby/object:Gem::Version
103
- version: 1.9.4
103
+ version: '1.9'
104
104
  type: :runtime
105
105
  prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
108
- - - '='
108
+ - - "~>"
109
109
  - !ruby/object:Gem::Version
110
- version: 1.9.4
110
+ version: '1.9'
111
111
  - !ruby/object:Gem::Dependency
112
112
  name: ohai
113
113
  requirement: !ruby/object:Gem::Requirement
@@ -294,6 +294,7 @@ files:
294
294
  - lib/daddy/itamae/config.rb
295
295
  - lib/daddy/itamae/env/dad_env.rb
296
296
  - lib/daddy/itamae/env/os_version.rb
297
+ - lib/daddy/itamae/ext/file.rb
297
298
  - lib/daddy/itamae/ext/remote_file.rb
298
299
  - lib/daddy/itamae/i18n.rb
299
300
  - lib/daddy/model.rb