daddy 0.2.23 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e133d8c78a903bc95775fb63c6993da37a6ef8a
-  data.tar.gz: 03010b465c8e5ed6017c3f1a5d13a568ae19dbc2
+  metadata.gz: f142153fb20a1e67c0736ce49e1c8da9c5dd4659
+  data.tar.gz: c330563953f11d762ea2c7ce15f398e49f4ff769
 SHA512:
-  metadata.gz: 54e723fe8ed68695379cfc70387e0db3772eb1b125027b0786c73c812bc5909af4b5ac6551ebc337e5088beec6a5bfef85187c6d92a4d6614964488afa12ed5a
-  data.tar.gz: 7cc9a4144aded9ae74cb87a61218c0f30576b8adcc21e81c0f49f6c612536c96592190ffd8dfebf134871afd17db30862e628c0bffa7e6345194946e9705e3b5
+  metadata.gz: 7ec28b26bc2a9eb5c916df39fdf0b7af53b825827b254fd8de9e1d30337fe1eb4f0dd974b5df171ae998be835e52e4c2c5fa277b34ab451d35f5fca55c3e86f8
+  data.tar.gz: 23613cd11cd440a21b1ea96c870bbf4a41b404852d17b24a2e6c00e9f9eccd97f9ef28374fc235c392599097b3cb0248011f1beaa561aadcecec4d79eb781de7

data/bin/dad

@@ -1,65 +1,44 @@
 #!/usr/bin/env ruby
 
-RAILS_VERSION = '3.2.19'
+require 'erb'
+require 'rails'
 
-GEMFILE = <<-EOF
-source 'https://rubygems.org'
-
-gem 'rails', '#{RAILS_VERSION}'
-
-# Bundle edge Rails instead:
-# gem 'rails', :git => 'git://github.com/rails/rails.git'
-
-gem 'daddy'
-gem 'mysql2'
-
-# Gems used only for assets and not required
-# in production environments by default.
-group :assets do
-  gem 'sass-rails',   '~> 3.2.3'
-  gem 'coffee-rails', '~> 3.2.1'
-  gem 'uglifier', '>= 1.0.3'
-end
-
-gem 'jquery-rails'
-
-group :development, :test do
-  gem 'thin'
-end
-
-# To use ActiveModel has_secure_password
-# gem 'bcrypt-ruby', '~> 3.0.0'
-
-# To use Jbuilder templates for JSON
-# gem 'jbuilder'
-
-# Use unicorn as the app server
-gem 'unicorn'
-
-# Deploy with Capistrano
-gem 'capistrano'
-
-# To use debugger
-# gem 'debugger'
-EOF
+DADDY_HOME = File.dirname(File.dirname(__FILE__))
+RAILS_VERSION = '4.0.6'
 
 action = ARGV[0]
 
 if action == 'new'
-  app_name = ARGV[1]
-  
+  APP_NAME = ARGV[1]
+
   [
-    "rails _#{RAILS_VERSION}_ new #{app_name} -d mysql --skip-bundle",
-    "echo \"#{GEMFILE}\" > #{app_name}/Gemfile",
-    "cd #{app_name} && bundle install",
-    "cd #{app_name} && bundle exec rake dad:install",
-    "cd #{app_name} && bundle exec rake dad:generate:routes #{app_name}",
-    "cd #{app_name} && bundle exec rake dad:db:config",
-    "cd #{app_name} && bundle exec rake dad:db:create",
-    "cd #{app_name} && bundle exec rake db:migrate",
-    "cd #{app_name} && echo '<h1>Welcome to #{app_name}</h1>' > #{File.join('public', 'index.html')}",
+    "rails _#{RAILS_VERSION}_ new #{APP_NAME} -d mysql --skip-bundle",
   ].each do |command|
     puts command
     exit 1 unless system(command)
   end
+
+  # Gemfile
+  template = File.join(DADDY_HOME, 'templates', 'Gemfile.erb')
+  gemfile = File.join(APP_NAME, 'Gemfile')
+  File.write(gemfile, ERB.new(File.read(template)).result)
+
+  [
+    "bundle install",
+    "bundle exec rake dad:install",
+    "bundle exec rake dad:db:config",
+    "bundle exec rake dad:db:create",
+    "bundle exec rake db:migrate",
+    "bundle exec rails g controller welcome index --no-helper --no-assets",
+    "echo '<h1>Welcome to #{APP_NAME}</h1>' > #{File.join('app', 'views', 'welcome', 'index.html.erb')}"
+  ].each do |command|
+    puts command
+    exit 1 unless system("cd #{APP_NAME} && #{command}")
+  end
+
+  # routes
+  template = File.join(DADDY_HOME, 'templates', 'config', 'routes.rb.erb')
+  routes = File.join(APP_NAME, 'config', 'routes.rb')
+  File.write(routes, ERB.new(File.read(template)).result)
+
 end

data/lib/daddy/cucumber.rb

@@ -1,8 +1,7 @@
-# coding: UTF-8
-
 require 'daddy'
 
 if defined?(Rails)
+  require 'capybara/rails'
   ActionController::Base.allow_rescue = false
 end
 

data/lib/daddy/cucumber/capture.rb

@@ -1,5 +1,3 @@
-# coding: UTF-8
-
 module Daddy
   module Cucumber
     module Capture

data/lib/daddy/cucumber/hooks/database.rb

@@ -10,13 +10,19 @@ end
 Before do
   DatabaseCleaner.start
 
-  ActiveRecord::Fixtures.reset_cache
+  if ::ActiveRecord::VERSION::MAJOR < 4
+    fixture_class = ActiveRecord::Fixtures
+  else
+    fixture_class = ActiveRecord::FixtureSet
+  end
+
+  fixture_class.reset_cache
   fixtures_folder = File.join(Rails.root, 'test', 'fixtures')
   fixtures = Dir[File.join(fixtures_folder, '*.yml')].map {|f| File.basename(f, '.yml') }
-  ActiveRecord::Fixtures.create_fixtures(fixtures_folder, fixtures)
+  fixture_class.create_fixtures(fixtures_folder, fixtures)
   if defined? RailsCsvFixtures
     fixtures = Dir[File.join(fixtures_folder, '*.csv')].map {|f| File.basename(f, '.csv') }
-    ActiveRecord::Fixtures.create_fixtures(fixtures_folder, fixtures)
+    fixture_class.create_fixtures(fixtures_folder, fixtures)
   end
 end
 

data/lib/daddy/cucumber/step_definitions/click.rb

@@ -1,5 +1,3 @@
-# coding: UTF-8
-
 もし /^(.*?)をクリック$/ do |name|
   click_on name
 end

data/lib/daddy/cucumber/step_definitions/common.rb

@@ -1,5 +1,3 @@
-# coding: UTF-8
-
 もし /^(.*?) を選択(する)?$/ do |name, suffix|
   click_on name
 end

data/lib/daddy/cucumber/step_definitions/fill_in.rb

@@ -1,5 +1,3 @@
-# coding: UTF-8
-
 もし /^(.*?)に (.*?) と入力$/ do |name, value|
   assert_fill_in name, value
 end

data/lib/daddy/cucumber/step_definitions/select.rb

@@ -1,5 +1,3 @@
-# coding: UTF-8
-
 もし /^(.*?)に(.*?)を選択$/ do |name, value|
   assert_select name, value
 end

data/lib/daddy/formatter/daddy.css

@@ -111,6 +111,12 @@ div.feature .narrative > div {
   margin-left: 10px;
 }
 
+div.feature .narrative > pre {
+  border: solid 1px #999999;
+  border-radius: 5px;
+  padding: 1em 0;
+}
+
 div.scenario {
   margin: 10px 10px 10px 1.2em;
 }

data/lib/daddy/utils/sql_utils.rb

@@ -1,5 +1,3 @@
-# coding: UTF-8
-
 module Daddy
   module Utils
     class SqlUtils
@@ -10,16 +8,16 @@ module Daddy
       
       def self.like(columns, keywords)
         target_columns = columns.is_a?(Array) ? columns : [columns]
-        
+
         sql = []
         sql[0] = '('
     
         keywords.gsub(/　/, ' ').split.each_with_index do |s, i|
           like = SqlUtils.escape_search(s)
-    
+
           sql[0]  << ' or ' if i > 0
           sql[0] << '('
-    
+
           target_columns.each_with_index do |column, j|
             sql[0] << ' or ' if j > 0
             sql[0] << "#{column} like ?"

data/lib/tasks/cucumber.rake

@@ -1,5 +1,3 @@
-# coding: UTF-8
-
 require 'rake'
 
 unless defined?(Rails)

data/lib/tasks/cucumber_install.rake

@@ -1,5 +1,3 @@
-# coding: UTF-8
-
 require 'rake'
 
 namespace :dad do
@@ -8,26 +6,24 @@ namespace :dad do
       FileUtils.mkdir_p("features")
       
       FileUtils.mkdir_p("features/step_definitions")
-      FileUtils.touch("features/step_definitions/.gitkeep")
+      FileUtils.touch("features/step_definitions/.keep")
       FileUtils.mkdir_p("features/step_definitions/開発日記")
-      FileUtils.touch("features/step_definitions/開発日記/.gitkeep")
+      FileUtils.touch("features/step_definitions/開発日記/.keep")
       FileUtils.mkdir_p("features/step_definitions/仕様書")
-      FileUtils.touch("features/step_definitions/仕様書/.gitkeep")
+      FileUtils.touch("features/step_definitions/仕様書/.keep")
 
       FileUtils.mkdir_p("features/support")
-      system("touch features/support/.gitkeep")
+      system("touch features/support/.keep")
 
       FileUtils.mkdir_p("features/開発日記")
-      FileUtils.touch("features/開発日記/.gitkeep")
+      FileUtils.touch("features/開発日記/.keep")
       FileUtils.mkdir_p("features/仕様書")
-      FileUtils.touch("features/仕様書/.gitkeep")
+      FileUtils.touch("features/仕様書/.keep")
 
       if File.exist?("features/support/env.rb")
         puts "すでに features/support/env.rb が存在します。上書きはしません。"
       else
         File.write "features/support/env.rb", <<-EOF
-# coding: UTF-8
-
 require 'cucumber/rails'
 require 'daddy/cucumber'
         EOF

data/lib/tasks/tesseract.rake

@@ -1,5 +1,3 @@
-# coding: UTF-8
-
 require 'rake'
 
 namespace :dad do

data/templates/Gemfile.erb

@@ -0,0 +1,31 @@
+source 'https://rubygems.org'
+
+# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
+gem 'rails', '<%= RAILS_VERSION %>'
+
+gem 'coffee-rails', '~> 4.0.0'
+gem 'daddy', '~> 0.3.0'
+gem 'jbuilder', '~> 1.2'
+gem 'jquery-rails'
+gem 'mysql2'
+gem 'rails-i18n'
+gem 'sass-rails', '~> 4.0.2'
+gem 'turbolinks'
+gem 'uglifier', '>= 1.3.0'
+
+group :doc do
+  # bundle exec rake doc:rails generates the API under doc/api.
+  gem 'sdoc', require: false
+end
+
+# Use ActiveModel has_secure_password
+# gem 'bcrypt', '~> 3.1.7'
+
+# Use unicorn as the app server
+gem 'unicorn'
+
+# Use Capistrano for deployment
+gem 'capistrano', group: :development
+
+# Use debugger
+# gem 'debugger', group: [:development, :test]

data/templates/config/routes.rb.erb

@@ -0,0 +1,3 @@
+<%= APP_NAME.camelize %>::Application.routes.draw do
+  root 'welcome#index'
+end

metadata

@@ -1,281 +1,293 @@
 --- !ruby/object:Gem::Specification
 name: daddy
 version: !ruby/object:Gem::Version
-  version: 0.2.23
+  version: 0.3.0
 platform: ruby
 authors:
 - ichy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-02 00:00:00.000000000 Z
+date: 2014-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: cucumber-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: ci_reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: 1.9.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.9.0
+    - - <
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: differ
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: execjs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: holiday_jp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: poltergeist
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+    - - <
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 3.2.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: rails-i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: resque
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.25'
+        version: 1.25.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.25'
+        version: 1.25.0
 - !ruby/object:Gem::Dependency
   name: resque-scheduler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '2.42'
+        version: 2.42.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '2.42'
+        version: 2.42.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: rails-csv-fixtures
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: 0.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: 0.0.0
 description: Daddy helps me build web applications since daddy knows some good practices.
 email: ichylinux@gmail.com
 executables:
@@ -345,13 +357,11 @@ files:
 - lib/tasks/fluentd.repo
 - lib/tasks/fluentd_nginx.conf.erb
 - lib/tasks/generate/controller.rake
-- lib/tasks/generate/routes.rake
 - lib/tasks/generate/templates/_form.html.erb
 - lib/tasks/generate/templates/controller.rb.erb
 - lib/tasks/generate/templates/edit.html.erb
 - lib/tasks/generate/templates/index.html.erb
 - lib/tasks/generate/templates/new.html.erb
-- lib/tasks/generate/templates/routes.rb.erb
 - lib/tasks/generate/templates/show.html.erb
 - lib/tasks/generate/view.rake
 - lib/tasks/god.rake
@@ -382,6 +392,8 @@ files:
 - lib/tasks/unicorn.rake
 - lib/tasks/unicorn.rb.erb
 - lib/tax.rb
+- templates/Gemfile.erb
+- templates/config/routes.rb.erb
 - vendor/assets/javascripts/jquery-ui/ympicker-ja.js
 - vendor/assets/javascripts/jquery-ui/ympicker.js
 homepage: https://github.com/ichylinux/daddy
@@ -394,9 +406,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ~>
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='

data/lib/tasks/generate/routes.rake

@@ -1,24 +0,0 @@
-# coding: UTF-8
-
-require 'rake'
-require 'erb'
-
-namespace :dad do
-  namespace :generate do
-
-    task :routes do
-      ARGV[1..-1].each do |arg|
-        unless arg.index('=')
-          task arg.to_sym do ; end
-          
-          @app_name ||= arg
-        end
-      end
-
-      template = File.join(File.dirname(__FILE__), 'templates', 'routes.rb.erb')
-      routes_file = "#{Rails.root}/config/routes.rb"
-      File.write(routes_file, ERB.new(File.read(template)).result)
-    end
-    
-  end
-end

data/lib/tasks/generate/templates/routes.rb.erb

@@ -1,3 +0,0 @@
-<%= @app_name.camelcase %>::Application.routes.draw do
-  # root :to => 'welcome#index'
-end