daddy 0.3.37 → 0.3.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c0bb2d8aba8973fe59bacc0dcd1daa81e214fbc
-  data.tar.gz: e2f9ed6a88ddba78f8e20b8481c109e268714988
+  metadata.gz: 1cc05522ed0206954cc9bd86141a602c3e489d3f
+  data.tar.gz: 2a91636f3a4e59230a5f986f419989c9af20ec67
 SHA512:
-  metadata.gz: 15e4c7f8f5c0a29f1788efbb8a72df9e23a49f72fd74b411e9225703e2a22c4d34faf4d9503696d95a3b034ed03617c4163d8c8ada9726daf940149e86209bcf
-  data.tar.gz: 44925a6c65323dc6bf593728abbc905fea724d7cfc384a930d05d27242d5060986a713e10274db626cc721bf645dd657ca7c8ab42210ff8b0ddf6306c4699e9f
+  metadata.gz: 979d065eafcc1192b9277afba83c490c39f9dfc4df48537f0b67143503a4a878334f3cf33438ab6ba7f7e658129b6c4319269fafd867a42edfc6935aec0828fa
+  data.tar.gz: 83592048e7d71cd6a402ed12c5cf2a56c8c3ec9d3cd2a2f7150ce578419f0b33ef0538de4361ef59d062b0993e65ce3580aaf02b37f7db9f1621ff3a7343799c

data/lib/daddy/rails/railtie.rb

@@ -28,10 +28,7 @@ module Daddy
       end
   
       rake_tasks do
-        lib = File.dirname(File.dirname(__FILE__))
-        Dir[File.join(lib, 'tasks/**/*.rake')].each do |f|
-          load f
-        end
+        require 'daddy/tasks'
       end
     end
   end

data/lib/daddy/tasks.rb

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

data/lib/daddy/version.rb

@@ -1,3 +1,3 @@
 module Daddy
-  VERSION = '0.3.37'
+  VERSION = '0.3.38'
 end

data/lib/tasks/cucumber_install.rake

@@ -4,30 +4,15 @@ namespace :dad do
   namespace :cucumber do
     task :install do
       FileUtils.mkdir_p("features")
-      
       FileUtils.mkdir_p("features/step_definitions")
       FileUtils.touch("features/step_definitions/.keep")
-      FileUtils.mkdir_p("features/step_definitions/開発日記")
-      FileUtils.touch("features/step_definitions/開発日記/.keep")
-      FileUtils.mkdir_p("features/step_definitions/仕様書")
-      FileUtils.touch("features/step_definitions/仕様書/.keep")
 
       FileUtils.mkdir_p("features/support")
       system("touch features/support/.keep")
-
-      FileUtils.mkdir_p("features/開発日記")
-      FileUtils.touch("features/開発日記/.keep")
-      FileUtils.mkdir_p("features/仕様書")
-      FileUtils.touch("features/仕様書/.keep")
-
-      if File.exist?("features/support/env.rb")
-        puts "すでに features/support/env.rb が存在します。上書きはしません。"
-      else
-        File.write "features/support/env.rb", <<-EOF
-require 'cucumber/rails'
+      File.write "features/support/env.rb", <<-EOF
+require 'rails'
 require 'daddy/cucumber'
-        EOF
-      end      
+      EOF
     end
   end
 end

data/lib/tasks/db/database.yml.erb

@@ -0,0 +1,52 @@
+# MySQL.  Versions 5.0+ are recommended.
+#
+# Install the MYSQL driver
+#   gem install mysql2
+#
+# Ensure the MySQL gem is defined in your Gemfile
+#   gem 'mysql2'
+#
+# And be sure to use new-style password hashing:
+#   http://dev.mysql.com/doc/refman/5.0/en/old-client.html
+#
+default: &default
+  adapter: mysql2
+  encoding: utf8
+  pool: 5
+  username: <%= @app_name %>
+  password: <%= @app_name %>
+  socket: /var/lib/mysql/mysql.sock
+
+development:
+  <<: *default
+  database: <%= @app_name %>_dev
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test:
+  <<: *default
+  database: <%= @app_name %>_test
+
+# As with config/secrets.yml, you never want to store sensitive information,
+# like your database password, in your source code. If your source code is
+# ever seen by anyone, they now have access to your database.
+#
+# Instead, provide the password as a unix environment variable when you boot
+# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database
+# for a full rundown on how to provide these environment variables in a
+# production deployment.
+#
+# On Heroku and other platform providers, you may have a full connection URL
+# available as an environment variable. For example:
+#
+#   DATABASE_URL="mysql2://myuser:mypass@localhost/somedatabase"
+#
+# You can use this database configuration with:
+#
+#   production:
+#     url: <%= ENV['DATABASE_URL'] %>
+#
+production:
+  <<: *default
+  database: <%= @app_name %>_pro

data/lib/tasks/db_config.rake

@@ -5,9 +5,10 @@ namespace :dad do
     
     desc 'database.yml を生成します。'
     task :config do
-      command = "APP_NAME=#{File.basename(Rails.root)} erb -T - #{File.dirname(__FILE__)}/database.yml.erb > config/database.yml"
-      puts command
-      system("#{command}")
+      @app_name = File.basename(Rails.root)[0..15]
+
+      template File.join(File.dirname(__FILE__), 'db/database.yml.erb')
+      render template, :to => 'config/database.yml'
     end
   end
 end

data/lib/tasks/db_create.rake

@@ -11,6 +11,8 @@ namespace :dad do
       system("echo '# mysql ddl' > tmp/create_databases.sql")
   
       config.each do |env, props|
+        next if env == 'default'
+
         puts "database for environment #{env}"
         system("echo 'drop database if exists #{props['database']};' >> tmp/create_databases.sql")
         system("echo 'create database #{props['database']};' >> tmp/create_databases.sql")
@@ -23,7 +25,9 @@ namespace :dad do
       end
 
       system("echo >> tmp/create_databases.sql")
-      system("cat tmp/create_databases.sql")
+
+      puts
+      puts File.read('tmp/create_databases.sql')
 
       if ENV['NO_ROOT_PASSWORD']
         fail unless system("mysql -u root < tmp/create_databases.sql")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daddy
 version: !ruby/object:Gem::Version
-  version: 0.3.37
+  version: 0.3.38
 platform: ruby
 authors:
 - ichy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-21 00:00:00.000000000 Z
+date: 2015-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -287,6 +287,7 @@ files:
 - lib/daddy/rails/engine.rb
 - lib/daddy/rails/quiet_assets.rb
 - lib/daddy/rails/railtie.rb
+- lib/daddy/tasks.rb
 - lib/daddy/utils/config.rb
 - lib/daddy/utils/sql_utils.rb
 - lib/daddy/utils/string_utils.rb
@@ -296,7 +297,7 @@ files:
 - lib/tasks/cucumber_install.rake
 - lib/tasks/cucumber_steps.rake
 - lib/tasks/dad.rake
-- lib/tasks/database.yml.erb
+- lib/tasks/db/database.yml.erb
 - lib/tasks/db_config.rake
 - lib/tasks/db_create.rake
 - lib/tasks/db_dump.rake
@@ -374,7 +375,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: My rails dad

data/lib/tasks/database.yml.erb

@@ -1,42 +0,0 @@
-<%
-  app_name_short = ENV['APP_NAME'][0..15]
--%>
-# MySQL.  Versions 4.1 and 5.0 are recommended.
-#
-# Install the MYSQL driver
-#   gem install mysql2
-#
-# Ensure the MySQL gem is defined in your Gemfile
-#   gem 'mysql2'
-#
-# And be sure to use new-style password hashing:
-#   http://dev.mysql.com/doc/refman/5.0/en/old-client.html
-development:
-  adapter: mysql2
-  encoding: utf8
-  database: <%= app_name_short %>_dev
-  pool: 5
-  username: <%= app_name_short %>
-  password: <%= app_name_short %>
-  socket: /var/lib/mysql/mysql.sock
-
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
-test:
-  adapter: mysql2
-  encoding: utf8
-  database: <%= app_name_short %>_test
-  pool: 5
-  username: <%= app_name_short %>
-  password: <%= app_name_short %>
-  socket: /var/lib/mysql/mysql.sock
-
-production:
-  adapter: mysql2
-  encoding: utf8
-  database: <%= app_name_short %>_pro
-  pool: 5
-  username: <%= app_name_short %>
-  password: <%= app_name_short %>
-  socket: /var/lib/mysql/mysql.sock