daddy 0.1.3 → 0.1.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Njg4MDc2ZDgwMmNjMzY0MmE3YWIzZjU1YjczMGE3Zjc5NTNjYmRhZQ==
+    OWMyOTg0MGZmODIzOWQzZTUwODhhMDA1NWRmZTgwZjAxMDdjYzYyNA==
   data.tar.gz: !binary |-
-    MjVlN2UyMTM3ZTQzMWE2OGM3N2M1NzU5ZWEzZjVmMjY1YTI4NDRjOQ==
+    YTc5MzllMjE2YTQ0MTVlMjI2ZDE1NDk4MzYwZDY0ZDE2M2Q5MWI0Nw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YjVkYWI4YjQyMGUyNjU3OGIxMjdhOWNjZDZhMWExOWRiOTc2ZDM1NDUzMTNj
-    MDQ4N2M1NDhjMTZjOWY5NjE3MTQ5MjdiMGE1OTU4OTcwYzc1NjM5NWYxZThm
-    NGUxNTUxMTYzNTg4MjIzZDhlMjc0YjY5NmVmNmQyNjZkMWFjNDA=
+    MTQ3ZjYwODI0OTMzMDM4ZDhhNGQyZjYwNDY2ZDgwMmZlMWQ4MWQyNThjMjJi
+    ZDVkMTUxYzllNDZkODM2YTkyNzJjNGExMzUzYTVkOWQyODBkNDhmYTFiNDEz
+    MThkZmY1MjEyZGMwZTRjZmJkYWNjOTQ3YWRlMzU5ODdmM2RkYmE=
   data.tar.gz: !binary |-
-    YWYxMDUxYTJmYWNmODBiYzUwZmJiZmE0MWFkYTc2MTE3NDY2YmQwNTU2OGQ1
-    NzhiMWEwMjA1YjI2ODkzNmZkYzIwNWJjZWZhMjhlY2I2M2Q2NTZmNTRlOTA0
-    NGE5OTA4YzMwNzIxMmVjODQ3OWQ1NjBiODljNzRhYzYzNjU0M2I=
+    ZjkxNjk3ODA0NmNiODE2N2FkOWViYWQ5ZjQxZmQ0ZTYwMTNjNTI5MmNjMWE3
+    OTE1M2NlODcyYzQzN2JhMTIxMWIzNDIzZTNmNjg2MmY4ZDA2Mjg1NDM4OWNm
+    MmNiNmVkMjBiODU1M2IxNTM0NGI5ZmM0NWZiYjQ0ODliZTdjY2U=

data/lib/daddy/cucumber.rb

@@ -1,13 +1,14 @@
 # coding: UTF-8
 
 require 'cucumber/rails'
-require 'capybara/poltergeist'
-require 'capybara/webkit'
 require 'daddy/git'
 require 'differ'
 
 Differ.format = :html
 
+require 'capybara/webkit' if ENV['DRIVER'] == 'webkit'
+require 'capybara/poltergeist' if ENV['DRIVER'] == 'poltergeist'
+
 Capybara.default_driver = (ENV['DRIVER'] || :selenium).to_sym
 Capybara.default_selector = :css
 

data/lib/daddy/formatter/daddy.css

@@ -1,3 +1,7 @@
+h2 {
+  font-size: 1.4em;
+}
+
 #menu {
   float: left;
   background: #FFFFFF;
@@ -35,7 +39,7 @@
 }
 
 .cucumber .scenario h3, td .scenario h3, th .scenario h3, .background h3 {
-  font-size: 11px;
+  font-size: 1.2em;
   padding: 3px;
   margin: 0;
   background: #FFFFFF;

data/lib/daddy/formatter/html.rb

@@ -44,7 +44,6 @@ module Daddy
         end
       end
 
-
       def before_features(features)
         @step_count = features.step_count
 
@@ -61,7 +60,7 @@ module Daddy
         @builder << '<div class="cucumber">'
         @builder.div(:id => 'cucumber-header') do
           @builder.div(:id => 'label') do
-            @builder.h1('Daddy')
+            @builder.h1(ENV['TITLE'] || 'Daddy')
           end
           @builder.div(:id => 'summary') do
             @builder.p('',:id => 'totals')
@@ -549,7 +548,7 @@ module Daddy
 
         @builder.div(:class => 'step_file') do |div|
           @builder.span do
-            @builder << step_file
+            @builder << step_file.force_encoding('UTF-8')
             @builder.script do |script|
               script << "$(function() {"
               script << "  $('#step_file_#{@step_number}').css('cursor', 'pointer').click(function(event) {"

data/lib/tasks/cucumber.rake

@@ -22,10 +22,10 @@ namespace :dad do
       end
     end
 
-    output = "> features/reports/index.html"
-    output = "-o features/reports" if format == 'junit'
+    output = "features/reports/index.html"
+    output = "features/reports" if format == 'junit'
 
-    command = "bundle exec cucumber --guess -r features -f #{format} #{features.join(' ')} #{options} #{output}"
+    command = "bundle exec cucumber --guess --quiet --no-multiline -r features --format #{format} --out #{output} #{features.join(' ')} #{options}"
     #puts command
     ret = system(command)
     fail unless ret

data/lib/tasks/dad.rake

@@ -3,7 +3,7 @@
 require 'rake'
 
 task :dad do
-  system('rake -T | grep dad:')
+  system('rake -aT | grep dad:')
 end
 
 namespace :dad do

data/lib/tasks/publish.rake

@@ -5,17 +5,18 @@ require 'daddy/git'
 namespace :dad do
   task :publish do
     if File.exist?("#{Rails.root}/db/schema.rb")
-      ret = system("bundle exec rake db:schema:load RAILS_ENV=test")
-      fail unless ret
+      fail unless system("bundle exec rake db:schema:load RAILS_ENV=test")
     end
 
     system("mkdir -p features/reports")
     system("rm -Rf features/reports/*")
-    system("bundle exec rake dad:cucumber PUBLISH=true EXPAND=false features/開発日記")
+
+    fail unless system("bundle exec rake dad:cucumber PUBLISH=true EXPAND=false features/開発日記")
     system("mkdir -p features/reports/diary")
     system("mv features/reports/index.html features/reports/diary")
     system("mv features/reports/screenshots features/reports/diary")
-    system("bundle exec rake dad:cucumber PUBLISH=true EXPAND=false features/仕様書")
+
+    fail unless system("bundle exec rake dad:cucumber PUBLISH=true EXPAND=false features/仕様書")
     system("mkdir -p features/reports/spec")
     system("mv features/reports/index.html features/reports/spec")
     system("mv features/reports/screenshots features/reports/spec")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daddy
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - ichy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-29 00:00:00.000000000 Z
+date: 2013-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -28,16 +28,16 @@ dependencies:
   name: capybara-webkit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement