daddy 0.5.11 → 0.5.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6308ad7d7552c30d5902d7b5ae50e68b94a6ef9e
-  data.tar.gz: 2676b801407bbaa36218ff66eefe66c1b96a0231
+  metadata.gz: 579a0828199198496d56a2646e0ade28a1af3049
+  data.tar.gz: afdfc1e20ebbd83651237af7c5e7d75b8da1b1ae
 SHA512:
-  metadata.gz: 930548cd6b99fa4a6a13a4326cadd7b3d2497dff2342285b89fc12419d445c1a96bdd9e44fd18ee45aab4c3e511e2fe07db1c7ee80afb6771828f68ca3588fab
-  data.tar.gz: 4c1ba131807d6b44453b4ce054dd6244087bf3b27f10a487b785b6b808e7db9e394e98cb4b737875881d42eff4ec42f9afdd1df1310bcea464d32d5bcdd75e72
+  metadata.gz: 5137c02e93414a0507a580f817f0272ce03d503e47ada61f4222af8aac29969058c82413794a0b22c4acb4cdb168f64e8c7661b8a3cdf93ee7a04e736c1ceedd
+  data.tar.gz: fb6a3facc78426c63cbd7b72e623a7a6803c336df0bf6ec23b3c9728870ff08cd2090f5aca8072091d2b2f4099a522d1a82c6cdbf8b75c340df6e44150cbaf03

data/itamae/cookbooks/app_base_dir.rb

@@ -0,0 +1,33 @@
+require 'daddy/itamae'
+
+case dad_env
+when 'production', 'development'
+  directory '/var/lib' do
+    user 'root'
+  end
+  directory File.join('/var/lib', Daddy.config.application) do
+    user 'root'
+    owner ENV['USER']
+    group ENV['USER']
+    mode '755'
+  end
+  directory File.join('/var/lib', Daddy.config.application, dad_env) do
+    user 'root'
+    owner ENV['USER']
+    group ENV['USER']
+    mode '755'
+  end
+when 'test'
+  directory File.join('/tmp', Daddy.config.application) do
+    user 'root'
+    owner ENV['USER']
+    group ENV['USER']
+    mode '755'
+  end
+  directory File.join('/tmp', Daddy.config.application, dad_env) do
+    user 'root'
+    owner ENV['USER']
+    group ENV['USER']
+    mode '755'
+  end
+end

data/lib/daddy/itamae.rb

@@ -1,44 +1,10 @@
-require 'itamae/resource/remote_file'
-
-module Itamae
-  module Resource
-    class Template
-
-      def find_source_file_with_daddy_convention
-        begin
-          ret = find_source_file_without_daddy_convention
-        rescue SourceNotFoundError => e
-          if attributes.source == :auto
-            ret = find_source_file_in_templates
-          else
-            raise e
-          end
-        end
-
-        ret
-      end
-
-      def find_source_file_in_templates
-        itamae_dir = ::File.expand_path('../../../itamae', __FILE__)
-        path = ::File.join(itamae_dir, source_file_dir, "#{attributes.path}.erb")
-        if ::File.exist?(path)
-          path
-        else
-          raise SourceNotFoundError, "source file is not found (searched in daddy path: #{path})"
-        end
-      end
-
-      alias_method :find_source_file_without_daddy_convention, :find_source_file
-      alias_method :find_source_file, :find_source_file_with_daddy_convention
-    end
-  end
+Dir[File.join(File.dirname(__FILE__), 'itamae', 'ext', '*.rb')].each do |f|
+  require f
 end
 
-require 'i18n'
-I18n.available_locales = [:en, :ja]
-I18n.default_locale = ENV['LANG'].start_with?('ja_') ? :ja : :en
-I18n.load_path += Dir.glob(File.expand_path('../../../itamae/locale/*.yml', __FILE__))
+require_relative 'itamae/config'
+require_relative 'itamae/i18n'
 
-Dir[File.join(File.dirname(__FILE__), 'itamae', '*.rb')].each do |f|
+Dir[File.join(File.dirname(__FILE__), 'itamae', 'env', '*.rb')].each do |f|
   require f
 end

data/lib/daddy/itamae/config.rb

@@ -0,0 +1,9 @@
+require 'daddy/utils/config'
+
+module Daddy
+
+  def self.config
+    @_config ||= Daddy::Utils::Config.new(File.join('config', 'daddy.yml'))
+  end
+
+end

data/lib/daddy/itamae/env/dad_env.rb

@@ -0,0 +1,4 @@
+def dad_env
+  ENV['DAD_ENV'] ||= ENV['RAILS_ENV']
+  ENV['DAD_ENV'] ||= 'development'
+end

data/lib/daddy/itamae/env/os_version.rb

@@ -0,0 +1,3 @@
+def os_version
+  ENV['DAD_OS_VERSION'] ||= "#{node[:platform_family]}-#{node[:platform_version]}"
+end

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

@@ -0,0 +1,35 @@
+require 'itamae/resource/template'
+
+module Itamae
+  module Resource
+    class Template
+
+      def find_source_file_with_daddy_convention
+        begin
+          ret = find_source_file_without_daddy_convention
+        rescue SourceNotFoundError => e
+          if attributes.source == :auto
+            ret = find_source_file_in_templates
+          else
+            raise e
+          end
+        end
+
+        ret
+      end
+
+      def find_source_file_in_templates
+        itamae_dir = ::File.expand_path('../../../../../itamae', __FILE__)
+        path = ::File.join(itamae_dir, source_file_dir, "#{attributes.path}.erb")
+        if ::File.exist?(path)
+          path
+        else
+          raise SourceNotFoundError, "source file is not found (searched in daddy path: #{path})"
+        end
+      end
+
+      alias_method :find_source_file_without_daddy_convention, :find_source_file
+      alias_method :find_source_file, :find_source_file_with_daddy_convention
+    end
+  end
+end

data/lib/daddy/itamae/i18n.rb

@@ -0,0 +1,4 @@
+require 'i18n'
+I18n.available_locales = [:en, :ja]
+I18n.default_locale = ENV['LANG'].start_with?('ja_') ? :ja : :en
+I18n.load_path += Dir.glob(File.expand_path('../../../itamae/locale/*.yml', __FILE__))

data/lib/daddy/version.rb

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

data/lib/tasks/app_base_dir.rake

@@ -3,15 +3,7 @@ require_relative 'task_helper'
 namespace :dad do
 
   task :app_base_dir do
-    case Rails.env
-    when 'production', 'development'
-      app_base_dir = File.join('/var/lib', Daddy.config.application, Rails.env)
-      run "sudo mkdir -p #{app_base_dir}",
-          "sudo chown #{ENV['USER']}:#{ENV['USER']} #{app_base_dir}"
-    when 'test'
-      app_base_dir = File.join('/tmp', Daddy.config.application, Rails.env)
-      run "mkdir -p #{app_base_dir}"
-    end
+    run_itamae 'app_base_dir'
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daddy
 version: !ruby/object:Gem::Version
-  version: 0.5.11
+  version: 0.5.12
 platform: ruby
 authors:
 - ichy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-28 00:00:00.000000000 Z
+date: 2016-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -247,6 +247,7 @@ files:
 - app/assets/stylesheets/datepicker.css.scss
 - app/assets/stylesheets/ympicker.css.scss
 - bin/dad
+- itamae/cookbooks/app_base_dir.rb
 - itamae/cookbooks/docker/install.rb
 - itamae/cookbooks/docker/registry/install.rb
 - itamae/cookbooks/god/install.rb
@@ -290,7 +291,11 @@ files:
 - lib/daddy/helpers/html_helper.rb
 - lib/daddy/http_client.rb
 - lib/daddy/itamae.rb
-- lib/daddy/itamae/os_version.rb
+- lib/daddy/itamae/config.rb
+- lib/daddy/itamae/env/dad_env.rb
+- lib/daddy/itamae/env/os_version.rb
+- lib/daddy/itamae/ext/remote_file.rb
+- lib/daddy/itamae/i18n.rb
 - lib/daddy/model.rb
 - lib/daddy/models/crud_extension.rb
 - lib/daddy/models/query_extension.rb

data/lib/daddy/itamae/os_version.rb

@@ -1,3 +0,0 @@
-def os_version
-  @_os_version ||= "#{node[:platform_family]}-#{node[:platform_version]}"
-end