daddy 0.5.12 → 0.5.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 579a0828199198496d56a2646e0ade28a1af3049
-  data.tar.gz: afdfc1e20ebbd83651237af7c5e7d75b8da1b1ae
+  metadata.gz: 26a219b53e199fbb5c3461d7311c2bc12c3eefb7
+  data.tar.gz: 227e0a98edf7913f363374ccdf287f1eada8b7a1
 SHA512:
-  metadata.gz: 5137c02e93414a0507a580f817f0272ce03d503e47ada61f4222af8aac29969058c82413794a0b22c4acb4cdb168f64e8c7661b8a3cdf93ee7a04e736c1ceedd
-  data.tar.gz: fb6a3facc78426c63cbd7b72e623a7a6803c336df0bf6ec23b3c9728870ff08cd2090f5aca8072091d2b2f4099a522d1a82c6cdbf8b75c340df6e44150cbaf03
+  metadata.gz: ae8e32c0a43a35622347f4b63602a50aede0c2a87b5df863d0491ce0fa43e6a67936b3a4c00e17cd308f88a96335a93343d05f98054e4fd4c8c7ba3380db4757
+  data.tar.gz: 8592d9c232dcfd71812c578e20218ad1c0a293e1f75612a40a3288c9aaaa7c1a77c3be2b115d7cc8ff63ab7752870d6610c539f94762d2679e887d6a0410fffa

data/bin/dad

@@ -6,7 +6,7 @@ DADDY_HOME = File.dirname(File.dirname(__FILE__))
 
 case action = ARGV[0]
 when 'new'
-  RAILS_VERSION = '4.2.6'
+  RAILS_VERSION = '4.2.7.1'
   puts "using rails #{RAILS_VERSION}"
 
   APP_NAME = ARGV[1]

data/itamae/cookbooks/god/install.rb

@@ -1,8 +1,8 @@
 require 'daddy/itamae'
 
-execute '/etc/init.d/god stop' do
+service 'god' do
   user 'root'
-  only_if '-e /var/run/god.pid'
+  action :stop
 end
 
 gem_package 'god' do

data/itamae/cookbooks/mysql/install.rb

@@ -12,6 +12,9 @@ when /rhel-6\.(.*?)/
 
   template '/etc/my.cnf' do
     user 'root'
+    owner 'root'
+    group 'root'
+    mode '644'
   end
 
   service 'mysqld' do
@@ -30,6 +33,9 @@ when /rhel-7\.(.*?)/
 
   template '/etc/my.cnf.d/daddy.cnf' do
     user 'root'
+    owner 'root'
+    group 'root'
+    mode '644'
   end
 
   service 'mariadb' do

data/itamae/templates/etc/init.d/god.erb

@@ -19,7 +19,9 @@ case "$1" in
       RETVAL=$?
   ;;
     stop)
-      god quit
+      if test -e $PID ; then
+        god quit
+      fi
       RETVAL=$?
   ;;
     restart)

data/lib/daddy/itamae/ext/file.rb

@@ -0,0 +1,43 @@
+require 'itamae/resource/file'
+
+module Itamae
+  module Resource
+    class File < Base
+
+      private
+
+      def send_tempfile
+        if !attributes.content && !content_file
+          @temppath = nil
+          return
+        end
+
+        begin
+          src = if content_file
+                  content_file
+                else
+                  f = Tempfile.open('itamae')
+                  f.write(attributes.content)
+                  f.close
+                  f.path
+                end
+
+          @temppath = ::File.join(runner.tmpdir, Time.now.to_f.to_s)
+
+          if backend.is_a?(Itamae::Backend::Docker)
+            run_command(["mkdir", @temppath])
+            backend.send_file(src, @temppath)
+            @temppath = ::File.join(@temppath, ::File.basename(src))
+          else
+            backend.send_file(src, @temppath)
+          end
+
+          run_specinfra(:change_file_mode, @temppath, '0600')
+        ensure
+          f.unlink if f
+        end
+      end
+
+    end
+  end
+end

data/lib/daddy/itamae/ext/remote_file.rb

@@ -1,8 +1,8 @@
-require 'itamae/resource/template'
+require 'itamae/resource/remote_file'
 
 module Itamae
   module Resource
-    class Template
+    class RemoteFile
 
       def find_source_file_with_daddy_convention
         begin

data/lib/daddy/version.rb

@@ -1,3 +1,3 @@
 module Daddy
-  VERSION = '0.5.12'
+  VERSION = '0.5.13'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daddy
 version: !ruby/object:Gem::Version
-  version: 0.5.12
+  version: 0.5.13
 platform: ruby
 authors:
 - ichy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-13 00:00:00.000000000 Z
+date: 2016-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -98,16 +98,16 @@ dependencies:
   name: itamae
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.4
+        version: '1.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.4
+        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: ohai
   requirement: !ruby/object:Gem::Requirement
@@ -294,6 +294,7 @@ files:
 - lib/daddy/itamae/config.rb
 - lib/daddy/itamae/env/dad_env.rb
 - lib/daddy/itamae/env/os_version.rb
+- lib/daddy/itamae/ext/file.rb
 - lib/daddy/itamae/ext/remote_file.rb
 - lib/daddy/itamae/i18n.rb
 - lib/daddy/model.rb