daddy 0.0.4 → 0.0.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTc3ZmI4NTNlODk3NGI5ZTU0ZTU2Y2U1OGFjYjJiNjA5Y2UwNTAwZg==
+    YTljOWIyOWZkZTZjOGQ4MDAzYTBjNzBmOTc0MDY2ZTgyZWY4MDRiYg==
   data.tar.gz: !binary |-
-    ZWIxYmFkNGQ1MmIyN2UyMWE4MDM0ZmIyNzY4NDkzNjc2MmU0OWNjOQ==
+    YjgzODZkMDU2NmM0MmViNTUxM2Q0OTEwMDgyMjUxYTY2YjI3Zjg2ZQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    OWY3MzcxMDFkNDFkZjJiZDExNGEzOGQ4ZjBkMzAyNDViZTFlMzRjMDUyOWI1
-    MjBiY2Y3NTdiYTkxODJhZTgzZmVmZTIxMTU2MWY5ZWMxZDRmNTUzZTY3N2Nj
-    ZWNkZTY1OGEzMTJlZDFmZGE3NjNiOWE3NmRkNjE0NTQxMTMzODc=
+    ZWEyODdjNDRmM2Y1OTNhN2JhYmQ3MDAyOWE3YmY1MTRhZjg4Mjg1YTMxNGUz
+    YjIxM2NiOTAzNTBmODY3YjZhNzBhNWM3YmVkOGQ2N2NjNDc0MTc2NjA5NWI5
+    YzYzM2Q0NTJjYmU1ZDAxMjZmYTcyMWM0OGJjOGJkODJmZjVjZjk=
   data.tar.gz: !binary |-
-    NjA3OTlkOWI3MDkxYWVmYzRiNzI4ZWRlOGE3NzJhYTFiZDQ4OWU0ZWUyZTdj
-    MWE1NThmYWVjYzg3M2I2ODZmNzhlOThlZDY2NTMxZGI5N2U1ZDg4ZGQwNTNl
-    NTIzMWRiZWM5NmNmMjg2Njk3NDgzZjhjYjE1ODk2MzUwMjhlMjI=
+    NjA3NWE1NzA4MmE1OGQ1OTg1MzYwZThiYzMxNmVmZDdiZTk1ZWY2ZjZhY2Yw
+    NDY0OGY3MjgzMWJlY2IxNmZiN2NhOWU3MDc3NTYzODY2ZjI5YmI1Y2ZlMDcw
+    YTUwOGViZjQ5YjliZjg4NTRiYTg3NWZkNWNiNWYyMDg1MDg4ZTU=

data/lib/daddy/formatter/daddy.css

@@ -1,6 +1,6 @@
 #menu {
-  width: 120px;
   float: left;
+  margin-right: 10px;
   background: #FFFFFF;
   color: #000000;
 }
@@ -21,9 +21,9 @@
   font-weight: bold;
 }
 
-#menu ol li.diary {
+#menu ol li.sub_menu {
   margin: 0;
-  padding: 0 20px 0 40px;
+  padding: 0 20px 0 20px;
   border-left: 5px solid #65c400;
   border-bottom: 1px solid #65c400;
   line-height: 40px;

data/lib/daddy/formatter/menu.html.erb

@@ -17,10 +17,20 @@
     end
   end
 %>
-<ol>
-  <% branches.each do |b| %>
+<% branches.each do |b| %>
+  <ol>
     <% title = (b == 'master' ? '最新' : 'スプリント ' + b.gsub(/[a-zA-Z]*/, '')) %>
-    <li class="sprint"><a href="../<%= b %>/index.html"><%= title %></a></li>
-    <li class="sprint diary"><a href="../<%= b %>/diary.html">開発日記</a></li>
-  <% end %>
-</ol>
+    <li class="sprint">
+      <%= title %>
+    </li>
+    <li class="sprint sub_menu">
+      <a href="../<%= b %>/index.html">仕様書</a>
+    </li>
+    <li class="sprint sub_menu">
+      <a href="../<%= b %>/diary.html">開発日記</a>
+    </li>
+    <li class="sprint sub_menu">
+      <a href="../<%= b %>/coverage/rcov/index.html" target="_blank">カバレッジ</a>
+    </li>
+  </ol>
+<% end %>

data/lib/daddy/railtie.rb

@@ -4,6 +4,19 @@ require 'rails'
 require 'rails_i18n'
 require 'devise'
 
+if ENV["COVERAGE"]
+  require 'simplecov'
+  require 'simplecov-rcov'
+  SimpleCov.formatter = SimpleCov::Formatter::RcovFormatter
+
+  if ENV['COMMAND_NAME']
+    SimpleCov.command_name(ENV['COMMAND_NAME'])
+  end
+
+  SimpleCov.merge_timeout(7200)
+  SimpleCov.start 'rails'
+end
+
 module Daddy
   class Railtie < Rails::Railtie
     rake_tasks do

data/lib/tasks/cucumber.rake

@@ -7,7 +7,8 @@ namespace :dad do
     phase_no = `git branch`.gsub(/[a-zA-Z]*/, '').to_i
     driver = ENV['DRIVER'] || :webkit
     pause = ENV['PAUSE'] || 0
-    options = "PHASE_NO=#{phase_no} DRIVER=#{driver} PAUSE=#{pause}"
+    coverage = ENV['COVERAGE'] || true
+    options = "PHASE_NO=#{phase_no} DRIVER=#{driver} PAUSE=#{pause} COVERAGE=#{coverage}"
     
     output_file = ENV['OUTPUT_FILE'] || 'index.html'
 

data/lib/tasks/publish.rake

@@ -2,10 +2,10 @@
 
 namespace :dad do
   task :publish do |t|
-  system("mkdir -p features/reports")
-  system("bundle exec rake db:schema:load RAILS_ENV=test")
-  system("bundle exec rake dad:cucumber PUBLISH=true OUTPUT_FILE=diary.html features/開発日記")
-  system("bundle exec rake dad:cucumber PUBLISH=true OUTPUT_FILE=index.html features/仕様書")
+    system("mkdir -p features/reports")
+    system("bundle exec rake db:test:prepare")
+    system("bundle exec rake dad:cucumber PUBLISH=true OUTPUT_FILE=diary.html features/開発日記")
+    system("bundle exec rake dad:cucumber PUBLISH=true OUTPUT_FILE=index.html features/仕様書")
 
     system("mkdir -p tmp")
     system("git branch > tmp/branches")
@@ -23,8 +23,13 @@ namespace :dad do
       system("cd tmp/gh-pages && git pull")
     end
     system("mkdir -p tmp/gh-pages/#{current_branch}")
-    system("cd tmp/gh-pages && git rm #{current_branch}/screenshots/*")
+
+    system("cd tmp/gh-pages && git rm -r #{current_branch}/screenshots")
     system("cp -Rf features/reports/* tmp/gh-pages/#{current_branch}/")
+
+    system("cd tmp/gh-pages && git rm -r #{current_branch}/coverage")
+    system("cp -Rf coverage tmp/gh-pages/#{current_branch}/")
+
     system("cd tmp/gh-pages && git add .")
     system("cd tmp/gh-pages && git commit -m 'publish'")
     system("cd tmp/gh-pages && git push")

data/lib/tasks/test.rake

@@ -2,10 +2,10 @@
 
 require 'rake'
 
-Rake::Task["test"].clear
-
-task :test => :environment do
-  system("mkdir -p features/reports")
-  system("bundle exec rake db:schema:load RAILS_ENV=test")
-  system("bundle exec rake dad:cucumber")
-end
+namespace :dad do
+  task :test => :environment do
+    system("mkdir -p features/reports")
+    system("bundle exec rake db:test:prepare")
+    system("bundle exec rake dad:cucumber")
+  end  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: daddy
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - ichy
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rails-i18n
   requirement: !ruby/object:Gem::Requirement