daddy 0.7.4 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ecbbb75b02de583ccd016932676a1fa2dda83254bc5b6545134aea96e92db2e
-  data.tar.gz: 0ff829e7c3c0b8e2ad9e1646c8cd2d6f37b7bb0ab3a8fd9accb1e37a1b5cd809
+  metadata.gz: b23306f80a8ad93fb7087ab3c052fcbd708b75e1c3dba7aefaa27e9f25c5d568
+  data.tar.gz: 4c5130a5c5fcd7abdfa74d2351580f0cb1b56dc73b2856158df75cd455f75f6a
 SHA512:
-  metadata.gz: 49fd08bd6962c097362cf9cb2d86e1e76517f340dda02571819cef28cb12828dc7f381db2aee0e8d64139d9cce20b615362ac66b3959b1ab1c89bc06dfaf8944
-  data.tar.gz: f2b1a4338da9ddbb00c3bedd9f4a0c5b5f2df9b962cd0610dac571e05fb659a0a57b29045cc8cb84e6807110e5d75e21bd5f11308fc59123553dc0b16d73f228
+  metadata.gz: ef109bee3ac274754867330392cd3dc03713fdad7a9c92b2a80bb9fe7a3f25ab05b68b07fc71166b0fe6a1449b3ce2912cb2346b154be5ad8e67a2ecae9882e2
+  data.tar.gz: 1d6871454ed56b29ec1c281baeb5aa508b644f5102f9dd74942d7c06fea4c0bd9e9d8addf4007366454d7aa2c7d4891361f77d7a3fa3e27f0d553b88e2e7ea2b

data/itamae/cookbooks/tensorflow/install.rb

@@ -7,8 +7,6 @@ directory '/opt/tensorflow' do
   mode '755'
 end
 
-include_recipe '../python/install'
-
 {
   dev: '0.4.0',
   numpy: '1.13.3',

data/lib/daddy.rb

@@ -5,7 +5,17 @@ require 'sql_builder'
 module Daddy
 
   def self.config
-    @_config ||= Daddy::Utils::Config.new(File.join('config', 'daddy.yml'))
+    if @_config.nil?
+      daddy_yml = File.join('config', 'daddy.yml')
+      puts daddy_yml
+      if File.exist?(daddy_yml)
+        @_config = Daddy::Utils::Config.new(daddy_yml)
+      else
+        @_config = Daddy::Utils::Config.new
+      end
+    end
+
+    @_config
   end
 
 end
@@ -13,7 +23,4 @@ end
 if defined?(Rails)
   require 'daddy/rails/engine'
   require 'daddy/rails/railtie'
-else
-  require 'closer/tasks'
-  require 'daddy/tasks'
 end

data/lib/daddy/itamae/config.rb

@@ -4,7 +4,17 @@ require 'daddy/utils/config'
 module Daddy
 
   def self.config
-    @_config ||= Daddy::Utils::Config.new(YAML.load_file('config/daddy.yml'))
+    if @_config.nil?
+      daddy_yml = File.join('config', 'daddy.yml')
+      if File.exist?(daddy_yml)
+        parsed = ERB.new(File.read(daddy_yml), 0, '-').result
+        @_config = Daddy::Utils::Config.new(YAML.load(parsed))
+      else
+        @_config = Daddy::Utils::Config.new
+      end
+    end
+
+    @_config
   end
 
 end

data/lib/daddy/tasks.rb

@@ -1,3 +1,5 @@
+require 'closer/tasks' if defined?(Closer)
+
 Dir[File.join(File.dirname(File.dirname(__FILE__)), 'tasks', '*.rake')].each do |f|
   load f
 end

data/lib/daddy/version.rb

@@ -2,12 +2,6 @@ module Daddy
   VERSION = [
     VERSION_MAJOR = '0',
     VERSION_MINOR = '7',
-    VERSION_REVISION = '4'
-  ].join('.')
-
-  PYTHON_VERSION = [
-    PYTHON_VERSION_MAJOR = '3',
-    PYTHON_VERSION_MINOR = '6',
-    PYTHON_VERSION_REVISION = '3'
+    VERSION_REVISION = '5'
   ].join('.')
 end

data/lib/tasks/dad.rake

@@ -23,7 +23,7 @@ namespace :dad do
       desc "ロール #{role} のセットアップを行います。"
       task role => :environment do
         role_file = "config/itamae/roles/#{role}.rb"
-        fail unless system("bundle exec itamae local --ohai #{role_file}")
+        fail unless system("bundle exec itamae local --ohai --log-level=#{ENV['DEBUG'] ? 'debug' : 'info'} #{role_file}")
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daddy
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors:
 - ichy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-19 00:00:00.000000000 Z
+date: 2018-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -306,8 +306,6 @@ files:
 - itamae/cookbooks/nginx/config/templates/unicorn.conf.erb
 - itamae/cookbooks/obs_studio/install.rb
 - itamae/cookbooks/phantomjs/install.rb
-- itamae/cookbooks/python/Python-3.6.3_sha256sum.txt
-- itamae/cookbooks/python/install.rb
 - itamae/cookbooks/sbt/install.rb
 - itamae/cookbooks/tensorflow/install.rb
 - itamae/cookbooks/trac/install.rb

data/itamae/cookbooks/python/Python-3.6.3_sha256sum.txt

@@ -1 +0,0 @@
-cda7d967c9a4bfa52337cdf551bcc5cff026b6ac50a8834e568ce4a794ca81da  Python-3.6.3.tar.xz

data/itamae/cookbooks/python/install.rb

@@ -1,23 +0,0 @@
-directory 'tmp'
-
-execute "download python-#{Daddy::PYTHON_VERSION}" do
-  cwd 'tmp'
-  command <<-EOF
-    curl -O https://www.python.org/ftp/python/#{Daddy::PYTHON_VERSION}/Python-#{Daddy::PYTHON_VERSION}.tar.xz
-  EOF
-  not_if "sha256sum -c #{::File.join(::File.dirname(__FILE__), "Python-#{Daddy::PYTHON_VERSION}_sha256sum.txt")}"
-end
-
-execute "install python-#{Daddy::PYTHON_VERSION}" do
-  cwd 'tmp'
-  command <<-EOF
-    rm -Rf Python-#{Daddy::PYTHON_VERSION}/
-    tar Jxf Python-#{Daddy::PYTHON_VERSION}.tar.xz
-    pushd Python-#{Daddy::PYTHON_VERSION}
-      ./configure --enable-optimizations
-      make
-      sudo make install
-    popd
-  EOF
-  not_if "which python3 && python3 -V | grep 'Python #{Daddy::PYTHON_VERSION}'" 
-end