daddy 0.5.30 → 0.5.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74e0db457f51f25909586509a467641424404605
-  data.tar.gz: dc8db9009c5d361dcb9e8ff40d5c43d5aff237f7
+  metadata.gz: 7c0d7f9efe640da543b365fefac97aaca91480d8
+  data.tar.gz: 8716d3064cf35f21ef8a84060e6038918305aae1
 SHA512:
-  metadata.gz: 0ede154133a87b306893585760ce3b34fd4d1433ac9424ca2535390abcdbfbbde4ffea31ad76f68813900396d77d34f0d0b76c2d271a5d54b22dce4b25c66e4b
-  data.tar.gz: 71346f87c7090be8d6ce77bc49d5ff35f6a1e40e487d9f21f7452af7b4a92b9fe9cb7228b8b88d3f9152522eb821d8d4e895b678e1359c7d62e2c867e3195656
+  metadata.gz: 7111d8fef60d85083567ac4481378798c670e92b3d4761eb33d4408630611bda623a868c2b9eeed1f4347c49fd6794646430aad42a675150840f6ab8b6d8ce60
+  data.tar.gz: 59df049ad22948dbe87517745cd1e7787f59a424936b14ed787bb396f290019dc29d8361dac5f88c3fc3d6544956e21700baaa50733cec7af15f4a7c40905a63

data/itamae/cookbooks/app_base_dir.rb

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

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

@@ -0,0 +1,3 @@
+def app_name
+  ret = ENV['APP_NAME']
+end

data/lib/daddy/rails/railtie.rb

@@ -23,6 +23,13 @@ module Daddy
         end
       end
 
+      initializer 'carrierwave' do
+        if defined?(CarrierWave)
+          ::Rails.logger.info '[daddy] loading carrierwave uploader'
+          require 'daddy/uploader'
+        end
+      end
+
       initializer 'sidekiq' do
         if defined?(Sidekiq)
           ::Rails.logger.info '[daddy] loading sidekiq configuration'

data/lib/daddy/uploader.rb

@@ -0,0 +1,24 @@
+require 'carrierwave'
+
+CarrierWave::SanitizedFile.sanitize_regexp = /[^[:word:]\.\-\+]/
+
+CarrierWave.configure do |config|
+  config.root = 
+    if ::Rails.env.test?
+      "/tmp/#{::Rails.application.class.parent_name.underscore}/#{::Rails.env}"
+    else
+      "/data/#{::Rails.application.class.parent_name.underscore}/#{::Rails.env}"
+    end
+end
+
+module Daddy
+  module Uploader
+    class Base < CarrierWave::Uploader::Base
+
+      def store_dir
+        "#{model.class.to_s.underscore.pluralize}/#{model.id.to_s}/#{mounted_as}"
+      end
+
+    end
+  end
+end

data/lib/daddy/version.rb

@@ -1,3 +1,3 @@
 module Daddy
-  VERSION = '0.5.30'
+  VERSION = '0.5.31'
 end

data/lib/tasks/app_base_dir.rake

@@ -3,6 +3,7 @@ require_relative 'task_helper'
 namespace :dad do
 
   task :app_base_dir do
+    ENV['APP_NAME'] ||= ask('APP_NAME', :required => true)
     run_itamae 'app_base_dir'
   end
 

data/lib/tasks/task_helper.rb

@@ -79,7 +79,7 @@ def self.ask(prompt, options = {})
     puts
   end
 
-  if options[:required] and answer.empty?
+  if options[:required] and answer.to_s.empty?
     raise "必須です。処理を中止します。"
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daddy
 version: !ruby/object:Gem::Version
-  version: 0.5.30
+  version: 0.5.31
 platform: ruby
 authors:
 - ichy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-09 00:00:00.000000000 Z
+date: 2017-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -313,7 +313,6 @@ files:
 - lib/capistrano/daddy.rb
 - lib/capistrano/tasks/update_linked_files.rake
 - lib/daddy.rb
-- lib/daddy/carrierwave.rb
 - lib/daddy/cucumber.rb
 - lib/daddy/cucumber/helpers.rb
 - lib/daddy/cucumber/helpers/assert.rb
@@ -334,6 +333,7 @@ files:
 - lib/daddy/http_client.rb
 - lib/daddy/itamae.rb
 - lib/daddy/itamae/config.rb
+- lib/daddy/itamae/env/app_name.rb
 - lib/daddy/itamae/env/dad_env.rb
 - lib/daddy/itamae/env/os_version.rb
 - lib/daddy/itamae/ext/file.rb
@@ -348,6 +348,7 @@ files:
 - lib/daddy/sidekiq.rb
 - lib/daddy/tasks.rb
 - lib/daddy/test_help.rb
+- lib/daddy/uploader.rb
 - lib/daddy/utils/config.rb
 - lib/daddy/utils/sql_utils.rb
 - lib/daddy/utils/string_utils.rb

data/lib/daddy/carrierwave.rb

@@ -1 +0,0 @@
-CarrierWave::SanitizedFile.sanitize_regexp = /[^[:word:]\.\-\+]/