daddy 0.5.5 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6f58cf18c9ab41a3d9d6947db201cec35bb3392
-  data.tar.gz: 30d2f7881b79cefa4ad50979c3d55e7d3c532e87
+  metadata.gz: 0eadb2a4c7c0979839b8071a127c7b4b3105469e
+  data.tar.gz: d4b5a43b23fbd764e30c09b52a991eb3d1a0513d
 SHA512:
-  metadata.gz: 772fc2400b6b1035d3b9cff9dfe2df9764e648d65a95d35d1939c7d0ec062bb87aa541930ccbb2daf159ea5e49ba84458b67d215619304d1027fa23af3b12139
-  data.tar.gz: 2f5890121d5e9152b7ca62c6a41da3cd51c7d7b9a9b1cb8314ecace85be01e9bbce48d2a44529660684f9816e2d5626aba7910243a40cae7b1da4f61f6537ee9
+  metadata.gz: 92b51005d14db37725b7f4b8e88dac35a4570576030bbe7edf89bdf57f382faadf4f1f7f4427ab25d5957cda668e62d7af6ad5d3bd94dad70f1be83025dd5596
+  data.tar.gz: 60c76f810f20cf21c5c300e08910b6f235c4f7e35f38c1455bcc89e1a0f982394ee4c637440940556e3f5c550097ac9fa0571934db85ce52aaa427798c757bf6

data/bin/dad

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

data/itamae/cookbooks/jenkins/install.rb

@@ -16,6 +16,11 @@ else
   raise "サポートしていないOSバージョンです。#{@os_version}"
 end
 
+execute 'rpm --import http://pkg.jenkins-ci.org/redhat/jenkins-ci.org.key' do
+  user 'root'
+  not_if 'test -e /etc/yum.repos.d/jenkins.repo'
+end
+
 http_request '/etc/yum.repos.d/jenkins.repo' do
   user 'root'
   owner 'root'
@@ -24,10 +29,6 @@ http_request '/etc/yum.repos.d/jenkins.repo' do
   url 'http://pkg.jenkins-ci.org/redhat/jenkins.repo'
 end
 
-execute 'rpm --import http://pkg.jenkins-ci.org/redhat/jenkins-ci.org.key' do
-  user 'root'
-end
-
 package 'jenkins' do
   user 'root'
 end
@@ -68,6 +69,7 @@ directory '/var/lib/jenkins/plugins' do
 end
 
 @plugins = [
+  {:name => 'ansicolor', :version => nil},
   {:name => 'build-pipeline-plugin', :version => nil},
   {:name => 'git', :version => nil},
   {:name => 'git-client', :version => nil},

data/itamae/cookbooks/mysql/install.rb

@@ -38,7 +38,7 @@ when /rhel-7\.(.*?)/
   end
 
 else
-  raise "サポートしていないOSバージョンです。#{os_version}"
+  raise I18n.t('itamae.errors.unsupported_os_version', :os_version => os_version)
 end
 
 execute 'mysql_secure_installation' do

data/itamae/locale/en.yml

@@ -0,0 +1,4 @@
+en:
+  itamae:
+    errors:
+      unsupported_os_version: unsupported os version. %{os_version}

data/itamae/locale/ja.yml

@@ -0,0 +1,4 @@
+ja:
+  itamae:
+    errors:
+      unsupported_os_version: サポートしていないOSバージョンです。%{os_version}

data/lib/daddy/carrierwave.rb

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

data/lib/daddy/itamae.rb

@@ -34,6 +34,11 @@ module Itamae
   end
 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__))
+
 Dir[File.join(File.dirname(__FILE__), 'itamae', '*.rb')].each do |f|
   require f
 end

data/lib/daddy/version.rb

@@ -1,3 +1,3 @@
 module Daddy
-  VERSION = '0.5.5'
+  VERSION = '0.5.6'
 end

data/lib/tasks/task_helper.rb

@@ -4,7 +4,7 @@ require 'yaml'
 require File.expand_path('../../daddy/version', __FILE__)
 
 require 'i18n'
-I18n.load_path += Dir.glob(File.expand_path('../locale/*.yml', __FILE__))
+I18n.load_path += Dir.glob(File.expand_path('../../tasks/locale/*.yml', __FILE__))
 
 def self.daddy_version
   Daddy::VERSION

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daddy
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors:
 - ichy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-27 00:00:00.000000000 Z
+date: 2016-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -254,6 +254,8 @@ files:
 - itamae/cookbooks/mysql/install.rb
 - itamae/cookbooks/mysql/mysql_secure_installation.sh
 - itamae/cookbooks/phantomjs/install.rb
+- itamae/locale/en.yml
+- itamae/locale/ja.yml
 - itamae/templates/etc/god/master.conf.erb
 - itamae/templates/etc/init.d/god.erb
 - itamae/templates/etc/logrotate.d/god.erb
@@ -265,6 +267,7 @@ 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