daddy 0.1.22 → 0.1.23

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjVkNTQyMjg5YzkzOTcxNWU4Njc5NzdmYmE1MDYyNDhjMGZmNTZkYQ==
+    OGQ4OTBmMWEwNWZmM2NiZDA5ZjAzMzI0ZTc1Yzk2MzVhZWNiODgzNw==
   data.tar.gz: !binary |-
-    YjRkZjdmYzM1ODEzY2RhZGFjNjNjYjE1Njc2MTRjYTcwZmJjMDI2OA==
+    MGJmNzZmNjMwN2E1ZDEwMTRmNTAyMTE2NTAyMDNhZTQ5OTg4OTlhYQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZTQxZTAzYzhkYmE0NWUxN2M0ZDQ5YmEwYjlkZjI5ODEzY2RhYzY0ZTNiN2Q5
-    ZTBiM2ZlMzZhNzQ0YzdlNWFmOWU4Nzk0ZWJiZDdmNTIzYjkxNmNiN2YzOTI4
-    YTVhOTg3OWQzYzdjZmM1YTk4YzQwZDJmMGQ2MWMwODBhYzZlNzA=
+    YWM2MjdlY2E0ZmM0N2QwZDZjNDkwNTdiOTI4OWQwNGIyNDRlMmNlZGYxYTQw
+    YTE1MDJkNWM4NjdmYzhlOGJlYmI4NzEwZDY5N2U4ZGNlN2I5NDZjZTVmZGRi
+    MzgzZTJlMGNmMTVhMjk2NjBjMDVjYWRkNjRlNjAwMGJmM2VjNzA=
   data.tar.gz: !binary |-
-    MTJmZTgzMGYwMTUxY2NkMjQyMTkzMDc4M2U4MTcwZjlmYzJjMDM3ZWY1Mjg4
-    OWE2MDBjMzc3OTAzMzY4NDgzODAyNTQ2OGU2MDgzMzZkYzJkNzA4ODczZGE2
-    NWI3NmU0ZGZkZTdjMGUyZTI4YmU2YWI5NDBjNmY1MDQ2NGU3Yzk=
+    OTBlZWM0YjE5YTFjYmJlMTI4ODQyZWUyMDdlYzEzZWFhYmI2MDY4MGIzYmFk
+    MmFjN2ZkNzJjMjQ1M2M1YjZlMzAzYjcxNWZkZmY4N2QzZmRhZTU0ZTMyODhj
+    ZDc3MGE1YTI3MTJlYzAzNDdlNTQyMzdjZTAxZmUwMzI0MGU4Mzk=

data/bin/dad

@@ -45,12 +45,6 @@ gem 'unicorn'
 # gem 'debugger'
 EOF
 
-ROUTES = <<-EOF
-Banbanlive::Application.routes.draw do
-  # root :to => 'welcome#index'
-end
-EOF
-
 action = ARGV[0]
 
 if action == 'new'
@@ -60,11 +54,14 @@ if action == 'new'
   [
     "rails _#{rails_version}_ new #{app_name} -d mysql --skip-bundle",
     "echo \"#{GEMFILE}\" > #{app_name}/Gemfile",
-    "echo \"#{ROUTES}\" > #{app_name}/config/routes.rb",
     "cd #{app_name} && sudo 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",
   ].each do |command|
+    puts command
     exit 1 unless system(command)
   end
 end

data/lib/daddy/formatter/daddy.css

@@ -35,7 +35,6 @@
 
 .cucumber .scenario h3, td .scenario h3, th .scenario h3, .background h3 {
   font-size: 1.2em;
-  padding: 3px;
   margin: 0;
   background: #FFFFFF;
   color: #000000;
@@ -44,7 +43,7 @@
 
 .cucumber ol li.step, td ol li.step, th ol li.step {
   padding: 3px 3px 3px 10px;
-  margin: 5px 0px 5px 0px;
+  margin: 5px 0px 5px 1.2em;
 }
 
 .cucumber ol li.passed, td ol li.passed, th ol li.passed {
@@ -63,7 +62,7 @@
   border-bottom: 1px solid #999999;
   background: #F0F8FF;
   color: #001111;
-  margin: 5px 0px 5px 15px;
+  margin: 5px 0px 5px 1.2em;
   padding: 3px 15px 3px 10px;
 }
 
@@ -75,15 +74,15 @@
 }
 
 div.feature_dir span {
-  cursor: pointer:
+  cursor: pointer;
 }
 
 .step_contents {
   display: none;
   background: #FFFFFF;
   border: solid 1px #999999;
-  margin-left: 15px;
-  padding: 10px;
+  margin-left: 1.2em;
+  padding: 1em;
 }
 
 div.background {
@@ -99,7 +98,7 @@ div.contents {
 }
 
 div.feature .narrative {
-  margin: 10px;
+  margin: 1.2em;
   line-height: 1.5em;
   font-size: 1.2em;
 }
@@ -108,12 +107,8 @@ div.feature .narrative > div {
   margin-left: 10px;
 }
 
-div.scenario .narrative {
-  margin-left: 20px;
-}
-
 div.scenario {
-  margin: 10px 10px 10px 20px;
+  margin: 10px 10px 10px 1.2em;
 }
 
 div.scenario.faild h3,
@@ -129,7 +124,8 @@ div.scenario.pending .scenario_file {
 }
 
 div.scenario ol {
-  margin-left: 20px;
+  margin-top: 1em;
+  margin-left: 5px;
 }
 
 div.scenario table {

data/lib/daddy/formatter/html.rb

@@ -188,15 +188,7 @@ module Daddy
         
         if lines.size > 1
           @builder.div(:class => 'narrative', :style => 'display: none;') do
-            @builder.pre do
-              text = ''
-              lines[1..-1].each_with_index do |line, i|
-                next if i == 0 and line.strip.empty?
-                text << '<br/>' unless text.empty?
-                text << line
-              end
-              @builder << text
-            end
+            @builder << lines[1..-1].join("\n")
           end
         end
       end

data/lib/tasks/database.yml.erb

@@ -1,5 +1,5 @@
 <%
-  app_name = ENV['APP_NAME']
+  app_name_short = ENV['APP_NAME'][0..15]
 -%>
 # MySQL.  Versions 4.1 and 5.0 are recommended.
 # 
@@ -15,10 +15,10 @@ development:
   adapter: mysql2
   encoding: utf8
   reconnect: false
-  database: <%= app_name %>_dev
+  database: <%= app_name_short %>_dev
   pool: 5
-  username: <%= app_name %>
-  password: <%= app_name %>
+  username: <%= app_name_short %>
+  password: <%= app_name_short %>
   socket: /var/lib/mysql/mysql.sock
 
 # Warning: The database defined as "test" will be erased and
@@ -28,18 +28,18 @@ test:
   adapter: mysql2
   encoding: utf8
   reconnect: false
-  database: <%= app_name %>_test
+  database: <%= app_name_short %>_test
   pool: 5
-  username: <%= app_name %>
-  password: <%= app_name %>
+  username: <%= app_name_short %>
+  password: <%= app_name_short %>
   socket: /var/lib/mysql/mysql.sock
 
 production:
   adapter: mysql2
   encoding: utf8
   reconnect: false
-  database: <%= app_name %>_pro
+  database: <%= app_name_short %>_pro
   pool: 5
-  username: <%= app_name %>
-  password: <%= app_name %>
+  username: <%= app_name_short %>
+  password: <%= app_name_short %>
   socket: /var/lib/mysql/mysql.sock

data/lib/tasks/generate/routes.rake

@@ -0,0 +1,24 @@
+# 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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daddy
 version: !ruby/object:Gem::Version
-  version: 0.1.22
+  version: 0.1.23
 platform: ruby
 authors:
 - ichy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-20 00:00:00.000000000 Z
+date: 2013-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -306,10 +306,12 @@ files:
 - lib/tasks/cucumber.rake
 - lib/tasks/nginx.rake
 - lib/tasks/jenkins.conf
+- lib/tasks/generate/routes.rake
 - lib/tasks/generate/controller.rake
 - lib/tasks/generate/view.rake
 - lib/tasks/generate/templates/index.html.erb
 - lib/tasks/generate/templates/show.html.erb
+- lib/tasks/generate/templates/routes.rb.erb
 - lib/tasks/generate/templates/edit.html.erb
 - lib/tasks/generate/templates/new.html.erb
 - lib/tasks/generate/templates/controller.rb.erb